diff --git a/Manifest b/Manifest
index a1d3a438d6b2..aa32fccfbbe6 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 28834 BLAKE2B 0c85a2bfc6eb60f23dbbe27692f3852bffeffaf0e861ecaa4dc021a04fad69094f1574244d12c257eaeaa3480bded61fbf982f6a115df5e6962aa0296dfdb8d7 SHA512 2a88f8cd6f53f2012070825605bb5065d8e1093d296fe07d43baa32db8dbfe75233303937cad99a36b2bd769d9a4a47c6030614175f74656bfd64b6f409528f5
-TIMESTAMP 2018-03-04T19:38:27Z
+MANIFEST Manifest.files.gz 28791 BLAKE2B 384d75ff951b6debb438637e05d96abe87eac8fb323ac70d4dd0683f137dddaf937c8336e1baf8359570aee91bca4f6cc13b01978902f00d5879f21c44125b03 SHA512 60f6394a1f2bd66d38104830171d67f25fc9c96287348f5abce45036f82d4831ec10e1568b44c734e91d9a06fb082d81d44fd8ce5ab54d03e6224d1993ca7f82
+TIMESTAMP 2018-03-06T04:38:26Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlqcSzNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlqeG0JfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAtkA//cJRqobt1nw3seP0YPSK+p3+6egblDbSLLvEr6PukYTnKOPSME/kx38vg
-ZlEDhq7dM6bKoNrD+qc1aQTRpcUulk+ViUV+OTDhlrTBn+74/Ujke9PEpIzuf9T8
-yUXaQh5t4ML32KmA5bDz9EGstQk3xW9UQti+SSs1Sx+cdXt/dB7lXtp4MvhLsiX/
-kAa71rspICd1t1lmLuaQj/Jjk16RHoybC+irvmAaZsQcHErQBkfE0PxRrfrk7qvl
-NgqzX+00ifa+mAM2zxRpYd9CIiYsUZ9v2TwSySOPuQpN2pPvu8eAxHgN3I5yDSxP
-3034dw2vF6ySreO4GAM45h5loBtgyw5CAkBc3WeHKMCPJQroNROXHPTaBeHNJ35o
-WrGqHJ4az1fRpz2CCfpQsl0sUGtGAxaSHdEZanwaPHVc291u3XvvoDtJC7d3nzNy
-wUSVE1Rm9PVbZvmE5+LfK77AdDbCfH/wG7UjEINQ3n3RlLjv5iM5rfqsPOWlDy9B
-TyrIxzyAv8bGCNo/CuxghEJuyR1xSchLlo3XeZ0CYsqXMHw9Zmmmd9axEP+3MQrc
-dVSMQcu79ox4wg//0s1c13Vu2BC6r7nf9LxxAQOG8Ub3DwBGaDwPR+LzzgcLMLf1
-CXZxYtdXrfPBYAOstL/yKPY7jPUi4cMV5hRx9dWJvV3O+iuyx2g=
-=F6Si
+klCTiQ//UJNthQI5CP7YwfmBp96/UOvYpez7mN40YZgAetKrvgS6cHTpWGZIoTfA
+r9XNHvXsBQQMjNpN7jbwF7vEsy5u/k1yVjN45S6QleJG4xVrmk3I9K7Mb0kAjP7o
+abSiHbSiUwBrzlmDh742i3gGEH6trygQPyGtQOcOltmowsShbLzGqt09pUHsQlu6
+xDA4hxMXE4V2le9G+lWrm+vD6AOddIh3UyHvkXRCQ3qKzej0uFFPdIWy8fx1VX52
+SOuUuSuH7bfKefCYWyZA+b6QAllKmn7D2uLIsTan9LwsSC36igkolU4Vz0KyAT3B
+P5r/7uLeTHEoT5Y7V12+4BpcYlbLX4mlyhSTTRYhtUj7qLx+FP3MsA7icWMR/vJ8
+ZOgRvN2Y8YP6+QHGmGoobbMH3W9fDCdJUOHq55kbstv34dxfS8fQlZeLL/2F9e9O
+U+//Pi/dUJJeHj7zWPVWTDfBm9RBh5yorBe6dKT5oWJxomwFy5fpxpprqZrEc3S4
+y6JFPnZmyxdHF4HGxQQpE/1eVcro71nk9z9SrEtyvBKpw422OxURXqc4XOksQJcg
+aSpMOz95wRJDgpP2wGpIpgUKqGEVXbWsme8SFgKKjB7b9av9taL7HYdj/Cd7ciC0
+DoA++RnttgzXIWrT+nhR5cI1dXeHdXwcnd7D/S7XEvzx0VOFOcE=
+=nASh
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index f3116c870fcb..510cf7358d15 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 30f99b26812c..484dc5cf78fa 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/at-spi2-atk/Manifest b/app-accessibility/at-spi2-atk/Manifest
index b343fbc58cc8..52248259a843 100644
--- a/app-accessibility/at-spi2-atk/Manifest
+++ b/app-accessibility/at-spi2-atk/Manifest
@@ -10,5 +10,5 @@ AUX at-spi2-atk-2.20.0-tests-data/test-value.xml 289 BLAKE2B 0d8a8421e4443aab9a9
 DIST at-spi2-atk-2.22.0.tar.xz 306148 BLAKE2B 3606f96ca89dcc23700c2aaa67da9daf51709113b5d5a15d4864e565dd559e4136007f125801de08e9c6bc6c14d7b1c39e8307340c1758a6145aeb0caeb0a5c9 SHA512 9b815eecbe01164df8a3341a3b0e1fe57a4f333964a0836f89f54712512a32d69c333c0c099eb194716d081f5460bb6e6d2c852f7218df51549e88e75880f284
 DIST at-spi2-atk-2.24.1.tar.xz 308576 BLAKE2B 92b96c54cd5a2dbd8a3dddbaa3188b3396ef8e4631cc9438e4ba57da27672d509babae3415c66d2c6afc74855ff0536d4cc6f24a8cecf66478021d350b3572a1 SHA512 5dbc186c7ea4f7f34aa0acaf90f683e549162caa274ba5b5818ae9992b52f1b475923d9818870978e87e3dacdf1018db31810d2d53b39bb4f068bcb64a423f23
 EBUILD at-spi2-atk-2.22.0.ebuild 1305 BLAKE2B 5eb5cf35564ecdf2dc0bed7bcdfb0f7cea1a89d9ff7d0aa711a6b0eb257350c54ec16380d121c12c69df23d9b064f2eb77b61d7da58dce4e888963566cf4bac4 SHA512 e9a31fbdabb3ed984bb7909faa53c4ea34915d551b2e24791282610819989168da73215586d470b4862620d334b68b0bd8832370c6a1b36b0482bdbbbdd225cf
-EBUILD at-spi2-atk-2.24.1.ebuild 1310 BLAKE2B 8fb5b0ee2cefab5637c7cecb1ff3cb7d983fc9403ce8665654fe3120cfbeb18d190e68a421ddcf7ab9dd58a226601a87025db40383e694feba3e6e6fe9b07f6d SHA512 b9030f13222918aa0596cf8f6edf366e21e84449f22d2c5c4d024ef8d9bbcac95c85c6a1de44e1e2cb0f0baee57e548623c7209c40c23f76691d8eb39f18b8c6
+EBUILD at-spi2-atk-2.24.1.ebuild 1309 BLAKE2B 58d7035982b0f528c9ba2563e5beb72b65f0fbc118155be5caaa031da5d27593f0a7612a85c20d47012a34871dd41197bd9161e6b3512eca4833f9349657eaa4 SHA512 6998a685db93ce030db76da9ccbec79a3a5f7f4ce972882faeb84173983322c6f4422de35dfb32465396394a0c49f5c825e565bca5e08bfbbaba004f6081b542
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.24.1.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.24.1.ebuild
index 28502860d05a..2fc8ba189170 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.24.1.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.24.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 COMMON_DEPEND="
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index ce76e1a96b1f..d79f84db076f 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -2,5 +2,5 @@ AUX at-spi2-core-2.0.2-disable-teamspaces-test.patch 302 BLAKE2B 4165c68b7e8d983
 DIST at-spi2-core-2.22.1.tar.xz 454048 BLAKE2B 5ee4cdb83815258d9be8b81870b590b2f85311acf75e3c830c00092cbe5dd66a07f933318ce7d4bc308308f6f87e46579b30948b67b8b7f753adc5e10589246b SHA512 2376b57ce744351ed09a13cd02f0c02264c0998860710cfcdac59f0efb78061512986f5d7305a2f6c594d70213722f81795620e8cd2c6587c6d3f1335477171f
 DIST at-spi2-core-2.24.1.tar.xz 452440 BLAKE2B 2e3e262d507dadbdb8fc5bb1bd60d3dbe8a9c2946228b6dc551d0a9564684d96b1b6cbe29849c1d846b3106b5444a2c6880a10825ba20cca87893f6a52815023 SHA512 e7f354a90204f12d4e464a6b4e4cb27141af3715d7c5ec253bdd2ebe65bc7d191ae7b775c45470a1bd1fe2c0accdd4e84feeb5e1eb1a6c05f3e5e734371027be
 EBUILD at-spi2-core-2.22.1.ebuild 1771 BLAKE2B e401dfb647adf50ce166d5871393ef12af00af92d26e0c1d735cbe3ed927ef9b2bd9a63438e7ffa7736a9d61940c8783d6b31307bd2c0ef7aacb12cb7c05ee95 SHA512 824732f4a7c7fc484fb591a7862d8a18a5326ad58150e3c23befb8f23d089d5a5fe7cd71ac7914877aff6015b99b10c086bc4a3cf6fb9b1ad71ab8085e9ba722
-EBUILD at-spi2-core-2.24.1.ebuild 1776 BLAKE2B e0266dbaebb6bc8d8e2401c96d8ae4247af1bfffd33c1c6242f7f27408e71ef174a936e7350493cf9958905caa331323e3e8f0c31749a5032f291bab3d9c240e SHA512 f27088b8bf209aca1e99212a9df0e66e00956a3758bd0a854887931d363993c1675a6abaff830a631f5c4a744b69f9a1543598f27b72a7d21ff500819a19de6b
+EBUILD at-spi2-core-2.24.1.ebuild 1775 BLAKE2B 4e2174577b3c973398fe311927825feb6dfd7188026f39372ea72346ebcf43f8d0cfeda979ef545825af2dfff128a3e83732e954b7cb823a178b5b7014d1f734 SHA512 b00d48b63c6fec2bdcf8679ece2375531fe0d9e2f59964d127b62b481507f27ed55e78e64aa612eab7c9baf709a466a0bdea16dabb72e780ca0ff87acaf93107
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.24.1.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.24.1.ebuild
index b7dbf7786ac4..a6d1a9bdf7fc 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.24.1.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.24.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 LICENSE="LGPL-2+"
 SLOT="2"
 IUSE="X +introspection"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 
 # x11-libs/libSM is needed until upstream #719808 is solved either
 # making the dep unneeded or fixing their configure
diff --git a/app-accessibility/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest
index 4cc6bc5ed8ba..3060ec3c264d 100644
--- a/app-accessibility/speech-dispatcher/Manifest
+++ b/app-accessibility/speech-dispatcher/Manifest
@@ -3,5 +3,5 @@ DIST speech-dispatcher-0.8.3.tar.gz 1292321 BLAKE2B a9a69734b9aa3c38041ea2872fa8
 DIST speech-dispatcher-0.8.7.tar.gz 1333677 BLAKE2B 0b08f1a1228fe1240e14b3d52913f8fa64a1f2ee9b563294b49ea8d3e5cfd3041aa5572ec72354b360dabd2d263deb79e418b95b6174a5b89ee541e9fd23c7e2 SHA512 0e7af02e8521aa8d397ea4d0329f9a8d56970beed645456dfedc738ececd2ccd8ecfdf66e92ae852878a473ba991175e1d4dc2b8b0148c958163682b49678375
 EBUILD speech-dispatcher-0.8.1.ebuild 2645 BLAKE2B a6d970c44f8c1a1217de41fb6d78644ec3bccf0043116c6bd57a13fefa66927b93a84d45cf886946ea4b708cab1e49ff3ed59d886e790357980925741297f507 SHA512 7b9ada7edd6d2ccf949805c743f68848dbb35b8a3c4714e33b7a1c4248770165c77405214d24d38549d89309a85cc2233311b74594e9c0b21dcbc3390ab388a4
 EBUILD speech-dispatcher-0.8.3.ebuild 2686 BLAKE2B 64c7a07709e1ad1c1b11177b6a6bfbfb237d547113e508973a4f8cefa2802a4abc0813e88ec747fc1586c77dc0277c5c326a3dcbb53e4346a5a1885c37dd841d SHA512 186583ec15e3900ac82ffcac768002b3615ebe3d9e0906ca62d30642be72b7365b2d9043e327fb492f32057d735ec1a7b4e24fc543be000a3c951699ee341438
-EBUILD speech-dispatcher-0.8.7.ebuild 2687 BLAKE2B 4576b79e41f9f7044ef4559b10123460a91f0d173bed69eb4c4767f93ca4f8ac35532b5b85cf366c59ac4d072214934c7e09ffebf9684d691468625cdec2f80c SHA512 8cf13342b0c923818a66a9bacf1a6d3beabf37531a9c25c2ec0bc2ce4bfb10d400b5daa281f199a80cf40a9f5aa78a097642cb4fef698773320e6f7e467dc755
+EBUILD speech-dispatcher-0.8.7.ebuild 2686 BLAKE2B 11c3c8225f0dee8464215bffee67d6c242b70fd8b024ae0ac24ed56476abe202f3f9899b87b9d8d2a4d826f2099a480004502d576a3e8e0dabe40a458d2d1a84 SHA512 2df0eed8f300cd10600a79a0f868d5985222603d817c38deae99e6d939e5e81c943581eff18dcb67fcd84229abfd8c4b7395e95711b842c750098d8340865d4d
 MISC metadata.xml 632 BLAKE2B 2a60d2e822db36bf3f0547d97ccaad05d6bcce11afa71534b108358f1d71f857f200907f01c31c3083a5196e43eb681c06e2991a086c91731daced3f56282c2d SHA512 db94cba99bd2c9bbfe98b1647ac53a3861cbd697df791bea025e2a713a5991ca6929f2bc82a985ba38eef4a2571515d96aac6558fe143b68e24713490c12dd0a
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7.ebuild
index 9c0492d23874..78950b011917 100644
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7.ebuild
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.freebsoft.org/pub/projects/speechd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alsa ao +espeak flite nas pulseaudio python static-libs"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 71eddf5b9002..12908fb7e8f5 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index 35df9fa4b56a..42eeff422019 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -5,6 +5,6 @@ AUX conserver.initd 1055 BLAKE2B a515ff3c81c1e66b53f49d28db082d2a9eb3cd69a60f73b
 AUX conserver.initd-r1 1088 BLAKE2B 2ab26bafddf29f24488b147c2a90dca6e482361af96fc008df0029581a0308f380db36b7985ac8fdfc1884e0eeb897d3e84fed9ed3341e2b9ba35c9393850200 SHA512 332e59313f066a8e313f65b0f04c4a7f464cb77f9ac2b3ab5beb24b5fee393d9036b9f80a1c9cc0f6ba43a5c3519801aea6d61f96bed861d5caa3130ab4ff1e3
 AUX conserver.pam-pambase 194 BLAKE2B ad284008c94f4c19b911a93279b12893a1c686806b22f7f19500e7216c19768ab161f9ba5cf2405d9d46f412a08c0cb04de0bc05ead15fb75da931575c2c3be2 SHA512 5368394be5b9d97e0ae751d84fbb4848aa27fd57b1a2eea8c7919e56246e390985deca80f0019c2104034103f73ac382a5ab2129113a0ff0b63b0b8bd83648c9
 DIST conserver-8.1.18.tar.gz 323247 BLAKE2B 48176ba8be648df16ddb18c1a760af8069f7d926d2e0767e3b7ef903276d6104cfa9464a6ebdce009720fe5118862d89cf5371e104d17b967e11fe8e8968e8f9 SHA512 a8029aef5fd84f93eb3ae56ba7f751d79a6065c012bfd805e050f8c9edf09fd660c272d3f3ce0a47cfb17678574babbecad63f8bfd50ad4fdccdbabc2249435f
-EBUILD conserver-8.1.18-r1.ebuild 2294 BLAKE2B 3df61824650b1243e0b57764ea5e9268616b69c8862775e72892349edcbb32a2ee8ca92d05d20d5f2034a761b6d29284c264b991fd81b5561f25272a291b3de7 SHA512 567fa7751509fdcdbbbcf7b8a71b2322a2396e77b15a85549a5b3e9caf771d7561b2fde485059a362b5f3510f3f1b5721b04879f84a957f1bb78f35700f4fb27
+EBUILD conserver-8.1.18-r1.ebuild 2293 BLAKE2B fc5fd86847ad09fcb971a02b3ee2ed3cf63984cb731531e816384617e21118a5837bed9ef98d48d788b0dfda38b638fd3fa6423e14c21e14659d67435448f029 SHA512 e07ac71ac70733d8aa7ba5ef4f0b60839edf88e5add653299dcbc86d2fd858f41c250925da57426f29bfe776fce6bd64b671a0abe44a06347a9faea01b415188
 EBUILD conserver-8.1.18.ebuild 2230 BLAKE2B 2aa79efe824e6fbaa8fba254016187842699ca9aa119c693e25ba071d670065ef3ac8aa0f6363275b11703210d8d5baf6dd6ecef053de236f3ef48353f9d4e96 SHA512 a77a9c4550d25b134033f7d549528f58438f06012d2ecc8564dde521ed4dca880b7fd9ad75b43e0061988574a43c395e7760bb3b10e9709bdae54cfbf9311dc1
 MISC metadata.xml 1170 BLAKE2B cb2e515dc5e79cd5bea66d737f507c4a65be82b46968fa3f07ead05d5467756ca3a3f6b348ff50fe21c20dada080b1ddf2f2b24d703752b0266259d74d3c3327 SHA512 8b8babc1d68eadb8e5ffac32145fd28fe5c372cb87ad9d12c6266e17aef59511c7e20db0a97958e6da7120d9f7555ad708197395263c301eac222c1f7718eed1
diff --git a/app-admin/conserver/conserver-8.1.18-r1.ebuild b/app-admin/conserver/conserver-8.1.18-r1.ebuild
index 2ea0b792127e..86c1d7954963 100644
--- a/app-admin/conserver/conserver-8.1.18-r1.ebuild
+++ b/app-admin/conserver/conserver-8.1.18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="http://www.conserver.com/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ia64 ppc ~ppc64 ~sparc x86"
 IUSE="kerberos libressl pam ssl tcpd debug"
 
 DEPEND="ssl? (
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 0a8971741533..ecbe0c06f7bc 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -3,6 +3,6 @@ DIST keepassxc-2.2.4.tar.gz 3895421 BLAKE2B 0de35f394dae8cf8d70f75d73783965826cc
 DIST keepassxc-2.3.0-src.tar.xz 3803400 BLAKE2B 1e9d72bb71e3db0f7f4662bca22affe68c0ac857ce3b7b67924949622edf3a4d2f54717c1c629d79c2cfeccd29d0f1906a8f43e49483980d11afbb654a132f4f SHA512 44721a4dd9364898c69a10d73ceb3fce9b8e83bbe261d9bc656897bc01f37e9b65b923867e18d3c3269773075ad846a0e1195d8b7bf574fcbce7bef9a5778888
 EBUILD keepassxc-2.1.4-r1.ebuild 1540 BLAKE2B f16a6d6a45eca3926735ce4857c8007c421594e1e41a1d87feb75ce6234b92760a9221cd81734f5a8e1a55fef4f36f6faa0acba0b786dfd7c81d9f3f2c9f280c SHA512 7dcda961fda3b3166b2e38a878e2b2782e604c3373b67c358347746fccfa781082ce1c3417aeb8c1b76b8fc5ae94b38bff1442fc2477267b4a5096afdf1803ea
 EBUILD keepassxc-2.2.4.ebuild 1543 BLAKE2B bb828c6e56544ce760b713d769f4b77457b9a45687bab10fb2d6a624d62ac71c11bc93b7a25d240ec5e1ab8686b6dd5cb2d98fc6ff2497ccd8c7579dac87cf2a SHA512 14b030ef70fd5e43d5591271353d511acf88d5020ae28d682e9fb992e7338c071d72aeda6932beb4d35408ca4b42052185f18cd2b743aaba0e167a5c37942dff
-EBUILD keepassxc-2.3.0.ebuild 1735 BLAKE2B d563e0a1470e6d2192e1a6741e63ead96638f29093eefd2e2ab15bd06904f17f8a1fd3a4f408180598a3727c10afef31054f7f294de4a18d5121f560482c1385 SHA512 8f29bbe8395d7ead800eea057d515ead2126eeea45e198b4d9d4ed21f4e0b1d3e920a7102cd7c8e05471e4c9511df35316da2cac29af922729a01e4f8b41f519
-EBUILD keepassxc-9999.ebuild 1735 BLAKE2B d563e0a1470e6d2192e1a6741e63ead96638f29093eefd2e2ab15bd06904f17f8a1fd3a4f408180598a3727c10afef31054f7f294de4a18d5121f560482c1385 SHA512 8f29bbe8395d7ead800eea057d515ead2126eeea45e198b4d9d4ed21f4e0b1d3e920a7102cd7c8e05471e4c9511df35316da2cac29af922729a01e4f8b41f519
+EBUILD keepassxc-2.3.0-r1.ebuild 1749 BLAKE2B f40cfce681a8fddbbdc39b727fc5d36bf45e533a5cd36d0fbca4853928d27e945bac88a9ef84af0b5c2a3bfed1b2603543584c4bdaafedc9cc003da1afa20869 SHA512 1a40422bb5e84a7f6a57ae72ea8dd1252fbd865fcfc8da243b1a87ca5b2d399bf481ed160726ce30a2cad5fa1de5135c0a7feffd48b1bd7e759d857049a23c10
+EBUILD keepassxc-9999.ebuild 1749 BLAKE2B f40cfce681a8fddbbdc39b727fc5d36bf45e533a5cd36d0fbca4853928d27e945bac88a9ef84af0b5c2a3bfed1b2603543584c4bdaafedc9cc003da1afa20869 SHA512 1a40422bb5e84a7f6a57ae72ea8dd1252fbd865fcfc8da243b1a87ca5b2d399bf481ed160726ce30a2cad5fa1de5135c0a7feffd48b1bd7e759d857049a23c10
 MISC metadata.xml 937 BLAKE2B 21a284b7ee94184c22cdb740d9a24f8371cfb6f62d97361cb3a2f853409b3044e8ddad30f58f4f8ad27277739533972d22c7009808c7ae9e6a1c4b8e02003d7b SHA512 bd2e47e2ba3911323f0b5bee78e9e394edef7722e934c70a1e7d3509044d566b2e6d46fd77bde2c303d0c97a8ce4f756e0b32b476af253274a3a941b059da3f9
diff --git a/app-admin/keepassxc/keepassxc-2.3.0.ebuild b/app-admin/keepassxc/keepassxc-2.3.0-r1.ebuild
similarity index 97%
rename from app-admin/keepassxc/keepassxc-2.3.0.ebuild
rename to app-admin/keepassxc/keepassxc-2.3.0-r1.ebuild
index 6207e109fd62..69a100508278 100644
--- a/app-admin/keepassxc/keepassxc-2.3.0.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.3.0-r1.ebuild
@@ -43,8 +43,8 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	dev-qt/linguist-tools:5
+	dev-qt/qttest:5
 	dev-qt/qtconcurrent:5
-	test? ( dev-qt/qttest:5 )
 "
 
 src_prepare() {
@@ -59,9 +59,10 @@ src_configure() {
 		-DWITH_GUI_TESTS=OFF
 		-DWITH_TESTS="$(usex test)"
 		-DWITH_XC_AUTOTYPE="$(usex autotype)"
+		-DWITH_XC_BROWSER="$(usex browser)"
 		-DWITH_XC_HTTP=OFF
 		-DWITH_XC_NETWORKING="$(usex network)"
-		-DWITH_XC_BROWSER="$(usex browser)"
+		-DWITH_XC_SSHAGENT=ON
 		-DWITH_XC_YUBIKEY="$(usex yubikey)"
 	)
 	cmake-utils_src_configure
diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
index 6207e109fd62..69a100508278 100644
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@@ -43,8 +43,8 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	dev-qt/linguist-tools:5
+	dev-qt/qttest:5
 	dev-qt/qtconcurrent:5
-	test? ( dev-qt/qttest:5 )
 "
 
 src_prepare() {
@@ -59,9 +59,10 @@ src_configure() {
 		-DWITH_GUI_TESTS=OFF
 		-DWITH_TESTS="$(usex test)"
 		-DWITH_XC_AUTOTYPE="$(usex autotype)"
+		-DWITH_XC_BROWSER="$(usex browser)"
 		-DWITH_XC_HTTP=OFF
 		-DWITH_XC_NETWORKING="$(usex network)"
-		-DWITH_XC_BROWSER="$(usex browser)"
+		-DWITH_XC_SSHAGENT=ON
 		-DWITH_XC_YUBIKEY="$(usex yubikey)"
 	)
 	cmake-utils_src_configure
diff --git a/app-admin/webalizer/Manifest b/app-admin/webalizer/Manifest
index 9a287dca46c9..5f8f35654705 100644
--- a/app-admin/webalizer/Manifest
+++ b/app-admin/webalizer/Manifest
@@ -8,5 +8,5 @@ DIST webalizer-geodb-20140201.tgz 733070 BLAKE2B fd97dfd14e2fcbc6c97d6cb423c922d
 DIST webalizer-geodb-latest.tgz 639447 BLAKE2B a4a604f8ead42c403ce750c9f373e8ffc4a7510aab6cfd43b88f39b93f5636460860b72fcfcb9468a5a06739b830149878c948e5b3dd0748e14ee9cbfb2be9d4 SHA512 0f32d1249902e17f37cd0e7680004262bbe5b4a34a00d882319258c6aed80503e89ed192d8365731ab507fa54560082ae16c7023d0bc2232350709106be24117
 DIST webalizer.conf.gz 8986 BLAKE2B 6cee5f96c31a189bf7ce75ec845081d9a2f0e547362d415c84f78f1ddaa8e3ffd327517968037ac1606a485d9cba740054bb9851065d0ea03739b5558c7ef6f9 SHA512 ec7f815e0215116d72e6d93b471a4b86a1c152a8ebae7c374144cabeeb06750d3a39fde65faf069e9aeb133f27b0b4cdee16bed5442e7fbd4eb4f45a4f3cd84b
 EBUILD webalizer-2.23.05.ebuild 3813 BLAKE2B 73b3e795b6463598b432ed32a2cb9cb58c14824141c6edade11786c54bb52449cd13da01d68f930ece01376a8581c16e3779c394e3641ff9de2086a80e91ee35 SHA512 c81bdbb98168cb608c9eee163e71dbea85c487f16034fad1d772880f6b0b5350aa071fc5f3e870eaf49e8bfa5c6354c31c93866d8faaff9cec0843993afcde24
-EBUILD webalizer-2.23.08.ebuild 4227 BLAKE2B 69a84eaf7b6b4066ab3c7b62adf56ea0c79fac2016c7635d08c34a3dc4c8402e75204777a3a1a782874b938fd904b09186405f20adde01aaf9005655a9555255 SHA512 54f29cd70efd47f266797208f9aa0d8ed35a67c3c71b56dd1f6ba0e855db3c09c2cb5ec791046c770eb92cbfe419bd3d419683e3aeb7bb6a4d8ce5ae3e8c8055
+EBUILD webalizer-2.23.08.ebuild 4226 BLAKE2B c4f59e99dc9893e5092701d761abdb15c6e14c5b7239294655598c0aadfe4824e8285ab6253350746719ad2c0738334fd5c8cb48b0aeae77344d1ea16c16baa0 SHA512 192549ebb2fb69dbd87d9bdb33634b9e1ae8ea938f8a2f73e67db43729ea7803d82ec5c36c7e023e9dd1d5b50fabf973f8cb80063277176576eaa045fc8e9fd7
 MISC metadata.xml 434 BLAKE2B 72cde450aa4735601e14978c5bfc3be91f257907988e6017dc27f7aca8dad9b8586dc78943d69a10344d25d2435fb8394b5fe1239a0ea7ff2ae3ae2b26ba0eec SHA512 9d006c56a0019b4ea29e8f9f845ca9006ecdccf64b9e50c343420af4b3852b5c08f09a23d792c3d1454454f8a0696a0dbc4b36b4da2c6f0d4967f533ad3a3149
diff --git a/app-admin/webalizer/webalizer-2.23.08.ebuild b/app-admin/webalizer/webalizer-2.23.08.ebuild
index 04e5cfb7eead..ea893c1a44c6 100644
--- a/app-admin/webalizer/webalizer-2.23.08.ebuild
+++ b/app-admin/webalizer/webalizer-2.23.08.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2
 	${GEODB_URL}/webalizer-geodb-${GEODB_DATE}.tgz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="bzip2 xtended geoip nls"
 SLOT="0"
 
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 3d349af79d4c..c24c87c070b6 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/gnome-autoar/Manifest b/app-arch/gnome-autoar/Manifest
index 108ef4c4ae7c..8ab58f3131a3 100644
--- a/app-arch/gnome-autoar/Manifest
+++ b/app-arch/gnome-autoar/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-autoar-0.2.2.tar.xz 295488 BLAKE2B 33f614846547921b208239f7756cab3561ec417f2030e3196bece43c47af2a6496fef82838d90fa3ddcf8742023b525bc4e8cbdfbf3fc925c92c74a8a6918c3b SHA512 78faf8f82eeab4cb5f1f364d6e9caa4d24f21f9b81a79ebde4404253f3e7ae120f44600f236612859810afc6fc6f1a8c6f2e065db98be79103255642139c10a2
-EBUILD gnome-autoar-0.2.2.ebuild 947 BLAKE2B 79e1c67356f9359918c0eff408c71ef25ca8531e51a551bb2a8db7fc34f5c12b29371cd85f8cc97923276d2ec015292d555cdeba48620b4914182379236dbdf8 SHA512 af414338b33c8e851d4cc3ba1d453a72b4c72bd114c1635841b6bdb8e78b70b98de1459ca6d07a2ed77e224690bbf43d26de11ed6ad8d1b4a46a0ad6ba23b393
+EBUILD gnome-autoar-0.2.2.ebuild 954 BLAKE2B a0de53e098a86a73d9407ccd80efefbe1680d0f4fd674fa48ce8ffd14efe859e4212044ab671824cd7b56b7854754288e786a1ddc44a8db67fcf6993441ad5d4 SHA512 d90f8ac96987ebf8f2083c1885475d08432eede009d32713558bea7d9ff725d371008b88b1a77a0a84624346cfeac09cc5812d1fdf136a05021d22d4dc691960
 MISC metadata.xml 464 BLAKE2B 1144e271593c56474f4d7a733d09cb3d4bf042d6db45eaf81942d66e49a8c2a722d15cf8647af88c8406a7661365cded5b3ea9a8e4530d52e0f99cc5c847a1a8 SHA512 2ed7ffd5a60c7f0481868cf0f151ed8a9a097036cab309129a45b6bc5eb5ee21fc276deb3ed262d0309ffe5fcad531f05ef9c7e085e007760a9470878b61bc3c
diff --git a/app-arch/gnome-autoar/gnome-autoar-0.2.2.ebuild b/app-arch/gnome-autoar/gnome-autoar-0.2.2.ebuild
index 5943841eaf9d..ee8ace2a9598 100644
--- a/app-arch/gnome-autoar/gnome-autoar-0.2.2.ebuild
+++ b/app-arch/gnome-autoar/gnome-autoar-0.2.2.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 IUSE="gtk +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=app-arch/libarchive-3.2.0
diff --git a/app-arch/lziprecover/Manifest b/app-arch/lziprecover/Manifest
index ece18f987289..14d57daeadc5 100644
--- a/app-arch/lziprecover/Manifest
+++ b/app-arch/lziprecover/Manifest
@@ -1,9 +1,7 @@
 DIST lziprecover-1.17.tar.gz 75941 BLAKE2B 7b9e464ceac83571516a879a4809029219e05de43268d6febc0d1a9f5e86c869489dde2af87992d1d7d1bb8755f68f0f9d001f0cdd8971679acf54bea1568f52 SHA512 409a3634ef15238f8c87e6e69ecf0cf83c48274cff6c54a901a4f80bdc3d475b6bf03215cfee762ac64ca41b3e8a805ab620ceaaa1bec7fc22ffafad049b5f0f
-DIST lziprecover-1.18.tar.gz 86584 BLAKE2B a431d6919576866ca20e7deb04bfdba424c09107ebf34d646c2c82b892c3712c1c0c396e4184668aa476b8cce39dbdc71681ec786f102e3a6cd1a4dbab522196 SHA512 60febb52b5dde8e1fa1e4917c48bb09112bcd3a43c5486a234fdcfa3db1d5049977df306ce66ec0821e812676886f5fa214a3479649cb977151b5cf82018b6b6
 DIST lziprecover-1.19.tar.gz 96987 BLAKE2B c0a36c3a04723117d28edbd07443228321934459b9cfb40f74868813dd60556ff3018f066500fbfd60327893e0626def0b83d734c38a1a0ea28c1597d438c995 SHA512 2fc12c7fbc08fab45f97e01d97504258e77d9ac8a49e03a5099e6ed569523eb129898e5f9e7325e23e105f1ba171edf6628f5f03d8723daae1b1b4116d89c2f7
-DIST lziprecover-1.20-rc1.tar.gz 102589 BLAKE2B bb5b07f565432fc1c6abd39b404ccd0661b849956f72fe8e47278d9db8e415f138d8245996d1c13f567609d1ab6145db84fcde997628c379fb15ea2d20f80b76 SHA512 6a2cbaa7e5da867ddaca6a28d2918091c9a4d39273f12fa8c613e81dbaadcb68a0b88216880706819516592d311702c4af795ab0ffbdf861113f9648127bc4fb
+DIST lziprecover-1.20.tar.gz 102574 BLAKE2B 2b8a1d30d9094655d14978d935755083e4ce1168565745cd412cc56d110261a34afc335882e0e74edc7c87843f24698f6834395056381dbb170b229b68be4da8 SHA512 cb036869bc2bccd6ee56793ced03a4ce8556e6da1e2840934f12f2b9e1d9a9362c66c40483c061e7c3f817e739e4ed6488bd964b03c031b7c26cc99c2ee24867
 EBUILD lziprecover-1.17.ebuild 655 BLAKE2B cf7c042eeb532d477b001826e82979c4e9c8c9a0b1e5db50f5b6064fe0697ba8bbce7226ddacbf7797478771668a8ebf7acafa66def5a1db7af22036da2defa0 SHA512 0bdfe46c55ad1416c454091b228b39130e7cedb624a3d08eb6a05309f219304874628fd6874464a8832dcda7fc7c607c98374ba7700eaa7d15a543e4d60a504e
-EBUILD lziprecover-1.18.ebuild 657 BLAKE2B e5c159b6822ca97b71061c99f000a622cb039a3e38dfcb43a941ab2aeafabdf526e37403eca62707d74e9b5f9183bcdf4b935f8c26eacb982aa81f25de373401 SHA512 9655473dc568ffb079d9f2d925fba768d0c67e37a39ebd984ac62ff5030244e310ac4f8b7ab45c46cd6377cc9af4de6db0650017e6db801c7708e613b3ecf209
 EBUILD lziprecover-1.19.ebuild 727 BLAKE2B 0e899ec837ce663d5b9a5f9a1b677a250c4efad4d42a0894a6c2c3b2c8f646b9a5d9166aca3ef7f9303bce0d8ec8caf9e5fdbf755147016e736eaf7023e51318 SHA512 2535ae81e4c2a91a2e8f47a859a15d3c98f14d914d49882721c95c5ded413309022b312e78d951b8a8e7ff124402e56e001046216e2d7c084be8a995c9f317e3
-EBUILD lziprecover-1.20_rc1.ebuild 727 BLAKE2B 0e899ec837ce663d5b9a5f9a1b677a250c4efad4d42a0894a6c2c3b2c8f646b9a5d9166aca3ef7f9303bce0d8ec8caf9e5fdbf755147016e736eaf7023e51318 SHA512 2535ae81e4c2a91a2e8f47a859a15d3c98f14d914d49882721c95c5ded413309022b312e78d951b8a8e7ff124402e56e001046216e2d7c084be8a995c9f317e3
+EBUILD lziprecover-1.20.ebuild 727 BLAKE2B 49dc33e8f35307f2dedc2ca5bd59b749f004de686ea05d410f93398d70f39a36260dcda02e3ed749ad5b7db7ba0d47e524b1649037371853c0e3ff2ef356c061 SHA512 14e94ec502fd2bec72f321c2a6d02b9f00a4419437427eae29f325137b51c01d56a475faf865a6d7cc6a3f54a50943bbd9387de3f42bf8dbf60e50adb4506dcb
 MISC metadata.xml 2674 BLAKE2B 470d5c221311328b1620bc51fb5ccb6393f04e9a1d0367fcef04579061b9d88ac5bb131e050eb2cd3e2a8608db58586cf49bef3e58ca320d93398aba7579799b SHA512 c39f9d4478cdc3e5865567f5e6560e4fa34f014aa6538ca47a1dddf51f1d5549f8edcee34dda36e691bd28b734a8df4c04ff0a94d68c16caccc22e57c35a7823
diff --git a/app-arch/lziprecover/lziprecover-1.18.ebuild b/app-arch/lziprecover/lziprecover-1.18.ebuild
deleted file mode 100644
index 735ad623fc7e..000000000000
--- a/app-arch/lziprecover/lziprecover-1.18.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Lziprecover is a data recovery tool and decompressor for lzip compressed files"
-HOMEPAGE="http://www.nongnu.org/lzip/lziprecover.html"
-SRC_URI="http://download.savannah.gnu.org/releases-noredirect/lzip/${PN}/${P/_/-}.tar.gz"
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${P/_/-}"
-
-src_configure() {
-	# not autotools-based
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		CXX="$(tc-getCXX)" \
-		CPPFLAGS="${CPPFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}" || die
-}
diff --git a/app-arch/lziprecover/lziprecover-1.20_rc1.ebuild b/app-arch/lziprecover/lziprecover-1.20.ebuild
similarity index 94%
rename from app-arch/lziprecover/lziprecover-1.20_rc1.ebuild
rename to app-arch/lziprecover/lziprecover-1.20.ebuild
index fe902d995592..e861188313cb 100644
--- a/app-arch/lziprecover/lziprecover-1.20_rc1.ebuild
+++ b/app-arch/lziprecover/lziprecover-1.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-arch/zip/Manifest b/app-arch/zip/Manifest
index eda316ede101..9470d2312d5b 100644
--- a/app-arch/zip/Manifest
+++ b/app-arch/zip/Manifest
@@ -6,5 +6,5 @@ AUX zip-3.0-no-crypt.patch 1108 BLAKE2B 92de0a453e128a87a6d37f0a9cca55f5451946c1
 AUX zip-3.0-pic.patch 499 BLAKE2B 0b3ad7552ed4b3900b720360145f2466bb2835823a828ed4e3fe7e8ce22c547296ff0f74416f8b9a75ae4ef70d9cce521f96becbbbcc9ddb89481c3944d6b501 SHA512 a5f4381de900821c91bb164f580b7abe0bb61ebbbcb00e376f38763255bc647bda678fd66af59e9d56cb8bb7a2166553a77af79cfa75f3e0ea4dbc515b876b8e
 AUX zip-3.0-zipnote-freeze.patch 2170 BLAKE2B b0080c9d5310a9cdd14eebc503d76e7463969982717476aa4359ae1c4651290112654f25c202defeddec5efaf1f32ec74c824a7370727b7e6a055dcac6211908 SHA512 c7db2d8c43d33bff4be6068c89603d2f67876f2b5ea72a01ad53f1baa42206c7a0a967f101a54092715f7fcc3ee2bf45a448e76a0ef55e64dc0fe0b204966367
 DIST zip30.zip 1287223 BLAKE2B d29a3e3ddbaa3ce50c80b2dd058b39c35791bf2079879b61dab0be4f011ccd3331d1768ebda5a69aa150c651713eb7a99b02833bb727eee75a3e0bbdc8504cbc SHA512 642ea6768d79adc1499251a3fb7bfc7ddc8d708699cbf9e0cfe849deda94165cb93e21dc2606bea1166ae5d8531e1e2cb056a7246bf2ab86ea7587bd4712d8d8
-EBUILD zip-3.0-r3.ebuild 1720 BLAKE2B 58973350277d37f4c13aaa19e300f2bdcbf1417f66878b2b83cb76cf2cd07e8b149c1dab5608fdf452a66416c728a6af3fbf1968b4869a21c03c8f8fa62699b7 SHA512 1910a94dc81acd0533d91b161a21b1270b4898708cdbb20bd9cf728add15456c23ba9f9b820e181beac7e77650c8cbabfabc1fc12993da281c9960884179cdf7
+EBUILD zip-3.0-r3.ebuild 1719 BLAKE2B 3eb0086e814566937e582a4a524dc88c6b1c37eabec77c7a0215818359ea711c38fb1f5a50d9c2162572b87a0cec75bf7ae5a51befb021895fa3365ab99ff2b1 SHA512 3470b6dfccc160b77dc86f5dbdd021d8dbdf5135afea8e8a59b8fa7400b920a1fadcd6f79514ed3abf0fc0d497a81d4aa90337bae171044179ca61c7a2f84b77
 MISC metadata.xml 573 BLAKE2B 1818315ab71e9bbcd96875d0bd99f11fc41131c1d082bd6468465a3dd8e48f79817958c8aa4d31f4d0ad0aa28bfced7fbdc5567cebd23badf2a9b9a623f6a80a SHA512 bd9d04efbaf530bd10d6641543984a3f5672de39c66538dd4c7a52684e8c6cf31111d3c8c0052e9958297a972c6b9f11131dd3f5d95af6db6ee9ca64c3ab5131
diff --git a/app-arch/zip/zip-3.0-r3.ebuild b/app-arch/zip/zip-3.0-r3.ebuild
index ac5bf2612082..4a9bf5719f95 100644
--- a/app-arch/zip/zip-3.0-r3.ebuild
+++ b/app-arch/zip/zip-3.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.zip"
 
 LICENSE="Info-ZIP"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux"
 IUSE="bzip2 crypt natspec unicode"
 
 RDEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 7991b3cf7bb9..57bdbe8bb1e7 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/btrbk/Manifest b/app-backup/btrbk/Manifest
index cb32f4a38e14..3575ebda40d6 100644
--- a/app-backup/btrbk/Manifest
+++ b/app-backup/btrbk/Manifest
@@ -1,8 +1,10 @@
 DIST btrbk-0.24.0.tar.xz 72308 BLAKE2B 425811455087a5aec4443d8a7bc7ed23cd49813d839a17c818f3e61f4b162518f282da69aa0b1c100b24c47684a7c6d83765332cfbf1893496dbf7e0aeabff87 SHA512 fbe180743743ead1241968765b5ae6eff37b2925bee8379443568c126426f2098d280a3f62d13e5f5b63f967ac9889ad9331d73f354d0cd441c907ba92258267
 DIST btrbk-0.25.1.tar.xz 74904 BLAKE2B 12f0a1e9c383b1c736cba190bae6f948df5db608a689e2469af05716d2ed15f0206c9336148af1a09f29da44c44314d4d153c8d2e5eea8f7e425a185c9040d6d SHA512 6802e379f49c5433a811f6f844cf2663c752b23d8d678f001bb8cba9b099c7527983e23169814c7469ab8682b95fa0f742d1088415747ebebfe0fcc36425cd05
 DIST btrbk-0.26.0.tar.xz 82472 BLAKE2B 06effda16b2173e6d3dc3ea896ed9729d6f2840a29aebc0d271935a88fd54fbbc08bf0b257c8424976a2668907c74f1b34fe46465ba6457d60cacf0b15316052 SHA512 a08ec4e2e0d164b9a9a17b3d4b8417eb3890994c8aa2233ecda9d616659fce917311a94fdfd6762acacb40dc25a60fe8f6880703c980ccd4a176b14e24a2bb00
+DIST btrbk-0.26.1.tar.xz 83624 BLAKE2B a99c66dc16432edb1da38ac51e68ed939207ad8553108258346d4261c243a1a478a3e1dca1cf6d39d03e10a8a5c44e45a7784aec131246e060aded4fc24d708e SHA512 ee0043f468e11545ca28b5bd456aa9dab1b994ed6d8899ab0f53d455f78bb44f83bcf493e32fdecfec82b3029d5dabc2db72a2f32de80b709a12930df6d53b22
 EBUILD btrbk-0.24.0-r1.ebuild 755 BLAKE2B 1ee8bedbe3dd869c4afb8103763269906d4a75c5dccfebefebb851bdb4a1243d14eac3a35d5e8ac5d29660b96e7856e0421d2804f83c982c47d58f888e3b498c SHA512 2924123eeabd0b1e7a325d9b413c6ff9ee750184b85ea1f460f236aa74e978df1e5537ab77fc49e8f82148caff743724355d31cf60aa5e760d1615b60d22f7e5
 EBUILD btrbk-0.25.1-r1.ebuild 744 BLAKE2B 3f80137840ebc65fd833a6c87607c1fffb944d35bb33510d4eb65f27094684fa47b54ec05e5b2f7c148df1e6afe4684541e46af45e008d803d902a45c0da59eb SHA512 09cf887aa0abbfb5f3cf9888139a4639b58f7bd61499d9b5a70328b2538964f02715cc2f87f6a86cee1413f19b0bc86b0cc56e2cfed9e81203f06ac5116e0d34
 EBUILD btrbk-0.26.0.ebuild 1078 BLAKE2B 9c92380e34d5005cc0d738c68e7b404a4db77fccc1a233ada610d7518e253cfaafa91135da7d9ce6cf6546150a6805f524b3a9302b680b84e63616a1f910b029 SHA512 0d22df7d376f96de76a19be8a3ce7a9e7773c02c6da7545949ce0083a32ea6e5aaeabf026ce91655af34109532fa06fbd8b074e494e591d529dbb9d6f0bd4a58
-EBUILD btrbk-9999.ebuild 1086 BLAKE2B 687be2dd2d3be75401427a2b33626632d3cb70568b75c354ae8732ac92fb2d8e21c3391c2fac19f66c36ab9c98fc8ae46430a5000188f6b2e36b1ca0ce70e93f SHA512 59f6448613e0b1feec558a5a13329e5a0dfb5a1fa06b43c7749bd1ff5db17ba0db620479389f38006362bd9ac90180d99a1b14db0ddc0672882bef7efd5e854b
+EBUILD btrbk-0.26.1.ebuild 1086 BLAKE2B fc399e327dc380f2d8a6ba0afef6ed83fbd75b44e20cd1118e1d6bf554a01c1bbd9646cdd06141c5f2c6e20a51fa6dbb4a55c547ab7b4a67e52367f8df13a5c6 SHA512 a99fbb45829357f83e361a4e22cdbc38598d6dca808d7a84bbb0ec4c043f1ccba39dffd6c0c7c902de199a44106f6fbf6ff79066fad1a5781cefdb6a9cb4ae4e
+EBUILD btrbk-9999.ebuild 1086 BLAKE2B fc399e327dc380f2d8a6ba0afef6ed83fbd75b44e20cd1118e1d6bf554a01c1bbd9646cdd06141c5f2c6e20a51fa6dbb4a55c547ab7b4a67e52367f8df13a5c6 SHA512 a99fbb45829357f83e361a4e22cdbc38598d6dca808d7a84bbb0ec4c043f1ccba39dffd6c0c7c902de199a44106f6fbf6ff79066fad1a5781cefdb6a9cb4ae4e
 MISC metadata.xml 1076 BLAKE2B 38beb88fb33730c665430ce275d33b231a57f02c2644b3ff89974935f93d1f0cea8b53b908019eb7bcb0ad99dca49e69475d44a506e08719270c2f8524b5e096 SHA512 20141d3aeba7ebe743ed3101af70c3f6515f11aaed4d43a73d507c18a933d30e778d10cfc17b98e33c616e80c79edd157d64fb0f54e35ad64a7e3114b3fd667f
diff --git a/app-backup/btrbk/btrbk-0.26.1.ebuild b/app-backup/btrbk/btrbk-0.26.1.ebuild
new file mode 100644
index 000000000000..621ad7e2a0a0
--- /dev/null
+++ b/app-backup/btrbk/btrbk-0.26.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
+HOMEPAGE="https://digint.ch/btrbk/"
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+pv"
+
+DEPEND=">=app-text/asciidoc-8.6.0
+	app-text/xmlto"
+
+RDEPEND="dev-lang/perl
+	net-misc/openssh
+	pv? ( sys-apps/pv )
+	>=sys-fs/btrfs-progs-3.18.2"
+
+src_install() {
+	emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" SYSTEMDDIR="$(systemd_get_systemunitdir)" install
+}
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
+		upgrade_0_26_0_warning="1"
+	fi
+}
+pkg_postinst() {
+	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
+		ewarn "If you are using raw targets, make sure to run the"
+		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
+	fi
+}
diff --git a/app-backup/btrbk/btrbk-9999.ebuild b/app-backup/btrbk/btrbk-9999.ebuild
index 78df68d02414..621ad7e2a0a0 100644
--- a/app-backup/btrbk/btrbk-9999.ebuild
+++ b/app-backup/btrbk/btrbk-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 74e0f9438570..cccc55cae098 100644
Binary files a/app-cdr/Manifest.gz and b/app-cdr/Manifest.gz differ
diff --git a/app-cdr/isomaster/Manifest b/app-cdr/isomaster/Manifest
index d36f5749bdb6..7f79d4fbb9e0 100644
--- a/app-cdr/isomaster/Manifest
+++ b/app-cdr/isomaster/Manifest
@@ -1,13 +1,4 @@
-AUX isomaster-1.3.11-make-install.patch 1117 BLAKE2B d76609b12248503778e8c8dca7f086e936f3268829962d7839203b766c2311d0da4c9978b87e380f128fdb20045b385816118996882ee2f870920a6016e7fc04 SHA512 b86db8c76a8ba8751c5ae6d51f3ef6bcae3eb7a4baf1c8dd589593c5ac74652c20535a5f6e596f9a4615ee34254a04e06baa24cfc77b0613be6def039e8b7739
-AUX isomaster-1.3.5-ldflags.diff 434 BLAKE2B 757c4ed7225763e68bfdfd0b1cf753b007c6936d1a073aa4f88ecaadb37be1b690a39f30fc67522d840b295354e8ff8fab744eec6b1a3c09870e7a9f410e5f87 SHA512 cb66b99e35011241d4ce80d3e09a817315004c50d1e740a83dbaac22342cc466a606562113d456dcbc8e9758a5c6363b18aca55cc2451ef61a0f9c4469500889
-AUX isomaster-1.3.9-asneeded.patch 585 BLAKE2B 27212f0bbe3df72ae521cc4ef302e448f1c8d1bf1f96e4e5e5a8caad426c2b4a5c126c3c23f8a6f13c5e33215dba01ea812fc792c0baed2a1e8384a57e192744 SHA512 ea34b8815fceb73b84855e9f0dabd25d7e4c1d124e5d8de193ab788909ee0e3d8d0fab746c017b44db1ffef234c3191b08c54613782f4878250f68da49073636
 AUX isomaster-1.3.9-iniparser-3.0.0.patch 780 BLAKE2B bd7f3cff83b01bb241e005ce200016dd7ee30ac8798a9c250924f20da55f1f774558b64d37bf0a4e30dc44f18ed06f585bda4e3c2c0edf31b203ce5554d7cc50 SHA512 0681ab5b4578f67b1eb9e8180fde951d4a34dbf40452ee29a6f09992afed6da5084791d86778296964cb39d59d2eaf51b97972e02582a5d6ff3698655bf09134
-DIST isomaster-1.3.11.tar.bz2 232153 BLAKE2B e97c6a11a642d010c2c79ccd2e7a18cf71ebc73a80bc5c3cf065d47614a62de6e3613c44f085fec67a2556f36303bf861169e9499d0ec186e853a690020c5aae SHA512 98c654c9320410765f5d7656396b3d87c34505410638c01e3ae65b89a20eb19d6554a70c3deca79e39524459e3cce618be3e42fdce8b5de1d88fa72fa6e122d9
 DIST isomaster-1.3.13.tar.bz2 245085 BLAKE2B ae2333f5511aae8deed76e556cf6055f7ad257d613dcf5c85274946f31f0da879b5fb7953d065046371c6f20faa15663ecb3c5d976c4dff404140cd09d23207c SHA512 dbc6a77fabf8d454bbde25a7540e68820bf773bc991176e5684e87aeb6044ad1bbbcf1c4f537148c18ec8847572949a52d6578a14f68b8ad3f21d542685859ba
-DIST isomaster-1.3.5.tar.bz2 196042 BLAKE2B ca7d90bbb7afca7e653af2269644f92559fd827db72852fa82ab6e948000784b925a374aaeda9b9ed048ab13f6e5180321194629b83231f840c9226d9edc46ff SHA512 25ef3a8e4a381100ea8c1aa913f7ec28dc8b7c2c0f8bfa1cdcda529d69a76b7d8baf35ca3dfa087b7210f3ad53f340259717c099c188386b511e641a358aac93
-DIST isomaster-1.3.9.tar.bz2 223514 BLAKE2B 7d3f0b2b26dfa0db2f9fbadc81d44d0b9bd687cfb346d4f7fb20861da17a4dc916bf85b7062429f564dad6bf12ad9dcad6e4b606afc2b5f775d35373d2fa26ed SHA512 746f8e67fc5ebf39caaf1900c55752c07761cf919f49b49fdbf449b0c1309445c01b38d57cd5b741c057dd8d020d941863d2b29c1d5a725078cf8448d3ff8a4b
-EBUILD isomaster-1.3.11.ebuild 1555 BLAKE2B 20b8cffbdbf70b19d5e1e76239e212faf8bfdc18d5501b37224af0f70d4a3f9999d19992f24746981837720dd1bc39980cc5b07276dc33002485bd16216b4137 SHA512 e6bb158d7fe0a7d363acb65b4a7504fb7c6aa405744b3686707807587c24da92e424abc0144d5632e487a19d5c0965c3d7d88b7fb209d488bbcef7fec6a6d63e
 EBUILD isomaster-1.3.13.ebuild 1507 BLAKE2B c3e40379dfa8b44d84228af0fad6b6f0225b40a730ad05e698c1dcb225fc91575b36c19a0637a8e568e2f249dfd6b8650abb2f5a7a78a1fa2e762951f9009f20 SHA512 03567d3fb41abdeb969d334f2742b1596c12ba78e5ac4ec8148027fc4fa062a66af8b88d020c2ea081d441ff5808105448ec447ca8731d7b3edaf787d9374857
-EBUILD isomaster-1.3.5.ebuild 762 BLAKE2B 550d5654e2b1b477efaae677347dda26f3f6bd199452d952d1dde545d07e90b11dbccbd9d9127d90ce1614708fffb97852ead29783a4d478c2421722a03dc6d6 SHA512 2e8433933cbd2d884bf73044e2e7c1629318f21b9014559f4b0da544d3bbec7b0916c29ebdf8aa23c2a735d9b93dbddffa8198cadbeab4f723d771973e0198a9
-EBUILD isomaster-1.3.9-r1.ebuild 1498 BLAKE2B c7c1b25871085a0696008e4be297761e5d34f2a572d0dedd0650545685c81be421d25ded22cae27dc24a5bd37c3acccc3871e3893589e836ec2ccb055f8c867c SHA512 b3208c0e5e884b99074767c1b19c8f424aadb041f74a6b5bf823ebd24ed1d2bfe6a053b447f62010d33965cb9e87e57d306c9611b13a4489c55fc520ff0e483a
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/app-cdr/isomaster/files/isomaster-1.3.11-make-install.patch b/app-cdr/isomaster/files/isomaster-1.3.11-make-install.patch
deleted file mode 100644
index 90ebe346a0c0..000000000000
--- a/app-cdr/isomaster/files/isomaster-1.3.11-make-install.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 5717fb2da383d0c8c80fffdbe3ced568b2151f86 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Thu, 29 May 2014 18:58:48 +0200
-Subject: [PATCH] Fix "make install"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-[..]
-for FILE in bkisofs-manual/manual/*html; do \
-            install -m 644 $FILE DESTDIR/usr/share/doc/isomaster-1.3.11/bkisofs; \
-        done;
-install: cannot create regular file ‘DESTDIR/usr/share/doc/isomaster-1.3.11/bkisofs’: No such file or directory
-[..]
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 116b2fd..fa4989e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -129,7 +129,7 @@ endif
- 	$(INSTALL) -m 644 isomaster.1 $(DESTDIR)$(MYMANPATH)
- 	$(INSTALL) -d $(DESTDIR)$(DESKTOPPATH)
- 	$(INSTALL) -m 644 isomaster.desktop $(DESTDIR)$(DESKTOPPATH)
--	#$(INSTALL) -d $(DESTDIR)$(MYDOCPATH)
-+	$(INSTALL) -d $(DESTDIR)$(MYDOCPATH)
- 	for FILE in bkisofs-manual/manual/*html; do \
-             $(INSTALL) -m 644 $$FILE $(DESTDIR)$(MYDOCPATH); \
-         done;
--- 
-1.9.3
-
diff --git a/app-cdr/isomaster/files/isomaster-1.3.5-ldflags.diff b/app-cdr/isomaster/files/isomaster-1.3.5-ldflags.diff
deleted file mode 100644
index 8f328912552d..000000000000
--- a/app-cdr/isomaster/files/isomaster-1.3.5-ldflags.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -64,7 +64,7 @@
- 
- isomaster: $(OBJECTS) lib iniparser
- 	@echo 'Linking isomaster'
--	@$(CC) $(OBJECTS) bk/bk.a iniparser-2.17/libiniparser.a $(CFLAGS) $(CPPFLAGS) `pkg-config --libs gtk+-2.0` -o isomaster
-+	@$(CC) $(OBJECTS) bk/bk.a iniparser-2.17/libiniparser.a $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) `pkg-config --libs gtk+-2.0` -o isomaster
- 
- # static pattern rule
- $(OBJECTS): %.o: %.c %.h bk/bk.h Makefile
diff --git a/app-cdr/isomaster/files/isomaster-1.3.9-asneeded.patch b/app-cdr/isomaster/files/isomaster-1.3.9-asneeded.patch
deleted file mode 100644
index 102f54db4a1a..000000000000
--- a/app-cdr/isomaster/files/isomaster-1.3.9-asneeded.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -75,9 +75,9 @@
- isomaster: $(OBJECTS) lib iniparser
- 	@echo 'Linking isomaster'
- ifndef USE_SYSTEM_INIPARSER
--	@$(CC) $(LDFLAGS) `pkg-config --libs gtk+-2.0` $(OBJECTS) bk/bk.a iniparser-2.17/libiniparser.a -o isomaster
-+	@$(CC) $(LDFLAGS) $(OBJECTS) -o isomaster bk/bk.a iniparser-2.17/libiniparser.a `pkg-config --libs gtk+-2.0` 
- else
--	@$(CC) $(LDFLAGS) `pkg-config --libs gtk+-2.0` $(OBJECTS) bk/bk.a -liniparser -o isomaster
-+	@$(CC) $(LDFLAGS) $(OBJECTS) -o isomaster bk/bk.a -liniparser `pkg-config --libs gtk+-2.0`
- endif
- 
- # static pattern rule
diff --git a/app-cdr/isomaster/isomaster-1.3.11.ebuild b/app-cdr/isomaster/isomaster-1.3.11.ebuild
deleted file mode 100644
index 2a7e5876f9f0..000000000000
--- a/app-cdr/isomaster/isomaster-1.3.11.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils fdo-mime toolchain-funcs
-
-DESCRIPTION="Graphical CD image editor for reading, modifying and writing ISO images"
-HOMEPAGE="http://littlesvr.ca/isomaster"
-SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="nls"
-
-RDEPEND=">=dev-libs/iniparser-3.0.0:0
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.19.1 )"  # bug 512448
-
-pkg_setup() {
-	myisoconf=(
-		DEFAULT_EDITOR=leafpad
-		MYDOCPATH=/usr/share/doc/${PF}/bkisofs
-		USE_SYSTEM_INIPARSER=1
-		PREFIX=/usr
-		)
-
-	use nls || myisoconf+=( WITHOUT_NLS=1 )
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-make-install.patch
-	epatch "${FILESDIR}"/${PN}-1.3.9-iniparser-3.0.0.patch #399629
-	rm -R iniparser-2.17 || die
-}
-
-src_configure() { :; } #274361
-
-src_compile() {
-	tc-export CC
-	emake "${myisoconf[@]}"
-}
-
-_apply_linguas() {
-	mv "${D}"/usr/share/locale{,_ALL} || die
-	dodir /usr/share/locale || die
-	for lingua in ${LINGUAS}; do
-		[[ -d "${D}"/usr/share/locale_ALL/${lingua} ]] || break
-		mv "${D}"/usr/share/{locale_ALL/${lingua},locale/} || die
-	done
-	rm -R "${D}"/usr/share/locale_ALL || die
-}
-
-src_install() {
-	emake "${myisoconf[@]}" DESTDIR="${D}" install
-	dodoc {CHANGELOG,CREDITS,README,TODO}.TXT *.txt
-
-	use nls && _apply_linguas  # bug 402679, bug 512448
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-cdr/isomaster/isomaster-1.3.5.ebuild b/app-cdr/isomaster/isomaster-1.3.5.ebuild
deleted file mode 100644
index c3da00580be0..000000000000
--- a/app-cdr/isomaster/isomaster-1.3.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Graphical CD image editor for reading, modifying and writing ISO images"
-HOMEPAGE="http://littlesvr.ca/isomaster"
-SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ldflags.diff
-}
-
-src_configure() { :; }
-
-src_compile() {
-	tc-export CC
-	emake PREFIX="/usr" || die "emake failed"
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install || die "emake install failed"
-	dodoc {CHANGELOG,CREDITS,README,TODO}.TXT
-}
diff --git a/app-cdr/isomaster/isomaster-1.3.9-r1.ebuild b/app-cdr/isomaster/isomaster-1.3.9-r1.ebuild
deleted file mode 100644
index 7f6726773d30..000000000000
--- a/app-cdr/isomaster/isomaster-1.3.9-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils fdo-mime toolchain-funcs
-
-DESCRIPTION="Graphical CD image editor for reading, modifying and writing ISO images"
-HOMEPAGE="http://littlesvr.ca/isomaster"
-SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="nls"
-
-RDEPEND=">=dev-libs/iniparser-3.0.0:0
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	myisoconf=(
-		DEFAULT_EDITOR=leafpad
-		MYDOCPATH=/usr/share/doc/${PF}/bkisofs
-		USE_SYSTEM_INIPARSER=1
-		PREFIX=/usr
-		)
-
-	use nls || myisoconf+=( WITHOUT_NLS=1 )
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-	epatch "${FILESDIR}"/${P}-iniparser-3.0.0.patch #399629
-	rm -R iniparser-2.17 || die
-}
-
-src_configure() { :; } #274361
-
-src_compile() {
-	tc-export CC
-	emake "${myisoconf[@]}"
-}
-
-_apply_linguas() {
-	mv "${D}"/usr/share/locale{,_ALL} || die
-	dodir /usr/share/locale || die
-	for lingua in ${LINGUAS}; do
-		[[ -d "${D}"/usr/share/locale_ALL/${lingua} ]] || break
-		mv "${D}"/usr/share/{locale_ALL/${lingua},locale/} || die
-	done
-	rm -R "${D}"/usr/share/locale_ALL || die
-}
-
-src_install() {
-	emake "${myisoconf[@]}" DESTDIR="${D}" install
-	dodoc {CHANGELOG,CREDITS,README,TODO}.TXT *.txt
-
-	_apply_linguas  # bug 402679
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index dc878153faca..3ffbbee01078 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index 1fb8b353e670..209afaf563b2 100644
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@@ -2,6 +2,8 @@ AUX xca-1.0.0-desktop.patch 391 BLAKE2B 1cbec5681df8da9230b783c8ea048a199bd31a38
 AUX xca-1.3.2-build.patch 5871 BLAKE2B 5870a5b5a6331f33f43b303703ab4346bfc150af0bf3a5cd11a357ca48311abb35ba6d426a12f393a61b29e0edd53702856e7b986ac83b25741cd3ffdc08737b SHA512 1007fa6aa54273e1d279965ea41945063288eff72622325bb61086b288234fcba45f962ced77ddc037f1a64838204614b1a15b1b47d8d7a7b7699374bd54938e
 DIST xca-1.3.2.tar.gz 897947 BLAKE2B b12cc95c908187d78304ce93111c89bb8e0dc01ecab37e0ad1bd78f84a90ed9f44afa4ac35d22185b7018e238b476e496fca3c2b3a240bf654d2e5160e784b11 SHA512 f0a9c4d47f0c20632f44364cc55293a7d2152772a746a72bc4a46622da4e48ae612bafe918c098a71c29cdfca8e6c03c27cf85a862ca0f356eddf061414c89b2
 DIST xca-1.4.0.tar.gz 940245 BLAKE2B 1f0c9d72b647fa803c2b6b6019b0b9828f37b1d38d89838ac6102d560b1c930c0f962e9064d984540b0c8e14d7546529af978673955555283afa1f089af7ce7c SHA512 b220adc7551cf853037c4f5ef0cdd8eef1dda44d0fde634cfde35605396b988452bdbc97a60459911f663d6d6977d426f27f47a46a482d1a30331ac06862c1c9
+DIST xca-1.4.1.tar.gz 959107 BLAKE2B 7437cdbaa5277998de200e9a5ad3a7d44aed9ae8af8fd926d7ed1917d49bec79562455ca2e82557149d748840f299ffd66edfc7f265be7d5bdcd6e4fe8dbaf9b SHA512 8294669c4887ba7a9060c3c2c06014b8a1807898569842ed61c066e8a864de014fba51a2ff867b579048083fdd4934cc7f97c92268de4944bf4aafea9c2e7b42
 EBUILD xca-1.3.2-r2.ebuild 1107 BLAKE2B 40eaa44f511936f3be91eda8632bafba91511e9596e0fffdca6f53acf75e2fe11d6725e136cdc8c5d1fcd1bc4ec467dbb26f5c29ed9763185447c5ebbf59a6d5 SHA512 9379423c902b218ba5b7d60de2d8074c05e7a65a2223e723429ae47f4ef491b215ab3c68d2204f80b9d88a16207b4b30c993735e73d0ff2f5ed38b4588190de4
 EBUILD xca-1.4.0.ebuild 948 BLAKE2B d1cb112f8b1214c346f612d4c63bbc1a456a29f2a5bb57d8f86148fcad51ee4e74ad8871263f45618ee4bc1b894926d4a0576abe4d3c7b20269fc3d1e761e6b1 SHA512 31929fba97fa0a3c4c74849ecd23cfa56786cbd64af748cf4e521f534fb4a613013016dd271e81d6f2632464987359ed6f026be2d1f01f53ddc531cf225968e1
+EBUILD xca-1.4.1.ebuild 1162 BLAKE2B 59d2027654486918e0556543841c8a9c899b4408f1046b2d20541b08ca4f34b4871603a1883faca756e31559fa7c027d4e6ba655dd27ad276a0e31096c574dc8 SHA512 27acb24bff57264f34fbc487be93f5a34d118a687b3c9a0e72cca25e3e5ef24a3ace66a0e27e0aac3de91c5b60c518dceb316cf47190b19fee4d70f2aab8ba65
 MISC metadata.xml 313 BLAKE2B 6e1376d870ee5ab083ed80dcc19c1acd60d487e285e9bdba7b92c13e97cb05a3a6fa8bc4c6107d5d54470e6ca93889fca15c1a2f7e690a169ca7aff64bd2499e SHA512 ebc38746afd94878384ef0e4d7933e2a7433216716b1854cfc0227c3f0abf0847d784d36de4b04a778743e442298abd3769329deecdc771003681ecd3dbf3fa1
diff --git a/app-crypt/xca/xca-1.4.1.ebuild b/app-crypt/xca/xca-1.4.1.ebuild
new file mode 100644
index 000000000000..aaaacc6e8049
--- /dev/null
+++ b/app-crypt/xca/xca-1.4.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit xdg-utils
+
+DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc"
+HOMEPAGE="http://hohnstaedt.de/xca/"
+SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="bindist doc libressl"
+
+RDEPEND="
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	!libressl? ( dev-libs/openssl:0=[bindist=] )
+	libressl? ( dev-libs/libressl:0= )
+	doc? ( app-text/linuxdoc-tools )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.0-desktop.patch"
+)
+
+src_configure() {
+	econf \
+		--with-qt-version=5 \
+		$(use_enable doc) \
+		STRIP=true
+}
+
+src_compile() {
+	# enforce all to avoid the automatic silent rules
+	emake all
+}
+
+src_install() {
+	# non standard destdir
+	emake install destdir="${ED}"
+	einstalldocs
+
+	insinto /etc/xca
+	doins misc/*.txt
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index b2fe6ec208b2..8761da43c833 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/jargon/Manifest b/app-doc/jargon/Manifest
index 761163ebddbc..af94285e89bf 100644
--- a/app-doc/jargon/Manifest
+++ b/app-doc/jargon/Manifest
@@ -1,4 +1,4 @@
 DIST jargon-4.4.7.tar.gz 9061260 BLAKE2B f2e29464d0ed946a5a2f0529eba3110f55ae068796522c05402ff2addc626501a43cbc633aecee15d6289e7a5236ce196f065ab782e4686142c51ba21658b517 SHA512 afc8c44994f22de3fbae325e315fa101c04a5db2ef6af7c5592b4c072cc0e94a2bc523042ab9c894977c34f8321aea77c8208ae57040a4e3419cd240ce169803
-EBUILD jargon-4.4.7-r1.ebuild 600 BLAKE2B c8c8c06adbe0db960c2a51508a231970c7cc2ecf0e31519d37593f343d0f3bfcab335fa614af55c9da5e5c2fb21aac5dfcf328cb4940a576ea495e3bfea432c9 SHA512 85e274ec5862842386d7c2c010b3614e59fe732b1b232231c10663a41037e104d27184c965fae4348400d5163a4d8c9cb99e3d568f9ff1692184bc4ae9b852b1
+EBUILD jargon-4.4.7-r1.ebuild 599 BLAKE2B 2da559ab599279dae49833170ab0ff84d1de5e98236df07bbaf434fb99e65078c9157d278272b4b3650231969c9bbb3651eb90d6fdfe9b6732fc05cf3224c5f0 SHA512 cbdd14af1e69609186daba871be432cfa8e11253b63815eae1b46188961e804117ab19ad0f86a45c3692955731296541bd85b67a6530cb30620937a721b83252
 EBUILD jargon-4.4.7.ebuild 602 BLAKE2B 977b6df3fd38534acc879fcb567d3488a88a3c344eca8b4517636a767b346cba46b64203bcf63d69a18dcee6a159897ee34543bbb2458d6a6f597dddefbdfd8e SHA512 ef9f1e5cee8130882ae2c02bb0af1245c2e2ae1d89c20ac6d726249d254d686e36bf560cf2e99ea5c4e98fbbd25baa45c57c9470c4a9ebdd9200712cf2600204
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-doc/jargon/jargon-4.4.7-r1.ebuild b/app-doc/jargon/jargon-4.4.7-r1.ebuild
index 359e8e44eae2..0fa2c2111027 100644
--- a/app-doc/jargon/jargon-4.4.7-r1.ebuild
+++ b/app-doc/jargon/jargon-4.4.7-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.catb.org/~esr/jargon/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ~ppc ~ppc64 sparc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/app-doc/linux-kernel-in-a-nutshell/Manifest b/app-doc/linux-kernel-in-a-nutshell/Manifest
index d9d18e29996c..f3fadd5f8937 100644
--- a/app-doc/linux-kernel-in-a-nutshell/Manifest
+++ b/app-doc/linux-kernel-in-a-nutshell/Manifest
@@ -1,5 +1,5 @@
 DIST lkn_pdf.tar.bz2 3533339 BLAKE2B d67708c7b100707b6a74f1a983bc396f1068e60d74c63eb2ed99830f0ea4b37b4260504d45f27ceae70e9c01b92b65d9e5076476466eade84f9dbe8d1b384fbf SHA512 5a0815148b379347675e2c8f71476e8e950a8028fd625044457773c4e7b62fb886edc7151a46a9dd0cba47729c99317f779974e395149d87c4c9483c7404ede0
 DIST lkn_xml.tar.bz2 1058278 BLAKE2B f85cc277e7f313e00d26f53218d315c6b741b584a597b2b0adf3a9bf3dc13ddaa2203b1d6976e4189aa8dbeb167709f7ed3522a7c9cf8111e62b6f8d0425de2e SHA512 831b19f67b50f897f93720c19b7bbf90673c420c2b1ce257de3c656a01cb12ebee8499dc86c673cba9c14fb6fc50e644fbf84156d9d2580127affeabda87a83c
-EBUILD linux-kernel-in-a-nutshell-1-r1.ebuild 667 BLAKE2B 7a60bbb96f40eb87d0b96f3a498b9e3ad7f2548d190bf410919c325cdf8d92147edd009ee6a7ac2cd92e912f64840c2677fd1b72bd3a65272fa544c81f36740e SHA512 2f8b6718cb91cfbb3e8b7b2bc13bfb302127ca1ae86971e16688a503d619ab8ca54f22118190f214cd3bcebbbead1dc37685f09183d95b64804f85507a74878b
+EBUILD linux-kernel-in-a-nutshell-1-r1.ebuild 666 BLAKE2B 7ddbcd19858f1b79b6835519a7b1f657816c7a748f87bbb7590cc779c5cd176eaad8d38bf7ecf7dc3b294a24ba7e9dcbe4447261c9d32b72af7c89652b29904f SHA512 fcbeaf41557df4a74bda62f9ee3300517a07821438dc4f020cf27e415f9acee2d832b3b16285c55f41daf07c13f94745b04e75ce3214629d739bedad590a7949
 EBUILD linux-kernel-in-a-nutshell-1.ebuild 644 BLAKE2B 228bce01ce5ecf7c8bc8c441e5b1a9722c056d6e02004c6de56dd597c058d4baf7885b321e82c320a25eae14e2c78801b273eee7f17e8e202c03ee900e8daeac SHA512 de7e025ebefe5fbfd920411948524ad3261f7460c6f0eb1ef7f6bdb07f9f04f3383692de514a09ed6858f273ce5156eab51a5f90a98319a36f6103c11814e1b6
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/app-doc/linux-kernel-in-a-nutshell/linux-kernel-in-a-nutshell-1-r1.ebuild b/app-doc/linux-kernel-in-a-nutshell/linux-kernel-in-a-nutshell-1-r1.ebuild
index 2c9263d75083..6239307cee14 100644
--- a/app-doc/linux-kernel-in-a-nutshell/linux-kernel-in-a-nutshell-1-r1.ebuild
+++ b/app-doc/linux-kernel-in-a-nutshell/linux-kernel-in-a-nutshell-1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://kernel/linux/kernel/people/gregkh/lkn/lkn_pdf.tar.bz2
 
 LICENSE="CC-BY-SA-2.5"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 7def9e7c979f..6361b2875f06 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/leo/Manifest b/app-editors/leo/Manifest
index 9959a4eba51b..9056608e27e5 100644
--- a/app-editors/leo/Manifest
+++ b/app-editors/leo/Manifest
@@ -1,5 +1,3 @@
-DIST Leo-5.1-final.zip 9028778 BLAKE2B 17dcec884acc552c8079a842bc645c3279e66e52e2f043a92867ce4f00491561753156c8e4a31b9b132d2546d44a79d2d9c0050dfc153e0f37f043c992d0cb74 SHA512 a8e1d42c0b7c8f6aa4465295515ef19965a03142997a1b65304fd72a2c541248b7dba66d7be295465fd6dbdd7fcd5c6e6542d222edb71ddcab093c0c360340b1
 DIST leo-5.6.tar.gz 9255687 BLAKE2B 46a9aa1d90a1663ece57731b3685def3bf050f2c398310aca9d24c07256d23e40a94e505c43bd90c6c5a58fda2021409d3e6510eddd5a1bc0533273c45495475 SHA512 c9f6583be4f6a76d781adccc4076782c6f136b1057796228a398cd31c92d61e1b7a86d151f36352c6b1f677bb3d298b6f347c9874e3782c645fdb6ee38747955
-EBUILD leo-5.1.ebuild 752 BLAKE2B 3e332a29baad839b4d77e98696030bad380c6114cf434ee7b3ae1ec64e4105c206e44fb7e17d2fb27a6dc5ca634b5750d279bf0796bd76b15445cc1af754ccfc SHA512 18dfa9502681e7f206ec99e3a3c82e7b5b8b00e0b0a1f7b6a00a218db1458cf6944cda41dfa4dbc419b8208e123fd23ad07122fe755c7120d814876f68410110
-EBUILD leo-5.6.ebuild 815 BLAKE2B c49d82fe8d02f9191a5ea30ed4b0d1f971357b988468f0c3775d1c16b1cd465d59a27d392dc1cf808180acb05e161ef156c50916c847a451ec2e65bee056a1a2 SHA512 464713c68fa4d3a170a740d49e3961f9fab0161e7d8253c4c16965bcc3a45f44e394733f3b981e04af41b39598682e37ed36c361f917fb366c653fe018844e26
+EBUILD leo-5.6.ebuild 814 BLAKE2B dd44ea7d558f405d76b6a2ff47f113c1c7b0599c40b075cf397975999ab5a3605a8afd93f063f2d17e912f315be2faa84a634e0c8106a60df476852d2b03549a SHA512 416fb44fae4634fd72a5f14ab2816275d68b3c178499159836044db84cfee6f704548f4588b475be8dce19d1b67174ec0fc55157183800a34ec75c728f23a833
 MISC metadata.xml 308 BLAKE2B 2c8d0a692156e40f0d67d490212ded6b82a67efb0450e6512db856cc108772745dbcc5fade6b866b85bf07b4416db3357d3c04f3287ef8958477e6008828a8a3 SHA512 cfa3bb11079aca56b6b381f365e655078a1f07738c3af9d6c7d10313ee0a6826c0f40cc70e8ff31be6bf033a5effc8a7d725bccda8f78341700df10717976c66
diff --git a/app-editors/leo/leo-5.1.ebuild b/app-editors/leo/leo-5.1.ebuild
deleted file mode 100644
index 454e005df30d..000000000000
--- a/app-editors/leo/leo-5.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# Not py3 prepared
-# https://bugs.launchpad.net/leo-editor/+bug/1399895
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQUIRED_USE="tk"
-
-inherit distutils-r1
-
-MY_P="Leo-${PV}-final"
-
-DESCRIPTION="Leo: Literate Editor with Outlines"
-HOMEPAGE="https://github.com/leo-editor/leo-editor/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc"
-
-RDEPEND="app-text/silvercity[${PYTHON_USEDEP}]
-	dev-python/PyQt4[X,${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	use doc && local HTML_DOCS=( leo/doc/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/app-editors/leo/leo-5.6.ebuild b/app-editors/leo/leo-5.6.ebuild
index 23b9e04e1368..2ee3cdc76dc0 100644
--- a/app-editors/leo/leo-5.6.ebuild
+++ b/app-editors/leo/leo-5.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/leo-editor/leo-editor/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/app-editors/uemacs-pk/Manifest b/app-editors/uemacs-pk/Manifest
index d524a9578706..604ab48e233e 100644
--- a/app-editors/uemacs-pk/Manifest
+++ b/app-editors/uemacs-pk/Manifest
@@ -2,5 +2,5 @@ AUX uemacs-pk-4.0.15_p20110825-gentoo.patch 302 BLAKE2B b4e1e998b8befd15b0c6d930
 DIST uemacs-4.0.15_p20141208.tar.xz 151500 BLAKE2B 18fed2319b7440583e4e5bb46b8f05a7fe3ec7ffc44c1c8d6311a760472a509a28bc8bbded02f1128d0d663bc78b6a9382173d203bad83a1d09503a992382d33 SHA512 a632c82275ee652412aec7d8f3549d80c5fd5bb1211675828ec4c58365bb7819927ff4e92f6fb7b5b9030b681062773ea19f1af345d4d3ddb652c3d68507bdbb
 DIST uemacs-4.0.15_p20180117.tar.xz 151600 BLAKE2B 76a6a3cd3d0abf720721c7c09687c1964958e6c1c05ad8db07e6e561d6714e436d31659d118af85d069ad77da2606b0ac86005824e2ac56db8040a0ea739aabf SHA512 aadf3f9e8ab3f2c9c7bccf305f7a37e75ac1c92c5c388ce35a10b24cedf886f7d9b0ce8b1196c2f96a0d874bd5af130edb3ecb1ccf571d8e8c00753564e38aa7
 EBUILD uemacs-pk-4.0.15_p20141208.ebuild 960 BLAKE2B 8ec0c49532a0e7fdafa19de4f53b0d1a872ae77979ef698bb49770f985f75c7f4963396877759929012a99ceb4194f0efba30ed3ae2f03be3c0192cc9affc4aa SHA512 576483dcbee259b580687c43cdf06da086627f65cfd28db1af092b363e03dd1ececd1feecf61b3a6163d4a1f8f20e0261a26fd1f1d4378dd394f377f002796fe
-EBUILD uemacs-pk-4.0.15_p20180117.ebuild 938 BLAKE2B 99b6a42e2cb81b89c58e3bd3092bfff6690b19b7f25745926c6ab785af33a38064f36342ff4745b28e7c86c62b9d4475f937f8671a4128b3f230a843a7ab1141 SHA512 0ae04b9c709db62e90325af468ac26e2bcbce846d396faf0ee4051442d6397679698bcccb0ee0f74cbe1c2402de5cca1ee518f60a565104d7e95810000879dee
+EBUILD uemacs-pk-4.0.15_p20180117.ebuild 937 BLAKE2B f1ff9da5a0484ab9e5fca3573859766afc30cedf46d35ab77dff19c8850072c4e591145dec35f9b790dd0c8ccaa1107712ac6be1ad25c1c1ddd2f48959f21283 SHA512 ce04f47cf3d809ff8ae2b92514d7c032be5630165c5d000cbebee9ff0fae2588ab881c0d3009941752a8187c690d41b6d08dcfdc9e49cfe10f030171432626f2
 MISC metadata.xml 1038 BLAKE2B 78d5d45edaf021f6be2ecb46cfc2c8538a14f7589d16a1891481633e23c272f8d76905b27535baedb4af0be51b7e1e9a2ea1bc286dd79c6c06d7b6658a856df8 SHA512 303232f4886511f0731e699a8c29a1925f506a037cebc60669c02aa060b2d555bdb2378919f5d66e61859e18a3b2ede21204edc5fce37a9220ab9dcf2f23c1b0
diff --git a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180117.ebuild b/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180117.ebuild
index 33629347763c..33a4432c46d9 100644
--- a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180117.ebuild
+++ b/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180117.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/uemacs-${PV}.tar.xz"
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 
 RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 2a4dd56324b5..df98f6294c50 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 316ee642f971..129c37254cb6 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -3,5 +3,5 @@ AUX 50ebuild-mode-gentoo-1.39.el 805 BLAKE2B 3cdb41677c5ef11ef6fb44001cc36b58f92
 DIST ebuild-mode-1.38.tar.xz 30744 BLAKE2B a147fbb462f0e1a2ba3272c74b12c9357200b0ca6671d75263547d7b777489772504c9fda634a797fecff8dce35e40b7bb579cdbd9a7da99f68f74b08a48a4da SHA512 bfcc4fb100f7d9299e9b466c7661e865f9b93ee352780da1647f1a98159fe3e9eeb8cd4b7d1d9906d532316d1256ec7b6f821cac3d064cda15f2fd62ca7cb349
 DIST ebuild-mode-1.42.tar.xz 34936 BLAKE2B dd94d17dc57e2d32b329ab62ec6eec8ada6a4aeddadb8d978736f5dcb4d613759fd860043cab92d12db11614f8b7fa71fc5537576a2af3f5e6c9d56fc2fdcc05 SHA512 119f954eaf009bd0c9f0a75810b94a54d65ed91c6ffef20dd164c7a5ef095410dd0f3642426817f5efa6623d4f3e120ed3b27076222b02a90e75a83bb80b8703
 EBUILD ebuild-mode-1.38.ebuild 587 BLAKE2B 01bab3a0519d1fe60b3eb52cfcb8de2d56fe7a8ab0eca2a4189c9c498e74fc025833cb2fe53095f859ab3ab82221ca6de61ba5037c5f5e5f4b0f72f333947ee5 SHA512 cc893036f642763ae299d5b276aac11f0e7fd26559cff449b7e2964d9b58c8b03334a24b8702969609acfc59ae96944104f0b923449951ab953ead744ef52757
-EBUILD ebuild-mode-1.42.ebuild 739 BLAKE2B 8f496cdbce1f936ae78103c133269b80160fd669150276497a9cc91502c076db6a848d99bbccf31c9acc619856d34075ef27dfd61c8a947cc955354f1bdc0acf SHA512 a9393d51271307e2f04ee8db2979a6e2a9c72c36fe80c26619dc44e7e9492a2d4f4f662857058dbe5f42e565664c4fc08e610b33b8f79f30a551e856dc0787a6
+EBUILD ebuild-mode-1.42.ebuild 737 BLAKE2B a4aaea39292f0cd32690b22d2b2823522fa10cfd17c8115b08e65eaea5110136ec3cc79c109e3bbfd862197c39c85356193056c68046974dd440de7659d1083b SHA512 e8b8d42084d2816d694e0cb592ce734a22d9a2cd7e4027b149977b8692c6ab34642e15624a410e4f2fd0066a443c7915e75cb9180a899db6c13743c04b93cd43
 MISC metadata.xml 403 BLAKE2B b3996463afa7f1471fafe74467cc3b2bfac32c9ed6f8cbab1390ac1b974be057982f8f3ec7d796f7eb45b023d702b668f979e962d6c33c525f1e644de2703007 SHA512 b6c2ed67a0eac9b03f15bc00374f925eb8ba28000f8d1ebbe03f75e26c953ef799fe73c0bc1658089e5ab687cb07e97ff8d74123b6a67cd5dd8246e81051c239
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.42.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.42.ebuild
index 3de5301bb080..43c6b1b88a0b 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.42.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.42.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 DEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index 167aa6fe2dba..9372090b8b9b 100644
--- a/app-emacs/emacs-common-gentoo/Manifest
+++ b/app-emacs/emacs-common-gentoo/Manifest
@@ -1,4 +1,3 @@
 DIST emacs-common-gentoo-1.6.tar.xz 61224 BLAKE2B 70e4f30c26c9098fdb02a53cab5d60cb611143d8bac6947707f3c7596b5a81ceb513b5a0809ee90f351472824f1d4216720c02cadb51d25b3dfce5e436e02bdf SHA512 a7daed2241d778ab283482ecc016801e25084eed10fcbbc50e187d5f842df5a0d278a77f94ae950b086c8651e8ca1a18f89c11dffdde9cf9168755288aae926a
-EBUILD emacs-common-gentoo-1.6-r1.ebuild 2887 BLAKE2B cbbc4e8f0ef4e20dea5e990e55fd555061d81b8842b56d8122369f1eaf98588c16bff9d49ade3d9508d7a72ee23ea42b9d17aae3d1a1cde4e06d74b733c82859 SHA512 8dec173d096f8a6d654cfd964b04a31b3a48bd47037bba82c328cecae0ed3efceac2833f52b89d686a823f188e44427be27108e037a29f137ee941d702fe21dd
-EBUILD emacs-common-gentoo-1.6.ebuild 3150 BLAKE2B e98543f1db21c3f9aba5bf02e3363c2e935ab2b4b829d07abc77a39e1660b6da55c2d3ea2d1e6f0ea810bf443ffc50476a4a69b40f3be98e1a5cc280af36c96e SHA512 690be3a0a5daf9ba2d812e36db2be905c53d292e4cc9f8cefb9d31b03e49961b68603ee8ae1a3cb4e230697825dd2c3f40b3e2ab9c92f21f6a1984b34e4d1af1
+EBUILD emacs-common-gentoo-1.6-r1.ebuild 2881 BLAKE2B a0ea2ea78f87e85ab93c384e3b907ff1e83e88475963e234285d7f2e4ff3151f2216a987c5e826bb9ada3e7283f1777f99fe8349e2905e5c3c28aa33980af0ec SHA512 66e6abf850ffce638f54e93442840e787932614f7b2424adeb70034a134d2fd548284a0093bd5c90a20aaaa010f84d9d34bb8ba5706901932fbfdb022d71bbab
 MISC metadata.xml 337 BLAKE2B 4eb067768aa32943a1e7c0cf4fe8444a64c41b05ce7397d088a2f38d60fc2a484d7df5d8b78761a836d647ad005babc7ee8404ea112f7884b8918863eea2b8c4 SHA512 4fca91d99b7d069ef8a7b1ca182f8eef738817b3ee9a2540549642f21574fefc70eee2f3e0e000c3ee860983a651470b5aecf1e126b2cc7465defd708e608ebd
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild
index 5aa9b9586051..cd5609e84a74 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 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 ~x86-solaris"
 IUSE="games X"
 
 PDEPEND="virtual/emacs"
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6.ebuild
deleted file mode 100644
index e795561fea8c..000000000000
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp-common eutils fdo-mime gnome2-utils readme.gentoo-r1 user
-
-DESCRIPTION="Common files needed by all GNU Emacs versions"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 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 ~x86-solaris"
-IUSE="games X"
-
-PDEPEND="virtual/emacs"
-
-pkg_setup() {
-	use games && enewgroup gamestat 36
-}
-
-src_install() {
-	insinto "${SITELISP}"
-	doins subdirs.el
-	newins site-gentoo.el{,.orig}
-
-	keepdir /etc/emacs
-	insinto /etc/emacs
-	doins site-start.el
-
-	if use games; then
-		keepdir /var/games/emacs
-		fowners 0:gamestat /var/games/emacs
-		fperms g+w /var/games/emacs
-	fi
-
-	if use X; then
-		local i
-		domenu emacs.desktop emacsclient.desktop || die
-
-		pushd icons || die
-		newicon sink.png emacs-sink.png
-		newicon emacs25_48.png emacs.png
-		for i in 16 24 32 48 128; do
-			[[ ${i} -le 48 ]] && newicon -s ${i} emacs22_${i}.png emacs22.png
-			newicon -s ${i} emacs23_${i}.png emacs23.png
-			newicon -s ${i} emacs25_${i}.png emacs.png
-		done
-		doicon -s scalable emacs23.svg
-		newicon -s scalable emacs25.svg emacs.svg
-		popd
-
-		gnome2_icon_savelist
-	fi
-
-	DOC_CONTENTS="All site initialisation for Gentoo-installed packages is
-		added to ${SITELISP}/site-gentoo.el. In order for this site
-		initialisation to be loaded for all users automatically, a default
-		site startup file /etc/emacs/site-start.el is installed. You are
-		responsible for maintenance of this file.
-		\n\nAlternatively, individual users can add the following command:
-		\n\n(require 'site-gentoo)
-		\n\nto their ~/.emacs initialisation files, or, for greater
-		flexibility, users may load single package-specific initialisation
-		files from the ${SITELISP}/site-gentoo.d/ directory."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# make sure that site-gentoo.el exists since site-start.el requires it
-	if [[ ! -f ${ED}${SITELISP}/site-gentoo.el ]]; then		#554518
-		mv "${ED}${SITELISP}"/site-gentoo.el{.orig,} || die
-	fi
-	if [[ -d ${EROOT}${SITELISP} ]]; then
-		elisp-site-regen
-		cp "${EROOT}${SITELISP}/site-gentoo.el" "${ED}${SITELISP}/" || die
-	fi
-
-	if use games; then
-		local f
-		for f in /var/games/emacs/{snake,tetris}-scores; do
-			if [[ -e ${EROOT}${f} ]]; then
-				cp "${EROOT}${f}" "${ED}${f}" || die
-			fi
-			touch "${ED}${f}" || die
-			chgrp gamestat "${ED}${f}" || die
-			chmod g+w "${ED}${f}" || die
-		done
-
-		if has 1.4-r1 ${REPLACING_VERSIONS} \
-				&& [[ -d ${EROOT}/var/games/emacs ]]; then
-			elog "Updating owner and permissions of score file directory."
-			chown 0:gamestat "${EROOT}"/var/games/emacs || die
-			chmod 775 "${EROOT}"/var/games/emacs || die
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if use X; then
-		fdo-mime_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	if use X; then
-		fdo-mime_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 0254bc149816..604137d0b5fe 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/fuse/Manifest b/app-emulation/fuse/Manifest
index 83b7e0e8c40a..0e4c8550616e 100644
--- a/app-emulation/fuse/Manifest
+++ b/app-emulation/fuse/Manifest
@@ -1,5 +1,5 @@
-DIST fuse-1.4.0.tar.gz 1652821 BLAKE2B b7d8c5cd8c5fb13e077029eeee6283c9d2a114057c83e29bacc1d99933b338011ce255b5df34b6039bcf03410af46bf586cb6d6ec038d53b8e83bad2308d2ed1 SHA512 e5d0e65820f54d0ac0447d50aa89ea4ba3e6bb717e270ae813c640a9b36fe015c68f194edacb5cbe8899ee7893c30cab4493ed297919e962e722e9d3e1f72001
 DIST fuse-1.5.0.tar.gz 1619748 BLAKE2B 6ffbea1c7a6572f2cdd3d293a438f6e37da2eadf299396358bed2e65db3aa9720333b62b28b4f0064ec5434c99a6a0b790737230f8ec0c01f96e50f594305bd1 SHA512 c13fdef6b23377e7d2b53e7f5b2db01447d12eafc0b9114fd8b83cd5058964a655a720810ab7dc6a6e1a1d9a33ffc787b5e46bf54df1259f4ba0ff78c3189421
-EBUILD fuse-1.4.0.ebuild 1507 BLAKE2B db532c1f3e39fda1363069297ad6a78a570affef437d7ad208411f413c32e25884f29e6be80b6d684c8db57bfdf78def7f4a6d82bf76f46cfd836a80c7623bbc SHA512 e2ad4dc8e36405cd791d631897f2da902f2e90550383d06572d027f1e21d6193036b82367290329e60a8c570a0999158cedef60cf22d80195998f77a0b1e190b
+DIST fuse-1.5.1.tar.gz 1623081 BLAKE2B 4b6cf747d15bc2d33a0baba88254a08187e8a615564236835da19d32f9afb312d5a5c90ac07a88d904019626b153546ecd8cd09b88fa16731af94ea54cd0e346 SHA512 d5f5b8a0e61f298a955450de208b29f8ab4fc0133c5c58e596f36f3834c088c946e19d7437dd1a6e73a89d32dcaf6ca9ce0fed8ec310c37aa6a6568be482abe4
 EBUILD fuse-1.5.0.ebuild 1507 BLAKE2B fe247d5184e1a7e62824e04e09befd94294a673405cdbc0e0ece8e04f55d8aa52299050ff866ecace56d6f606fc884803a21f6628974c6d4962d69a61414925d SHA512 46c71560082e570e34eeb6d04ff6c2352e2f0cc8a2564879ef7737de7678cd075463524e5b2ba6d136d975a1391ff0ebc07f8f646716330751df560ce56db5f9
+EBUILD fuse-1.5.1.ebuild 1492 BLAKE2B d96f93cb03f97bda03e8d6e5fc7641befc064ece6d18a43cf9c0c00641db04ddc19883d0e995eee0b2e5a227fd9f89f0658d1fe4b42882472a296953523642ce SHA512 153e8cc20469ba0c19dfd1bd9935349c6ea285c56def18fc90cc08c34fa377e7208ec5e694891ff0dc5798836d7952aa11a09620ba4dafbc5696f22b876a5c8b
 MISC metadata.xml 463 BLAKE2B 6d6d3856e855523101aec81d8643c3b21dfe9748c34953fcaa478e60ace0122ac3f307c2f21bd41e952a953b37488f3649c57e12549520e1b3fe9985c9f6c1f7 SHA512 dce77f13c89a1e08aeba516eef1c8ca0a6fcf43167ed309971181ff133f221a50a73f6588ce4556e3cfadf62df8f00eb4c8d001acb5062909d7cb9bfcf3f6a80
diff --git a/app-emulation/fuse/fuse-1.4.0.ebuild b/app-emulation/fuse/fuse-1.5.1.ebuild
similarity index 73%
rename from app-emulation/fuse/fuse-1.4.0.ebuild
rename to app-emulation/fuse/fuse-1.5.1.ebuild
index 818bbdff2bea..4b8b2fa01d8e 100644
--- a/app-emulation/fuse/fuse-1.4.0.ebuild
+++ b/app-emulation/fuse/fuse-1.5.1.ebuild
@@ -15,7 +15,7 @@ IUSE="alsa ao fbcon gpm gtk joystick memlimit png sdl svga X xml"
 # Only one UI back-end can be enabled at a time
 REQUIRED_USE="^^ ( X fbcon gtk sdl svga )"
 
-RDEPEND=">=app-emulation/libspectrum-1.4.0
+RDEPEND=">=app-emulation/libspectrum-1.4.1
 	dev-libs/glib:2
 	alsa? ( media-libs/alsa-lib )
 	ao? ( media-libs/libao )
@@ -36,29 +36,29 @@ DEPEND="${RDEPEND}
 DOCS=( AUTHORS ChangeLog README THANKS )
 
 src_configure() {
-	local guiflag
+	local myconf=(
+		--without-win32
+		$(use_with alsa)
+		$(use_with ao libao)
+		$(use_with gpm)
+		$(use_with joystick)
+		$(use_enable joystick ui-joystick)
+		$(use_enable memlimit smallmem)
+		$(use_with png)
+		$(use_with xml libxml2)
+	)
 
 	if use gtk; then
-		guiflag=""
+		:
 	elif use sdl; then
-		guiflag="--with-sdl"
+		myconf+=("--with-sdl")
 	elif use X; then
-		guiflag="--without-gtk"
+		myconf+=("--without-gtk")
 	elif use svga; then
-		guiflag="--with-svgalib"
+		myconf+=("--with-svgalib")
 	elif use fbcon; then
-		guiflag="--with-fb"
+		myconf+=("--with-fb")
 	fi
 
-	econf \
-		--without-win32 \
-		${guiflag} \
-		$(use_with alsa) \
-		$(use_with ao libao) \
-		$(use_with gpm) \
-		$(use_with joystick) \
-		$(use_enable joystick ui-joystick) \
-		$(use_enable memlimit smallmem) \
-		$(use_with png) \
-		$(use_with xml libxml2)
+	econf "${myconf[@]}"
 }
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index b34906115273..1fc234d3de28 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-postgresql/Manifest b/app-eselect/eselect-postgresql/Manifest
index 1530df9628a5..882db9acf4dc 100644
--- a/app-eselect/eselect-postgresql/Manifest
+++ b/app-eselect/eselect-postgresql/Manifest
@@ -1,5 +1,5 @@
 DIST eselect-postgresql-2.2.tbz2 4428 BLAKE2B f18b7daaccb9ab2fe08bb6e7f88dd41dcdf69b951a3c20b65ee2955ff33fc614e5740ddbbe8eb8f55d20f5705d47fb2da8c3f3fc89e403ea24eb4b8d912404a0 SHA512 2a0b9b3c8c75792fb6b6f90f034562a3bef7c9391cac0d7c95a6a86db38b4c9840fce2fa0edb32b745905f974920ee1ce5dfb21d33f22c79d1bc776e013edf76
 DIST eselect-postgresql-2.3.tbz2 4526 BLAKE2B 226f2be462d54d835cc884f6b2c33e0f84d4500e19251fb6794929901ec033e0fa457d8606e36ada462d538674110ba8aab901ca9f86dccd52ccf9c860ba5ce1 SHA512 d7f87aa3e21c5e35f3a6879bdfb9404a2884f761463f77952f21c522b1605f191385ba7b4758548b121ad7eb56d395163e0d6bba57df446be515e6d7163635b4
 EBUILD eselect-postgresql-2.2.ebuild 932 BLAKE2B d01c59555bbe680338130b0aa452349ea2fbfd53fbde30c766618b3b8fd3ea4758c6a208ae5f02e83e2d36f3ec28c880ae4962ee71cad028b43b0dbf526d862c SHA512 43c9abe89dd5b84da6ed838e80c52f3c2349db0fbe2832881568a879b5fcb220673391e7cb124761aa4e8320c9a13755670dcf2ea3a9031ffe776e8f9f6d2052
-EBUILD eselect-postgresql-2.3.ebuild 928 BLAKE2B 0f0ff60f66264a2d07d14f82490932f1621be0ebc91137c104878d9601723ba1ec557e3f45dae55820b6f95f1849b6aa384e6032fec8bb1ab338853f0ad85858 SHA512 e45f9909c72539bc500582a9d96b26853460226251ed6da475245c9c7b6a256fb289df06a0a69aeb602cfa59f28e5f133b593fa3244ccc52053aa6f3c044cbcd
+EBUILD eselect-postgresql-2.3.ebuild 927 BLAKE2B c5bc818462b4a4106d8763825172573934e8b06b104f0778541a91aae5ca821b179a9a39a6e5ddd391227cce622ad2e69be733de4249aa8cc166a8417121a11b SHA512 63dfb75f86e580db0ef8737188160de8df4dd003c2066973e7c6a8dd8eaf0f40f6c6902a97e93afe2e75620ace4da92cc6aab2e2b49cf0c55aafb92c36450d10
 MISC metadata.xml 447 BLAKE2B 9bfd56f325d41f2d3d143e6747ce59055a32f70540084712ebc7756cb6cec6e1891f63bb02bf6bf9910a2ccf9cc66bc47c86f83aaef7ad60b7026b36ecdbc189 SHA512 17796c1b2b963db9237314a7ec5bc459bd59946d8c2d38e836d21e79f45249ed307d6fa82dd3130ffc3f5f4416015d68fadb5947b107c69a8fe04a8ea1845d95
diff --git a/app-eselect/eselect-postgresql/eselect-postgresql-2.3.ebuild b/app-eselect/eselect-postgresql/eselect-postgresql-2.3.ebuild
index 18fb560d8774..f67a61f9090c 100644
--- a/app-eselect/eselect-postgresql/eselect-postgresql-2.3.ebuild
+++ b/app-eselect/eselect-postgresql/eselect-postgresql-2.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.gentoo.org/"
 SRC_URI="https://dev.gentoo.org/~titanofold/${P}.tbz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 RDEPEND="app-admin/eselect"
 
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 519a91e4c885..e84447c2ec9f 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/canna/Manifest b/app-i18n/canna/Manifest
index eca21d66dcb9..70bcad257d9e 100644
--- a/app-i18n/canna/Manifest
+++ b/app-i18n/canna/Manifest
@@ -12,5 +12,5 @@ AUX update-canna-dics_dir 1101 BLAKE2B 9b429c2ddfb0e3c2c8a754f7fb61b776abbb809f8
 DIST Canna37p3.tar.bz2 1263065 BLAKE2B b5fb496c0ef71dc57b2da1409eea2238ea62ece3286d498d694bc7a18cb0f5e052dca95d692b4302988acd2199d350b893ae4aedc91aab0b737c3e0675be9cba SHA512 82846f2393aa2654dd2c97a93178098b8bd11e5409b584447f1b6fdf303adacc9802e2293cafd98b68af8b69622625ed00aa9712bf270feaa119adfdf4211158
 EBUILD canna-3.7_p3-r1.ebuild 2258 BLAKE2B b03a2e8c85e6fb544b2870e44990d35f5b48616f0500c0ac332a2287e4ab3e0b61bd222023b6cf4c207dee49c3e96dad2818d9042b8b353f5bcfd4f2bd972a59 SHA512 77a8ab7a8a8ffef263500364aa5fec7f888f2c55b9d5adea10c531852b8317872dfbfb807e9f92daacefee2a0bb725cd8a86f53f648964d672edfe8e0b238458
 EBUILD canna-3.7_p3-r2.ebuild 2893 BLAKE2B caf22d1d8914257992917784c03f173446e3cfa0c28aeb55a9007b07d053e33d9cc574d4f55eb253954442ab8c6f17805bf72c04113b36874a6693fe690490a2 SHA512 8c5a7660f2be089841953914fa8863d0ba9190b88c23d8266d5181c1da9e17f313e36b4448ec8009a65802b203d69c72428a640a3a2e0bf01049dffac3f12bba
-EBUILD canna-3.7_p3-r3.ebuild 3290 BLAKE2B 097b43a9de19f5fdec5fce14ebd1766d23a32b27fd78a697caadd90ba81853d0b2da7b1c8df6c68f18f90ed9dba45c0352f23b2f0f1ff8d380fa7080ab6951a6 SHA512 548033faf332008e16b901c5ba555b4f9fbf5ba1acb272c13d357d108222479b13e0e7e33d425d9c365a18121be3f29c001eb9ebd995759b7e35dc19ca910924
+EBUILD canna-3.7_p3-r3.ebuild 3297 BLAKE2B 5cb2d2305ab5b780efa5ab5a261c12f48aa536c53283c05bc1a448669c9d639cd9fb41f46609135082397bec23e00634691e2011a421bed9030abcbf080baacc SHA512 16111ac8cef55bfb54c6666ed50288629e3753d571defa98d68fb156e2e4d8c562c130b2ea374faeab2194a53e6521d66e092e054bc884cfad1ead480e9b7323
 MISC metadata.xml 383 BLAKE2B 2947ceefe007eb9bcfd46a69a4b97a2406383931cb320cb594b96952697378147824461f1b55d5caddc419b19aebeb1c5ce69c0f0d31568cbbbe3d1d15fba9ba SHA512 8affc10d697147ea5430d73c40eb4e7621ee9a06d444725566d4e16a28ccab4f53aed3025905894fe6cba0ea874dcf0d2d583d3dcedf3a0ccc8b139af02e5e98
diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild b/app-i18n/canna/canna-3.7_p3-r3.ebuild
index beb1f7613d3d..ac8473821f75 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/9565/${MY_P}.tar.bz2"
 
 LICENSE="MIT GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="canuum doc ipv6"
 
 RDEPEND="canuum? (
diff --git a/app-i18n/tomoe/Manifest b/app-i18n/tomoe/Manifest
index 036f7298b633..75aae3bc442b 100644
--- a/app-i18n/tomoe/Manifest
+++ b/app-i18n/tomoe/Manifest
@@ -4,5 +4,5 @@ AUX tomoe-glib-2.32.patch 688 BLAKE2B 5aeb0fa73f54331e20d8a3cd360a4e7c06e770f988
 AUX tomoe-ruby19.patch 2646 BLAKE2B 7b2289af7e87946bb9c4cb197b493bc2b8625a3bc3f22ee42270a403bd36b1bee4efcbb46117f11d537e3c8a38dfbcfca6484c0a1db6ec2f0b7a5469dac35b47 SHA512 52f555412853c3485e8d3ab7b7739f030e2c3d2b5c4aac14ebb967c93427fe04cbcfec2f5997f09f0f7611dc268ee63437b256ef4cac1ea805f0ae84a522b836
 DIST tomoe-0.6.0.tar.gz 4918949 BLAKE2B c9f4accc77fe7c6214c4d19dbbac7d0d39ed7947588ab1b8a1416f6cfeda33a6cfa84352f888d02848c8e2026bd5c36d2fe52d099bda6ca41a6d215733b11aa3 SHA512 eab618d7b28fc9613c175fab6f80fc7d6acc34af3a47f20c11b42a32acd87143ae10caca67fa1a5e2e75441d431799a5725a5d507604f8bd7447bbc1826f0bb8
 EBUILD tomoe-0.6.0-r2.ebuild 1601 BLAKE2B 210f94b60e94d65fb761a4a92007cbe76f5612450ac115c76c9952e1cb611965004324ee487c72d6480ccc6f4a0bb78f889a33b4dd398ff09b083efbe732ef73 SHA512 1c2fad47b395478bd0a9e200a84af14ffb61598022c6655dac28fcdd008cd8ccdd0e88ed9b51cfbf9145857368fae8945a8ec1eabe33b82d7f88fb1cd2c036cf
-EBUILD tomoe-0.6.0-r3.ebuild 2144 BLAKE2B 8f367b420d524982f700bef53547188da5ba2e208b7f0e27d2b2bc381329d5657e0a736a9072de89c863961b87a19a01fac20c2718babfdffdf88f0b27281dd4 SHA512 564e67e76f2e5f92f154006100632aec358c1a7b7779a7c63c67cd2572161d974c53a404cf4113ab639ff49c74b1ca1d71252891743214758bcc7dafbbcd5347
+EBUILD tomoe-0.6.0-r3.ebuild 2143 BLAKE2B 341ed2eb5e7408e054f9578f62c1cffc5d4eac8dd0577b1fc0a686a39c8e29bae7fa49f4de54ca044a71f1b8000c33a58c69900ef28db7e329ef886b45aaa08e SHA512 8404db587e1776a864801d9a9ff7396a2c4a63bd0f780821f8a3a1857d74bb6c2fc3edfe13f2989bdcc5b597a481316ba363c53045d025b383beccac7dfd63d4
 MISC metadata.xml 482 BLAKE2B 454f6c496dda5f9ca738bb81c843a650be203b58bbaf4f0775204be463de6eccdd11023705295e89d1cc8513eead67dbe1fb26740bdc39216e8e2d4ee838e8ca SHA512 0898e0ba0bd42458870d268ee6bc881da1c88ab01969037d57f0d4abf5f140a7ce77bf87d918976bd763a33c8869e73d0fb2ec744be747d5bc30d594cc54efeb
diff --git a/app-i18n/tomoe/tomoe-0.6.0-r3.ebuild b/app-i18n/tomoe/tomoe-0.6.0-r3.ebuild
index 183479bb5c8f..dfa2430580ed 100644
--- a/app-i18n/tomoe/tomoe-0.6.0-r3.ebuild
+++ b/app-i18n/tomoe/tomoe-0.6.0-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="hyperestraier mysql python ruby ${USE_RUBY//ruby/ruby_targets_ruby} static-libs subversion"
 RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/app-leechcraft/Manifest.gz b/app-leechcraft/Manifest.gz
index fb6d0bdb4eea..84d97894256e 100644
Binary files a/app-leechcraft/Manifest.gz and b/app-leechcraft/Manifest.gz differ
diff --git a/app-leechcraft/lc-popishu/Manifest b/app-leechcraft/lc-popishu/Manifest
index e3e137d4e3aa..c77765c2c695 100644
--- a/app-leechcraft/lc-popishu/Manifest
+++ b/app-leechcraft/lc-popishu/Manifest
@@ -1,2 +1,2 @@
-EBUILD lc-popishu-9999.ebuild 329 BLAKE2B 02b8535eda0fb1ac0ac383975d457d5c946a1016a98810d72358a4d64543103d81e7a17dffdc04c3bce8d958afac25cb3d266ad5539778f9f933e95194e4678a SHA512 529213fad444acd6b86e2b117b8d4a73f9a3e247bccbdfa8a304f015316c8d2214beed535b04d4cf11a9e5b5dd4674214cf48ca3d64a871618422be5324d8d5d
+EBUILD lc-popishu-9999.ebuild 332 BLAKE2B 0f42f2ba596449b29a4d44e0747656ce229d1c110262b6e35181ef6fea2318e4f521d886fa7c441fc93462830441841d171b54c64b8e8865b40963d7c41b75f7 SHA512 76c668c54dfa7c5ec6557e5f9cacb410313121ad3aa3d1edd24e065232aac0c3f772090b815ca1dc8958d1579c2b8e7a0cb5e6d5c51bb6cb9f2ecb3e293f8995
 MISC metadata.xml 364 BLAKE2B 39462072f9e35ecb19d9426fe032a499aefa12b7327ed4b97692f4a0778c9828f4b7cbef3bb5bb0bce597d51a99b11db8dabcaa9fda8a326c9916690e6ff4af4 SHA512 697d6e58b4620f4b3c1b7a147955d97f29815facb843de2b6cf67b0c44ccdcb6a0e47ae9a32947f0fccf6a3aea9d204bd30a334e642ff77acca43b03ff56f3bc
diff --git a/app-leechcraft/lc-popishu/lc-popishu-9999.ebuild b/app-leechcraft/lc-popishu/lc-popishu-9999.ebuild
index 1940b99df1a9..61a9d3e4cd30 100644
--- a/app-leechcraft/lc-popishu/lc-popishu-9999.ebuild
+++ b/app-leechcraft/lc-popishu/lc-popishu-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,5 +12,5 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
-	x11-libs/qscintilla[qt5]"
+	x11-libs/qscintilla[qt5(+)]"
 RDEPEND="${DEPEND}"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index e5af7a52f231..4d01c4ec3f7b 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/calendar/Manifest b/app-misc/calendar/Manifest
index 786b3e9af762..a5e816dea8b3 100644
--- a/app-misc/calendar/Manifest
+++ b/app-misc/calendar/Manifest
@@ -1,4 +1,4 @@
 DIST calendar-0.9.1.tar.bz2 65225 BLAKE2B b8ee591005d57fdb3e18412c9665ee3447f607224efad261ca0cf7a3dc88e94e8bfb8309b19996e38e7e18c26bafcaddc9ebf7d612ed25d7d1d159b63b7b6827 SHA512 c8f373ad06265720ab6ba1edb9066cb5474806d023bf0cb3a35876c5bad72de8bac8ab58c2b6d3a9f418d20d04b1811e256abce9296c9c8547c9b7f8005adfb3
-EBUILD calendar-0.9.1-r1.ebuild 633 BLAKE2B a1838e46dff6edcd0cbd3975609ac855aad4a1a46bc52707cb3b394cb208e61c8ffb0dadcf947970506465ce2c18bad1ef4ff77ef94dbcb95763c952b668181b SHA512 b9e2e60fc6b0fa27b49edef49828628c86adbd299ca386944ee458a711dd540dbdd9494ad749cef54764bee348fe797291327e79e6bbd444b6389d02a46c6718
+EBUILD calendar-0.9.1-r1.ebuild 632 BLAKE2B 3aab9f756c907ecb0afcc68f130b28aa60239f570b7c91393a79197d731a0fddcf940627c00d7acf3dd8e60bb587cfcc596b74285f8e4480338f13b4924061cb SHA512 23cc641518bf0ad3f674e16523a70a24051a0708d10e691c2c9a535be254586eeb1eab16cb5620b2178f7b130aabbf7a4683a678752f1d94deb9c4152867161f
 EBUILD calendar-0.9.1.ebuild 641 BLAKE2B 194b76a151bc43eb13e99f2ffa6cb0b3538f96b5aa3c79b52c1bc6f271c26492dc7cc7be4358f7138bfc5ea0819cdcb725e38788dc4ff69bb36c7b77059dd67b SHA512 24d3ca5ae255af3344c3ca2f9ff02af292ca388c7377d2f585e5be00ef6c4753f1ed2e81077138183be9b86eab087fe0861254fa1d3d651f9e4c42e2fc1d7651
 MISC metadata.xml 346 BLAKE2B 365bbcf4fca5fb793b4b9499b021c028eb13d1634d21a1c1627cd528c0fe77c195f7f789ee7cce987297ed8e8e20cc9937e83f6d5292b3878a25426488a3d691 SHA512 9fb15d47c1b5ea5eba7614339ed44e8812550589416f8fdb5aa02dfc899c95b782526577f97a24e024c0298e09af634b8a3dc27474755728d81866100c8d066d
diff --git a/app-misc/calendar/calendar-0.9.1-r1.ebuild b/app-misc/calendar/calendar-0.9.1-r1.ebuild
index 9ff0da301319..788efd4a52a0 100644
--- a/app-misc/calendar/calendar-0.9.1-r1.ebuild
+++ b/app-misc/calendar/calendar-0.9.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://bsdcalendar.sourceforge.net/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86"
 
 DOCS=( README )
 
diff --git a/app-misc/dailystrips/Manifest b/app-misc/dailystrips/Manifest
index 0dd8fc4a35cf..5e13de71cb8d 100644
--- a/app-misc/dailystrips/Manifest
+++ b/app-misc/dailystrips/Manifest
@@ -1,4 +1,4 @@
 DIST dailystrips-1.0.28.tar.gz 58713 BLAKE2B c7d1c04c7bbb655898a21c042636655b058fcdfdba3843d6d42bcce0c0315f765c4080987c95256e37601773b6587654e8d9b9eee197253b7e93a1804823de10 SHA512 a5388d5bd45ce1b8b22420c3d53bbbf4d26fec9737c6edca3b579126443e4f88ae5a7ce5c6770264ca96ea1488ab69b73831ab6bbd20e0f68854fb08714565cb
 EBUILD dailystrips-1.0.28-r2.ebuild 810 BLAKE2B de7b86da861863a1df925985b36033df94d32ba4e919ceb78ec1567ec5ac59bc7ff797f2ab954fee4259df87e6c3e33e2fffd1c3e840fc49f40ba86ffbb1dd08 SHA512 ef444ddf3c8caee991aae8e23fe013b84be795640243ff10f6c3c5af61ec09e4c21a732661c1576dbc752766ff2b2b2c322a6fbe9083f95b7256740fc405a618
-EBUILD dailystrips-1.0.28-r3.ebuild 750 BLAKE2B e515204fce0717672a3241fe45bb49d8751b8ef8dafb8b0f585f9b02d9758f48844d240bb05f3c30b4cba71966739973e23cca53012a9bbcf046c5474859612d SHA512 b2e1cc28bc3949b3fe16de9c18ff747ad4470999aa228557e661929bf36dbc2119629a28858dea7f758d2cfbaec77e526e66aa8655dd9ce1fb2a1f42cd2de642
+EBUILD dailystrips-1.0.28-r3.ebuild 749 BLAKE2B 514484bb53c78d9e445c0b798a9763a2fce345544213517e55f9a921bc87a68c000fc710248f2d2d5d2a53b5e32fab6800e9ebb40bcef0c4458f1cc7d39dd7f0 SHA512 47be6b5b5228e32cff62f1647466e551bcf14bcb096f54db9df65a6ee24361d52fa6deec8a5ec166789b60b5c4a40f77e4a40bdcc4a65724e4a58d7523113c0b
 MISC metadata.xml 248 BLAKE2B f0ce888e7f1c4373cc6d4f88a6e2870bb26e24adc5a50f747425399e154b44a93827635635fa82be033506a79d4d033119fabeae8bf24367d1dae19ce4129e67 SHA512 d08bc57fb26bc08dd2c8eb96219fcf98dd63b1e9ac4725dd0bc246ec90db63ed13cf9653d94ad11789ae3efc933d9ed9781bbb4db6f439c5596bac12011b7552
diff --git a/app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild b/app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild
index bc2f4ac04ccb..6ad447cab8d6 100644
--- a/app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild
+++ b/app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/dailystrips/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc x86"
+KEYWORDS="alpha amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND=">=dev-perl/libwww-perl-5.50
diff --git a/app-misc/inputlircd/Manifest b/app-misc/inputlircd/Manifest
index 344a745a6e3c..d4234fa9604e 100644
--- a/app-misc/inputlircd/Manifest
+++ b/app-misc/inputlircd/Manifest
@@ -7,5 +7,5 @@ DIST inputlircd-0.0.1_pre15.tar.gz 5226 BLAKE2B 92339021451b2575de5adbf6123f1083
 EBUILD inputlircd-0.0.1_pre11-r2.ebuild 788 BLAKE2B 186c968570aa829bf7a4a947f7a6210db4edb38357ac59f3e30afacd97acc6b8473cee1c1e191db7391684c0c582a32921d1d4625e6f2aae3cc63f3440cb6db0 SHA512 dbb451f60f1da705f5d87273dafc96e145bad81f45a3789d900385c6c99d016c8efd71082c6ee9eacd96d25a440755d529a915d44f8e6ecf0d0276918ed5db70
 EBUILD inputlircd-0.0.1_pre11.ebuild 586 BLAKE2B abe1411ab4f1e339b4c4ae6737e3c8f644d15c1b704d6dcdad3ebf0b3754b1bdfbd03d2d9b0a2c0e22cd27e08a86b331a8a2b62809b31b7532b0eccdcd5de281 SHA512 62ca7270bbcc7d621d936753ed7f5fa3f6b572de4313b52ea3d8318f06e1ebb316259b78111aae9a8240ade4523a05b11ce6a286d837d7981f53f18d8d2c48bc
 EBUILD inputlircd-0.0.1_pre15-r1.ebuild 787 BLAKE2B eb23152b943475a63ed158407ec48945574adecf125f700287dc90180181731cb47b644e403bddf53e21a14ba895d41fbdbd9154cd9ad4bbb31b16d81fc9b8aa SHA512 0a6ef5f19829c0d63b2c54baefeae293f693e21af88df9d4a10cec4f27ccaf77f915c4d78c3db6a5b4e43c64ac596a07c654f04b3ede78b8c900945a3718a2fd
-EBUILD inputlircd-0.0.1_pre15-r2.ebuild 916 BLAKE2B c940152e33cc29998993abd6d8c0412126bd86d6f3b151c7154b531a51804fb79fa9984d248b4d838e825329e27bcdd392f62c0e6a61d995d27a82dfefb5d5f9 SHA512 12877201ebb8a5641210f19b0b14a03b73ad4d0eb450fe416bd6d1529f8c353478d5f0c20387626f1b9d598bb4119861fb55e572f0c398602af68c54bc3e4d58
+EBUILD inputlircd-0.0.1_pre15-r2.ebuild 915 BLAKE2B f1651c621f844888537b03fb297de41b3052ae86ff8ff9d8a730607f70e524f90ca0afee12718672ce8a526a378f0b6ece6e09326b74ca46a4a705224325bb92 SHA512 6098adbefbd84118e01a06c5ac956cbc8735c568bbba5f214c21c7402505e265d81ac1027ffc68c5c98bdd7c37a4094c7cabb75419d977d8067223418de074ea
 MISC metadata.xml 258 BLAKE2B 1878517d827956dbd45c2d86e97fc066cd4293c3cc94d6d4beaff553462c1badb68aa38b3082c01fe6e21ca1519fc482e2670931d007382b8b2c38af715fe02d SHA512 33d52c9b472999f5722ba6a13598524745093ff45394dd1c9f560b051c9d28be465f72db260a148831b1ff8bc175f41d0c1e4b2d038afc0afdd230b039c67c2b
diff --git a/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild b/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
index 945592c7f128..504daacd2695 100644
--- a/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
+++ b/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://gentooexperimental.org/~genstef/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ia64 ~ppc ~ppc64 x86"
+KEYWORDS="alpha amd64 ~arm64 ia64 ~ppc ~ppc64 x86"
 
 src_prepare() {
 	local ver="$(best_version sys-kernel/linux-headers)"
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index dd0e3aaa9771..36afdbd9ae8b 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index b1a2fe1dfa73..a4ffba5f2ee5 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -9,6 +9,6 @@ AUX scribus-9999-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c272
 DIST scribus-1.4.6.tar.xz 73601104 BLAKE2B 5968a48410d1a2a4caa333c9f83b43f68c964862d9aa3cb20e136760201ef2ef6cb82f770026b6f962758c9d397f25a017d906433f52f88bec11c57105c27f6b SHA512 74d8a89eb767535bcd8fe5e3c55d03709d59ff8fc5280005bcc2ad36cae1d37c8442ab85abaea86fdee9f351a901c86947231001324e2d8df00cbd8e5c18d1e3
 DIST scribus-1.5.3.tar.xz 74222084 BLAKE2B ffb50c728c0669ab8a22c416c143e8dd47c818120247b4cf5a890872857326b53491be99004a344d78ea2cf2b174ae2987ddcddb4cef39a6e95fe1695be45d48 SHA512 487cea685869397bc52acc7be8e8e9f4bad3f594c1f95740207e4d9e26b07461a7fd2a95d5337b38f1b0fa6504a9f6059cca6740c78cc165eab0b779ffdfe980
 EBUILD scribus-1.4.6.ebuild 4501 BLAKE2B b30fa6004319b54965b5b61f9cc466535135a8dd78434b090ff827df779ec003af1cf9ed00903d1614b6102be34298a95a1c3c609b1c5ec7a707b09b42bfe393 SHA512 0ede0bf314d6aea40da9316ea1778b9e2810780d715fe5fb66221354467147c54694b3b6f620faa7da6ad386034cb4b8b03df9acb3cd372b17ecc4415543531b
-EBUILD scribus-1.5.3-r1.ebuild 7025 BLAKE2B f2e6633dfa842411962af2cb4921c507d4e2929501c79ee3d1b0f41f97cf75265ce2c88666d3ef9ffff1791f5ddc4d0003e81efef0f086acf30875c925724ea5 SHA512 f098ff544334553d5fd3825b3a5dca651906d401f47847f8eb88e78a42bde9299471c9775d1ebdd8574f5e5722aaa6a00e0dd695cb5e87f351682ce6ef8a1250
+EBUILD scribus-1.5.3-r1.ebuild 7024 BLAKE2B a3943ed45395e422f0f316ce622c384b2dd0d6418fe6f8e2a859e9b880376a90a6033b4da99fef3368f1ce55f9a4193ee392549fa7949cfbe9077696e95ac17c SHA512 f03c1c3c26076daf20bc8681f808ac3dccd32bf1b23825be9026c6d7ba55a4ad670e91da7f1380833c993f62577e7b415f011573abd578c03255762bb4a5e04d
 EBUILD scribus-9999.ebuild 6947 BLAKE2B 98d7eacf3fe442b1539519139e9a127a3d7c0ea7fa5b9e75c6b7b220353ce7635c97675df9f2df1f272116c44f6825817e8c62fff75860d4cfeb75bc4fa388f8 SHA512 fd3911b80f04485f8fc11f2b30bc3f3e1ced644217b6e1d00716e48a68154b5b12102267e363b39dcaeaff129eb46b246f415c581f724951f45b3a9e174355af
 MISC metadata.xml 845 BLAKE2B 6522fd7c428e4f5f8bd77c03a09408e443e91d45fb0bbe72a312d48f1cdee38ab62a4059940237f18aa2e63b0595b79598846d5acb3d7289427b9d1cae768510 SHA512 18872713a1aa8d6739186ffa60f8f747f8ee9de41339c8a2d20c49d97771ce3967839044f7573bab2d7717a73c2705722071d16441bb458060db5f9e5c15f3d1
diff --git a/app-office/scribus/scribus-1.5.3-r1.ebuild b/app-office/scribus/scribus-1.5.3-r1.ebuild
index 98fa959de9c7..85a102a443dd 100644
--- a/app-office/scribus/scribus-1.5.3-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk"
 
 #a=$((ls resources/translations/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'| awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_: :g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e 's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a
diff --git a/app-officeext/Manifest.gz b/app-officeext/Manifest.gz
index cc24e12ee348..173506edaf1e 100644
Binary files a/app-officeext/Manifest.gz and b/app-officeext/Manifest.gz differ
diff --git a/app-officeext/ooofbtools/Manifest b/app-officeext/ooofbtools/Manifest
index 97354fdb66dd..60f7372a7f5f 100644
--- a/app-officeext/ooofbtools/Manifest
+++ b/app-officeext/ooofbtools/Manifest
@@ -1,9 +1,3 @@
-DIST OOoFBTools-2.48.zip 5631726 BLAKE2B 3b91815956deef515707a2761f855025f487da92c7c596d30a392446c9129d676f7cc55cc32e613938dab8b9d88977e8474cfcf43e3435edb21bd3eab05a917d SHA512 31d6571e4050975bdec92f85578235dea4784cd0e45dc4d1e612e0999744f1700a8bf22983378333aecdb146ffd151b6e7cbe071b90e9816443e939b27d117f8
-DIST OOoFBTools-2.50.zip 5631882 BLAKE2B f6847e7639936f4a7d1928a83cec933afb6d818f13534a4122dd0a75f764afdcdb027d2f7f1580a3837cdf024d90b013284b1020b06003d4eee57a5e2181f8aa SHA512 a2aed60ac1690f9a629f3d81e449a7700b949f75e332748b846edb85c5954622e1cbac62e97cb9a5f823f1da2c901cc6cb4fedfd58a1c45136331b55ef6ce482
-DIST OOoFBTools-2.51.zip 5632570 BLAKE2B ec6c8a2b19a8a53d22fc725533669d3bfd69d038f2f2457590de84073be2cbf546524a4d01b84650ba196ca24338ef7467c20c3c8194f394b8ebc8320f9d64d8 SHA512 c89044c9e6b82a51fcfb370a31cc2ef6ab16cc2895667519324c42c450164ed933e3b492b3ed21a50dd5e563bf796f71bb7333132410fba512eb59e1d5b7255d
 DIST OOoFBTools-2.52.zip 5650498 BLAKE2B 57a068f1098278bc65d056a98c9047d3391cd732180fb02279d854d10215fec8ef60aa5024e837646738c5ca4f6c60f2205d2311da68eb755ef3427b79c697de SHA512 3da09160422f81be2871e294ddc9397267bf158a6304d23cfa125756c75266d21bb6a6dc5b5ef5feb7afde2979484fd092c555bf14460b43ce215b6c91007e61
-EBUILD ooofbtools-2.48.ebuild 761 BLAKE2B 8126207fe93fd83520b829025d2336265d5a0d466509cb7db95cded083bff141af2a1f581f8584c9b13ec5f43e76f982f95c3ae7b036c505706e6234ed41d37a SHA512 6e1c9f67f25ade0249c5636740d5ae4a166694082a1a6c884b9b0b52d3d1089327728865d9bd80d8d9f69b1b6388f5970c08eced0f59ac2d1d62018c912062b1
-EBUILD ooofbtools-2.50.ebuild 763 BLAKE2B b510068451179d28a58bfcd8b1e68351efc12e01fad3fa2ac10f204556ad95787402544ab9ec5abc60f1dfbc1452f576ed34ae27a3936f02f32db36b7499d3d5 SHA512 e4e989bd44bf1893171de1c605dcb6e27b893dd062dacb959e7a8a32677e807df94ffc6e9e2cca64c09fb9d1e3b3a5462669be4ba5d128090159686680ceaf1a
-EBUILD ooofbtools-2.51.ebuild 776 BLAKE2B a46b2eaced520a6dccf4f22e928121aa30c56af5a48cde7c5b82fa7b8b0948351aa087d954c4760f093befaea631e4a4d4a21074979269daa6033e40a03e8199 SHA512 4fa0d51fd22e6f6bf63cb451efbc1e212b447fe4dce8ac1f4d4df1ae2d3bc661395e3986c9f05f17d676540016c325aaecaec64849e5299cd66b23d3afb4d9dc
 EBUILD ooofbtools-2.52.ebuild 775 BLAKE2B 724d8d07d6c34981e0bd4159cf05aac3a3149cb6980735374ec53483deaa8336ec86ea062c0f1ae723ae6e8c8f4795ec68eb6a2b40809b7b32a5e4f1523fdbb0 SHA512 0e76e93b9eda0c190e045edf8f6ae1b594ea5af40c0439b03475a9aaadd8475643a5acc7f7e30136286dab90876aa25e4f8748b118899d7120f5d89771178e49
 MISC metadata.xml 558 BLAKE2B fd01136ef59f107646bfd319657c23cf75cd2a75066a9ae63c1b430b34e5a30b087fb307a5442ad6c40a16f74a81178f35f216c95d264ef584e10ea4c3784c5e SHA512 45b372bbf351cb6d5e2f984fd8151a47f85f398059ef5470afd671fbd1d0f05e6fb987c94a29c263f4e71283c3cccdab5094cce9b78d16221c2e87045aa92009
diff --git a/app-officeext/ooofbtools/ooofbtools-2.48.ebuild b/app-officeext/ooofbtools/ooofbtools-2.48.ebuild
deleted file mode 100644
index a41a102c9905..000000000000
--- a/app-officeext/ooofbtools/ooofbtools-2.48.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN="OOoFBTools"
-
-OFFICE_EXTENSIONS=(
-	"${MY_PN}.oxt"
-)
-
-inherit office-ext-r1
-
-DESCRIPTION="OpenOffice extension for the FictionBook2 format with validation"
-HOMEPAGE="https://sourceforge.net/projects/fbtools/"
-SRC_URI="mirror://sourceforge/fbtools/files/release/${MY_PN}-${PV}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-libs/libxml2
-	app-arch/zip"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-OFFICE_EXTENSIONS_LOCATION="${S}"
-
-src_prepare() {
-	# Remove Windows cruft
-	pushd "${WORKDIR}/${MY_PN}.oxt" 2>/dev/null || die
-	rm -r win32 || die
-	popd 2>/dev/null || die
-}
-
-src_install() {
-	office-ext-r1_src_install
-	dodoc ChangeLog*
-}
diff --git a/app-officeext/ooofbtools/ooofbtools-2.50.ebuild b/app-officeext/ooofbtools/ooofbtools-2.50.ebuild
deleted file mode 100644
index 34d38d5a5ec9..000000000000
--- a/app-officeext/ooofbtools/ooofbtools-2.50.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN="OOoFBTools"
-
-OFFICE_EXTENSIONS=(
-	"${MY_PN}.oxt"
-)
-
-inherit office-ext-r1
-
-DESCRIPTION="OpenOffice extension for the FictionBook2 format with validation"
-HOMEPAGE="https://sourceforge.net/projects/fbtools/"
-SRC_URI="mirror://sourceforge/fbtools/files/release/${MY_PN}-${PV}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-libs/libxml2
-	app-arch/zip"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-OFFICE_EXTENSIONS_LOCATION="${S}"
-
-src_prepare() {
-	# Remove Windows cruft
-	pushd "${WORKDIR}/${MY_PN}.oxt" 2>/dev/null || die
-	rm -r win32 || die
-	popd 2>/dev/null || die
-}
-
-src_install() {
-	office-ext-r1_src_install
-	dodoc ChangeLog*
-}
diff --git a/app-officeext/ooofbtools/ooofbtools-2.51.ebuild b/app-officeext/ooofbtools/ooofbtools-2.51.ebuild
deleted file mode 100644
index 5cea90c2d8d3..000000000000
--- a/app-officeext/ooofbtools/ooofbtools-2.51.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="OOoFBTools"
-
-OFFICE_EXTENSIONS=(
-	"${MY_PN}.oxt"
-)
-
-inherit office-ext-r1
-
-DESCRIPTION="OpenOffice extension for the FictionBook2 format with validation"
-HOMEPAGE="https://sourceforge.net/projects/fbtools/"
-SRC_URI="mirror://sourceforge/fbtools/files/release/${MY_PN}-${PV}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-
-RDEPEND="dev-libs/libxml2
-	app-arch/zip"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-OFFICE_EXTENSIONS_LOCATION="${S}"
-
-src_prepare() {
-	# Remove Windows cruft
-	pushd "${WORKDIR}/${MY_PN}.oxt" &>/dev/null || die
-	rm -r win32 || die
-	popd &>/dev/null || die
-
-	eapply_user
-}
-
-src_install() {
-	office-ext-r1_src_install
-	dodoc ChangeLog*
-}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 5569106dde64..9edefc330ea7 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/etc-proposals/Manifest b/app-portage/etc-proposals/Manifest
index d4be5439117c..f34aa4096f56 100644
--- a/app-portage/etc-proposals/Manifest
+++ b/app-portage/etc-proposals/Manifest
@@ -1,3 +1,3 @@
 DIST etc-proposals-1.4.3.tar.gz 53696 BLAKE2B aa86d4b55d53ea269bfeb58cb1db9877fab224c5387fd91ac377d757814580b8c4561c868d9c2d97c465b332041c67fdfe7a5e196fe329b92a768d542257a9ff SHA512 9de117b96908bbde87e8ee9c326525961547ba779ae571071c57571d039f3e01f9d0ec6be5eefc1ea40abdfe73631b4c750964dc94dbb6348119b83afbc556a1
-EBUILD etc-proposals-1.4.3-r3.ebuild 1422 BLAKE2B f99fea4c9b301e5ef01d77563ae6cedee8f707a6a3dc9071fdc8d046138f9f246d864b31d6c0b2be24fe319d0d3ab861def60ebe4e965e14f3db1188828a7713 SHA512 8e85c645dfec3349f14dedabdac4b3b7c26a6c5a84261ea3a05c144bf575f0ff197e72cc430e4fd0b9b118bb719bcfc0026855ccf44e4b4dea5c53b9c063f6db
+EBUILD etc-proposals-1.4.3-r3.ebuild 1272 BLAKE2B b99b4f39bc3c08f433fd93d90f24f3f8e953bd1d4c091d81fcf8fcbda045b670bbcf93bca0835164cf3c0307fa43f3a1b688653f913b9d45f51eb93e69f5eaa8 SHA512 1d85af758807a3d7eb94041528c29c48566809a4c5a975562b153f62fe40a91d61c912629c4f9792ce53cecfa72a0e241c7b395d173509420d37ef48146ade07
 MISC metadata.xml 463 BLAKE2B fc408f9701b4ffee390c6d5983b94e5913d28dca4c0ec97a7f0fe5758797b767d3fce8738208a869b5134907c066d5dfdd15fab70f0de821f69e587b7361453c SHA512 8e858c382a8880509a3f8964a2d94e64899a842d7c0368069eb8f58c041863a3a6d6a3d586cfd12d411de21bd990b685ebfa3d2d97ac460c0eb2a6dbf6aa91d1
diff --git a/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild b/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild
index 798238739380..8ec312a94438 100644
--- a/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild
+++ b/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -10,13 +10,12 @@ DESCRIPTION="a set of tools for updating gentoo config files"
 HOMEPAGE="https://sourceforge.net/projects/etc-proposals.berlios/"
 SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.gz"
 
-IUSE="gtk qt4"
+IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ~sparc x86"
 
-DEPEND="gtk? ( >=dev-python/pygtk-2.10 )
-		qt4? ( >=dev-python/PyQt4-4.1.1[X] )"
+DEPEND=">=dev-python/pygtk-2.10"
 RDEPEND="${DEPEND}"
 
 python_install_all() {
@@ -27,9 +26,8 @@ python_install_all() {
 	mv "${ED%/}/usr/bin/etc-proposals" "${ED%/}/usr/sbin/etc-proposals" || die
 	rmdir "${ED%/}/usr/bin" || die
 
-	# Bug 308725: Filter out the "PreferedFrontends" based on USE Flags:
-	use qt4 || sed -i -e '/^PreferedFrontends=/ s/qt4,//' "${D}"/etc/etc-proposals.conf
-	use gtk || sed -i -e '/^PreferedFrontends=/ s/gtk2,//' "${D}"/etc/etc-proposals.conf
+	# Package has PyQt4 support no one ported to PyQt5 so far, bug #634956
+	sed -i -e '/^PreferedFrontends=/ s/qt4,//' "${D}"/etc/etc-proposals.conf
 }
 
 pkg_postinst() {
diff --git a/app-portage/hashgen/Manifest b/app-portage/hashgen/Manifest
index 55c49f7c62c9..901a26ae3103 100644
--- a/app-portage/hashgen/Manifest
+++ b/app-portage/hashgen/Manifest
@@ -1,3 +1,3 @@
 DIST hashgen-1.0.c 36299 BLAKE2B 4419ffd2b4c8435b05b0cf2d9e54e2df5c539f945166da8305c910ec267e5d93cd26822ef189777cf952bb8644193fbfeaafefa4e98c5b7561845fb9a1f40c0a SHA512 4f8df94e91b02ebc611553d2dd9776de4ba77989869ed1ce411b91cc7fed224c3d8715d15cce6234caa25f2143962949dfd59da79d8f1ab211c287c604c22fff
-EBUILD hashgen-1.0.ebuild 1151 BLAKE2B 33933f28906de456e321d72639dec65bf20c1c7844dbeb34b2c209c38dd574929cb1d8e4ca42ce043157c3c8181c7ef0a79303d26ae02ea2a2f35f83a91e8e27 SHA512 0a1e2813e109ed5c05db9ff540e242341c49838f359079872e54d63bdee63d8dc03b000488ba93756398479127c0857d83f2843ac32ce2a74047007fe50f169b
+EBUILD hashgen-1.0.ebuild 1277 BLAKE2B 6532dedc635b96156633fc402c02656c0211d991adcecb2ab1d9c977e26a647d502b8e0137eccf48ddb626cfc9add057e2ceb2a5a898bda4939852e185611fe1 SHA512 535cf69887158b5b1c3fe764a5b14c20fbe267d6fb48ceac097f09791f8b6beb0444347ec32a1ef9e418f716c755132bec05c0b6e8e783a87a7202fabf7197e9
 MISC metadata.xml 248 BLAKE2B 60e4295b22f6f36039547e98305ae072755044f6516df2e29e65768732900ffc93dac9cbcf1da9e6c731403a62cf272f2f378d0641bd466974f8a234235c862a SHA512 f6fee7363592cb9dcd666011806321b791fb84bf0719fb2454d1f3ceb738650184286c17a13684c077bacd1a93581a71accfe9cef74adcaf40dfda7d8a167d13
diff --git a/app-portage/hashgen/hashgen-1.0.ebuild b/app-portage/hashgen/hashgen-1.0.ebuild
index a27739de9e50..26a83a7bc513 100644
--- a/app-portage/hashgen/hashgen-1.0.ebuild
+++ b/app-portage/hashgen/hashgen-1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit toolchain-funcs
+inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="Manifest generation and verification tool written in C"
 HOMEPAGE="https://prefix.gentoo.org/"
@@ -40,6 +40,9 @@ src_compile() {
 	local openmp=
 	use openmp && tc-has-openmp && openmp=-fopenmp
 
+	[[ ${CHOST} == sparc-*-solaris2* || ${CHOST} == i?86-*-solaris2* ]] \
+		&& append-flags -D_FILE_OFFSET_BITS=64
+
 	v $(tc-getCC) -o hashgen ${openmp} ${CFLAGS} \
 		$(pkg-config openssl --libs) \
 		$(gpgme-config --libs) \
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 4fa0eca68761..5182f06be8c0 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/docbook-sgml-utils/Manifest b/app-text/docbook-sgml-utils/Manifest
index 22cd3961d5a4..1327ab9e8090 100644
--- a/app-text/docbook-sgml-utils/Manifest
+++ b/app-text/docbook-sgml-utils/Manifest
@@ -3,5 +3,5 @@ AUX docbook-utils-0.6.14-elinks.patch 445 BLAKE2B e4e64e0cdc22dec01bc96ce5ae0b73
 AUX docbook-utils-0.6.14-prefix.patch 3055 BLAKE2B f8b7f5ffa47d0a1d18fcf9ef66dae9db74b30086bed3a6d3900e73f83dda660c6abedf697f71e51f9b5145751bae2d461ace626a7336f95e95b284468ed50857 SHA512 c4f95b8507070dda4ed102c45e6b8fe40172a2a5d8b041259903f46c3bedb351d85924810cb9bae3073b674ec8b39bd86d5f570c8c28c8100134f62abb59c1a8
 DIST docbook-utils-0.6.14.tar.gz 124998 BLAKE2B c0ae31adbbbf78732362638bdc73638cd67205b4ce2b2ac4e740334fd230c8cb031e5ba3ee9e34110c48ea42115f2f5f4dab4b4b6dd45d963976d2b48d7836a2 SHA512 8052316a643b5eaa6c0373a9ed7f2406e7c3cb3da9d3c955a271c89813a8f3196fcd9e6c8385c7b6b7ecb916515e3ec7897aece4473989f0e4dc52a2bc8bbfdf
 EBUILD docbook-sgml-utils-0.6.14-r1.ebuild 1852 BLAKE2B 73578b17213d709948be2b0a519a76bc263fb1e78e1fc012fb50d302e4caf16e20eafbc4bb5d022c92f8dd465f3a968af4dcaf1388ec025594459cb3a07f6137 SHA512 1318b4293582d34a4c91c4e9bd067c40270179448b50f74997bffc86cb08074be24358179c15a5956d525299f2d092a94f348cf219a94e9da8c6ede384b150e0
-EBUILD docbook-sgml-utils-0.6.14-r2.ebuild 1918 BLAKE2B 8fc00ccff67aab4ea1fca57414dec85235cdd02ea573329678591eff41b1d954e7a97e98664506bf51ed5cc8cd88b73097f017cf817f7ca8ad7b55671333ba22 SHA512 383d5bbf48db5aa47a2be900b36334d5bb83729143b2a6e7e675c77406ab5a6560efb37e6602c3ed8681de67122ccd53d5482ab1f66b8366ff566910b0efba6f
+EBUILD docbook-sgml-utils-0.6.14-r2.ebuild 1917 BLAKE2B aad1d436a5043ebfe98dd14c7b288c9a2bae4d6b5492be98ad948ba5a7191ee518f10ba9830614dcab085a6df583cfe908f3b9fd1b6288d36c74cb2e03b825c4 SHA512 ab21d16979b3fe3120444ae82fd83280658f6aaddde53e482fcbe7b91f7cc8e61a96b6353537d7ddaf6c4766a23197f192e97f5220ae15533d6370a182c30e44
 MISC metadata.xml 328 BLAKE2B 03a0d4494de5507fcbddbcaf14fd0da4002abe3ae6c00ec8afd922f0f8034eeb1c3918fa7662da1d3c2016b1ce22980dde08c59d74cbbf3489e6eba3ff434867 SHA512 258243842db06c12a0751afd612ada57c02433da50c419be86dea6ed655b11120e30b8299228bbb81b6efda1574915d69933c4cda8bc9b0ad79c506a6172bb06
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild
index ce13cf350a9f..1627a0c29dac 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="ftp://sourceware.org/pub/docbook-tools/new-trials/SOURCES/${MY_P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="jadetex"
 
 DEPEND=">=dev-lang/perl-5
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index be799fb36d63..4e80d18a362d 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -8,5 +8,5 @@ EBUILD highlight-3.17.ebuild 1671 BLAKE2B 5130d3eeff4f695456d0b8ba5ffef82d1df518
 EBUILD highlight-3.33.ebuild 1703 BLAKE2B 89ca400f6c460d4faacaae353c48a402353f1b2fa1f4b6fcb0f2fa08d6a020b41cd03ea16af536e800392575d7a2d61af0a34100189531f8ff13fadff822e106 SHA512 a05064a3bcb5111e8dee23d7d59ef4d6bb68c150f6af6589bf765010f3c7973e33b7e37227d67537e344c2622a8463bc398759182d4549ef3e56c2915194d73f
 EBUILD highlight-3.34.ebuild 1874 BLAKE2B 6cef640fce6fe138c254e7604dd9765d7717a689d49a4f8f92cfbcb232d4fbf59880a171f34e175ed08917682ae46d790a26a509d35592f262873c77888c10d9 SHA512 a096bddb1e73adfbee46d5c85f6d96a8a7fc7bf8166de352d518249c249b34812f1c518f77ff9b815685ac117b525cb247fcb0e567abf8d68bb35615f7365630
 EBUILD highlight-3.35.ebuild 1881 BLAKE2B 095b28d5bed378f606f1370a62710b916e266b90c2b0e279c1596333a36f45b30f3ce6a59b05099742d3fd822c68f68f4710f0c2bc477de2131e0a52d9a5b245 SHA512 ef89032b8570768becdf30112bf1d914d9b7d18957c4d15e1ad41fc759ee6b2ff36477f7489d9f526103b6fb8e22514432d40968316316bc381f5e9811306400
-EBUILD highlight-3.42-r1.ebuild 2234 BLAKE2B 2c900ac156c45db1e216d66664e0eb3384d109e2627cfda9acae4efb7fb9764d786e34e76d9822437c12a6615af2a0f03eff285e06f84c794a048dba00556947 SHA512 3973e4b904641e8f97928965af62a7bcb1b232fa8d13d9617c031bcbe332f48188c144549c23c8119982fcb068feebd41288cb5d16b25705f0441b6ce3e3066d
+EBUILD highlight-3.42-r1.ebuild 2233 BLAKE2B 3cb2f8b6a50b09b380ee768ee31a5a096e9cb26b50f8a30091223f1f41700304009d54291407f9c2146f03e20fcf704f15555ef1d6e6d70475aded7a76e37c07 SHA512 4a137878cd46b932b8ca1c0d1256975e5873a1f987e42092f7fee745d28a2140efd654fb35049a2e3f63c5855f7ccbff77a8e936c3ad5c833049f94ffb480974
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/app-text/highlight/highlight-3.42-r1.ebuild b/app-text/highlight/highlight-3.42-r1.ebuild
index 2e0eb8be1600..f3e47428ab23 100644
--- a/app-text/highlight/highlight-3.42-r1.ebuild
+++ b/app-text/highlight/highlight-3.42-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples qt5"
 
 RDEPEND="
diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest
index 3316620482ea..0b2f4463931c 100644
--- a/app-text/htmltidy/Manifest
+++ b/app-text/htmltidy/Manifest
@@ -3,5 +3,5 @@ AUX htmltidy-20090325-tidyrc.patch 923 BLAKE2B 1ce5800a8991d37edb48d652c03525ce6
 AUX htmltidy-5.10.26-strip-O2-flag.patch 370 BLAKE2B 7c2a58a6a8c00460871278f59676d3b8b8077a7cf2fc1f65dc9ae2987e06d760c73177baa37a197eb0f45f3a5c09bc2030f556948cfd2470fabe2bd734527e3d SHA512 671a0ef17388fb39d5623e0dd2b8aa6c55c22d9f3ba8eea093ddea1234a2786ef983cbe9dd7002fe04b2986ae888458f4f44120c47aa34dc145d34d9db2f81d7
 DIST tidy-20090325-doc.tar.bz2 13319 BLAKE2B c55c5e10cdfbf0eb62685955cad24f628c21e612bd12c41018c139b3b93db95cc201888f6766d7f68f2d1c4d4cfb2cab25b668eff0d2d241462f4cf9b65e79e1 SHA512 0224d1f839f3829a9c879eba8a98ceee3b0c9f8bfe1721076859714428d534f492acd11e49992fccc2e45afd64d79067793c90f7af06d623ef89e7c16dfee35b
 DIST tidy-20090325.tar.bz2 382016 BLAKE2B 3373e94d54cfef866e701e2e258be821b8749dbbbc37b10e4e4e4ba6d7f5995676161ac11bc6a2497f5e02c3907f680fabe9ac6dec2f2365aeb39c03b9697e0a SHA512 daeab2c3dd7f1248a5dbc1585267a8fdb0be09a940b79c3e53c97051f692cf85ea9f0a267f37e1c877054b77efb836d422a1e7ff61b22b383a2d2ac08939b970
-EBUILD htmltidy-20090325-r2.ebuild 2004 BLAKE2B 701b3a57f9a54af94717641eea2e01d9727ea5ce96274277b859a7d5b15efbefa37b575a660a6676df6946e8643d00c0384fdc9d38f6741f751b8b050d742489 SHA512 1ed2082e5c4c4df5e13f4febc7d65de8a6b0b18580660fd0ee09ff45973f41cfd7f92a80ae0f6fa7ea544c9632e1cf3c89e3bcc398658b937c6f7d116c5c5c5e
+EBUILD htmltidy-20090325-r2.ebuild 2003 BLAKE2B 43116843d4c9eaacdb91822247b6a96868654c87ee92f180fb7112e87644ab66a09d4e105c1e4f983e700708b46aafe3bec67168698e890a42a90042ca68ed80 SHA512 c16aa9a70389e21ba8260fc2118bc36889350d95fc53ea7350279f8fb70252182156cb21efdcd8c2b31181ef18e0e53a499859064cc73149cb6d60ed328ef09a
 MISC metadata.xml 241 BLAKE2B bd724ebe3c99c206e2e78f9bdab811083ca54eafaf1e283f4913af473e6e9710f380021fcb71cc863bfc3cc0984475adff5d5f5e938b55c533ebc7460c597ee1 SHA512 3f74e1d47cf7af59d7255fbb4e6f04fc372447cc101a524779ac59bdc4acba08d53756350575e377f2ccf0ebf309f499ec81fda9d7cd93d234e53dd06cf504ba
diff --git a/app-text/htmltidy/htmltidy-20090325-r2.ebuild b/app-text/htmltidy/htmltidy-20090325-r2.ebuild
index 660b01c8fe4d..d3a18bca8cce 100644
--- a/app-text/htmltidy/htmltidy-20090325-r2.ebuild
+++ b/app-text/htmltidy/htmltidy-20090325-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index dd1f1dbccc74..2543a7fa19ed 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,5 +1,5 @@
 DIST iso-codes-3.75.tar.xz 3461424 BLAKE2B 5548307415b45d2a149fa3868521a464522c9a34e19607faea64aec3e2ff68d331872ff7de3c5807f7ae431a489fede42b6b59f068c5f22132aad4a0f1de8f87 SHA512 157899048cec091864ad8a7723314e28a0ccc4a0e1a5c2101bb630baf1a034bf117e38263e3c95e0135ba9d3a4d76635c8201c50a54e25f6af24c87253b8b40e
 DIST iso-codes-3.76.tar.xz 3474728 BLAKE2B b418b7b80d1926e765b65aad4edbd74ad8d37251fda14e3ab0e222095762d54e358de6f8d4a08fde8ae14460fd975a2a541ca6a5a4cf8ef1d777719462b0f991 SHA512 a0f6714a79a52b5dab82a268e85cb2d019ff5255744b88d088dcd7d5a15eb9710876a338a0a5d0f5659b4146bc6cc53d6d3474d621b3dcca7c47afabfc7e0dfa
 EBUILD iso-codes-3.75.ebuild 2426 BLAKE2B e95562582a1d3db51a6d395ab95dd0c3ce2b41f1792b94554ca5aea406e5d44a0dc5e963e5b1b44f4f7e11fa1ec305f5d5337491458c39902599df675b798181 SHA512 51bae9c45a1aa31d5b94326a69f0391825ef558236589122725260e2d61b89bc8a72ebfb512d297bb0e8dca1af44a2aec3597d7ed86ed284d03b291d14aa6858
-EBUILD iso-codes-3.76.ebuild 2431 BLAKE2B 063338b30f48c4c385df3dc06516f85ab05017e15bc9347cfe013e34db1c31b979e28968848786ed9a869bbb4fd3a9b33ada6734308921921c149d862913ff96 SHA512 b6e759f3bc5ceb28ef0216cc859bce467ef57f20f4d4ed83dfbcc91be786f6f13ea90477b5134571d82bb5c4ee0ac9c86975dd392ac261f713a2299e5ef5b101
+EBUILD iso-codes-3.76.ebuild 2430 BLAKE2B eacafee1d3383aaf6b1af7aa28e6977fe4411d0133b0a7bcf37989be29a03f172b87554d6b7c5eda1a2454af78235c20daffd0aba3f83d38985c84dc7cb34077 SHA512 2817c5ba82e5c3d5f2676fa30cced76dff523412359a9ddc10ec6ce810d83b4cb799c0c973acd8997ea249b73490bff9008be4318166eda30fa00c89d7c842d3
 MISC metadata.xml 480 BLAKE2B 3aefef945cb111095839e8fa8b84757e7f51a9aa8848806911d8c01763ab2d2f1d0c5b31c042f6ee307756e007893f6559c54d74a104caa612c9a6d39b2eea7e SHA512 5729ca31911ea7dad748e9f3afdd1f45f9034d783b56a75609101bfdb0a204bda8a078e7d251e89731091726062c4ac962e000ec7a898cb66ff787c8f2308d4c
diff --git a/app-text/iso-codes/iso-codes-3.76.ebuild b/app-text/iso-codes/iso-codes-3.76.ebuild
index 040e51c583c8..a254b09eaec3 100644
--- a/app-text/iso-codes/iso-codes-3.76.ebuild
+++ b/app-text/iso-codes/iso-codes-3.76.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/languagetool/Manifest b/app-text/languagetool/Manifest
index cf980e5327ff..6fd45fe2f895 100644
--- a/app-text/languagetool/Manifest
+++ b/app-text/languagetool/Manifest
@@ -1,3 +1,3 @@
 DIST LanguageTool-3.5.zip 93540212 BLAKE2B 166be74df8424692d637d1f23f2044492741984feb8c863aa363aca07ca9903c1e5934e4026a4e8c7b135320053808f1735ae5800a3964e9d75381368a8c5b7b SHA512 ad49dd292ca6841e1ef439b2dbe55748f621333b418bd6a596534cd5b2cb7019170c98046c8e2c68c3d75a9e5d132cf329de6481eaaccb8f78aae2233bdb8e45
-EBUILD languagetool-3.5-r1.ebuild 1401 BLAKE2B 05197f3d91977a988682a92416b4f2c0607d50686f98b549cd81a7ca6bfa7e1c6ade581895d91cbc40b7dcbbec56ab6ff9970a01821e974ed10c8b7e60e8ca33 SHA512 06017178133ce4deb304287cbb7529a0bf3ec26a606042e8b6db80c5a2a6641c2caa9b4196069fc60d0d03a4010f57b41634d9e25b36fdc2bcb4a6cfde190c83
+EBUILD languagetool-3.5-r1.ebuild 1403 BLAKE2B 1fff1dbc72a71536804c645cdbf64e21ebe7ab3c160b29f93474bd32c2a5ef8ff375fe27d45252b530218f029348204696dd326109f4e1898875c577cae7ef1f SHA512 96db2123e9d72b3017fcae610aa53ac8fafff57c0f72ac5240a44890842fca9dba5cca9cfcd9cfe4a522d80311f6e3aaefe8d2c1bb9be045444a9e7b01be7e23
 MISC metadata.xml 255 BLAKE2B c3c51ff357cdf3ea565d7f4bf7cb236342061e471b67eacc0a436c26d52532ce7499657a76fc92a845321318a65f9eb877573104341ddae66dc3a554a35f7362 SHA512 305ae93d2bb3da79ee181cf36bb0ca2bbac016c20555967d7281cd5c0edfc26c1450dacd7a7de57078650dab0e815be9169c0b25a24d71488185f71ae8834167
diff --git a/app-text/languagetool/languagetool-3.5-r1.ebuild b/app-text/languagetool/languagetool-3.5-r1.ebuild
index db1fe9570a30..bcf5c6bfd5d4 100644
--- a/app-text/languagetool/languagetool-3.5-r1.ebuild
+++ b/app-text/languagetool/languagetool-3.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,8 +8,8 @@ MY_PN=LanguageTool
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="A proof-reading tool for many languages"
-HOMEPAGE="http://www.languagetool.org/"
-SRC_URI="http://www.languagetool.org/download/${MY_P}.zip"
+HOMEPAGE="https://www.languagetool.org/"
+SRC_URI="https://www.languagetool.org/download/${MY_P}.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/app-text/libmspub/Manifest b/app-text/libmspub/Manifest
index de0820780169..d5d3fa049d7f 100644
--- a/app-text/libmspub/Manifest
+++ b/app-text/libmspub/Manifest
@@ -1,6 +1,6 @@
 DIST libmspub-0.1.2.tar.xz 345556 BLAKE2B a3b47fb188fc859abf54e3375514d31a1fafa21fb57fe0ac4a20013741a223a7011adf8ce7784b61346b49e9f4c0b6c353138dc12a5035f7bcc24576a508aa50 SHA512 c19025a2b887c33f5966b0972204ab2a8ae841b82df38eaf53c0cdc8f99d93cccab5e1c78143a79d5aef9c7a7387bd6f2cf34833a00861058e0e4687f48be714
 DIST libmspub-0.1.4.tar.xz 377472 BLAKE2B 89bd994a5aa2b3a22681dfe78fcea19561ea6057210e61630fa904ded12cca4694d715dd8f2fe8f687a91951bfa2f7aec1ff11d0b978a517476545bb07f654dd SHA512 7275f890645961b3fd56df4584788962e8c064fe3f99f5834c6ba6177ce76d00d544fbe9a25b7ab2f4180d2f3a90c609fe0bb68d61ea24e95b086190390fff31
-EBUILD libmspub-0.1.2.ebuild 1169 BLAKE2B cd68cd7f1b6b51358e78f59b7af38a3da8e9a04c4008e39209bda33f6be03b3cd34fc6ba341277c7434ab4cf99d12ed1b3a29e01a68fbb6d8ff4274e34be11d8 SHA512 51d391abb02111bd9628f8abf9f63171e09f7eea345774989c0e214ebde21f0335870371cbe9a6badf3b72bbdd489d5c7726ab5dbe24c311d60c80978277c37e
+EBUILD libmspub-0.1.2.ebuild 1168 BLAKE2B 0c55aafc424575b019d2032cc51ae4076a8a75cdc65de89b7cbc1e5085e4904188ae52cfd3a55cab450170887576ecc0655d4cac3a04e4b1d2ec349a85bd7891 SHA512 1a3b56695bc505b745a553eaf2f675e7f2b89750c298001c09cf2d845d271a17f9a3bbf9e99d06f3c095120dc969c832a1aa23eccd7fb0cd2535fd5a90071b52
 EBUILD libmspub-0.1.4.ebuild 1171 BLAKE2B b9df1f08071dfb36cd24e62e3e6e120b47c7f3a252a5921533357706a5eda7139e3f6e8720d6401c3259bd941ba326ac044de2772cb8a5bd86c86453d1f110ee SHA512 c6b9f035c794632f6e4ba273ea8ec31d23dc3067ba531bb4365ec6b945039b7ea59ab1f3e89934f3d2600b2b9147d6cc4889a858561e350accab32219e9afad3
 EBUILD libmspub-9999.ebuild 1171 BLAKE2B b9df1f08071dfb36cd24e62e3e6e120b47c7f3a252a5921533357706a5eda7139e3f6e8720d6401c3259bd941ba326ac044de2772cb8a5bd86c86453d1f110ee SHA512 c6b9f035c794632f6e4ba273ea8ec31d23dc3067ba531bb4365ec6b945039b7ea59ab1f3e89934f3d2600b2b9147d6cc4889a858561e350accab32219e9afad3
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libmspub/libmspub-0.1.2.ebuild b/app-text/libmspub/libmspub-0.1.2.ebuild
index a7a301490ef3..840b2e136a89 100644
--- a/app-text/libmspub/libmspub-0.1.2.ebuild
+++ b/app-text/libmspub/libmspub-0.1.2.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86"
 
 IUSE="doc static-libs"
 
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index a7b947ec7b54..a7181a8bc587 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -788,5 +788,5 @@ EBUILD texlive-core-2015-r1.ebuild 10925 BLAKE2B 85715b6526c34cb996854834f70687c
 EBUILD texlive-core-2016-r5.ebuild 11555 BLAKE2B a518636f0d5ab05d7e76a5200e2ba94bb8a0c8d76c37193b31789c8176b32bb2142cf5616c5a278732c110914be82636f0598e3e4c9234187d38f049f4cc68e6 SHA512 8d17485bea8ed2f0da0b5a3443c38f8e1d78daba639033042464c609432f42a574264920b673e732193efc6a9522c015c8ca9a1529577b5c6a01551a39864237
 EBUILD texlive-core-2016-r6.ebuild 11560 BLAKE2B eccee05d4a349985c5eafc0149d5e85ded7d7c865883b2fd668a3403313ed74d6ba2060ab730d80d8a6d47cb19e384e2e62329f8d6b923183ab7732441434276 SHA512 1e2796e4c9348d229066324ba9916b9635957b7a823836abdfa1a9b55e7062d2c175f38c3d1f67f64831c44fc3ebd6752decb2edf2411f6252a24d410502ca2a
 EBUILD texlive-core-2017-r2.ebuild 11637 BLAKE2B d2b7e0b062a14232492e21e7a7c2d747e054888091da79786d03898d7ab0eda2410ffe9fc9533c79b844c1ec4dd96cc8ac8610ad3428a9e16d1bcaff8421ac15 SHA512 2298ae898b67362cc5bb3c56bec13f105f0124980e26da8aaaca2ffc21edc04eac6cf7a755f1867f85835a98c00865656f9b97e741bea8dec22aac841e2e727c
-EBUILD texlive-core-2017-r3.ebuild 11605 BLAKE2B 11bd1b193c265e46d17109374c84901abc65885a81f15929c303700858a22e8936ece1519c80bb9e06b27b46473726e22e470aa75ff790e1624885f8dbdf41b5 SHA512 9fddc7e9634eaf2a28374017922711e2b9343cf591b44e390bc792850fcc96d46f210856c7f47b5038070e8d90861674f17e99a4970f1130da09dd17068c5779
+EBUILD texlive-core-2017-r3.ebuild 11604 BLAKE2B d915d5c8ec929927e50d4c6a0ee715e622dfe5d364f92901a29321adfd4e1d992a13be96ba5e5e40baed02095cc978eeece8a80836ce0cca565df3f511e70d59 SHA512 83d61f6534b8bfb44e7af523ae8e34449c5da940debebd3498c058ad70d055271e72e43b300a598f46be5d40b50238c5394cdecbb4fc72bb18023a293b467a15
 MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9
diff --git a/app-text/texlive-core/texlive-core-2017-r3.ebuild b/app-text/texlive-core/texlive-core-2017-r3.ebuild
index af54a567e4a0..9aedb1a07870 100644
--- a/app-text/texlive-core/texlive-core-2017-r3.ebuild
+++ b/app-text/texlive-core/texlive-core-2017-r3.ebuild
@@ -74,7 +74,7 @@ for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
 done
 SRC_URI="${SRC_URI} )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE="cjk X doc source tk +luajittex xetex"
 
 TEXMF_PATH=/usr/share/texmf-dist
diff --git a/app-text/texlive/Manifest b/app-text/texlive/Manifest
index c640f78c45bf..dddf9f90fe31 100644
--- a/app-text/texlive/Manifest
+++ b/app-text/texlive/Manifest
@@ -1,3 +1,3 @@
 EBUILD texlive-2016.ebuild 7545 BLAKE2B e6924aa445756dbd686f8f87cb717bcc444fbc39ecbebd4828efcae10f25a88fddcf8a9649a97b485996fb8df54fda0556de9cbe38d1a9e631f1bd07e0a5f4c1 SHA512 f5306d3c4031cd7095e27e41990f57dd8f8a5bc4045ab4ef4ed40f9ab7b3bfe656ab8d531c1aa527f316895eadc774dcb3ccc81724b176794e89dcce726b100b
-EBUILD texlive-2017.ebuild 7404 BLAKE2B 107755b960afe3a5aa23bcb2776e934ec389097ad3af1aa19f72ed019d8f39eac491a4a18f243e32cd4ae59d32f29a356e155ef8e9494fe3182f2c8e3e209b24 SHA512 7dc726d2cd96746b9b50081c968305c3cf78bdd1fa05372e9dcc405e3ac905114f2ab64b36b75d16754c71690a96bb17951c18dac9aacd135edbc9a633d566fb
+EBUILD texlive-2017.ebuild 7403 BLAKE2B ecade1c30d50ce72406b32ff1984dcddc1b3e0073c7dbe567ccc7fd7da15050dd42e9b17bc57918c869e7f996e509f7053815d53060f64e20304a16c51a61ff8 SHA512 9f94cbf388205b9ddeb143de575271cd0fbdd8fa9a86858241ec9690171ca5038d842a27994ac5258461c75e184231bfdecf292b694ccfb3796ef7a1dfa32d5c
 MISC metadata.xml 2501 BLAKE2B 973dc4c6f9f8bcd51246dc345a9462708c0272604f95e38789f2583c25fc1305fc38a602389bf41d821d5b9aafb7e5ca25cd0554741d0121c8c62446842ea39b SHA512 0a7fc544e4e52ce62503217fa1257813694701dfd4b4e170b19e3bcff698e87f97e586e7a6c4879fba8f27c8478efc211e538eefaf19a46488b4f1ddbd8312e0
diff --git a/app-text/texlive/texlive-2017.ebuild b/app-text/texlive/texlive-2017.ebuild
index 42a205ae4610..b0bf24656cec 100644
--- a/app-text/texlive/texlive-2017.ebuild
+++ b/app-text/texlive/texlive-2017.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk context detex dvi2tty extra epspdf games graphics
 humanities jadetex luatex metapost music pdfannotextractor png pstricks publishers
 science tex4ht texi2html truetype xetex xindy xml X"
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index baabc825cd45..9d38be39fd93 100644
Binary files a/app-vim/Manifest.gz and b/app-vim/Manifest.gz differ
diff --git a/app-vim/airline/Manifest b/app-vim/airline/Manifest
index a0f734ea36d6..06462fcd2228 100644
--- a/app-vim/airline/Manifest
+++ b/app-vim/airline/Manifest
@@ -1,4 +1,4 @@
 DIST airline-0.8.tar.gz 52767 BLAKE2B 908489fca1fb31d0ee41f279b146046d50c9069055bb13645b049c4333984f0ca180315e50fe3fda13e36780dffa0b213719babbbcd2b27defd60470a05dbc2f SHA512 51ae20f7e5b869f714e9c21ab6ab8af4d2de31b3cf4fe9f6bd64e75e87e7796184d41ddd9536f3e41dcc93e9ca6aad684b286df6e5d8d6eae202f91ed8851292
-EBUILD airline-0.8.ebuild 750 BLAKE2B 11dd4fa652ae18921c12d48237d585bbe0aef38f8376220113d11269d977024edf86542c9a3c9c9e59a9a0f81db501824b1c020ed787a0d5c88e1cf7f43d1482 SHA512 4cef4ca504e0eb4e028a20011ee5dc3b1a1b4989efed4343e4ed2ee0dae14d8c7d9541cc8835124601e64d9ff3c826bc4b6e9520b894baa04cbfd768d6726af6
-EBUILD airline-9999.ebuild 749 BLAKE2B 5926b8b4a25b41cefbdc801ff333172fead7f3de656ccd690e515c51a3d4721083d4c112bf0d12d39b2a82df8c2f735eef6c706740c3db1e7e4afe64f969c05e SHA512 a9fb9cd9f871836d400f1b63d7a901f5668f75d1e18a7dd89de5e86761d496e051f438575998e2a2597f5fc00a52f9cfe6cbac6545d9735f9ec3ffef95e19cea
+EBUILD airline-0.8.ebuild 751 BLAKE2B 8be15c3264b648a0b319e9d716d98bb8cab064c50afcc7b13262b59fb620ae9421df11a6ab096e506f9aad84d95c7a79bcf12d6ae4d412137c2afc75e62dbc71 SHA512 b394b5a818dfb48ef8564b30b4c16bd6fa786f0975bb7bd5a3c8698d8f3138dc18191c78cc3e2f0581154927d8aafdb3ba7381f7c02f70eaf0e6df0543ed5ce9
+EBUILD airline-9999.ebuild 750 BLAKE2B 620145a57cca1495b5b7684adcb2f44ea61fad984d6a13e8514a77eb726c412c3069b1dd1c945d471f0ec80c4ca7d95fadd57f6db66d205978d6950cb0334e6c SHA512 be985fceda4bfb738887e6139fb4d21a984ef21959080566f4d269efa8602271e9dd96eec6e29fdbbb64837bf641610efb9a766d3afaba8816a406e9eeddc9ea
 MISC metadata.xml 341 BLAKE2B 773326b7103bbac0a5d028d4269187e8acd4a7c0603cb1ccdb129c2d3cffed385e87f47fadd5fd8d68dcf5271521ccddc43412b7f8b7ab41dd7618c65f56c849 SHA512 90eec982571c778fff57d1e8a604fd994d249149846544223c2cb0c244c16632fb320fce1eda35641bc0a914cc2a9031bd2e73a1444412119690a2d3729c541a
diff --git a/app-vim/airline/airline-0.8.ebuild b/app-vim/airline/airline-0.8.ebuild
index 8959016c24a0..b42a9c204ccd 100644
--- a/app-vim/airline/airline-0.8.ebuild
+++ b/app-vim/airline/airline-0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ else
 fi
 
 DESCRIPTION="vim plugin: lean & mean statusline for vim that's light as air"
-HOMEPAGE="https://github.com/vim-airline/vim-airline/ http://www.vim.org/scripts/script.php?script_id=4661"
+HOMEPAGE="https://github.com/vim-airline/vim-airline/ https://www.vim.org/scripts/script.php?script_id=4661"
 LICENSE="MIT"
 VIM_PLUGIN_HELPFILES="${PN}.txt"
 
diff --git a/app-vim/airline/airline-9999.ebuild b/app-vim/airline/airline-9999.ebuild
index 82c71b13e2ec..248f1fbb3ed7 100644
--- a/app-vim/airline/airline-9999.ebuild
+++ b/app-vim/airline/airline-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ else
 fi
 
 DESCRIPTION="vim plugin: lean & mean statusline for vim that's light as air"
-HOMEPAGE="https://github.com/vim-airline/vim-airline/ http://www.vim.org/scripts/script.php?script_id=4661"
+HOMEPAGE="https://github.com/vim-airline/vim-airline/ https://www.vim.org/scripts/script.php?script_id=4661"
 LICENSE="MIT"
 VIM_PLUGIN_HELPFILES="${PN}.txt"
 
diff --git a/app-vim/align/Manifest b/app-vim/align/Manifest
index 9dfed8b09e2f..2991875f06e5 100644
--- a/app-vim/align/Manifest
+++ b/app-vim/align/Manifest
@@ -1,3 +1,3 @@
 DIST align-43.tar.bz2 34490 BLAKE2B 61fa5d7233275ca372541379bf498004553daca788d1cf4f23da7ddae001530507cab551d8c49a747fa252c88acc0a8f0d24f8d58e515fb9db31bf1c76c1b26a SHA512 b796ce56a60982a1b974a55e6b3ec74cd13ad8b572b00f49d814f22385d76441cb244c913216af3ef0d2ad128d5871eb60e5fc70343e55ce88453356941b0ecd
-EBUILD align-43.ebuild 391 BLAKE2B a2a180c493ad40053c6930837743f8070a2693b59be8aaeb1003a3cc478bc7d1c115023d1a5c54e776208f1c6078a24452a897e293db45653b45876b7fd2dd32 SHA512 4c410b686ad7b3526fa5aaf9ce53701c88cc44d43aed54dc77321fb218feb5d221378f89f10b6da511d9d1abdd5622c1e018c5da1fce7a55a08fa28170933d70
+EBUILD align-43.ebuild 392 BLAKE2B b0656b35697da22acd25e641199e7be1f9232cabf9fa5a1d0e2b1b52f3a4fe5acf73c4dbbd481d4b45fdc19f79e01c580fa47c258ff7881eeaccd59f52c6f222 SHA512 beea50bf7e363e89e185ab82a858d111b32b300cd7039a2c7e019e58db7fa549d12ffdc2230af72c8ae0643ccd8768c062349398039284d59af6dde784ba59ab
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/align/align-43.ebuild b/app-vim/align/align-43.ebuild
index 5286e61a8ff4..877894bd4964 100644
--- a/app-vim/align/align-43.ebuild
+++ b/app-vim/align/align-43.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: commands and maps to help produce aligned text"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=294"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=294"
 LICENSE="vim"
 KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
 
diff --git a/app-vim/alternate/Manifest b/app-vim/alternate/Manifest
index d438df18144a..52062146781a 100644
--- a/app-vim/alternate/Manifest
+++ b/app-vim/alternate/Manifest
@@ -1,6 +1,7 @@
 AUX alternate-2.18-hh-cc-alternation.patch 918 BLAKE2B 0362420f64fdd1607529842d965e4f6bcafa49467e7d6befd9621844f47ff2c1f58e22bd1e1efd5579b6373bd24a0c7974e468cf9edf471a58e964718a25c506 SHA512 b1f524d47785e7482791b56f891e624da2a06739483d0584d080f691eaf89c9a350e708fd1369c41b6f99a263d7395b25572366e0b90b0349230079fbdcea4b9
 DIST alternate-2.18.tar.bz2 7907 BLAKE2B 574369557d3a56b163e7288bc60636649a2c44192c56d1d30464cbc2eb89e672aece59a205d39124e062037b3bc4983f628ae0bed53b7982915c8f9546ec4117 SHA512 397d39a5c5fd186f32f3e0a1651f9b9f739899ffcfdd344e85117c4bb676d8fb8c668410754fefe8934ff1a57537387d49d115dfa17bdca896e423935840ae3f
+DIST alternate-2.18.tar.gz 8652 BLAKE2B f6e50d3e1499fb913f7cfa4ff95df180855c7857a700428be1339916aed4513bf77a8da62b75407a6c129f4da3e3bcd00f5caed53d7a939a2eac96a287a11ffe SHA512 d797b99cbe536285d87c5bb14adfcaa3e18611351c8529d9a0755606e766ecc006f19af5cd9b9535f236220dc525bbc27e1280cbb1e3c71f7444cdefd506cefa
 DIST alternate.txt 8897 BLAKE2B b2c2ad9e39c98c82592034ddb0db79803f39bdf3c8d55307aecc488855a75c7be508b41a6a6cf9d3f3d0f4e938feb65fdd756040d8e51e0244c9dc6b9fbacd86 SHA512 92b24aef5fe1fb459b4cb85ca780ae20126bc79138ac15dec652c15a89b688d40bedc00bdae8fce912c8805b24b8805e45ddbd9e6b1ec10c20e61eed11d37651
-EBUILD alternate-2.18-r1.ebuild 689 BLAKE2B 7e8149c3cd8161feee14d98327d81f593209b15b23ff271beaf21f69f0109aa7563fbe3ac276c40ab09b40d7e48643baa37a6463b74fe28b7265ef1e5de77566 SHA512 957ae30088ed8242bc3b78b9f2c655b51ceb2cf9a8c2a7e7ef0b77cd1838345668a5860aa7172dc15e6808a3e62404c0225cd0b996556fb881228449b9773f72
-EBUILD alternate-2.18-r2.ebuild 934 BLAKE2B 59891f5d8a3324a9e7ac50ccf9f01469424f55db7b0cbf8519870f98b92997d002fb65732bc339191e00dd67d0825215bbe595eda192f092e879ba9988dbca97 SHA512 e06f8b7a890b2a1d80ef6fc020f36cb5a71fa05570eac1bc0ad8be9fa1b1728f2ef321943bb5ebac40489974d9d668e6b446419fb78f692369e57945ef9cd58f
+EBUILD alternate-2.18-r1.ebuild 727 BLAKE2B e09fcbd230d6ff7ca1f940556a16483f7fcf9eca457abbfe519fb2c27acbd794b633a96bd2e7ab6f35685832625dd00234374041b1132f122a85854ef48970ef SHA512 1b0932395f1783e4adcad151dc5f12c71938706f15210f26137f6932a30ec17da4f842ddb816e00fb9831bda8c746c3bdc0aa82e091881b7185c1a9c5e6341ac
+EBUILD alternate-2.18-r2.ebuild 985 BLAKE2B 11cebce8641e3c1be0c21435482dd8332dca973e08f5cac1d048b0d4785674d18670b9b6160faf0ba4aac26c959b095da3bbd5a1d8a4b1611aedd3d253bfe5f4 SHA512 657c2ea8628fc408cf74f58132f78f23535e811344331d3bd09c87e20fa391cc866e42e7374a47314ed8260fb2b3149ef0c28335b5d0e8e6c08df68777305b76
 MISC metadata.xml 331 BLAKE2B 2dc5ef5397f37066b5fc7d3a3c5c04185632f538fa6efb5006d0d8aa12d51696464850b2b3a0aea4e7bff8c3e9caf9cbe9e90a312e903d0b5313e29eb5588d3c SHA512 ef4ca068ea9f5409c814ca371c0f68456799bed2bae3019cf2ea3af5c2d13750a059f1d885e2c901cc6549cb7915dcb48abb9d5ce7d67210d89b73d79a2e319d
diff --git a/app-vim/alternate/alternate-2.18-r1.ebuild b/app-vim/alternate/alternate-2.18-r1.ebuild
index 5fce4fba8e50..dd9a4b2a2719 100644
--- a/app-vim/alternate/alternate-2.18-r1.ebuild
+++ b/app-vim/alternate/alternate-2.18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,8 @@ EAPI=6
 inherit vim-plugin eutils
 
 DESCRIPTION="vim plugin: quickly switch between .c and .h files"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=31"
+HOMEPAGE="https://github.com/vim-scripts/a.vim
+https://www.vim.org/scripts/script.php?script_id=31"
 
 LICENSE="alternate"
 KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
diff --git a/app-vim/alternate/alternate-2.18-r2.ebuild b/app-vim/alternate/alternate-2.18-r2.ebuild
index 53430a53691f..8f7e87cca08b 100644
--- a/app-vim/alternate/alternate-2.18-r2.ebuild
+++ b/app-vim/alternate/alternate-2.18-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,10 +6,11 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: quickly switch between .c and .h files"
-HOMEPAGE="https://github.com/vim-scripts/a.vim"
+HOMEPAGE="https://github.com/vim-scripts/a.vim
+https://www.vim.org/scripts/script.php?script_id=31"
 SRC_URI="
-	https://github.com/vim-scripts/a.vim/archive/${PV}.tar.bz2 -> ${P}.tar.bz2
-	http://www.vim.org/scripts/download_script.php?src_id=6347 -> ${PN}.txt
+	https://github.com/vim-scripts/a.vim/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://www.vim.org/scripts/download_script.php?src_id=6347 -> ${PN}.txt
 "
 
 LICENSE="alternate"
diff --git a/app-vim/ansiesc/Manifest b/app-vim/ansiesc/Manifest
index 3c66db651293..c594c8403c0b 100644
--- a/app-vim/ansiesc/Manifest
+++ b/app-vim/ansiesc/Manifest
@@ -1,3 +1,3 @@
 DIST ansiesc-12.tar.bz2 8647 BLAKE2B 224b38073e5013705b90d4c98dd768dc090bcb2ff9336d18a680d1ecf477070963db8e64d94f91b49ffa3b2986ff52114ee472f02519255aab00bef5d1c14516 SHA512 e699974e3b2e532e3c6dca038a148dca8cc3d3a7efa65d63de63e259a34958f62bb7e43b1078d21fcab4603c856dba392e6e82ddb90e2335dc714e9ad60e336e
-EBUILD ansiesc-12.ebuild 395 BLAKE2B a6c3a462728c1ccb1e605c9d4b269c0762a9d1d75230557392bde0a448d4d123642294bcbf9517246d899758f7621409f5ca750d6729d94b4a3fd0faf5901a40 SHA512 4e51e63d74fab6f9fab1353e8839b84310ec361923f53137bcad2cda87d3048af75d19c594784fd8e0b43a24798ceaab298438bc36424d3fc7227d5f367267f1
+EBUILD ansiesc-12.ebuild 396 BLAKE2B 933915c2d148dbf86d0e357f70c51532fa0b1178d552d42fea29b4d2bdcb68518bb943fd849b4daa9ccb0d78ea780e5e1c946ac253967d5a9d4a9da8e1907c93 SHA512 5004ccb5270e6ac02da25545c819c412f70bd105178ac7dd4cb9521e994f903f3aac2207cc56d0a356755aa233bb01612864c712586055cc3486132d03a0d8c3
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/ansiesc/ansiesc-12.ebuild b/app-vim/ansiesc/ansiesc-12.ebuild
index 54b4ae24985d..b45dfc4f9b25 100644
--- a/app-vim/ansiesc/ansiesc-12.ebuild
+++ b/app-vim/ansiesc/ansiesc-12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: ansi escape sequences concealed, but highlighted as specified"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=302"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=302"
 LICENSE="public-domain"
 KEYWORDS="amd64 x86"
 
diff --git a/app-vim/ant_menu/Manifest b/app-vim/ant_menu/Manifest
index e08fa6bfe7f3..df20f4fc1299 100644
--- a/app-vim/ant_menu/Manifest
+++ b/app-vim/ant_menu/Manifest
@@ -1,3 +1,3 @@
 DIST ant_menu-0.5.7.1.tar.bz2 3786 BLAKE2B 43f1e7c90a9c72a1b9998ae126d931b398c6631055e2d15fe0bc981cafb97ee6be8e38fb9b9f9757557cbaab8155381c9cbb42e92c056e14b06e210925bee321 SHA512 e8cc2bbe416d54137839e6f122fbcf52398321c8faa5b3a83ba42661c889c29af44029a3ffb386667228950c49d01247703cc6dce8101ea622cb3586c9a07fb4
-EBUILD ant_menu-0.5.7.1-r1.ebuild 437 BLAKE2B e4b6a5f5b31c41b2cb34ff9df6f77bef038c666c8ed9a7599b762d5465984ad25249eae84d809f4908d12eae32a015a3122a0938e6dbfc52785e2fde9b4c67c4 SHA512 1f9db13e1d03c599ead53a26b1cdaa4b763e80bf9d3f80e987353aef1f423f7ffcf62d7e76a2913454a7ddfa5b9cd74a6565045b2654781ab683058b6bbc1e92
+EBUILD ant_menu-0.5.7.1-r1.ebuild 439 BLAKE2B b30d472d25e1b4c8bb7fac67cd61008eba831c604ad251419d500a72728556465f68699864f2f707d37e15082c8d72a19b00b6d25f5b9e0b9093598aefde4dd0 SHA512 dc05c13a41c6cfbfe60794d7b65b9f9f632355e9dcf400bfd2d56213d82b7f508727e02636bf5260c9dd2b0f53d08e002c207a69798a7ba1c6afd3d14d7e5f2a
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/ant_menu/ant_menu-0.5.7.1-r1.ebuild b/app-vim/ant_menu/ant_menu-0.5.7.1-r1.ebuild
index f6f0d904911a..57337fc2c004 100644
--- a/app-vim/ant_menu/ant_menu-0.5.7.1-r1.ebuild
+++ b/app-vim/ant_menu/ant_menu-0.5.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,10 +6,10 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: Java ant build system integration"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=155"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=155"
 LICENSE="LGPL-2"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 RDEPEND="dev-java/ant"
 
-VIM_PLUGIN_HELPURI="http://www.vim.org/scripts/script.php?script_id=155"
+VIM_PLUGIN_HELPURI="https://www.vim.org/scripts/script.php?script_id=155"
diff --git a/app-vim/autoalign/Manifest b/app-vim/autoalign/Manifest
index 8a782c654691..f5e0ca779414 100644
--- a/app-vim/autoalign/Manifest
+++ b/app-vim/autoalign/Manifest
@@ -1,3 +1,3 @@
 DIST autoalign-14.tar.xz 13400 BLAKE2B eba5a5fe00d264c1b8aaacfb79e9ba6bdb0f6a6314a6a8364c89b7e4136a8edcdae73db2343f94a7b76103285a88e6fa13d60cbaa91a6ac35bea99410776819c SHA512 40107b8e12c4190c4f31c740d9b7615eb0836f4d159e6071526de768e6f7726849cb0cd93af8674aff7d6cfecc1b7f27d5b894628f426c51941bb914b92944f2
-EBUILD autoalign-14.ebuild 770 BLAKE2B 1076edb3bbabe85ad2253f4354f70bd8752784283a3b1f36368a3ad61e8f65c48474bf1d79219b987c87c57be6898c76eda929b195d166451c852213d7dd1772 SHA512 62a85afb448d4bb17d9cedaaa90485cf8753473ceca6dd305cd24d02a56eb4e4b1dabac8b65a77c7bce54a8234bf2b2779354188285bfe4070ab6efea1f8cfbb
+EBUILD autoalign-14.ebuild 771 BLAKE2B b460dc053cc677c1196b3399b5a71a5e11724e6ae053c89f2c8a5a4a22e797d406a82fe7f76f4e2ccec22b9ae7f9affb34c55eb67f0f98ad22c814c85baf69f1 SHA512 96d0ac9dd64f23355a00248305d26ca94a184a3a93514c88df567571e32d0f2b757dc214dde32d31b757da979ede4584232e52ba0cfdf87d417096ed51d85ec1
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/autoalign/autoalign-14.ebuild b/app-vim/autoalign/autoalign-14.ebuild
index 970009cb14e1..0d7d12e9d234 100644
--- a/app-vim/autoalign/autoalign-14.ebuild
+++ b/app-vim/autoalign/autoalign-14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: automatically align bib, c, c++, tex and vim code"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=884"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=884"
 LICENSE="vim"
 KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
 IUSE=""
diff --git a/app-vim/bash-support/Manifest b/app-vim/bash-support/Manifest
index 50c15daad767..6310db35d2f4 100644
--- a/app-vim/bash-support/Manifest
+++ b/app-vim/bash-support/Manifest
@@ -1,3 +1,3 @@
 DIST bash-support-4.2.1.tar.bz2 115200 BLAKE2B 2fab4f1bb0897af389a206051e63d2fe7a8cd89367298b1be51146eed7c0d788b23cec7bc81ce3056d26b5efc920043e67be003e4e6bfe25b503d532c74d9c07 SHA512 12ab39f5cffb58e4adb2137265d6c4f1a61b5f2e360f6866c21ead0a67e02a5445bd12fec5b00b26e5d6102b3aaab99b8b13539a67575067c3ef9b26c4ef8fba
-EBUILD bash-support-4.2.1.ebuild 466 BLAKE2B 744c99955af91635451bbc3bd4095adff8aa6db4c4c7a03b46c88f40b459a236962fe60c83272c8ad287baf5a7395e2b73e41caa64c9a892cb46c533142d393c SHA512 75c945faf31f789acdfdf1c7bd834ac34fe0654572626901ccba2f24cf824249852c63e7ebc8f0939e586210077b103f325f191119723baecee0041767e2ddc5
+EBUILD bash-support-4.2.1.ebuild 467 BLAKE2B 4c82f25ae607a82f5a420734c3ce4eca70a4f46920e18c12df7359749a58cc49b7bdd760d61d9f359e5676817cceb55f152f01c2551b4099ef5b77b5c85f3a9b SHA512 a78d7140c56889dc3710926085b653b4693aefc21ade0b453bcffea1ded123c40c4704ecfcd4f0bd71676f07ba14bff6a08972d54f028463e97d35a2be4761f9
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/bash-support/bash-support-4.2.1.ebuild b/app-vim/bash-support/bash-support-4.2.1.ebuild
index b825e918d5e5..f48008913875 100644
--- a/app-vim/bash-support/bash-support-4.2.1.ebuild
+++ b/app-vim/bash-support/bash-support-4.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: write and run bash scripts using menus and hotkeys"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=365"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=365"
 LICENSE="public-domain"
 KEYWORDS="amd64 x86"
 
diff --git a/app-vim/bnf-syntax/Manifest b/app-vim/bnf-syntax/Manifest
index 219a9a429c1e..423084150d3b 100644
--- a/app-vim/bnf-syntax/Manifest
+++ b/app-vim/bnf-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST bnf-syntax-1.2.tar.bz2 887 BLAKE2B 11923f80153d760e92577e461fb912a13ea6ac1ab8c48b6371362d9f5e6ddacf520608626ecb2020f0bc043106241a818b53131be43c991720ae37df8ec40132 SHA512 e073866a8dd41bc0ab982e250bf2a803d78916dbdaafabe504a6854f67255fe4ed84a4db426f1cbde77c9b0a059070fda666338c53b6ddcc7e46f04d9f0265d6
-EBUILD bnf-syntax-1.2-r2.ebuild 555 BLAKE2B 687405e05900070936828d0252428ea0e5fedc0b9f82bb7626cb0a84cffe2bcf2ac134b6491e64f8c4dad340adbc3ecd4efe47dc7ac4aa86ae22c0790b5733e3 SHA512 056ec7016a7b8704a15b091c93420d775d79fa23cda6016b16e8485c8874970078079c94bb1ac7ab73e22e74c80ca32a0fb2c819f4705fc8fc707410f153ba9b
+EBUILD bnf-syntax-1.2-r2.ebuild 556 BLAKE2B ee6139b5b201617be9bee86c7e8a2f2506ae604d62599ccc822e1614b214beb73d5bdae64bfb6828c9b83132d41975ab8bc0e561e3106f7d9282028ee1267372 SHA512 bbf353bcf9a5436bb2f744bf0bb02273691bc05e7506dd4061fd7b987acb9a03a958b053c14b1ad5c3404e79a443d03f7f0763d4009a65c99d891eb88d246ccd
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/bnf-syntax/bnf-syntax-1.2-r2.ebuild b/app-vim/bnf-syntax/bnf-syntax-1.2-r2.ebuild
index a509cf39fbc9..5df55562ff91 100644
--- a/app-vim/bnf-syntax/bnf-syntax-1.2-r2.ebuild
+++ b/app-vim/bnf-syntax/bnf-syntax-1.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: BNF file syntax highlighting"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=250"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=250"
 LICENSE="vim.org"
 KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
diff --git a/app-vim/brainfuck-syntax/Manifest b/app-vim/brainfuck-syntax/Manifest
index cf29e5b89d71..33ea98305c97 100644
--- a/app-vim/brainfuck-syntax/Manifest
+++ b/app-vim/brainfuck-syntax/Manifest
@@ -1,5 +1,5 @@
 DIST brainfuck-syntax-1.0.2.tar.bz2 916 BLAKE2B 0436337aef6cb28b55806510046c3604840f6f7e1cf0a1f94222886658474e41f76879ca1e2b42b5db378fbf98e2f8bffe5da27fe3381af5e778576d377b1576 SHA512 d01e544e45d4ada1c7ed8ca02e72d888fdcd374be8ee45c01d7797fc1e32457be94e0429dc3fc88f12fee063bd70d06af8ab4238795154a82793b6abb42dd974
 DIST brainfuck-syntax-1.0.3.tar.bz2 926 BLAKE2B e5cb55e58d0d2a597cdcc00fd5a1fc482a715b4fda6d0fbd0790ceba261005478091c4c94dfeba0154e4917470ce386b3ebe03bd3e1f90a315b0d5bc2cfc4a97 SHA512 42dbcbe916b19bcb30cadf929cb71aadb7032ebe38c26b1d5fa2fc9d8513d3dda275df289cc5fdf094f9fccd5f4e720e6c24d006d431fd3668f73d2c44e8b82a
-EBUILD brainfuck-syntax-1.0.2.ebuild 416 BLAKE2B 354d4fa69b3218bf75d7b626fdc5d45c82f476e0c2e2d6b33af81ead84ea2445a4e47febc0cb930f40b6a3ad05272525061220b70aee859f8bae52faca8ad44f SHA512 8b160299e932dd5b8d4f85b4d50689ce9eb9457f13be639ea4b9b02bf9e833601126ac9db358427c4dc110059ea41b6ecaef88e2a3bad6fa56da6c219f59cbb4
-EBUILD brainfuck-syntax-1.0.3.ebuild 415 BLAKE2B 9211475c99b694f76ca5ef7bb4d2987a9cc53244e97a17219770075883c4d14cd36422da5aa5083e31eaa420df496cc6f204f129740a0323b1959526ed10c992 SHA512 5b42d8b4377cff247fe100c748169524f19c6cbe86d22ffa6d34cb6e9b7e4fdb69f1bf8dd7e3ea8ada2b45c294187b7db6a07b834ec5fb06e1fccda8bd741025
+EBUILD brainfuck-syntax-1.0.2.ebuild 417 BLAKE2B 4ec6ef52903fc8d9722e49e3d696e81fba1614e6141010a9f3f22cec55b82abf620939e804606f02241e561afdea77213b0e8d45c766b078961a45ceaa098fc9 SHA512 c61b0d97ecdf5aacbbab627bf6b7146a33deba14c0b6f2763ff7ddd61e66d1d49131d451a993952eb153fdfd32faf6f79a11de3e162293d04b5c5c780054a027
+EBUILD brainfuck-syntax-1.0.3.ebuild 416 BLAKE2B df4397a6e2fc07e3d463537657eb74a0b7fbf0d58fb085fc261afc26571308d0a8f11f61a818fbccef5ef75500472f38fb32ea568513e211cbfcc6bde2dd536e SHA512 6592246bd4003317536964c006aa4a73dee9875a46aa2d6682f876584164066b34c9e074f71aa6dbf84269075a4fd36734518636b54003a1a784826ccc41380a
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/brainfuck-syntax/brainfuck-syntax-1.0.2.ebuild b/app-vim/brainfuck-syntax/brainfuck-syntax-1.0.2.ebuild
index 11b0f9b837bc..2d1ee99fad93 100644
--- a/app-vim/brainfuck-syntax/brainfuck-syntax-1.0.2.ebuild
+++ b/app-vim/brainfuck-syntax/brainfuck-syntax-1.0.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: BrainFuck source file syntax highlighting"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=716"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=716"
 LICENSE="vim.org"
 KEYWORDS="amd64 ~mips ppc ppc64 x86"
 IUSE=""
diff --git a/app-vim/brainfuck-syntax/brainfuck-syntax-1.0.3.ebuild b/app-vim/brainfuck-syntax/brainfuck-syntax-1.0.3.ebuild
index 106e5aa0416c..3228130a7b40 100644
--- a/app-vim/brainfuck-syntax/brainfuck-syntax-1.0.3.ebuild
+++ b/app-vim/brainfuck-syntax/brainfuck-syntax-1.0.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: BrainFuck source file syntax highlighting"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=716"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=716"
 LICENSE="BSD-2"
 KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
 
diff --git a/app-vim/breakpts/Manifest b/app-vim/breakpts/Manifest
index ef60b8b62694..1e2df12aa0e4 100644
--- a/app-vim/breakpts/Manifest
+++ b/app-vim/breakpts/Manifest
@@ -1,3 +1,3 @@
 DIST breakpts-4.0.tar.bz2 17349 BLAKE2B c7ad9eed8fb13537c940e6868f5e4e5dd812a6b7f7c26c4617e3c24905b6e2a817dc91990b613b700e793dd763a6841f85dd7f9cc42fb9f5afc25c3609f909fc SHA512 a480bf32cd3e756ac25849b1d5fd20521bd8c965454bb94c33810c9d1d4464762a731d08dcae858c59853a6cf41ab3cb6cddeda440c8b041cc8ec192ab2bd2fd
-EBUILD breakpts-4.0-r1.ebuild 681 BLAKE2B bf3335fe33b95752262ec163cf4a3b7bdf1cc8fd13a91e1224b1bf45bec85f3f380e9331f5ee265b5679c0adc5bc98d7af5b5848e6b7e23bb362d6483554e554 SHA512 f5a38360a5f83dd56015cff26fcd8305e61042d58b74f01b264ba8fc7dec21d8f6c4df299d994461be48b1d5f98d8eef7f4a992598d483c1d68499352bb14095
+EBUILD breakpts-4.0-r1.ebuild 682 BLAKE2B bf0c5025e3e2707a805b6fbd22f97313235c6a7d55f0397015c36f7e0041305c374fc44104d5a26c1f56f9a7452b60fa26f72869d6fb65b1f433e9f90930780a SHA512 90aed4c69a96cf1cbbd27162d9e1b057792f3f1ccaf6335a99060bbf89fe2b1dfb0344c2999004802628329b567ff33728faf643df0cfc5eabd73ece79a1c250
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/breakpts/breakpts-4.0-r1.ebuild b/app-vim/breakpts/breakpts-4.0-r1.ebuild
index 5dd9d271c7f8..2358b0b21ccd 100644
--- a/app-vim/breakpts/breakpts-4.0-r1.ebuild
+++ b/app-vim/breakpts/breakpts-4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: sets vim breakpoints visually"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=618"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=618"
 LICENSE="GPL-2"
 KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
 IUSE=""
diff --git a/app-vim/bufexplorer/Manifest b/app-vim/bufexplorer/Manifest
index 9723da5b8c1a..f86f4d8ff46c 100644
--- a/app-vim/bufexplorer/Manifest
+++ b/app-vim/bufexplorer/Manifest
@@ -1,6 +1,6 @@
 DIST bufexplorer-7.4.18.tar.gz 25117 BLAKE2B 2768f7fdc31b4678147d492f3322cf12f97384f3fab4f5219f7237263e83060d24b476c25dabc6850aa6b6168f98b4350c3dfe0fd61a3975a6e607ac4e11e3e4 SHA512 420e3d352bb31a80311c3ab8ad62f7a6530fdcf78eb0bc45717e075f81a3d1a42fef18d756c129d2c25e8d5f7d8e1161affae905cfa7d8b0d1d3c9245c9f1bea
 DIST bufexplorer-7.4.19.tar.gz 25679 BLAKE2B 814adb79fc196174a9915643a3617e3c324f963792a2706f59f35699289524d0b93e7337ec3697d03e3a98b9f15018d40dbf9c0d4f35d6cebde8ea6de4cf1b23 SHA512 d38bcb52a50cfcf6d0b66ca6f1290a6be53d5cee98b3d2d7a93e01b5ef904af53c6cc8256e667bdeeb23a58344f5d69838bb7b5d71d225a83d1e173b99344888
-EBUILD bufexplorer-7.4.18.ebuild 503 BLAKE2B c03760f51b383509913e7ab0320fc453347b01d4728371972686a60628e9d08e334b8e52cbb3d3fd6e3c7e2006307be9191fd09cf30de403ed09846ba749f2e1 SHA512 268fb5dda23a8a25085da25a4c485ebd4ad51db2cf4a61f6d9970bef28e432e3f53eb40390eac359c698c9938c69baf36ca3def2c5889288cd90f51492bd8cb4
-EBUILD bufexplorer-7.4.19.ebuild 505 BLAKE2B 210953f0f486857fb06afc52151715e104f5122eb5e5ba2412f2b8e25afc6c435c6143c6ccd60c1131064dc15e4f848239a85a38b926a215c48b31fc4a440ed0 SHA512 14f292dd10a2e1c5cf17192d71dffe34c33c60c31a33647016c6c064f3fe82e8a86708be4acf739497208ced5eaa2183ac265e6d07cbe808ef27fb393a18a9a2
-EBUILD bufexplorer-9999.ebuild 628 BLAKE2B 79e3990fefa9270e148d9cbf35804d19db269b5a84543756effd0aa8a1ce99ab3ec2734bb9895a2f9a9250f58bacd4571cea82ff0abc570d9a8f566bc9faf3aa SHA512 8b6d39ed46164135c8816efc5daedcceb072ab5ffa6579a1100d5e1cdf54e579039eb2bd7500138c744045709228f8e41ed3f9e98da6b0eac8cababf3a893ac1
+EBUILD bufexplorer-7.4.18.ebuild 504 BLAKE2B ee68329b9446ebf1c7571af162de167dae2ea85fcdbc1b9ac88cbb623bdf9cb728d1ef7fe296be1309542dd5ea01c68a72effaf920274f2a8b731ef26db4c168 SHA512 90dc950091b57c65896ff66b77e3b65671cbb21ae37f878445b3771153ce9509dcc5984fe0c3734ae693ca04518328b8517312188eb691a03ef4066df06752ff
+EBUILD bufexplorer-7.4.19.ebuild 506 BLAKE2B 8bd50099f3da4d4841089e63f9634f480190c4e5ef0a73ddb3d7f181ebb3ae32a72970fc51df72d7c3e31e46c288f69ac470095e246855f36838f82235670038 SHA512 b396c84c4fda3fbd12d1a91a96012c1cae337c8db7bd2eef56e70b79ac3d45645e20139f049c8749cec6d146eac0487c6469b6d97d67a30674a15c24e67ca5cc
+EBUILD bufexplorer-9999.ebuild 629 BLAKE2B 1bb452f22f906ffa14e6dec853dd5dfe14a478cde4c4e7a47984d42ac12e14b338423bdce9869c5643d4a4f30efab691018f6c8c11fff5714dfbd60e110965dc SHA512 7fe257c7df973c65d80920d2af28c710e21a8f3337628b517faa546de954b27b1303be55334b0c89cbbcb814b8cc40c4a6a75d667b501df8018de803764d919b
 MISC metadata.xml 337 BLAKE2B 1f7ff65f6508fb9463322cbf6d76f55455dd281dbc5b1227fea6f066e0c197216cbc775373fef3a8d8bece89f39b84ff5546ab5b3ee0ffe6244ddb482e51d2ef SHA512 31c66f4059fd32f6521fa33b6d655d6d006a71b6d14fc008e4dbe2cc1b93bd3fe5a8055105afcef07f38845377ebee7ecb41d0f92cf7da73e020dcf72216590e
diff --git a/app-vim/bufexplorer/bufexplorer-7.4.18.ebuild b/app-vim/bufexplorer/bufexplorer-7.4.18.ebuild
index 86bfe82b862d..c286927dffc5 100644
--- a/app-vim/bufexplorer/bufexplorer-7.4.18.ebuild
+++ b/app-vim/bufexplorer/bufexplorer-7.4.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: easily browse vim buffers"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer"
 SRC_URI="https://github.com/jlanzarotta/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 KEYWORDS="amd64 x86"
diff --git a/app-vim/bufexplorer/bufexplorer-7.4.19.ebuild b/app-vim/bufexplorer/bufexplorer-7.4.19.ebuild
index 320b746f4db7..9447a5bc849d 100644
--- a/app-vim/bufexplorer/bufexplorer-7.4.19.ebuild
+++ b/app-vim/bufexplorer/bufexplorer-7.4.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: easily browse vim buffers"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer"
 SRC_URI="https://github.com/jlanzarotta/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 KEYWORDS="~amd64 ~x86"
diff --git a/app-vim/bufexplorer/bufexplorer-9999.ebuild b/app-vim/bufexplorer/bufexplorer-9999.ebuild
index cd3d232d76ee..e285e23f86cd 100644
--- a/app-vim/bufexplorer/bufexplorer-9999.ebuild
+++ b/app-vim/bufexplorer/bufexplorer-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ else
 fi
 
 DESCRIPTION="vim plugin: easily browse vim buffers"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer"
 LICENSE="BSD"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/c-support/Manifest b/app-vim/c-support/Manifest
index 8f102be047fd..e3ca8fdb0d13 100644
--- a/app-vim/c-support/Manifest
+++ b/app-vim/c-support/Manifest
@@ -1,7 +1,7 @@
 DIST c-support-6.0.tar.bz2 130832 BLAKE2B 0cec691b367904647b2d8ea0e284027b3b7ce0d3f8db0c8e8d5c9ceac996d0cdcd2899cc4432425fd2ab0ee205069ab95a239686de81c13c77dbf7c16db06811 SHA512 280e8e91b8961ad856524f1869ecd580870ccbb6064c02aefdd5cec7f55a7bf12a17c76a4de91c8d2a7fed25bd96e793909f7cc258b9664f295e1324e0b392da
 DIST c-support-6.1.1.tar.bz2 167371 BLAKE2B 2c1d333d377eb57c52845f215c98d41e15029bd34fbef9cd8844cc2f237d129ed471d64dc71a55495189500de90b6e7fc3bb41cec18d62c51ba3b4ceb0331cc3 SHA512 dda33732505341bc260b9c3f73f95c70c3ee6f0eb50b9d1fd534fc8e83fb21d0caa3feea0ae50cf59da4abbef455c31fe1c02c80bb9168423cfa332941ff0886
 DIST c-support-6.1.tar.bz2 164255 BLAKE2B d57ab7d74eb0cc13767401aa2bad1f7883842d24e47ec0a03fb5354d5a6950029021ec1084acd7e5e86c42e9682eb4b1cc19c8c1f4c4f9d0a147571d88d51f8c SHA512 6fdc4f757ba0febfebe0c8898b6b0d582e03d6f7d08523e8663368011c41d6444df2620f96c6276d959b4a05b7c83a0e377bc5a8e75aaed5cf478f8bc83ce9ec
-EBUILD c-support-6.0.ebuild 481 BLAKE2B 766f03e8964321bfa6a699e32bd7c6a828c65db0972cfbc6a8503f6d8d21dd5ae06ac0c89acc75f4693cf58c1dd9e60e021e438703c48e05e0564a08cb00cad9 SHA512 c65f3a0f0661f38b88f3ebe77ab6a42596cb8ad060e632127244577be020964ab7aa7e33f4157ba7c9b61d41e915f27d0ae16383fa713cda0bcec73312ba3b7b
-EBUILD c-support-6.1.1.ebuild 471 BLAKE2B bf296200eb632b0dba1b04c341454d30cc6dd8b9adef81edb0b17636113aee16dfe26cff22a53bc13cd88195ab974cd94dcc0b27806ba279669a5c9821f8f7a6 SHA512 1b6f8749273e6548135e5cef6a13f91ca663650568c4c03786cd5e164178c3ad9c73839ef038667103d5f01118d4ab9f81043436e2cbd187a2d4feb79ef52242
-EBUILD c-support-6.1.ebuild 473 BLAKE2B 6c8eae302f0c76b101e76283b1d843ed39e80bd2195820341b18fcb43f4bd98419faaa8bd6f3b7996112299b29dea284574a4546e1e9656218169341d292b04f SHA512 21a89a0d0073afed5d6a333a8c9ab94120c993977f0cd72eefbf5939e55a7b8ae4da5bd9c48564c0b9d63083b223bb1e48d85a5bf26c2a417bba5745e16626e4
+EBUILD c-support-6.0.ebuild 482 BLAKE2B 3f9a451bd1c1c1e5daf2ab26c8b1d3a38d9f599d24443b730ee7a84e660dc7bd9c93375a365d0903e46ccae35d66fbc29e1e5c5b2a1d6bff975a098a20ef4919 SHA512 7950de1386b3d4dcc32aa11425f99a564e5009f9f91e2f9f3d460d50b15a4c67b8f7f5ee4268e827b62f8e31a1c31f110dac989a960279d1f9796742d3d49e9c
+EBUILD c-support-6.1.1.ebuild 472 BLAKE2B 0ae8b108eb6607233c00bb62a3a00850bad8971a0a3ff0380b08f0acbc9b54889cd3d5bd0ec8c9b142b127546ee857d6dae007b3cdfa63a906ab3e85d30b694f SHA512 34bc159b372bc8d15324b0d7a67f2eb7912410fdc19559d5075d91d6bbee5de7b8e4fd6544584fb620cd99bdfab15d02af0de9ebef29f4b2904308fc42f2fcec
+EBUILD c-support-6.1.ebuild 474 BLAKE2B e51b80a2794749007cdda1a8de58f5779b317461bd1929f8f70b577260ad4eb45e651ab5c894d47f61955f98928ebb89c584bd75e3e070d5d43fa8a33ca29066 SHA512 1c59e8308129105f946554daea9ba016667535a35bb1a115d10dbe2b8c3bd58225a2bd466622ccc95ffc489178c3f8c3969680976a9e9cd99c4ac04edea8ee42
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/c-support/c-support-6.0.ebuild b/app-vim/c-support/c-support-6.0.ebuild
index ed67e2ba8354..9432efcde238 100644
--- a/app-vim/c-support/c-support-6.0.ebuild
+++ b/app-vim/c-support/c-support-6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,7 +6,7 @@ EAPI="5"
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: C/C++-IDE -- Write and run programs using menus and hotkeys"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=213"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=213"
 LICENSE="public-domain"
 KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/app-vim/c-support/c-support-6.1.1.ebuild b/app-vim/c-support/c-support-6.1.1.ebuild
index e629fc851643..f9cfe8c262e4 100644
--- a/app-vim/c-support/c-support-6.1.1.ebuild
+++ b/app-vim/c-support/c-support-6.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: C/C++-IDE -- Write and run programs using menus and hotkeys"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=213"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=213"
 LICENSE="public-domain"
 KEYWORDS="amd64 x86"
 
diff --git a/app-vim/c-support/c-support-6.1.ebuild b/app-vim/c-support/c-support-6.1.ebuild
index 7b3a03ddceb9..b845e2e7abfc 100644
--- a/app-vim/c-support/c-support-6.1.ebuild
+++ b/app-vim/c-support/c-support-6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,7 +6,7 @@ EAPI="5"
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: C/C++-IDE -- Write and run programs using menus and hotkeys"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=213"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=213"
 LICENSE="public-domain"
 KEYWORDS="amd64 x86"
 
diff --git a/app-vim/calendar/Manifest b/app-vim/calendar/Manifest
index d69566d51df6..07b2fa30ae38 100644
--- a/app-vim/calendar/Manifest
+++ b/app-vim/calendar/Manifest
@@ -1,3 +1,3 @@
 DIST calendar-2.9.tar.bz2 11070 BLAKE2B 9c137d6975f3978776e8739dfa0697a6fd9f1828c0903ec529008d6c272e2226418e7f175149f048feecd405235501a88967fd6fa4dc6413eabec4021d675bca SHA512 8d1c29cb1e7b8189447d60bb5e8940b7ed52837c9039bd8ff8e3ce19c5fd7a9a8060291bb8a0c0bd2a2bb677fce388bb7f807f25358f3903c28b07c715ae1a07
-EBUILD calendar-2.9.ebuild 319 BLAKE2B 0a525d900c68df44f166eeed938088e93343cfde01b086d94048ff0e9508699ed2c5ba58071c48c80e4a2c0c14433a1a930254ae25e159eac5d9ae0a5e38fbf7 SHA512 f3a151058db9b4805dc5b4f877885f11902d2edc5d41cd3694e2f2fbeda90bc39cba62a407b46a4a027ea65ecc14dc76a8b01a69b28cbefca34103d9aa44f7f0
+EBUILD calendar-2.9.ebuild 320 BLAKE2B 56d5aa88b5a00b580e2415197df7734c503ea10b84cd0998d116dd88f872dfa867968f897d87161c6731d8a6c9df84994c403493441f96cc4475be0c06ff3cf4 SHA512 728f07ee715dae3c00771ef7ef78c4e7f03d5ae940bb77d34b32c8b6b3c1dbdf5d1322f1e93ed8d171f99d4c19e10ecb357950f7927fe0e87364f39014057ca9
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/calendar/calendar-2.9.ebuild b/app-vim/calendar/calendar-2.9.ebuild
index 9219fbfb3ce0..d8ec95a7f8c4 100644
--- a/app-vim/calendar/calendar-2.9.ebuild
+++ b/app-vim/calendar/calendar-2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: calendar window"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=52"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=52"
 LICENSE="vim"
 KEYWORDS="amd64 ~mips ppc x86"
 
diff --git a/app-vim/cecutil/Manifest b/app-vim/cecutil/Manifest
index 13c09642803b..95352fa6eedb 100644
--- a/app-vim/cecutil/Manifest
+++ b/app-vim/cecutil/Manifest
@@ -1,3 +1,3 @@
 DIST cecutil-17.tar.bz2 6985 BLAKE2B ae67aec09177198ca2934ec488a76105f9fabb867cb9b435a7696a45074d65876ac04df2bc3f33dcca82220e63d2627e86ca5af08a7d31c6a0ebb29ad85ca1f5 SHA512 2ad7963e5928d3d6b46fc4a8eafe1927445c73e54b8af2869253a8223aa3dba7776a118085b4e7b517845c3872bdac96978981004e863da5a7ff8716acea1393
-EBUILD cecutil-17.ebuild 373 BLAKE2B 16f6a4a5f78a21f2c8962fdc4fc4fedf3ebf2068cda98eaa9d2e3e2f6a6517f8f223ac6e9df144a757d3c01e98b66d4fe2d9085d70db33fde5bdaf395ca3ed23 SHA512 9b01587b1f23122826ec7dbded9c5810cb33003a2c1c4ed38e255eba0df8458f2c0f686cf6ec4fa45bec7770141d3d1792bd989e4c8fdfac3092be9369c73b29
+EBUILD cecutil-17.ebuild 374 BLAKE2B 0a8945961bf1d3c19d52e5155c1b300f4b8103135a316227b4c8d9d3bf8c60e8e2ef160f63d50281e4cf17a1b0d6d065cd0364cdc15322be9bbbe4bed783d0df SHA512 846f67a261785fd4be2669a2fe1c056c7c6c5378980f22384388dddd096bf3b4738185ca7caa4a08d4a3f2e2c09770fb2364bb61f97fa5f81a92457841b1bc17
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/cecutil/cecutil-17.ebuild b/app-vim/cecutil/cecutil-17.ebuild
index d0bf08072ed6..5ad2ee32c8a9 100644
--- a/app-vim/cecutil/cecutil-17.ebuild
+++ b/app-vim/cecutil/cecutil-17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: library used by many of Charles Campbell's plugins"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1066"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1066"
 LICENSE="vim"
 KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
 
diff --git a/app-vim/cfengine-syntax/Manifest b/app-vim/cfengine-syntax/Manifest
index 89329c8f922c..c94fa88c75af 100644
--- a/app-vim/cfengine-syntax/Manifest
+++ b/app-vim/cfengine-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST cfengine-syntax-20141019.tar.bz2 7611 BLAKE2B e43f3c374292404ebe28dd63bc4ee7f95d51ef6e88948d9155f3c1f6c58c948a58e844325ab7b12b300d277e573a61ea9855041c5389bea4341586ed5e1ce2b6 SHA512 c8987073b9cc9b1494b0d3cb8737a5b99f62c1b99f5b1e84ce1903e37a924ec9b3e2487cb3b72c75dfba40528809289efdaf3641bf6c059a668c6bf073bcb83e
-EBUILD cfengine-syntax-20141019.ebuild 532 BLAKE2B c396ccc98db33ffad2f35f826c6577e395817ad9d9462a8dd60ad3a5b04b84f2f652b78aafa8ea4fba3c688d7c01daba5bf3dfc514e25ff2eb9a1eb3ce47f6ba SHA512 ee948490888d4d952b2743731b557ab6468286c18888c3526fc3c79d294a0faff1c8e7535a9cb4fd7bdcc7181667c8e8b6687a9c4ca76f4de76dc139b3b6e717
+EBUILD cfengine-syntax-20141019.ebuild 533 BLAKE2B 394f966a09701bb5d0857ea4a9d06492e9dfbcf699095e8b0149aedbcf14ca5021162e45f41f6697844ffd931c04dfd796e865ab1caf9d5f6d7a282cdffa7fb1 SHA512 5dcca2328ac6b458f5bb372598db4aa4a895335d65e4e4d3661c463c4d5991ef07aa32d5c53bac3cded2260e969c64cfbba311df283efb4b0b46733aae912800
 MISC metadata.xml 538 BLAKE2B 3eb09b3af0b2cb8732cc07640aeef9218ce4bffa529437cd2e5fa18a32c36411e29a4a923dcfa9691c67d274e039f54dad872e45979a14cb29c53af746a45bcb SHA512 64ce2e382ba91771caf3d654164d111191f65cbe281d8525ce4ae683ee3148c47f8514e1f01dcc9ec052e0db6ab75c5b2453dbbde5f0e00bd1b4b6da5b0433cc
diff --git a/app-vim/cfengine-syntax/cfengine-syntax-20141019.ebuild b/app-vim/cfengine-syntax/cfengine-syntax-20141019.ebuild
index 86d6c12ca69d..6459dc9faff8 100644
--- a/app-vim/cfengine-syntax/cfengine-syntax-20141019.ebuild
+++ b/app-vim/cfengine-syntax/cfengine-syntax-20141019.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: Cfengine 3 configuration files syntax"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2904 https://github.com/neilhwatson/vim_cf3"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2904 https://github.com/neilhwatson/vim_cf3"
 LICENSE="GPL-3+"
 KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 s390 sparc x86"
 
diff --git a/app-vim/checkattach/Manifest b/app-vim/checkattach/Manifest
index 76e31132b3f0..47a0571cbd6c 100644
--- a/app-vim/checkattach/Manifest
+++ b/app-vim/checkattach/Manifest
@@ -1,3 +1,3 @@
 DIST checkattach-0.17.tar.bz2 6491 BLAKE2B 5069bf24d09e9d7d6cc10c28681ea57902d9b01baf52727b7491a3c1f5f11907a9934906e3396cdc9db2efa8196007c21573fbcae840191cb18cec9224f9a650 SHA512 98ac172a5fd84bacda8cd682dfb320aceb799098bd1f5a5abcf5834c2a883e7269b0fafbe1e77d2215982ed0548d592c32e80fc4aa67ae3e87c6a69ffc75cdbd
-EBUILD checkattach-0.17.ebuild 392 BLAKE2B b5293c85d14160ce167b730c197e74b4bea67302c3a1f80697915bea82d18722814a69b3b274c754d90090cac394fb78459214df3062badd972b22581b005aa4 SHA512 541395384b42a9d147de6652dff4cc4cc6c6230552b193f9d2ea3c4618f883864903d47bc21ef0004e475f87d6447c8c4c276c3c7ea49d56d09759c36498a1e6
+EBUILD checkattach-0.17.ebuild 393 BLAKE2B 55af7eacad4f26556ec8aa08b21d5897faafdf382e557d9d9d1e4992b557a3ab98c812454efb167fb733f54a0e726f8b5fd24674a336eea96aa71cd9b4af6811 SHA512 4501ca6f3cfc2de127fa3e857b3e5bdde770003da8e4bb659597f3533da3ecd0f8552039befbee45f04a2f6bedf4eb88ada8ccc5fa6b168ac1ccf997dcc73612
 MISC metadata.xml 344 BLAKE2B 693bc7aafe1a27687df50fc216e02a9cd5c2809e2d0544b56cc704a9c34b523ddd3b61a3961fc28c30feee24cb22ef2d9499fec23a9692442d3e9960a4880da3 SHA512 53935b44d8dc0efeb033c8326cd8b4776d863cde5267f3ff03aa2006a825a1f1c94e95b94cff4a0ac9ee25b35219d02fcfc0999f8e4a7f0ce1bbf98c2ba289c7
diff --git a/app-vim/checkattach/checkattach-0.17.ebuild b/app-vim/checkattach/checkattach-0.17.ebuild
index 068bce07d813..8e37492bd15f 100644
--- a/app-vim/checkattach/checkattach-0.17.ebuild
+++ b/app-vim/checkattach/checkattach-0.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: check for attachments when writing mails with mutt"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2796 https://github.com/chrisbra/CheckAttach"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2796 https://github.com/chrisbra/CheckAttach"
 LICENSE="vim"
 KEYWORDS="amd64 x86"
 
diff --git a/app-vim/closetag/Manifest b/app-vim/closetag/Manifest
index aa8f9eb28f4a..ce8821a812dd 100644
--- a/app-vim/closetag/Manifest
+++ b/app-vim/closetag/Manifest
@@ -1,3 +1,3 @@
 DIST closetag-0.9.1.tar.bz2 4717 BLAKE2B e5324bf5b6017d7a1116c3d9dafb24aeb3151dc772250282be6897d9032412e47e09e7841c70a0703baa0aeae549a6fc15ec1547c1babbea08adbfbe3568425b SHA512 67e10871c98716bf65c1c1f3e07cb65ebd158fb058ee4e51e189703a5848e5f35066fa492c9614703936add21fbb34a387e9cf4a82043d794f3abb62d6c3ff38
-EBUILD closetag-0.9.1-r1.ebuild 417 BLAKE2B 17715eec72f96f41f47258b081598de365137bec5a0d9d39396ae3b7300b825cdf81732a0a90e77210b79f9ce7119b88463e1c7a3bf7a1e010eaaf842a02aa9b SHA512 27aa0156755a4c6bdad31715fd70e61ffa395e415e05fe0e062e2aff8fe75c997a400d4014e13d2e0aa0a8d7a573a4c7b1df96a26140f351221c401847d04263
+EBUILD closetag-0.9.1-r1.ebuild 418 BLAKE2B f4372d4760f56afe4e6fe127f519e0a35fc62285eb25279da62e5aec327b21d590fd52a8b1ede1fdaba11645cfa6617eb5a77d364a9110388208ccb8d9a8a960 SHA512 85279925059bb11e8b1574568f6619b0dc1c5df5d6686bb6dd6d5bd6949cd917aa43a03176af3efcf90232f429879b0edc8bcfee3b6a032f1e81324999880337
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/closetag/closetag-0.9.1-r1.ebuild b/app-vim/closetag/closetag-0.9.1-r1.ebuild
index feae211a6346..ab2e93def305 100644
--- a/app-vim/closetag/closetag-0.9.1-r1.ebuild
+++ b/app-vim/closetag/closetag-0.9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: close HTML/XML tags quickly"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=13"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=13"
 
 LICENSE="vim"
 KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
diff --git a/app-vim/cmdalias/Manifest b/app-vim/cmdalias/Manifest
index 765fa608abd0..c3b46859788a 100644
--- a/app-vim/cmdalias/Manifest
+++ b/app-vim/cmdalias/Manifest
@@ -1,3 +1,3 @@
 DIST cmdalias-3.0.tar.bz2 2601 BLAKE2B 89b36b2bd638dbdc454739e1f9a3cd61715faa5c392bf3a85c937a0ec179f4e35485ac3137fdb84c2d66ba235e44af84d1ce42ca7e8f212438e88eb91f691570 SHA512 a29b8b588c662ca48e8208422e4592e4d2a2908f23ed123b0b2aa639e6c05725dcc6ee0179418dbfdc39108953de064f5da5eec4261f7e9db5efea0d91fe58aa
-EBUILD cmdalias-3.0-r1.ebuild 441 BLAKE2B 8e7f9e199df39d00e784be1e23755b2a8b751f6135945c2ecec28ac38bb1fd79e744f4a3a17f7dc1ad7515204682827c6156427d606c973ae51b6047a56cc7d1 SHA512 bea86a2cbf8700deecbd0590245c3c3ceaeb1eee0819048edfb60dae67102048dbe7820f942ce68f85682d99f51395533166a1fb47ac3d57d3261d21662be91b
+EBUILD cmdalias-3.0-r1.ebuild 442 BLAKE2B a7e932c1c2babf9b35c8380b16c0e5c9fdfa1ede74b771525573ab9ea9aa5ab7ddcdf1a37ba50e1d2b675a9747eafec02b27a93d470254145ddb88d15b2d4b7a SHA512 64ba4c261fb9ed34fafa8b049bfd83113fcc206a836dda5e80b80e1205a6ce3af5edd9a67f6aeccf0fedff7a362d464ab5c5ca4c6d645580437ba803b9f743d0
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/cmdalias/cmdalias-3.0-r1.ebuild b/app-vim/cmdalias/cmdalias-3.0-r1.ebuild
index b8d1a7e77b23..0d37167dd15c 100644
--- a/app-vim/cmdalias/cmdalias-3.0-r1.ebuild
+++ b/app-vim/cmdalias/cmdalias-3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: library for alias creation"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=746"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=746"
 LICENSE="GPL-2"
 KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
 IUSE=""
diff --git a/app-vim/colorschemes/Manifest b/app-vim/colorschemes/Manifest
index 49e21ed78175..193630d60699 100644
--- a/app-vim/colorschemes/Manifest
+++ b/app-vim/colorschemes/Manifest
@@ -1,3 +1,3 @@
 DIST colorschemes-20140623.tar.bz2 683654 BLAKE2B 465c6dda4b45b847ac674d0116987723f68454a97b57471569d3d7333e64960a6ffac8a3bb4d157f2f9f87d0be9ea871871ec33de2e9e09fd67eed1ad8fa96b3 SHA512 523a1fcc5f179ede94887c844397bf507ba6432f7e8812794be3a2451f467370e0c2119000e138ca021f05eee4b3f43e34444916f3fed3eeb7749db459b502e3
-EBUILD colorschemes-20140623-r1.ebuild 853 BLAKE2B 4365fd7f2cecc75b2edd95f496286319e149e6d98e23c423dc17d09d3d62fbc9e152e62037558e387951581fc80f51c934234109fb93741ccabfea5c0cea2a62 SHA512 dee1d21fb5a15c227ae804d5eb6e316000869e8ce681ca1c6cc0eca2212e90537c63eec2c1b4884f251a685e26a67112100806654611c78f5cf83563feb0ec47
+EBUILD colorschemes-20140623-r1.ebuild 854 BLAKE2B fce8820ca92c71ee2db582707f6186b1d69bb2b781580545096111c11749d183c7dcbba41e28448ade64f72ab82db2c572bd7ceb4896995898f6cfd0206a6939 SHA512 42d4e16e21c3c9b47a737831058e85a8ece8aeb6cc63bfc488ab11c1fe14dec6bb07930192a391b52db612b7ec7fed14d9de59c96cd6d271e50ffaae77dd3147
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/colorschemes/colorschemes-20140623-r1.ebuild b/app-vim/colorschemes/colorschemes-20140623-r1.ebuild
index 528a8076f7b0..29f54897ed03 100644
--- a/app-vim/colorschemes/colorschemes-20140623-r1.ebuild
+++ b/app-vim/colorschemes/colorschemes-20140623-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit vim-plugin eutils
 
 DESCRIPTION="vim plugin: a collection of color schemes from vim.org"
-HOMEPAGE="http://www.vim.org/"
+HOMEPAGE="https://www.vim.org/"
 
 LICENSE="vim GPL-2 GPL-2+ GPL-3 GPL-3+ MIT BSD WTFPL-2 public-domain vim.org"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
diff --git a/app-vim/colorsel/Manifest b/app-vim/colorsel/Manifest
index 8d34e8f7beb0..3347c06ff1c7 100644
--- a/app-vim/colorsel/Manifest
+++ b/app-vim/colorsel/Manifest
@@ -1,3 +1,3 @@
 DIST colorsel-20100406.zip 11216 BLAKE2B 7fed182d4d79c1ab971f734a196a3d99b5b45abf92fa5c101ef05c8b74b8f4ddeb0bb144c46c23c3926f2f40a22f1ea0f107f468744232e5e6640622e9098984 SHA512 628c2824ce0c5524f45eac209010873324111c33697fd4e36a71d7dbe7aa83f388caec46cdf18224faaaf5480fb671e2e0fa241f0ab4379b276354217d5587cb
-EBUILD colorsel-20100406.ebuild 510 BLAKE2B d34ba9781d5820c4fd3747fa2a2b9aed6f9ea9028979d56a20fd8106a4f46d08b4b9d575a2e06d1abd1bb58d34736cd51d885a2530befd8d7660b4c31379ffdc SHA512 ad494c24b52d3f7b29705743f8e278ec9ad026cfe19a34664518ccb57e43049970e05187485b1fafc503afcd08bc3bf6d5e2d61a4c411914bc5aab13f48d80e0
+EBUILD colorsel-20100406.ebuild 512 BLAKE2B ce678c3fae7ad07f85cc27018bcb46ed598b98d87ebe733ae145b913fcc17a9c5d4d8db89b26d2d9f57532481b29942fef66686ea5a3def4b0cea4bfd3475213 SHA512 be123e53431f2b3c8b67fe501ee99ca3babb8cfc781dc39c6597df9c8bebd276b5ae2e96edbff56f316639722a01911123a89c8e697c9e80edbaf420b8c2fb56
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/colorsel/colorsel-20100406.ebuild b/app-vim/colorsel/colorsel-20100406.ebuild
index ecdc50440661..7c63a3c90123 100644
--- a/app-vim/colorsel/colorsel-20100406.ebuild
+++ b/app-vim/colorsel/colorsel-20100406.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: RGB / HSV color selector"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=927"
-SRC_URI="http://www.vim.org/scripts/download_script.php?src_id=12789 -> ${P}.zip"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=927"
+SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=12789 -> ${P}.zip"
 LICENSE="public-domain"
 KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
 
diff --git a/app-vim/colorv/Manifest b/app-vim/colorv/Manifest
index 756ac91ff602..b90b9d88cd3f 100644
--- a/app-vim/colorv/Manifest
+++ b/app-vim/colorv/Manifest
@@ -1,3 +1,3 @@
 DIST colorv-3.0.2.tar.bz2 47059 BLAKE2B 2a84b264085d61f02d3ec881bd1f097d11f23286f53f52e46db468f3bb49df94dcbb9a3514bbbe143167fc597f871064dc998665a25796c43d000c051a62debb SHA512 cb4a893d65bbada5cec27c0810bf3e78db3c64e64f4179529d5da30402ab65b141f53dd7f2a9e8bbccf3d5f7dc5843afc7cab0d908e66a86fc41a5c38c9a848e
-EBUILD colorv-3.0.2-r1.ebuild 949 BLAKE2B 79d69fa8de712b3945b96f2d079a2a7e4a24505d32bea5ec9a8cab751ffdc6b36bd5fd22a06f2e175eadb51c8797c5c46fb46d4a6a0ddef81659a1931c7afe6a SHA512 f1672a381e9740e50199961912acfedb65541eddd6891577e1f645848bdaf50b8d1e045677fd01c4798c5368e1c70e8e78eeeadb3aa60035075ad681a8e0d98f
+EBUILD colorv-3.0.2-r1.ebuild 950 BLAKE2B cdfcdc7dc3194f2df142652c5c0aff747aae19c03b2706584b80fa4cf070e42b10ba2fe6ac6aeb6fd1d1e798360d8b26761c803c40100a7dc797904a8680ff67 SHA512 703c0521578c74c3b4a533faadb28419ba8e442d2cfcf97c85b5026d483ca09a82587ae3f925dfbfa2fc21c5c43dc82062fbc84b967e71d52e1a25c0e9c36fe0
 MISC metadata.xml 332 BLAKE2B aadba68bd1f0ea3b25ff5b0e807175ec9438e0b10479b539ad60199e9ea3c4442ab45dba549b6507b98b5416d4a65cf981d750cb8698b219e56bb792da616543 SHA512 f7665a682723f68af0fb47584b8442216937a348a9bee52959209cdb44de6d79453ef4029c0ae536371e5a2292624d1cad8c2058d569c703d4f2fa17c0eef0d9
diff --git a/app-vim/colorv/colorv-3.0.2-r1.ebuild b/app-vim/colorv/colorv-3.0.2-r1.ebuild
index 104df9cc3bf3..7f371d403d8d 100644
--- a/app-vim/colorv/colorv-3.0.2-r1.ebuild
+++ b/app-vim/colorv/colorv-3.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit python-single-r1 vim-plugin
 
 DESCRIPTION="vim plugin: a color tool for vim"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3597 https://github.com/Rykka/colorv.vim/"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3597 https://github.com/Rykka/colorv.vim/"
 LICENSE="MIT"
 KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/app-vim/command-t/Manifest b/app-vim/command-t/Manifest
index 03f0322d2ec5..11bd4e9505ed 100644
--- a/app-vim/command-t/Manifest
+++ b/app-vim/command-t/Manifest
@@ -1,5 +1,5 @@
 DIST command-t-5.0.1.tar.gz 81781 BLAKE2B 5d606892d9653c259525b6778cd72309da898fae787964fd4d1c9a6ebfd91e467e1f88f5756d7966c4866f721912164f0bf852efdd19209ce779a56725e2adbf SHA512 54262f4628bbef8a11878a8593510af566dabf35dd70005dc90e4abb4c4e9aebde5dc7d08d808c944980017f8f35d7e9723b0032ccde5ab6d2d2fae38e1c632d
 DIST command-t-5.0.2.tar.gz 83601 BLAKE2B 0391f010252fcd8b48909ad4a8dd504e6cbb74f1a2f776d719a8179f0d44299bfddf8161a2961c9089cbb3a4c4c944daa4adb26927f27c4c3beebceb0b938f53 SHA512 f8c8356231c3fb0f3a91cb61f534acac4dd401721a940c6ea045ada287d29395923eb46b1cb4f55b8254000f10eea9970841531abb2b110992180a1edbd66b81
-EBUILD command-t-5.0.1.ebuild 1266 BLAKE2B 504f07a7516158657ad44202237c9d8589966ae2fd99ef597a53ae6592eddd8987347c168dc85510c6fdfa1b61dec0c18160532c13edb36b3753d47fe888c3eb SHA512 4a2067a95aca0326776e6f8d885758cacca10a5227edfeb9e600d34e6be9f7cdc6bbf4f6c1d1ecb8bb60581a213ca1f9d5f68dcdaabbf1c057e552646f1f9577
+EBUILD command-t-5.0.1.ebuild 1274 BLAKE2B c2330d4912899a05e05f2acf5584d74342059ef6a573eb5d7fe4c9f0a64ed2225a4f0bf2d103527db7aa8f9f56cdf8339841f4e35712eb0f4f567c1744c7c5fb SHA512 4ffdedc751a9cbf8bc1a700b3220a570ff99c539e269f870f5b4a2034728243d7d261cf3c3024f0ee8d548a57c16f0745d9977be9de429896423692ea931da59
 EBUILD command-t-5.0.2.ebuild 1274 BLAKE2B 26853635b32078ee63daee365599f815186565b4295ef8db749c0dd2986e6272b1554e5ee6db78b1c65432e100f0463980966e732d47ad7fcc18034f8db9b378 SHA512 a35ba097aac85835bf0d42780ac7ae87fbfbaf960e5ca1d9f60aebcf3cc42ba247e8b4d2a0a9bbf220cb1010095387c1891156a81e1ed9d1ee6777659f978380
 MISC metadata.xml 331 BLAKE2B ce98227d75f9770a856398ac8ee677a237a2ebff220647964e59ffa6c02ae0162eef5a97b078014cf9c07fae2287d3bfcdba4af162f9d3760a96bc71f5cde6ae SHA512 e6b82ef13f3942afbb08a2d192073d5498640a719e64512c8203c15081e6873e0acb39421adcc711efc6a0f3adbea2953309da0d48acc86a92c51b6a3924f331
diff --git a/app-vim/command-t/command-t-5.0.1.ebuild b/app-vim/command-t/command-t-5.0.1.ebuild
index c9923ecdfe3d..700b5dbef1e5 100644
--- a/app-vim/command-t/command-t-5.0.1.ebuild
+++ b/app-vim/command-t/command-t-5.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ USE_RUBY="ruby22 ruby23 ruby24"
 inherit vim-plugin ruby-ng
 
 DESCRIPTION="vim plugin: fast file navigation for vim"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3025 https://github.com/wincent/command-t"
+HOMEPAGE="https://vim.sourceforge.io/scripts/script.php?script_id=3025 https://github.com/wincent/command-t"
 SRC_URI="https://github.com/wincent/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2"
 KEYWORDS="~amd64 ~x86"
diff --git a/app-vim/csv/Manifest b/app-vim/csv/Manifest
index 5d1d94c34aee..94ba001977e7 100644
--- a/app-vim/csv/Manifest
+++ b/app-vim/csv/Manifest
@@ -1,3 +1,3 @@
 DIST csv-0.31.tar.bz2 38537 BLAKE2B cc148b084b6b139646b4bbb0a907830b02343e3ed6f55cab0c7f0864124705df31c71e2eee976b5bad340400e033e9da303f9c1e972185dca2164701ecf38ae8 SHA512 1d0716765e3268e20ef7b2ed822e7322febbe2c9e9b775e79a2628c4641f157084b6b24d999b051657881acaee5ae8dd36a558ef31e5985bf7bf14ac894d5677
-EBUILD csv-0.31-r1.ebuild 324 BLAKE2B 26021daa3b3bfabdaa8586568ac3fc380e8d5e8647c0912091cb84988d6e770f7059c7de9bcf60a32bd2504bd3154adec17c58d19ee6e2f2ec90cdd15346fdd5 SHA512 0d16794876e71347b322c973902d2ba57b8da719fb9347c414edd87164e6e0849fead087f6b99e56f93ed4702233aa95e6051efd6a22add10dde0a5cde2fde4f
+EBUILD csv-0.31-r1.ebuild 325 BLAKE2B c552086da2673808ec74f62635d10d20346c37d9836884edb91cbd01887a7707a502cd6e11525b031b1364d2b4beb6463c99d21472813d77f0c656a1e1a14003 SHA512 9ef6f9f5e85cf6a9104913824a2bbcebff63ee51ce4f58089e44a4d792c46e70deb721b3b0b0edc78a1f5fc5584576824fe859e5a8546058bedcf1f9d39f7cfd
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/csv/csv-0.31-r1.ebuild b/app-vim/csv/csv-0.31-r1.ebuild
index cafcbed622c9..df81af3d6bba 100644
--- a/app-vim/csv/csv-0.31-r1.ebuild
+++ b/app-vim/csv/csv-0.31-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: display and alter csv files"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2830"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2830"
 LICENSE="vim"
 KEYWORDS="amd64 x86"
 
diff --git a/app-vim/curcmdmode/Manifest b/app-vim/curcmdmode/Manifest
index 69a3b2a22483..1e1b1c020820 100644
--- a/app-vim/curcmdmode/Manifest
+++ b/app-vim/curcmdmode/Manifest
@@ -1,3 +1,3 @@
 DIST curcmdmode-1.0.tar.bz2 3566 BLAKE2B 138c7b9b84d69a40df731dc633dd7b7e2b2859af70d8418a5760a7b6016dd61f3401bd7bd1bb7854e500c744cabb8f0c65a89fe2ee37ffbe0a3117909c232491 SHA512 eae4e7cc92ae3838ffbdb507fd51174daf2fcd05d23f418555ac9ea3dde5562e49c67ee7b27dfcf6bf2088dd335ca97165835919dd804a86fca581b4d6bc0ea2
-EBUILD curcmdmode-1.0-r1.ebuild 486 BLAKE2B fb3a60d64199f687cc079f05161f60ba9a3788b343443702dc62ae804280aa3a976f1ed64c3b47f5a8e3e28f2f45894b420d5c9b165b83449817620f69f24060 SHA512 6124618abbfb67a5207cf2b06385b2cee807039459302e865512041b993eb6db2ad58f10d4d8bf038f28c5c5c8e417a97932626ba173c3b5463f5315efc577fc
+EBUILD curcmdmode-1.0-r1.ebuild 487 BLAKE2B f7e27dd0363ee7a6467f0872215f942ed5223c77f8f3a0e0cf72e64a0b5e05d3544cbe5839ae891854828e17874c44605f659308babf90aee95dec998ff4b8e4 SHA512 fc04cb7a064c5838136757c7fe5a7a87617808960b2f3c2b07bb44b242427634a0161fbff3b14bf97ad6b5138a08071f0f631426f3c9f91d046b1cf24cd23e36
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/curcmdmode/curcmdmode-1.0-r1.ebuild b/app-vim/curcmdmode/curcmdmode-1.0-r1.ebuild
index 66e3878fd404..48607fca05bf 100644
--- a/app-vim/curcmdmode/curcmdmode-1.0-r1.ebuild
+++ b/app-vim/curcmdmode/curcmdmode-1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: library for extending vim's mode() function"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=745"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=745"
 LICENSE="GPL-2"
 KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
 IUSE=""
diff --git a/app-vim/cvsmenu/Manifest b/app-vim/cvsmenu/Manifest
index 30af31db6fd6..b90df55971ad 100644
--- a/app-vim/cvsmenu/Manifest
+++ b/app-vim/cvsmenu/Manifest
@@ -1,3 +1,3 @@
 DIST cvsmenu-1.147.tar.bz2 16440 BLAKE2B 509b5240232b8bc2770a49e9b7814ce5783114108d22f2ae80de04c19ff037fed7c76479b3c783407c753c5d7b7f58a51df455dc4e9f7d4472e607d8b1e3f5d1 SHA512 ca25c4b6d50d0d82ce179a76a8993b1a7a5ef72d032639ec9cf16fbdeafd87eddf7f89214fa8d370d330f5f7501e1265f1c5635153cc387e23191ab81ce56c8b
-EBUILD cvsmenu-1.147-r1.ebuild 479 BLAKE2B 12149ea5347953be2f1f170ab248f1064caa622e3c955e95f856860f8143900fe98604de4f030ee6dcde5a55018aec6fd1e64722f426da66ce7eaaa39a99e65c SHA512 98840dea131530ba4f23c740e966d9ce241e990c198bef9943b87d39248c21afa749d1db85c97f49fb4c928d31313c6edd83edeb6e385c6aaa8a7620c04fd55d
+EBUILD cvsmenu-1.147-r1.ebuild 480 BLAKE2B 88e2005a772fdbd4f2e77fe4a71661aaa8f3da768d78a298563e99949e9afc49d918efab4c79439908e01fa3552b75682f201f4843b7184b6f9d303edf23db2b SHA512 30cf8e0e0aafe85c21b8fd745ab9179b45e016f1df6167738493d7c56a912cdb723c982dd22e1ffa72c7445cea653d5ba70db019f69d55821877fe3892f6754e
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/cvsmenu/cvsmenu-1.147-r1.ebuild b/app-vim/cvsmenu/cvsmenu-1.147-r1.ebuild
index ab6ca41381a8..afa97bfe8197 100644
--- a/app-vim/cvsmenu/cvsmenu-1.147-r1.ebuild
+++ b/app-vim/cvsmenu/cvsmenu-1.147-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: CVS(NT) integration script"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1245"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1245"
 LICENSE="LGPL-2"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
diff --git a/app-vim/dbext/Manifest b/app-vim/dbext/Manifest
index 8991b79ad623..65c1159140aa 100644
--- a/app-vim/dbext/Manifest
+++ b/app-vim/dbext/Manifest
@@ -1,5 +1,5 @@
 DIST dbext-25.0.tar.bz2 108580 BLAKE2B 858d9828348acbeeeeb2094f127ef4184a124443ac2b8a0a5bffe013259536c99594df8fa9284976f4528ba15e6e8e8e043103028e3bd93be693ea8fee958cfd SHA512 715d9d41be46f691ea5e635bf564c4f16d16a74e5b65d9ae12f794406a2a7815df836e34d0c415e8696847e8f36f2ceed1fda4bc688ebe0db8826dc3f0493340
 DIST dbext-26.00.tar.bz2 109724 BLAKE2B 01f1378514836ac43cbdf9ca6087377ce83118b95fba04d530854a268f22dc2dc78a5f163c75c35ed9bf76514b3889c5f420b704f105dbd88bffc17f3d3c1bd3 SHA512 02d0f75443d91d32f8a6423712fb7eebde7659b986fcca2ddfef6458a5fd5caea3c73ba21ecd7a0fd57793f0a6fbc71d81c2ee6db3b82a9d98fd84572b1df18b
-EBUILD dbext-25.0.ebuild 331 BLAKE2B 9897021f9ab1feb98967f3ada9db05e72a9159a98f9298aea7ea8afd3625d7734ab8a14aeed4022cccd6aab22467988325ed7de9f5ce25beb9fddb0ae666bb88 SHA512 48224738e3241c65ef58031ba0cd7e3bc8844772ef1449b360214993b10163e1a7115a4341f49232a523e9952ae82c0715180b2b95b8e606e90cee6a96810053
-EBUILD dbext-26.00.ebuild 334 BLAKE2B 6449e2c8bc2159cce599f081b2142c5d3f998af1c33742f94fc5bfe96bc998757bd42412f59c39146af28c8b5cf24811d6e91585eb8373107f374830c21bf56b SHA512 82d27853fdfa2aa7f27c1b0aace3180437bdf4c56db22d8031d435f69fe43c9766e812eef0c5765fd6ae252d8cb8f18a53a61b6140df8645e34a76a911298883
+EBUILD dbext-25.0.ebuild 332 BLAKE2B 1ef70306c946cb18d2fd8a82ff1863647b640e2b5aff7d5f4c6544a4ef002db8187c3649bb6abf8c1a83bdd2040a5c480dc9f8382fbc11271d7c7897ceb64967 SHA512 b3fcc20e340b19227b1c1dc95a6780266468cb2da0a5d54beedf2f8e68c0aaf600f3d987460d1c95f1153a2edfeec1094eac0ff67a16315d0c27f50bbd735f0c
+EBUILD dbext-26.00.ebuild 335 BLAKE2B 7dd4e41963ee2a293bdc6109b0c6edd7e6ea64d3c370cbf363e8e912f551976e49d76aded845f2453e4c4d36a61864a829caa7580e4447e69b2eb2f28a1fc4b8 SHA512 08464bfd45f4b7f31eb661b1c982fac03f9f5bb97ad12c45b5a6c8328dbdcae9f2a07ad42fe602bdfc7e22ab11e5b834bebeb3b5e469140403b1547f87037fac
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/dbext/dbext-25.0.ebuild b/app-vim/dbext/dbext-25.0.ebuild
index 7f4f03480746..90f05bddfff0 100644
--- a/app-vim/dbext/dbext-25.0.ebuild
+++ b/app-vim/dbext/dbext-25.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: easy access to databases"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=356"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=356"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ~mips ppc x86"
 
diff --git a/app-vim/dbext/dbext-26.00.ebuild b/app-vim/dbext/dbext-26.00.ebuild
index a967751576ce..6f66ec1f03b9 100644
--- a/app-vim/dbext/dbext-26.00.ebuild
+++ b/app-vim/dbext/dbext-26.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: easy access to databases"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=356"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=356"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~mips ~ppc ~x86"
 
diff --git a/app-vim/dhcpd-syntax/Manifest b/app-vim/dhcpd-syntax/Manifest
index c80044c0ab1e..1e9ed9ebd983 100644
--- a/app-vim/dhcpd-syntax/Manifest
+++ b/app-vim/dhcpd-syntax/Manifest
@@ -1,5 +1,5 @@
 AUX dhcpd-syntax-20030825-multiple-addresses.patch 588 BLAKE2B 1f38da00084f2e3c42ec7c851e0d4798782e7727f4677a289b0db9096d93bcd8fb2a28695c05f390727bca1c1f27ed7f4918472496e94e673009ca8ba40d9600 SHA512 9b6a22f50bb4402fbe63c7971b11a1b1d7dfec5976758897aebf14a8f0025c52daaed9e3c8668a93f5b2c7c61afde600040f6c64aeac62f2e0e9a6b01735a74a
 DIST dhcpd-syntax-20030825.tar.bz2 2761 BLAKE2B 95478de740c28a93e03179e576e2edf02a682a6161bccae676b379dbb5b654d0239c3f8e523925f2e6d36f949847f9ba7cefae20104196d71f42837afcaae76d SHA512 97c1706e0ab2c89ee20618ae0c854347f8674a3008a5c4414aacb78e984e35b0eb6eeb5f641363ed6601ceeac0c794577d518658db9200c7391871ffae5341bc
-EBUILD dhcpd-syntax-20030825-r1.ebuild 528 BLAKE2B 6d55d5bea95fe6f962471d620223f9eac16f231f5360200b188c14c95eb8d8db36e1f559ed3e6ccdc7af01dcef657ad9b225ce698f634429274841076dc75c13 SHA512 44abe22346d9826d2e748adb968b468bcfa50bf63a6507e964986a853f192da5a88f5d672796822723b76052b0142d68d77f0ddb31256847774fa60044afc489
-EBUILD dhcpd-syntax-20030825.ebuild 563 BLAKE2B c1253b0a69171e581dc16886edd86ecf9f5a15a133d53378021b2494c6abe71287991260f72b4c2013d4c7c132f8d1847ac6b5d9eb5607dbf9501c170be53add SHA512 f934aa5c06d9aea2af614a1319295965b9c032241596d7af6440b6cb23e346bfbf1fcc2aabdd1943b9cd558a20935a96fc8b390692e0636833a70d4cef275f94
+EBUILD dhcpd-syntax-20030825-r1.ebuild 529 BLAKE2B 2a681e90c903a6cf0f1afe1cf6ddc0dd1b0d01861a068ba4b3f8e6e009a4eb316e173735f5d0ca88ff4bfe07b1f4e53613b274e2fd8f63d9e9689a7d7574968e SHA512 ba0b1284b04db52662d0de635e2555f87e5ca594b43536754b9b2bcc664e7cda4b7e9deaaf47f1a0ad1d726e9070a77f46b9331d6cfd6809ae171be1e4aed89e
+EBUILD dhcpd-syntax-20030825.ebuild 564 BLAKE2B 87c524b2b36dcc82046203fbea4d225fa9a0bc18ce87b60a3526956c637bbac19231230d2c0b5dccd5b3b9f6eabb3595e2c20471ebd166c513de6497ab00b528 SHA512 a84dc76f77d558fb637901b7b1a87dc95ecfa75f3597eef8c76d20c4f857824944f6120eee2f25eb8338acd567cb4ad6ea74c0510ae51a7b11ff927686a8b1e4
 MISC metadata.xml 451 BLAKE2B d8b36c756c321d18b52d77db7cfcd40b3ee3c9e8cdc282c090f6172f8b58b2639026650c317cbd2f4b1d575353a4b3cd22d80fbcea298d875fa5b737d69976b7 SHA512 cc138ac01df08624272da2daac14b2efd86fa8880e79b76de9fed6798fb5b8f6421fe608e2851af9c1afb7e6586f8d3f27865729960ce82ea76ac29f499e9e9a
diff --git a/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
index b5d16e15beb2..64596938a653 100644
--- a/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
+++ b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: syntax highlighting for dhcpd.conf"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=744"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=744"
 LICENSE="vim"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 
diff --git a/app-vim/dhcpd-syntax/dhcpd-syntax-20030825.ebuild b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825.ebuild
index 6a4bdb499cec..40f3dc706b8b 100644
--- a/app-vim/dhcpd-syntax/dhcpd-syntax-20030825.ebuild
+++ b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit vim-plugin eutils
 
 DESCRIPTION="vim plugin: syntax highlighting for dhcpd.conf"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=744"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=744"
 LICENSE="vim"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
diff --git a/app-vim/diffchar/Manifest b/app-vim/diffchar/Manifest
index 39485fbd9ba4..59d4d9b8f905 100644
--- a/app-vim/diffchar/Manifest
+++ b/app-vim/diffchar/Manifest
@@ -1,5 +1,5 @@
 DIST diffchar-7.01.tar.bz2 19950 BLAKE2B a014fa17e5b15179a4baa8e2cd4fcce36f1cc66cbd8c4ab3a13c0288a510b74f06105d2034666669e2bac2881f5bc5cd81aa1cabb3b80a91f3d67a3bf62bd916 SHA512 3f42f40ec27262f76058d9461ccde80c5badc61d0854c1ff239bea399c26e20eb5cf8960b76901223e937097e18dd7e015fc14a8f7a99907666c518d4baf5117
 DIST diffchar-7.2.tar.bz2 20092 BLAKE2B 20eef77d7019e55e466e1212e4560d91cde83f55808a4b77eb6fe2e5b7518715606d8d89c046e453dcb380517163974e173e00c18d662df2ee8ae43a6a347c06 SHA512 7c9a9239ae4eae1d325984ab40ae8d90e2dabf96dc929ed6f05c3496352aeb562452bd154fe3d1ec96353356c287604162f5b89d762b7afe26bc975449d92427
-EBUILD diffchar-7.01.ebuild 403 BLAKE2B fee47979fca2eac6b5b95bc4825183737eb330c0fa97e3823c54864bd98fc2fdc775104070077ff897f61a6dff1cc8fddf5ca150952f77c2ccad04e889b36632 SHA512 d55b3dc9e0ba654d4d23108f8f29bef93062b261c0ee5c30625a5786a43531686b24b69c6baa0de97dc87a7c8bdf19ca2ed9101ecfdc3c70d2813b9ae46a8d05
-EBUILD diffchar-7.2.ebuild 405 BLAKE2B 57ba0a9918f9c1a3ee537079f58d70ad89628b18ef4a436d73707589086e097b9dce6245b0d8ef70322189364872fc9b62abc251af03b0972402795f160b3e41 SHA512 95a7bb6babb873b24636b72fb1204098a2038f6f348b83ca1507285bbbbdd89293a542215f0aba48a2b7cf3d607ef34dc62609f0dad9609e99d2edac09d2c505
+EBUILD diffchar-7.01.ebuild 404 BLAKE2B 0e367725b5b0ba6ee4d0ab82cafc55f1e5ee429a7478d5240836475f6d1bce055b947ed51bf3cc1c7d13748f5cb4d47af4ad86e50ac847dad9553a79a06f5eb5 SHA512 bed5f93ea8048e5b21b71250b95ec5cd89473b615e65222a47366aaee6a83b582674f0314f1213ae4d204afaae60d0dfa0e77feaba95078d24ccbec025955010
+EBUILD diffchar-7.2.ebuild 406 BLAKE2B 29853c47dc16d39d7390349eb00be951c430405422dfdbcb22543a353294d20482cf7b4e3bbe30788bf8eb90a92166a0cfacbaf86695b79b6565e12ca2975d30 SHA512 52f1966646b49749170a482af5c34240f906749a3041b3bfaec482732dac24e1e4838aa5ac085c3dd52ad67fe3aeceee9563dbe55ac5241bf7cce474ed5bff47
 MISC metadata.xml 345 BLAKE2B 25adb1e474dae23ba85761950707568de3a87a9f9b0b38545e3a7cb127cd1099f0531f23c04f55a0b21f42a4d5a36b2ef454f2608c692c3afe9a90068dc4ffdb SHA512 bbe312936f14ed5cda6ac637f0780480b5e82580ca79320c5503b404e0a2eb9659fb7d0dda9e83097546fa104b7b9503bb1b25b166725b045487c78d80219d7e
diff --git a/app-vim/diffchar/diffchar-7.01.ebuild b/app-vim/diffchar/diffchar-7.01.ebuild
index c7ec4e2fdc9a..6c45dd971e77 100644
--- a/app-vim/diffchar/diffchar-7.01.ebuild
+++ b/app-vim/diffchar/diffchar-7.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: highlight the exact differences, based on characters and words"
-HOMEPAGE="https://github.com/rickhowe/diffchar.vim http://www.vim.org/scripts/script.php?script_id=4932"
+HOMEPAGE="https://github.com/rickhowe/diffchar.vim https://www.vim.org/scripts/script.php?script_id=4932"
 LICENSE="vim.org"
 KEYWORDS="amd64 x86"
 
diff --git a/app-vim/diffchar/diffchar-7.2.ebuild b/app-vim/diffchar/diffchar-7.2.ebuild
index 6790b0da6cf5..7a51a1973915 100644
--- a/app-vim/diffchar/diffchar-7.2.ebuild
+++ b/app-vim/diffchar/diffchar-7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: highlight the exact differences, based on characters and words"
-HOMEPAGE="https://github.com/rickhowe/diffchar.vim http://www.vim.org/scripts/script.php?script_id=4932"
+HOMEPAGE="https://github.com/rickhowe/diffchar.vim https://www.vim.org/scripts/script.php?script_id=4932"
 LICENSE="vim.org"
 KEYWORDS="~amd64 ~x86"
 
diff --git a/app-vim/dirdiff/Manifest b/app-vim/dirdiff/Manifest
index 12d5a2e0a913..eb83cc2cc79d 100644
--- a/app-vim/dirdiff/Manifest
+++ b/app-vim/dirdiff/Manifest
@@ -1,3 +1,3 @@
 DIST dirdiff-1.1.5.tar.bz2 11131 BLAKE2B 17a7adaa67f90c2e23ada8a53b10c5b50db3039bb17b7a32797870072b1b06ff14cc8b1b41106d0eadbfc9ac4dfabf1bb4e925a39ca2ab2a8b4444e64d7acc66 SHA512 d1abc7981d38eb784cec265146fb3b45af32f9df17698d133f6f001608c48d53aa2529f4d3d7204509ee26fcd84e813842b5a8193b145abe9d0cc468f69b7f87
-EBUILD dirdiff-1.1.5.ebuild 367 BLAKE2B 9bab546eebb6f08efb8f0aedac7ca3c6fc19fcdf0c7b20504a2e874d1122c68bab13fc178e9b17920a902ac7bae626e112fa097c8a4589fbd26d2ab1796ad076 SHA512 f4dab2d9aae65e15c1f449f74c50951f048ed323e2f6b49e2e66dc8366bb37b06bf474ccbc73ab3e201c2150570adcf31c3ef913315d0a82f8d55f2e830223bc
+EBUILD dirdiff-1.1.5.ebuild 368 BLAKE2B 71dbc4958a6a7b3b17745c8f15fab89b2bacf919313e6261c373d73de67b5faf78a07f60fddabf21a72b34e70a8279f8fcbf01b1a5fa951f88a2ea798e948220 SHA512 4595aa09c345dff988be2c50c2c6d435b518954b41989604eb30a3a4b1190274d0db050e4a4237e5db9d626977538796b22cdf7e35822a321a60f6928b2f60ae
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/dirdiff/dirdiff-1.1.5.ebuild b/app-vim/dirdiff/dirdiff-1.1.5.ebuild
index 5f26517162ea..e0cd57fdb82b 100644
--- a/app-vim/dirdiff/dirdiff-1.1.5.ebuild
+++ b/app-vim/dirdiff/dirdiff-1.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: diff and merge two directories recursively"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=102"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=102"
 LICENSE="BSD"
 KEYWORDS="amd64 x86"
 
diff --git a/app-vim/easy-align/Manifest b/app-vim/easy-align/Manifest
index af5c278402cb..f8fe5d8d2030 100644
--- a/app-vim/easy-align/Manifest
+++ b/app-vim/easy-align/Manifest
@@ -1,3 +1,3 @@
 DIST easy-align-2.10.0.tar.gz 20056 BLAKE2B 3319cfc84147a3cfb0c7109dbb9116c94b734da528623944e2546667ac45e5d912e404c8c94df963002e7789760ba8fa7023e98cf22c1201bedbe8f667b1d13d SHA512 4a6a46db96b78d830fc0191b77b2226e9c1a2de585b731d1997f69ee31c8c76038ceb14f18e13f30fee00b5ce9ca7aed4241db06cac303b8ae903a856e4baabd
-EBUILD easy-align-2.10.0.ebuild 550 BLAKE2B 9aa900a06d9cfa11e4fa03631b633925f924726ca84a8525d9129e57b42de9dffe23a6eda088bd3c3be075d80bec3352d5084d01eacaed68463d5685b12c518f SHA512 0e9498a552059cae6508ff0e06e8d5cacb70f8c96f6db014a61831e59a7fbe49322f6ec644b42fe3b87143180c00017964368ca95924f423beaa14d2a515c0fe
+EBUILD easy-align-2.10.0.ebuild 551 BLAKE2B e802d9157674c57d00f502f4e17babf34bfd039f2df5890b64ff91ef87fa312d11c784b14d65d9f006d9f18fe8a31f20b3101f37c74c10fa66c3e023e8cc0909 SHA512 d7cc1c6432630f3db2342c64d04d660506c3d2b721865dcbae625ec945ffdb0a2b93bcac5cb4f5ae7503466018beccede4f492ddd56e2d1f0f59ac6c26a0eb03
 MISC metadata.xml 347 BLAKE2B 21be1fa0f775c2734cede9e1e5ffd6bd2a23681a16a6361689a927ae4871ed3df26592c87da7e8e8771242fdf496baa0647fee36d007c356e60bd190d2a9ba62 SHA512 4b687e38ddec009ffc0ab3effb0f1d4d46d8a576812b73f3526bf13f0facef23525b75765ac7c56e9c541d66b0cbdb1f3f46a0907d3688f91576cd0a6bb67c92
diff --git a/app-vim/easy-align/easy-align-2.10.0.ebuild b/app-vim/easy-align/easy-align-2.10.0.ebuild
index 22705144e805..e13cbff4ce51 100644
--- a/app-vim/easy-align/easy-align-2.10.0.ebuild
+++ b/app-vim/easy-align/easy-align-2.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ MY_PN=vim-${PN}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="vim plugin: a simple alignment plugin"
-HOMEPAGE="https://github.com/junegunn/vim-easy-align http://www.vim.org/scripts/script.php?script_id=4520"
+HOMEPAGE="https://github.com/junegunn/vim-easy-align https://www.vim.org/scripts/script.php?script_id=4520"
 SRC_URI="https://github.com/junegunn/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 KEYWORDS="amd64 x86"
diff --git a/app-vim/ebnf-syntax/Manifest b/app-vim/ebnf-syntax/Manifest
index f835a253191f..a6c41ab89183 100644
--- a/app-vim/ebnf-syntax/Manifest
+++ b/app-vim/ebnf-syntax/Manifest
@@ -1,4 +1,4 @@
 DIST ebnf-syntax-1.1.tar.bz2 981 BLAKE2B 5ab1916fc909f8b6b4fc139fd34c5c982f2bfac3f4ccfa53f13945787db6b9c6b5531cb805d4a0feea5f3165259cd3a033951fd9074344e62657e067571e5300 SHA512 0fba3be91e998b26a3011bfe18765a3bc3ebde6aa33e96580dc0529d79a067020cfeee614dfa40126a1a968d3ca8e77711eca096095675cf6072061c9be7c083
-EBUILD ebnf-syntax-1.1-r1.ebuild 586 BLAKE2B f3a2f32b9fce8bd59083cbc0f79dccf5c37643337bc1170141387ccc3b4816ee285070e6a0d2e7d723e6b2af0a641b35fc1aac1d99fce3898f10688794f57a7c SHA512 a0e19fbb29b09bb1b0ac55b4d9486ad58fff5d8dbea91d11cd8af470a9710b98e9b2dd0d31c0d6d0f3b9d5611e452d5b1f46905afc949c49239de77f371b52e5
-EBUILD ebnf-syntax-1.1-r2.ebuild 588 BLAKE2B 88ce232ca6aa04ffb8e07fb47e72dd83e351e8c1e306eb98cb306401fdb8385c40fb19505e996a34178a86bf21582fa682e405c1292ac02eea2d21356b2a7f99 SHA512 085509d4509a001749b64a3237b1babed57b04e096a9d56e5d8367e4935597958ee8005390d5f541494d9500b5c0be155944ee9274b0ff685b1d88840a834659
+EBUILD ebnf-syntax-1.1-r1.ebuild 587 BLAKE2B ec57aaed932a7d61807539d086f41293abe79a2fccfeeb91cb2da0308c5f3d983cf869a3bd91ff0ad3c7e3c782cb1b07bd49d18daa5eea19daabbdf3e8a618e2 SHA512 c65c4cbcd3446fc68260c4e0e660b1d1deccf70b0c31236de44a72c854d16f779e559ab31eae13b67d7e1bc45a8f499fb00be2f1889f75ac2b6ae98b8c83d061
+EBUILD ebnf-syntax-1.1-r2.ebuild 589 BLAKE2B 897ad9b7e9a060742eb0d1d4046c4338fc266e9aeecb6ee87910fdc0f74e678f5afada425dadd1ec1a95deb3695f279dc5ed7d17dd5e091be062984055de1fe2 SHA512 3e995681f02a6128f9d15831960493ce46d7a28b0c6c668c359c1e4c31ee8ec88ea7c3e5624f54d5f60f992bc9ab954319c9fb32d27c888aa95dd54c107198c9
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/ebnf-syntax/ebnf-syntax-1.1-r1.ebuild b/app-vim/ebnf-syntax/ebnf-syntax-1.1-r1.ebuild
index 887c96824fef..019f09f580c3 100644
--- a/app-vim/ebnf-syntax/ebnf-syntax-1.1-r1.ebuild
+++ b/app-vim/ebnf-syntax/ebnf-syntax-1.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: EBNF (ISO/IEC 14997) file syntax highlighting"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=545"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=545"
 LICENSE="vim"
 KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
diff --git a/app-vim/ebnf-syntax/ebnf-syntax-1.1-r2.ebuild b/app-vim/ebnf-syntax/ebnf-syntax-1.1-r2.ebuild
index f628efe94fd8..05e418e59cd3 100644
--- a/app-vim/ebnf-syntax/ebnf-syntax-1.1-r2.ebuild
+++ b/app-vim/ebnf-syntax/ebnf-syntax-1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: EBNF (ISO/IEC 14997) file syntax highlighting"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=545"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=545"
 LICENSE="vim"
 KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
diff --git a/app-vim/emmet/Manifest b/app-vim/emmet/Manifest
index 41a1d45a474e..60060e58936e 100644
--- a/app-vim/emmet/Manifest
+++ b/app-vim/emmet/Manifest
@@ -1,3 +1,3 @@
 DIST emmet-0.85.tar.bz2 31274 BLAKE2B ffba1130c7c51144524a9da6f1477f1c836b7f16b19c669050139540beaf933382b62a4a7784cf4e90703b153f53e2da8416126f606c6fd572e73efe7b09e9b4 SHA512 567f79c43ac0d5560dea2130e6fb6d32f25d35b20c3bbf8fc40b7cdc8c20e2d9352b9e1c03e57de2077ac192915ab174a6bee442d5311f01cc79c3fe6e10af56
-EBUILD emmet-0.85.ebuild 375 BLAKE2B f2eb0b0980dec24c0d1a7672c08744999dc45b89920fad6a69301e93f0a549ec233af51c72e6c8077396b6c962f2b52bc414d2a4f449eebacceb4b9c4c0aa956 SHA512 1440ff6d619eeb1d7e58790549f466874de8e01688f8743b752bba71d1426db01c32796e49df93a358efc700993603b99ef60d30702ec8d3e84b5b7af1a3f450
+EBUILD emmet-0.85.ebuild 378 BLAKE2B 9d232b4f3e89a913d5ce46679270baa39cdf03c83aaedab8648f95aaa1c3c24325d02f66709de1c11b5a244c9fee29dc70757b44276f585800ecf8469cb8e880 SHA512 6ea5cb5f681fe5eb8eb7824a41395670c5cdf3c2d4c715451efd513fa9bde18738378919f2a0ebbe586de46be3c43b4972391042a0be2d2a9c07d5aab625af9c
 MISC metadata.xml 245 BLAKE2B d4f5ef381d0a479a17bfde792cd6828e5fa0ecdd26732c1a13c97fcae2f22396b879fb430aaea7680920d5ba897f78cfbb6e50bb2f65165613a5a0ba1f7dc609 SHA512 6d6d35ccbb839c939bc663cecb55e2178f5fd4e455ee3088b8847416d558dd3e7969f4c78bc445ff29503d6906fec12d302d7249e9adc8cb708d0790e681e5a2
diff --git a/app-vim/emmet/emmet-0.85.ebuild b/app-vim/emmet/emmet-0.85.ebuild
index 8a9e6e3125fd..3fb6d0a756ce 100644
--- a/app-vim/emmet/emmet-0.85.ebuild
+++ b/app-vim/emmet/emmet-0.85.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: HTML and CSS hi-speed coding"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2981 http://mattn.github.io/emmet-vim/ http://emmet.io/"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2981 https://mattn.github.io/emmet-vim/ https://emmet.io/"
 LICENSE="BSD"
 KEYWORDS="amd64 x86"
 
diff --git a/app-vim/enhancedcommentify/Manifest b/app-vim/enhancedcommentify/Manifest
index 3da017bb610f..7f0756956785 100644
--- a/app-vim/enhancedcommentify/Manifest
+++ b/app-vim/enhancedcommentify/Manifest
@@ -1,5 +1,5 @@
 AUX enhancedcommentify-2.1-extra-ft-support.patch 665 BLAKE2B f9afbc2602b1f7b215943a4bb504e31780e41edc602a80c5aac22780561c6be0cd471dc19e6adbc9be66e56d1db1c4c6ae972b8eaea62328c00146f41aacce11 SHA512 44adbcbf9fcb993db85e56853cc0eaed95fa9b194bec1a1be71523323ffb6640fdbedafd94b4f336de105c0b1b07c6b479a6f40a5a15bb6baa5a22644e33946b
 AUX enhancedcommentify-2.1-gentooisms.patch 808 BLAKE2B 6802720fdc4883629a2e180461982ea9f6d51886d882895a4aa962b4a407e096811473e97b9fd6b502d4d2aa0da076625fd758c6b108c930e8596059a7fb8084 SHA512 974ae98fedbc4c3ea75499d615066efaef5dd8e03ebe00bb20a5fdc6dd8d5cc7ebd0f34e86cb587175f0c3e26d04bed4d09561216dedcc7757d1e9266dff0046
 DIST enhancedcommentify-2.3.tar.bz2 17005 BLAKE2B cad7f66092a9c54535226616dc2da8c13b9fcc1ae8cb2a5077462e0138345033ccd756556b640ee6e4569a1ba2037b98138ad84f9d44d9466a3955f3ef0ea12e SHA512 673cb42fcc5a2d23ae404bbfa4664f388901249d3ed8315f77227f3fa42f3c267d69eda7554347b4e70de81c9bd58437c243a42d62218444063d5235fe22a171
-EBUILD enhancedcommentify-2.3-r1.ebuild 556 BLAKE2B d79638b8214cdc4bbabb982e6e2e10298437eb276768038d3bb9efb3afdb07627df6671a2f14b952f9fc39d5a4166325dd77f6a96f437b230c5ec8defff0df80 SHA512 9aa88dffb7deb1de74811551cb88ad8245ffaa932998e7a053482a857dbee96c1e52b2761c655683118cc660db087cb6406dee3bc23cd29db93c517bb9474771
+EBUILD enhancedcommentify-2.3-r1.ebuild 557 BLAKE2B e34ef57120978c754cd59675913d27194f62514bd28c00d23169f58001c5d3c81a801f13957b48fe0605d3a631c8054a9fa5fdd4d51cf64b6fea1edb2866679b SHA512 79b809cc7879538aec0f25840020e0cd9a22991c20ba55d3c55fb1430b8fce7747f6e9cf7e9472ca3e84f6dc790cd98aa58d87fa8aa7d68833df41a44667b35a
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/enhancedcommentify/enhancedcommentify-2.3-r1.ebuild b/app-vim/enhancedcommentify/enhancedcommentify-2.3-r1.ebuild
index 4f88d8f11279..3d04912e6153 100644
--- a/app-vim/enhancedcommentify/enhancedcommentify-2.3-r1.ebuild
+++ b/app-vim/enhancedcommentify/enhancedcommentify-2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: enhanced comment creation"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=23"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=23"
 
 LICENSE="BSD"
 KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
diff --git a/app-vim/errsign/Manifest b/app-vim/errsign/Manifest
index 88aa8dcd5f72..ab1ac1b8f93f 100644
--- a/app-vim/errsign/Manifest
+++ b/app-vim/errsign/Manifest
@@ -1,3 +1,3 @@
 DIST errsign-0.1.tar.bz2 599 BLAKE2B 85b6589da0cad1827d16d33e1e38c7b533c3ab3caa985bb77bdb5cc8f96fbc1e29daa6d925ff30be69e8810bf7ea8148d0c4340144743f6cdc50d2c9110ce9fe SHA512 ccf1136043b5a54614ef90190c157c02fa5470bd79159b8ba6f7a7cd95bdd0c0dcc41eb993d8a26d2b308012cd400f4d3168f4e7dde7bbdbe8dcedcfe5d1c929
-EBUILD errsign-0.1-r1.ebuild 547 BLAKE2B b6180d7810d5ae660d47a06e7a88913a5d21e8d5aa33a6631bf7c295e2ebb62b82ec9eb2ddd4f046e96f63db4aefa6b20c6ef177c1af3b76250033acb77e9b25 SHA512 c2be24c7d4c28cd5335300ccea227fea21fcfd16a187b034b3dc9df138ad0d5256ffc623b2ae7ffb483040b025a0ee1c6cc1234a79ac3febbdae3571992e63ca
+EBUILD errsign-0.1-r1.ebuild 548 BLAKE2B 9adfa98efb0e4e6a6ba0299f9ade747ac2b040abc025435cd7afa6cf53e01599fe91430f3c0569db8ecec526815ad65397c08f60d879d94f58926b2154157c0f SHA512 5ba4594fc680687fe5bd350670ea7cd8c7f2d341548e33a167e05665aa419175651dc9fef7f7383a3e252e00d028441e9dfd760790578a46ce258013ce423e14
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/errsign/errsign-0.1-r1.ebuild b/app-vim/errsign/errsign-0.1-r1.ebuild
index 1fa7a1eb8cd0..46ade2f94c13 100644
--- a/app-vim/errsign/errsign-0.1-r1.ebuild
+++ b/app-vim/errsign/errsign-0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: display marks on lines with errors"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1027"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1027"
 
 LICENSE="vim.org"
 KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
diff --git a/app-vim/eruby-syntax/Manifest b/app-vim/eruby-syntax/Manifest
index 10efd2baf0a5..00df670690d7 100644
--- a/app-vim/eruby-syntax/Manifest
+++ b/app-vim/eruby-syntax/Manifest
@@ -1,4 +1,4 @@
 DIST eruby-syntax-2.0.tar.bz2 958 BLAKE2B 467e1df5bf32ad83bb427bfde6755425a752051b1532397e75f627dc084cfb6bbeba99655366698f812bd398b171fec4110af0fba28de1900a0a22aaa08b01ec SHA512 1fdf1e6ad95109528b13b30d7504da2ea8678785b1a716c33bae0b94fafb8f23d50d81022b5bc373c1970f6d3df04f2e78d87fbb2067f0c270780963b472468c
-EBUILD eruby-syntax-2.0-r1.ebuild 531 BLAKE2B 386bb7f183749104b2c39628186039722558e7e7d749837760e835b7261691fa9687e6a0eb27f3ac5cb4cdabf7dcf5b5ea551b0f862b6da6fbfab9a93c13600f SHA512 fe16be5f248dfcdcd212a497854eee9cc51154367f4a4794547441ee6d71c9fdc97e3d5cf910fdb92b99696be5d1ebc73e33de8855ca9c0798bfec8c95ed36d2
-EBUILD eruby-syntax-2.0-r2.ebuild 525 BLAKE2B 0e366279ca2e7d2a0c3d0401fe7f9fd2fad1a8170137928fcfdfa950ac761a580686028641999ea0a4a7bbcdc9c047d918f5d9e175b19e8543c05afbc8ca08c0 SHA512 51b92fdfc888c066f36ff792e4ead4b1deed30e833826e760dfb918e58eaec5e1a4feb5f15beeab8f144ce27331b8b944d42bf42820657cfba1c1f326b063487
+EBUILD eruby-syntax-2.0-r1.ebuild 532 BLAKE2B d1de244ab32cd661d32896a35662c194b0b4912c27881bc8f101c90bbe5d0bd8449ea5b7d17dda749be5a67d70e333c55d91f4d0418bf0f973b8d94b063794b8 SHA512 af96820d5f4f60f86f34ff0f1d301321b55ec314a202480494d85bce438497aa50edf373d9d4b140a810064cba74c62fbd487772794c66f0fbf3fe10491dec02
+EBUILD eruby-syntax-2.0-r2.ebuild 526 BLAKE2B 42ad324c61cace013e518bce8911ddfd204d7366a3b65e64f033152e5a2e3a0622af8d6d685d205c60e135527a9d20256f56aa33d18e256cb1e61d38e3f28ffe SHA512 a2b28b84349844c9e2d399eca8074feb07498927cc3ff5ee90311a6ec5ec3b6b5aafd15406479b93b313723937148316355287884851913b362016f18dcc0ff4
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/eruby-syntax/eruby-syntax-2.0-r1.ebuild b/app-vim/eruby-syntax/eruby-syntax-2.0-r1.ebuild
index 6b501debb743..7ee7fbd88530 100644
--- a/app-vim/eruby-syntax/eruby-syntax-2.0-r1.ebuild
+++ b/app-vim/eruby-syntax/eruby-syntax-2.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: syntax highlighting for eruby"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=403"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=403"
 LICENSE="vim.org"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
diff --git a/app-vim/eruby-syntax/eruby-syntax-2.0-r2.ebuild b/app-vim/eruby-syntax/eruby-syntax-2.0-r2.ebuild
index 6e87f0279590..08e3138f69ed 100644
--- a/app-vim/eruby-syntax/eruby-syntax-2.0-r2.ebuild
+++ b/app-vim/eruby-syntax/eruby-syntax-2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: syntax highlighting for eruby"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=403"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=403"
 LICENSE="vim.org"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
diff --git a/app-vim/extra-syntax/Manifest b/app-vim/extra-syntax/Manifest
index a1ef26c76ea6..dc58fcfd7c1f 100644
--- a/app-vim/extra-syntax/Manifest
+++ b/app-vim/extra-syntax/Manifest
@@ -1,2 +1,2 @@
-EBUILD extra-syntax-4-r2.ebuild 762 BLAKE2B 0845686f13ec53c4786f6fad69c3a1233001daec9b3f55a80bff3f2d1d97528aa651a42c061326d627f95a55b4460d358c6530aab40cad1e5ec5a4abc87d0951 SHA512 ea29cf43994bcc663fa1d0963b485b9c3e3148477816df6071d3d0832f0286d2f365bd4c3ea6503402a5840c936305a3687905b9d39bf7d0ffd7e4d3e19861aa
+EBUILD extra-syntax-4-r2.ebuild 763 BLAKE2B c626825376942ad8b54427dba933ef2984427e7274620c9d430e02498561ffde05f1cda9ec3c02f90b046340b2b36e99d5219fd98a7ddb9e5cc33a9666c06161 SHA512 ced8f80f55f5a1cd2baede670fe903e9f0b35a29af0ac33ae2b21dc60cc7d0fbd9bbef72ab334c8fdd9656f098036866365f3e29a7d0eb6feb0492a4bdfafefe
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/extra-syntax/extra-syntax-4-r2.ebuild b/app-vim/extra-syntax/extra-syntax-4-r2.ebuild
index bf4ba20c683e..9bd35da4565e 100644
--- a/app-vim/extra-syntax/extra-syntax-4-r2.ebuild
+++ b/app-vim/extra-syntax/extra-syntax-4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: metapackage for all extra syntax packages"
-HOMEPAGE="http://www.vim.org/"
+HOMEPAGE="https://www.vim.org/"
 LICENSE="metapackage"
 KEYWORDS="amd64 ~mips ~ppc ppc64 x86"
 SRC_URI=""
diff --git a/app-vim/foldutil/Manifest b/app-vim/foldutil/Manifest
index 52d4d8571d5d..d2c2801f0cec 100644
--- a/app-vim/foldutil/Manifest
+++ b/app-vim/foldutil/Manifest
@@ -1,3 +1,3 @@
 DIST foldutil-3.0.tar.bz2 7323 BLAKE2B de59313da23a277a2eb3e971b3033202001cd1304058b5e096e33e7c28f95326169754c0e0062120099677e567c6bd79b265a69524c8b8fe55a9666ab6bde23f SHA512 a38561c4530333f5a56596b2fe19a2892f58b4fd35229536c054578b199e9b6b19c18d255aa1b078d51ac4f610d4ca49b205d1929e8be51299bee527058b3452
-EBUILD foldutil-3.0-r1.ebuild 547 BLAKE2B fb1cff7832742ace0c1a5d7cacf22c21ab40352f65e995eedea081a9c7e20803160f8497a181f60b2d89f0ec475aa0fc28539a509a56e6ac486bbd64d67898f5 SHA512 d122a2a89680172166adec7526b2f17c101333781d4394014b12eede391a56133011c4339dfeee86a93dc332351f43d2840071eb672ec34e99f9793ed7430eca
+EBUILD foldutil-3.0-r1.ebuild 548 BLAKE2B 345997b30841845c4a647a491fea8b130ace2a94120e93a02b7885fc22a834c88d3ca29606a9c59a410200cfbb2cc6e9e85058b46a2d9988381376e82f52004b SHA512 37eb4a1975a91049247ef690aaee8a0b97e0876c1fc0fdc7798dff35369dbe41edf2b3b8e58bcd3a07dc6155c08270203d230ab5b2cc69925d3c7704c2b0157e
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/foldutil/foldutil-3.0-r1.ebuild b/app-vim/foldutil/foldutil-3.0-r1.ebuild
index 953cbc3f0d0d..034686ed7a4e 100644
--- a/app-vim/foldutil/foldutil-3.0-r1.ebuild
+++ b/app-vim/foldutil/foldutil-3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: fold creation utility"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=158"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=158"
 LICENSE="GPL-2"
 KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
 IUSE=""
diff --git a/app-vim/fugitive/Manifest b/app-vim/fugitive/Manifest
index 924273515c7a..8848022072cd 100644
--- a/app-vim/fugitive/Manifest
+++ b/app-vim/fugitive/Manifest
@@ -1,4 +1,4 @@
 DIST fugitive-2.2.tar.gz 30651 BLAKE2B 7e6ecf372661afcfa586097e979c996f19df85bf41d3b2409e26fe9131a48c02946614a15231accecbe8906a458698f89b66cc86f3707f2f7014e00d795786fe SHA512 763fc352e495dae6346fdedee5e3993a11fe402dbad0e9ee4b002b6b416404c46b56a061b3d9e663174b371d2d62e62e22f5a2cf8767fb6aee28b236c77d9d41
-EBUILD fugitive-2.2.ebuild 622 BLAKE2B 3e91a7837f49e880b4637662a761297f4189d0c06c73ad2dd411866cd494932a08361c9e55a5ef46c507893b5687b1c25adbc88c07469c95a8c8a0681a59a9a9 SHA512 6853dda72a463010abf304eeed07e68735c2a3da95cb4fe5fca29519b19fd7264ab6f6c3bda1ee607fe5b1c0305e2f4a7497bbf347afe3ea623630067caaf2e7
-EBUILD fugitive-9999.ebuild 622 BLAKE2B 3e91a7837f49e880b4637662a761297f4189d0c06c73ad2dd411866cd494932a08361c9e55a5ef46c507893b5687b1c25adbc88c07469c95a8c8a0681a59a9a9 SHA512 6853dda72a463010abf304eeed07e68735c2a3da95cb4fe5fca29519b19fd7264ab6f6c3bda1ee607fe5b1c0305e2f4a7497bbf347afe3ea623630067caaf2e7
+EBUILD fugitive-2.2.ebuild 623 BLAKE2B 3c7b51661511b4492dd76e7d1cf3976a748df0b33f9b096aaf67bc9f71aa7c44e15a94def16d318082852a7566388d71e842231dcb1648a0b05e1a99f0f96a0b SHA512 fe94a114cb46b74cbcbf65287f97d23a037e1fb9472b1e7039735410ce067f623986e4bcbcf3fcf3df459959fdf09f584a2f0e84a27027de3428e3c9f0ed944c
+EBUILD fugitive-9999.ebuild 623 BLAKE2B 3c7b51661511b4492dd76e7d1cf3976a748df0b33f9b096aaf67bc9f71aa7c44e15a94def16d318082852a7566388d71e842231dcb1648a0b05e1a99f0f96a0b SHA512 fe94a114cb46b74cbcbf65287f97d23a037e1fb9472b1e7039735410ce067f623986e4bcbcf3fcf3df459959fdf09f584a2f0e84a27027de3428e3c9f0ed944c
 MISC metadata.xml 342 BLAKE2B cef6ff7e21df2703dc1c1138f95ad5f8e478a7c6bbd013791fd7c1b1754a2f7eaac9c84ebb42af9cef1943e7a94a880d0cedc030ff95966ac607a1b0b37dc37f SHA512 4ad3c706ea17ef2ab4e6852c6251cec3b8b5b37b687cd3ed87061adbfb791b8786bb5faa4550a73c707a0013ad8981aeda930eba8d74221cc7ca33d110ceb842
diff --git a/app-vim/fugitive/fugitive-2.2.ebuild b/app-vim/fugitive/fugitive-2.2.ebuild
index 71ee67fe65df..5f7552c24ee8 100644
--- a/app-vim/fugitive/fugitive-2.2.ebuild
+++ b/app-vim/fugitive/fugitive-2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ else
 fi
 
 DESCRIPTION="vim plugin: a git wrapper for vim"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/"
 LICENSE="vim"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/fugitive/fugitive-9999.ebuild b/app-vim/fugitive/fugitive-9999.ebuild
index 71ee67fe65df..5f7552c24ee8 100644
--- a/app-vim/fugitive/fugitive-9999.ebuild
+++ b/app-vim/fugitive/fugitive-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ else
 fi
 
 DESCRIPTION="vim plugin: a git wrapper for vim"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/"
 LICENSE="vim"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/fuzzyfinder/Manifest b/app-vim/fuzzyfinder/Manifest
index 52133bb448d2..a76b18e32c63 100644
--- a/app-vim/fuzzyfinder/Manifest
+++ b/app-vim/fuzzyfinder/Manifest
@@ -1,3 +1,3 @@
 DIST fuzzyfinder-4.2.2.zip 66965 BLAKE2B 833d75be61551c776d6d918f0909b4805a4182ace928b448431c39961db999c83b61b4d0be8c6ab14aabeefd430aef857267ed1f1fc83029101198d788a6efd3 SHA512 8a4124ec876bd605fe64c9146afdd591b95d045238fbc0160547942d3c247129cd3a6ad05f23e668b0cd8f5a574192c03bcd3c9406f61625f78c4e32b35bbca3
-EBUILD fuzzyfinder-4.2.2.ebuild 490 BLAKE2B 7b99e8f211cf9b1a34972f0cca25e3e90deb1ecf5b10f5ba836fa9eaa24e028c308279c87faf597dcbdf51d76350babeb5b42efa0c5013b60e383112be297877 SHA512 e76d28f881121970f51dae7bf99a3a060d6949c80e44f5000f3b205b5945fdc85c4d7290ac37b0f296bf92d1a38ca2427af6c15cb984e3259da0f735d8cbd88b
+EBUILD fuzzyfinder-4.2.2.ebuild 492 BLAKE2B 2b1c9eb5a6701bf48d15ee4d61903f63295cbbc5aacd44b72c78cb36a61327824de230ca5589d233473ed6dee7d10d900748d91994c163865b3f990b5e530730 SHA512 04185865af9d40580d5183c20cbe274c339435b8ab29ac5dc68292b41c6e2d267ffe4630a6346bbb942b199b740a14958a0e52dea0934ee0038dc504e1ade310
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/fuzzyfinder/fuzzyfinder-4.2.2.ebuild b/app-vim/fuzzyfinder/fuzzyfinder-4.2.2.ebuild
index 3c1e79f68332..46f399bbb7bc 100644
--- a/app-vim/fuzzyfinder/fuzzyfinder-4.2.2.ebuild
+++ b/app-vim/fuzzyfinder/fuzzyfinder-4.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: buffer/file/command/tag/etc explorer with fuzzy matching"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1984"
-SRC_URI="http://www.vim.org/scripts/download_script.php?src_id=13961 -> ${P}.zip"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1984"
+SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=13961 -> ${P}.zip"
 LICENSE="MIT"
 KEYWORDS="amd64 x86"
 
diff --git a/app-vim/genindent/Manifest b/app-vim/genindent/Manifest
index 555d874de7ec..d6b79d44a8ea 100644
--- a/app-vim/genindent/Manifest
+++ b/app-vim/genindent/Manifest
@@ -1,3 +1,3 @@
 DIST genindent-1.1.tar.bz2 1248 BLAKE2B 761b5285ba8816ec8b64542d9e6784f9d771be8d02fc085dacfc8422dd636be600c44c973089b1922d19e8b2ec0256f66d547f35609db6d3f08eeb0998fb69e2 SHA512 aa90cfc988b08708bb25352b66196191e6cc322f2072a771cf768a0e2ace2e4e193e2e34dc0556266bd84c49055ec1d4183f1aec3d89fffc29f5ded88c26a2af
-EBUILD genindent-1.1-r1.ebuild 509 BLAKE2B 6d2843a8288583a72d398dd2a27cd049e3187c5a20423142d2d1331471fcac4b9b4ce0800d1dabdcc17636fc10c19e8bd7106b1697deae7160fbd236e2bf44fa SHA512 847972fef6273969e4a8e6466139c89ab19278e046ccbb67e4f5ca927bb7c4c6ace9886d0b183ec5cff9acbaf2aa4c1fa5b32ea98a3f3509ed1809bbaab309b7
+EBUILD genindent-1.1-r1.ebuild 510 BLAKE2B fe55619751e34fe4996867d32113ee1a97a4f9980ba376c34ee65e5b7e3359f0eb05418782d2c76f1ef3051959d1db4c101a7462bb7155dc4ba3395f60172960 SHA512 35029df226de286c3cb0432ad872bbb664bf948b7cda43afe6a8466e7aaac6b952ec4d47231d52eb7ad6dd14e45cc7491f5f6f8e1ce034139abd436bf96e1eb0
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/genindent/genindent-1.1-r1.ebuild b/app-vim/genindent/genindent-1.1-r1.ebuild
index 0044e6ce14ae..86333788f2f0 100644
--- a/app-vim/genindent/genindent-1.1-r1.ebuild
+++ b/app-vim/genindent/genindent-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: library for simplifying indent files"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=678"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=678"
 LICENSE="vim"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
diff --git a/app-vim/genutils/Manifest b/app-vim/genutils/Manifest
index 707104045661..8a587a13cb29 100644
--- a/app-vim/genutils/Manifest
+++ b/app-vim/genutils/Manifest
@@ -1,3 +1,3 @@
 DIST genutils-2.5.zip 30510 BLAKE2B 4e9466844efc0cc607b22ed6aca4cb49f1b65ce569e631a2a0c7f4534e433ac70a3b57b18b8de930eb2604169f71e35c4fbca26b4a521a2ee34a48471a6c6240 SHA512 80a751038f629d58ce962a6be7d806cf2b7c35ad28f9d90e58cad32e1e462083629f2069ac23281683db026510d7e3d96d6883027d424fae3de63352b80fc5db
-EBUILD genutils-2.5.ebuild 565 BLAKE2B 59ca1627ebd1a21f65e6aea325bdf7dad37bab0e56885b509f3b43cd7f6aca6f1c63edb6664b80b6bd87d60e9a274a9af17b5db9f9c9d93edc4991935269fd77 SHA512 c3dbf21b42c85b3f25bb74c41ffcbf3f55ff11c59ad848b1f68ff537033f6bb5e60cc6ab7c3c26ed84db37d4b1709263fa0627f51886084f328e9d18df3e5400
+EBUILD genutils-2.5.ebuild 567 BLAKE2B 542af48484cad7edba2febb8aa6694f3e4c508f48ee2cf0b03d81dccf54b200ae384df18fabf19547e75bcf3f8562acad96c814105e98b3673602636e59b5dff SHA512 76d043c8fc73223ae91309490f8834d9c5db03e3ad74457ca4b1985f670caaf5e278fe3fe76b831a7e398483dab7cc8dfff4543ff44f748eb6c2334bf7ac44e8
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/genutils/genutils-2.5.ebuild b/app-vim/genutils/genutils-2.5.ebuild
index b263733bfdce..ad3e2f826c81 100644
--- a/app-vim/genutils/genutils-2.5.ebuild
+++ b/app-vim/genutils/genutils-2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: library with various useful functions"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=197"
-SRC_URI="http://www.vim.org/scripts/download_script.php?src_id=11399 -> ${P}.zip"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=197"
+SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=11399 -> ${P}.zip"
 LICENSE="GPL-3"
 KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
 
diff --git a/app-vim/gist/Manifest b/app-vim/gist/Manifest
index aa489f5c14c0..b946d69f43b7 100644
--- a/app-vim/gist/Manifest
+++ b/app-vim/gist/Manifest
@@ -1,3 +1,3 @@
 DIST gist-7.3.tar.gz 18170 BLAKE2B a6f281f92944203c17037a8ab9cd7e202ad491a11f7e79cf89794bfd94f188ac056c25c138fa98a9d50ebb38223e679b334c79705bf1d063e54f43297db6da40 SHA512 dbd3f638a365c8ee419140d9a934dd2c80fed181910137f61cec3c2d8d61300c21cabc9fdf85d83caa185cf78edb92990e04d49d937cd3fc546b6ae889e5cbb8
-EBUILD gist-7.3.ebuild 640 BLAKE2B 4381e41c38b6a6d3fc16439ac695f023b8c2c87fdada447d4f7e81d0bd7ff16a56b2b6e426a3336e5b04124b05c74d406e725f3f45fde0718750913ca38e624d SHA512 3258719152a1ee8c5ce9533555f957ed7487e1410df435e918e4cb1512e2b6177209b9d7d3b93fd5552cdbe25654dcad1515f68df586a15a0191cfb7ab5a1a4e
+EBUILD gist-7.3.ebuild 641 BLAKE2B 3a103330e9b8a0db424906590d6b2a076f44c9199b486aa482ced1aa473edc5df2effcdbcec9011767828487b07cbc524011e6038d02b74c68c78eacf62d4cac SHA512 bc96c7a8618ad4fd0226c0305187e6f4a1c99f39a63a4e62a50c482bffec89c863c6f4b0c7ab811f75d551d9431a5ebb43bd380894a4951c467054df132161d3
 MISC metadata.xml 328 BLAKE2B d72cba480fcc4b318e2ef5c42f25219aca6b08839b2f52945faf878abecdbb5a04dabd43612c39b48e3c9d24bb154831ad3866e4c187a0c2d7745a642d3f41aa SHA512 c7ecce29dc9fd9a7eaa2ebf61fbb0a191e3309ca87b4473d4aab058ee585287e7f7fbcaee931dda26807ff66fdb7a2b449edf9caf97ac616fcd283f34f24d710
diff --git a/app-vim/gist/gist-7.3.ebuild b/app-vim/gist/gist-7.3.ebuild
index 9bfc10349b4b..adce6ea8f64d 100644
--- a/app-vim/gist/gist-7.3.ebuild
+++ b/app-vim/gist/gist-7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ MY_PN=gist-vim
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="vim plugin: interact with gists (gist.github.com)"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2423 https://github.com/mattn/gist-vim"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2423 https://github.com/mattn/gist-vim"
 SRC_URI="https://github.com/mattn/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 KEYWORDS="amd64 x86 ~x64-macos"
diff --git a/app-vim/git-patch-tags/Manifest b/app-vim/git-patch-tags/Manifest
index 72a5a9f5f9bc..8b61c1941ecb 100644
--- a/app-vim/git-patch-tags/Manifest
+++ b/app-vim/git-patch-tags/Manifest
@@ -1,3 +1,3 @@
 DIST git-patch-tags-0.2.tar.bz2 1508 BLAKE2B 2177c121e549726fdaf50a22d5b55e54ee47297646d2a7109fa5841ae1093516a88794060bd71a885fc257a90d666b41ddfa0d00df8858a110b694503c1502a3 SHA512 63ab541ec77ea70d79ea4e4b441c2f84cb45e0b130c1a57f4f3f1522fd9d7a4a90d137c243ca20733424602d0e75f5079b98b6ce7d39b6d2df185690020dee48
-EBUILD git-patch-tags-0.2.ebuild 355 BLAKE2B f0fc0cdc6f24881969fe6799dccbd4869cadfe46f02cee6f18f2969fe86af62ae520f675b3fe786065eb89f20b8a2b9ebe2e7ef32b7a51aabbaa655a5d2c0087 SHA512 ef7125183c67b5cc1bd80c1a9d191f2e798ad5baeb3d8a19dd8571d391965cb705cec3297f61e840b6cde128ee6d113050442fc8b1a7d71f9ea141f60ceeadb4
+EBUILD git-patch-tags-0.2.ebuild 356 BLAKE2B a51001f6e903e48f77bf788631cbb5bd86141df17371b0f517c17a3be6a026343b7f9888e09d6c7cd2265ee15c29373313868cf9d992231e9133cfb9308ab7d5 SHA512 599a45981b0a0ac07c2b3a6b9b27770cd555ac95ddfe72327de05f5b1060ac40c3a82f39a847b998f70e29ec9862e27520328894676f3743b719163b40bdae98
 MISC metadata.xml 245 BLAKE2B d4f5ef381d0a479a17bfde792cd6828e5fa0ecdd26732c1a13c97fcae2f22396b879fb430aaea7680920d5ba897f78cfbb6e50bb2f65165613a5a0ba1f7dc609 SHA512 6d6d35ccbb839c939bc663cecb55e2178f5fd4e455ee3088b8847416d558dd3e7969f4c78bc445ff29503d6906fec12d302d7249e9adc8cb708d0790e681e5a2
diff --git a/app-vim/git-patch-tags/git-patch-tags-0.2.ebuild b/app-vim/git-patch-tags/git-patch-tags-0.2.ebuild
index 0f8d3a0f1ec8..fc3d10475db3 100644
--- a/app-vim/git-patch-tags/git-patch-tags-0.2.ebuild
+++ b/app-vim/git-patch-tags/git-patch-tags-0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: add git patch tags as used in linux kernel development"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3632"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3632"
 LICENSE="GPL-2+"
 KEYWORDS="~amd64 ~x86"
 
diff --git a/app-vim/gitlog/Manifest b/app-vim/gitlog/Manifest
index 413af27ec91e..7f8672b3352c 100644
--- a/app-vim/gitlog/Manifest
+++ b/app-vim/gitlog/Manifest
@@ -1,6 +1,6 @@
 DIST gitlog-5.1.0.tar.gz 29684 BLAKE2B 80d48890f25015c448a8acfd9ef9fb4da8e39ec61de0741d8fd9e33858a0696336b599b81ff379e0674a084d1bc80a6562721d963b4a5e60b611ff1fd741e867 SHA512 1c2bd363ce5341fcdaa80955af350084903da7e7cac1e20583d05f8812ef11e562137e2ef3bd198f787a6cc1e322f7d942135341c27186a7c987cd9d631a0eeb
 DIST gitlog-6.0.0.tar.gz 33956 BLAKE2B 5a7472db7cbf03396e3ed4e7eea417e44e538946d9432b4d94c3114b59bfeb961c6e0df4137c116f152b57986b7cbaa1aeacd59df33d709f2794f5d2607693c4 SHA512 17016057df69b22e72548d00bd8c253ace864f0551890f64e6b9a91c1411b1e0a479d6c04028583edf9f9c366418b50b758f60d197fe0a62a75c7799b68a4069
-EBUILD gitlog-5.1.0.ebuild 499 BLAKE2B 3d748ff36ffaa452896b9bf0863b475b64ac8d9cb1b84771135f9d36096973a1cec6516c44c8bbf63d5f208e0af9fcffa8826d48c08f046e56533cf77567531e SHA512 99f5de2279eb2004045af925ce6f6e53b46819f413ceb48f60ab96900a359db9e63f23770f8e9f9e63c82eaffaf3aedbf24b66fec40ed3f8f3793b30c1a77b00
-EBUILD gitlog-6.0.0.ebuild 620 BLAKE2B 73de8eb6228514eb9a23fb27e3351fdbd702490012977c5b494400e22c163e0a2d4118b600e7b2888ce8d85b91dd36db13aef97028c874aea50fb7f183d80399 SHA512 dcc80bfb97357f367187a7edb0bb5aa849e8c0f4fd6b138a1ec2df0e4bc4fd9c445040b5334ef5e0cb5856b8a0565a13be83c09e0a7d02aea71e022e77007d59
-EBUILD gitlog-9999.ebuild 620 BLAKE2B 73de8eb6228514eb9a23fb27e3351fdbd702490012977c5b494400e22c163e0a2d4118b600e7b2888ce8d85b91dd36db13aef97028c874aea50fb7f183d80399 SHA512 dcc80bfb97357f367187a7edb0bb5aa849e8c0f4fd6b138a1ec2df0e4bc4fd9c445040b5334ef5e0cb5856b8a0565a13be83c09e0a7d02aea71e022e77007d59
+EBUILD gitlog-5.1.0.ebuild 500 BLAKE2B 6234508aeea1aab566499ba99ce680606094205f1af6a3f0f9cea5be2c4c104ae7a5cc9c2da5b5529e5ac4b4af94ceb95776f5d7ded25aefccb920135cab0db4 SHA512 da8ed526bc9cef86e213a5b2786298ad5f24743ea50a2ccd22575cc90c35694836329203d5090480fb677dbfb10fc365fc7994d897204673560629f3628340aa
+EBUILD gitlog-6.0.0.ebuild 621 BLAKE2B 9f0c0cbe917d08f9e3a75e2ca9921007e41ca3eec8a111d7497ac0e411c858a209bcf0420b7e8e03d145419cc7d22bb1960df1ddde43a439079ef2e197acb111 SHA512 144f2c24bed882dfecd15538eb467e10ae29f29c04380b237725b808a19fe31a5fe4596a9f00a2e6e1a477921c52bcc18752f86b27f76afd7489e2994ec35fde
+EBUILD gitlog-9999.ebuild 621 BLAKE2B 9f0c0cbe917d08f9e3a75e2ca9921007e41ca3eec8a111d7497ac0e411c858a209bcf0420b7e8e03d145419cc7d22bb1960df1ddde43a439079ef2e197acb111 SHA512 144f2c24bed882dfecd15538eb467e10ae29f29c04380b237725b808a19fe31a5fe4596a9f00a2e6e1a477921c52bcc18752f86b27f76afd7489e2994ec35fde
 MISC metadata.xml 342 BLAKE2B c19182db6fcedd6a9b1117db5936015b4e0247e302b3dbf6e39ac1bdab719d9a5ab22706264004c5dfa75712ca9e9223187b10e90663139cf298ea84fcc55771 SHA512 419f19aff509708c460c7848a5e90c03a19c47c986ae6d5d07be0abb3a387a8045f89b98139d2ac0ac5abb16b9b8cd315fe3001a8808a2c1e4ee497449e23a60
diff --git a/app-vim/gitlog/gitlog-5.1.0.ebuild b/app-vim/gitlog/gitlog-5.1.0.ebuild
index f0591aa22ce0..55e58752e730 100644
--- a/app-vim/gitlog/gitlog-5.1.0.ebuild
+++ b/app-vim/gitlog/gitlog-5.1.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: git log and diff plugin for vim"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/"
 SRC_URI="https://github.com/PAntoine/vimgitlog/archive/version_${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Artistic"
 KEYWORDS="amd64 x86"
diff --git a/app-vim/gitlog/gitlog-6.0.0.ebuild b/app-vim/gitlog/gitlog-6.0.0.ebuild
index df4052666bdb..658a3cb149c8 100644
--- a/app-vim/gitlog/gitlog-6.0.0.ebuild
+++ b/app-vim/gitlog/gitlog-6.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ else
 fi
 
 DESCRIPTION="vim plugin: git log and diff plugin for vim"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/"
 LICENSE="Artistic"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/gitlog/gitlog-9999.ebuild b/app-vim/gitlog/gitlog-9999.ebuild
index df4052666bdb..658a3cb149c8 100644
--- a/app-vim/gitlog/gitlog-9999.ebuild
+++ b/app-vim/gitlog/gitlog-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ else
 fi
 
 DESCRIPTION="vim plugin: git log and diff plugin for vim"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/"
 LICENSE="Artistic"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/gitv/Manifest b/app-vim/gitv/Manifest
index cf10deb8b9b2..703ef2073064 100644
--- a/app-vim/gitv/Manifest
+++ b/app-vim/gitv/Manifest
@@ -1,4 +1,4 @@
 DIST gitv-1.3.1.tar.gz 553719 BLAKE2B 0d775f3bb05b3a49b69c5717f13a0f923fc5e0b5366c217042ac75e13c01080828ae4cd3e759e7dca44556c2b07aafa42cf8661a3ad0f52152c5cb8f4db294ed SHA512 e6a6773dcac18fdc36c891bd592d4dcb2eb20af6253df5886582fd223e040fb8296dc606d4fb25abd7a14f9dc1a712fe0e354821e234c8f54b1b5914af55dcbc
-EBUILD gitv-1.3.1.ebuild 683 BLAKE2B 34ffc9b06cf75b9d4677f55803ad7e742663b9e3661da268cf258b28a15637a3cb6d5a130fc433787af213ffd0c44a3144b5f5f5e63522fdfefb0ea1d54af4f9 SHA512 437e9ede3da5d52016e35fce2c2e2b3430bb0ac5b60e3ba0c9d7e09e92db7c3c26dfad421205f568438cba3a910b6fe762f3fc6d5fd217ea4a26577f8ae9fcf7
-EBUILD gitv-9999.ebuild 682 BLAKE2B b9761e16099f38f3b3dd5ca3a482a291063e3cf7bce09b94d6030adc91b6ce2046c798fde73d769a59a7da42029d331852f1423cf3c3dbe54a325679a4389dcf SHA512 6dac563def9f199a5dbe20070ea2656fab379fbd5fbdfdc7b3bab667b082950220ae39c8028b74374a24192a3f16002a2fbf3212158fe86c71627d1f9d97d52d
+EBUILD gitv-1.3.1.ebuild 684 BLAKE2B 2bc4aa2ca505cdbdc6ffae142b2905357e7054d0ce647bc7d5475f123c7756337e8460c38fb3d44fa6e43a13104bf20944ba8258b1c0bb9f76988315378c88fd SHA512 574878dc0b2f68da9bd39ad5467b343420e91ccd4fca3f5c69a7b75c837669a074dbfd54ed91cd7cfa7159a3301afad86091503c822e1808a6a34708ea62a778
+EBUILD gitv-9999.ebuild 683 BLAKE2B e2ceb93cb9bbd70a5764b7f93342e878caa463f639cb7ebf907ec230d1107977537df3298ec0d25d826330aa95aa4ebff6d3a5026fe49632b3d6d5eb74c0d651 SHA512 d42619dd5673761810cc3c5ceb434c9eaeb8bf5f39e5ea4e5909387a8cd79699320217a02edc14230a5b425683ece201fefcbdfa080842da87aca415ac842dd5
 MISC metadata.xml 339 BLAKE2B 7fcb97cc60c38b475e6ba392f55db1643e547903aa5f58ab5f81573681da85cba73e18de25dc3896321a971e99b44677322db3dda99afe1200ced4bfa49dcdf6 SHA512 ca3cb18c58b214701105d230d86f6499c1df741d0631483991465daa0680e3c3a8c2adb9440d828b98cf73fb598bcf33b4eb31ade16fe7faf31210663742344e
diff --git a/app-vim/gitv/gitv-1.3.1.ebuild b/app-vim/gitv/gitv-1.3.1.ebuild
index 32b603a8c921..0c83e952b99e 100644
--- a/app-vim/gitv/gitv-1.3.1.ebuild
+++ b/app-vim/gitv/gitv-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ else
 fi
 
 DESCRIPTION="vim plugin: gitk for vim"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3574 https://github.com/gregsexton/gitv/"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3574 https://github.com/gregsexton/gitv/"
 LICENSE="vim"
 
 VIM_PLUGIN_HELPFILES="gitv"
diff --git a/app-vim/gitv/gitv-9999.ebuild b/app-vim/gitv/gitv-9999.ebuild
index a772cbef62f2..665594feb07b 100644
--- a/app-vim/gitv/gitv-9999.ebuild
+++ b/app-vim/gitv/gitv-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ else
 fi
 
 DESCRIPTION="vim plugin: gitk for vim"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3574 https://github.com/gregsexton/gitv/"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3574 https://github.com/gregsexton/gitv/"
 LICENSE="vim"
 
 VIM_PLUGIN_HELPFILES="gitv"
diff --git a/app-vim/gnupg/Manifest b/app-vim/gnupg/Manifest
index 58516a204642..57635c8c8bd9 100644
--- a/app-vim/gnupg/Manifest
+++ b/app-vim/gnupg/Manifest
@@ -1,3 +1,3 @@
 DIST gnupg-2.6.tar.bz2 12074 BLAKE2B d06e4637627187e1d276c3b485e22b35f0cba78a491d34f0884da7ad320f12a3443e40a7c0e7e3f27be03984380eb966d593a283d768bb834a1fefed05656dd3 SHA512 1b7307954aad751006286edebb80767951b9bd9a8eff4c4a57fa6030cb442ceca12730a82c76a2181e1da19cc4cc8be21ccd4f8a21817aedf42785d8ff4b61ac
-EBUILD gnupg-2.6.ebuild 770 BLAKE2B 279823dc95a4eb76543a078404cd483dbc6da75b009064ed227d15ea2731604baa678491f647e46abd2003ae4655bf23ba13d6ee41c5bc416dfe907fb942f017 SHA512 c9856be7cfc7ecfc4769c4a153103334aa258d21673987f27f316ed2c21a3894ea547fee0db50fff2dacb210b015ccbc711a91c397e26c229813f0bce5241790
+EBUILD gnupg-2.6.ebuild 771 BLAKE2B f3767681669d829f63e517e3919e5921c8903f231dc7138470cab808c2d82ba7a5681ad8210d0cb279af7e33bda6ad227792a9d8c24ceaf1e9172ad6b1f227f5 SHA512 16533f194b0f5f78afaf278f4722317c71cace8db2982d6d759070b079ed72c73ebaaaa38d6654b272328c9b4281a02b1ffa100262e1c6aaff457896a67e06f2
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/gnupg/gnupg-2.6.ebuild b/app-vim/gnupg/gnupg-2.6.ebuild
index 9729d06a6e81..ef344bdcf3f9 100644
--- a/app-vim/gnupg/gnupg-2.6.ebuild
+++ b/app-vim/gnupg/gnupg-2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="transparent editing of gpg encrypted files"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3645"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3645"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ~arm x86"
 
diff --git a/app-vim/greputils/Manifest b/app-vim/greputils/Manifest
index 7c0f301bac47..8aac9b20804e 100644
--- a/app-vim/greputils/Manifest
+++ b/app-vim/greputils/Manifest
@@ -1,3 +1,3 @@
 DIST greputils-2.8.tar.bz2 11886 BLAKE2B 7c1a8c08393d50d044203b8190c5ce35fa75b5ab6e2b18a6e5ad2eb679ac4685c92c336fe347e03db230a6f3a459d7acfac9f4e0161ca4adb17ee90192b38641 SHA512 07a7b22a900860b982bb0596232892ad056472fa48447131ba56083caef00318886719f379c9f9296fc00fd54575ab16aae71b3d1adf2af5d05a11a45a2bd7f9
-EBUILD greputils-2.8-r1.ebuild 479 BLAKE2B 16b6a0b5accee7e25a9ab332711145c3614700709735e510f32060831868eee91e90ab5414fb174fdbb5c8e6a9dd3b4ebf232b9d6de767d9e87fd7a872ab99a1 SHA512 46f3e17fd138f3902a60267d0a69602171835b7ceeb67afd7999728c06ac65c6e68263a52205727ff37ddf60fb7bc59e172e497d0f5f22ac3a8916ab22360a53
+EBUILD greputils-2.8-r1.ebuild 480 BLAKE2B 67e8437109fb5e09c370408acaea2d85d714a0448dcbb72b3680b5180733932e5f105cad46be7b072dbdf5015617d4ea7df552cf3cf838ac77db8d8c5cf4abc6 SHA512 ce50fbabacdd0264b1907d46fda725e9e989abd0ab2c4a8be8b31eef3be687491fbd5e60e045a2a66ddae0d9744bb6591ad00c8de621ca565417c7e9b7802282
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/greputils/greputils-2.8-r1.ebuild b/app-vim/greputils/greputils-2.8-r1.ebuild
index 08131ea52566..ad6fb677b12c 100644
--- a/app-vim/greputils/greputils-2.8-r1.ebuild
+++ b/app-vim/greputils/greputils-2.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: interface with grep, find and id-utils"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1062"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1062"
 LICENSE="GPL-2"
 KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
 IUSE=""
diff --git a/app-vim/gtk-syntax/Manifest b/app-vim/gtk-syntax/Manifest
index 7cd105dd8e78..f2e7181d354c 100644
--- a/app-vim/gtk-syntax/Manifest
+++ b/app-vim/gtk-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST gtk-syntax-20130716.tar.bz2 234878 BLAKE2B 0d412e1a04f4cfa0303108bf7e83e21332e1ef4d84f6f65054b860db032aa65bcc0c1ae827ba4968e650114343eeb444bbf9e985e6c4cf8cf4f69b957936a100 SHA512 a90bdf84765ebaf10946b974c7720ebb9366f7ae5e360c8254ffd54bf9eacf1d0e35cf2061ef42727ffd7df3b4d78bb9e5f3ab7392180c435f8eef06c81ff5da
-EBUILD gtk-syntax-20130716.ebuild 465 BLAKE2B f3e9780b668ef129c99df35735650fac32401ce02df7de2675feb1362852ddf796faac4da9d6868c911ba233194942fb5b2d48430936abe263b152eb15b71f83 SHA512 9ab81b8c230dc4888cf6fda9e412c9cdc7d02cca16095246d48090dcea489048d055dd8a2b8d8e1c1f09ab755e3018d4bdaefdce8fbf7cf160bfcbdd72eb837d
+EBUILD gtk-syntax-20130716.ebuild 466 BLAKE2B e201ec0e17a09e3176aa39107b929f096396369572b37356c0fdc78bc833e5a915d605e3811acab0ee2424ca74a148d04eaabf4b93c1207409bb2673e6d9a9c9 SHA512 e66853cb49eeb3a3c3de4c2e6d0fec15ab1547f311370db6c1cba2529c87af176df751845104c8cdfa0b0bb2e92b479ef9472eb345ebf1d2277ef6a971b28b3a
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild b/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild
index 7a23163b982d..6b9d88d9d658 100644
--- a/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild
+++ b/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,6 +6,6 @@ EAPI=5
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: Syntax highlighting for GLib, Gtk+, Xlib, Gimp, Gnome, and more"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1000"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1000"
 LICENSE="vim"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
diff --git a/app-vim/increment/Manifest b/app-vim/increment/Manifest
index 51aeca58f9e3..07d60f4f91ff 100644
--- a/app-vim/increment/Manifest
+++ b/app-vim/increment/Manifest
@@ -1,3 +1,3 @@
 DIST increment-1.1.tar.bz2 3058 BLAKE2B d079e0fa180b68a0616ffdf5b2ca86496f7aca2ab2e69e27e16a56dda49c96eed0ad7c53e0a0aabc9b29fcb0895247987afb28282477247046e07bb3f01630b6 SHA512 eae4fd492c02e83556646df35c57a50c07a09ea3c9cca0c8d8e15b8a49b621007e3952c23dc997d99d22dd8352852d98332180aa299ecdd4e53ffdafdc6b7a30
-EBUILD increment-1.1-r1.ebuild 378 BLAKE2B 957352e0c4e57322b7c57af9678464819b62644dd34cebda842ef5d4c26c89c9459ea8bcd81e1fd4e6e5313f5ff8ca4625c90d32047f08fe4b576bf46cabac9a SHA512 4d4b7e7c514e3bfb779d3d35ac3fbc0c39f10f316c7273498037ecbce61381c392d4caaecf62c1c482ba7414260f844b70c106e5f96274708422898ee57f427e
+EBUILD increment-1.1-r1.ebuild 379 BLAKE2B cee4fc85bc0549e5f892978f0208d74fb10cab6d82d7f54bfb578d937b34fd19b96240a676e65e275820a873a6d5bdae8a70c30d60191a56bdf085a7b8afde88 SHA512 090717ee116381d9e2b6b215a331c2055d543cf0be315e999bd606e13975115e63062675d1f18a728adaa8d9d498e586de5af997d4298355fb7751346151c649
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/increment/increment-1.1-r1.ebuild b/app-vim/increment/increment-1.1-r1.ebuild
index 25c0c7e7989c..12e6a64a35e8 100644
--- a/app-vim/increment/increment-1.1-r1.ebuild
+++ b/app-vim/increment/increment-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: easily create sequences of incremented values"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=842"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=842"
 
 LICENSE="vim.org"
 KEYWORDS="alpha amd64 ia64 ppc sparc x86"
diff --git a/app-vim/indentpython/Manifest b/app-vim/indentpython/Manifest
index 88244d6c9e48..5bf88dc6bee5 100644
--- a/app-vim/indentpython/Manifest
+++ b/app-vim/indentpython/Manifest
@@ -1,3 +1,3 @@
 DIST indentpython-0.3.zip 2682 BLAKE2B 0c803921ce23796dc48792a2e55ab721edd86d690e75df35e646cb71c53d32e3aa37870e2840b2363bb1ae277d4e35631a1b6d0d1735a62374b4fbc6e14154d9 SHA512 d358579357d5197dc035816b02557b8e84d5f0c85fb6433d171b9880e211dee75ef6f5fd7a37651677591c6c31a570c39094d6bbd5052a29ef344ec18b0e13c5
-EBUILD indentpython-0.3.ebuild 449 BLAKE2B 5c522d05eae114209dc631887f88844150a70d373808868829166f222f5761d32ed376aa17e0e4c8f414d88003647db768eeedc707e917c4767532c36852ef53 SHA512 c378174dacf9d514a2eaa3cc6b5714a9c29e58c30daca71c92f4287a1c6026732cc06b5c1613c520c79267d7a69c106c520ca2f84b06ce5d92953ee580490f39
+EBUILD indentpython-0.3.ebuild 450 BLAKE2B 20ff5fd3e6ed5af3832fb3eb13360155e373d545332982131effb344e8ff9a23984f7a790f78e22ac081d65899fa9db4756dc5638e07417099ffa645b905bc20 SHA512 d28ec498ac1ae50d043df161b8f053d7443ccf649c2606600d00b7927e2a13c1d2309b7f6c9fcaafdbb5d0168843c3864fb4c7af62e6b2c75dfdefa7fe8afdd3
 MISC metadata.xml 437 BLAKE2B 302eee78ee54aea1ade2aa9206518258d8d4d8d2382ff7f5ce786c404561aa049f0e9a1b50330fe54d3c3432d688a7ddda193161d38dc43559278f802c378d3f SHA512 a6dc546a8b543e5e568f0dace43860187d1ea909b614ade44ecf3eb6cc03507b77fd4f62da85284c191b7007376ac31ca9933171983df84b5da04bfdb8424ac7
diff --git a/app-vim/indentpython/indentpython-0.3.ebuild b/app-vim/indentpython/indentpython-0.3.ebuild
index ec5e9935e3cd..2f897aa847fc 100644
--- a/app-vim/indentpython/indentpython-0.3.ebuild
+++ b/app-vim/indentpython/indentpython-0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: Indent Python code according to PEP8"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=974"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=974"
 SRC_URI="https://github.com/vim-scripts/${PN}.vim/archive/${PV}.zip -> ${P}.zip"
 LICENSE="vim.org"
 KEYWORDS="amd64 ppc ppc64 x86"
diff --git a/app-vim/info/Manifest b/app-vim/info/Manifest
index 12377d5615c0..8423a12edb0e 100644
--- a/app-vim/info/Manifest
+++ b/app-vim/info/Manifest
@@ -1,3 +1,3 @@
 DIST info-1.7.tar.bz2 3958 BLAKE2B 23c8f8e06e923adc6d97ac578331cd5669dfe54ba7dc470c07426dbcf475cab4cf66ceb60a1f1b79c0fc12109db4ed3fee575bde56de221a9ebf8fe99dca9d63 SHA512 8d1d00b844a7485544fe02e17a3938a08b25be8cea7cf9f5e139be5b1f1f1b37abed8d717e149154d7bb87028f4d7e94b1ded844a6f83e8e645da2a214eaa81e
-EBUILD info-1.7-r2.ebuild 635 BLAKE2B 59701e67319fee6ffb29595b8ee25f3018d71960321b7030dca3a7dd63a40f5427dfd98a65d164ec18d231f77eb030d28275f35d378108b615cef0a2fd897bc8 SHA512 07caaae100964922f67f01892fef1ca37247b5b6b9cd40928b5fbccd6690cce487ef03ec3fbd06ab072bc18fd617cf70d7352408f37bad8af0900892aa78c7b9
+EBUILD info-1.7-r2.ebuild 636 BLAKE2B 76a4c9418a2fdfc4368892b766f45b6d2204c130ea6006909a0f2e5a8dab1dd75c08e51f7c2b1f860e0f8765cb857632b522ad62645aa4ebdb4f74fbdf42cefd SHA512 bd646d479f4a8f15f2e2184b9e1b2e8aa311d13c64cab5976857954a8ddd8583def80d431ac03259d723a6a8e462ab4c987db12115f890cbd830a81357121738
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/info/info-1.7-r2.ebuild b/app-vim/info/info-1.7-r2.ebuild
index fdc870f23c28..5f80fab54390 100644
--- a/app-vim/info/info-1.7-r2.ebuild
+++ b/app-vim/info/info-1.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: GNU info documentation browser"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=21"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=21"
 LICENSE="BSD"
 KEYWORDS="x86 alpha sparc ia64 ppc s390 amd64"
 IUSE=""
diff --git a/app-xemacs/Manifest.gz b/app-xemacs/Manifest.gz
index f77cf3dfc5bb..ddaee495e06d 100644
Binary files a/app-xemacs/Manifest.gz and b/app-xemacs/Manifest.gz differ
diff --git a/app-xemacs/ebuild-mode/Manifest b/app-xemacs/ebuild-mode/Manifest
index 449e5ebbfc44..3ec1a12f8f8c 100644
--- a/app-xemacs/ebuild-mode/Manifest
+++ b/app-xemacs/ebuild-mode/Manifest
@@ -1,5 +1,5 @@
 DIST ebuild-mode-1.38.tar.xz 30744 BLAKE2B a147fbb462f0e1a2ba3272c74b12c9357200b0ca6671d75263547d7b777489772504c9fda634a797fecff8dce35e40b7bb579cdbd9a7da99f68f74b08a48a4da SHA512 bfcc4fb100f7d9299e9b466c7661e865f9b93ee352780da1647f1a98159fe3e9eeb8cd4b7d1d9906d532316d1256ec7b6f821cac3d064cda15f2fd62ca7cb349
 DIST ebuild-mode-1.42.tar.xz 34936 BLAKE2B dd94d17dc57e2d32b329ab62ec6eec8ada6a4aeddadb8d978736f5dcb4d613759fd860043cab92d12db11614f8b7fa71fc5537576a2af3f5e6c9d56fc2fdcc05 SHA512 119f954eaf009bd0c9f0a75810b94a54d65ed91c6ffef20dd164c7a5ef095410dd0f3642426817f5efa6623d4f3e120ed3b27076222b02a90e75a83bb80b8703
 EBUILD ebuild-mode-1.38.ebuild 662 BLAKE2B 08e6f672a151cbb8fd073e96b2699fb193ab97880a2c23a20cf7d93fd88de8e0fc17fa98fd11be4250de912b4d99105c2c2f2d433a76f0b6273047dafd635f4c SHA512 1c9202c08e99ca94de61d887d13699d391799a26f0946d0ec3af109d13163e40413bedda9466c88a04e7ef14475cfb5d7c56c3678c81a4e35e4540c15474653f
-EBUILD ebuild-mode-1.42.ebuild 702 BLAKE2B 3917cdc93e5c0060b598dc1e014b6a0571c1a2299a99644dbc32e55b5ac54e2eca437928eb68398f24e21cf98d31c4df874cbca6a407f45efdfcad5138f29de5 SHA512 2cc41d56bf3f7a9b5d7baf7607d7fa4bba6a541e3fdee1c96c4b9bf2238a8375415415da5130b06d9d5dfa0a88e143188a4a238f8fe2e9a72b015f36691f0845
+EBUILD ebuild-mode-1.42.ebuild 701 BLAKE2B 86958778803270973daf212b36336a12fc51d771f0056c34a710fbd51d7b262e9fc264980116e0dd8bfb49511d8b09061afa3ae58c548f542daec0e9cab30112 SHA512 17ba5cdfa3c72436f963641afd15fedbc2b28d37ff00a4e39565cf9c0e66a08cbb9ba0c2677bdecb40b894f7a03b7037682d4bae93412c8e1a15bcda68584b38
 MISC metadata.xml 417 BLAKE2B d442b7726c175c95922475904d9dbb6260ecf53140bf041121fed80c3183142bdf7bcc88f7f87eeeab0dd91a81eacf507e2c4ea8cc8f86dbf6b60c52fcec868d SHA512 459969f9a78209b1058fb5fed220192bddd532c9dabc8e5d340c040bef0e454f08fe3896b33bcddaa011fd4639351f6f6a33ba6669895e99e001810324c101ad
diff --git a/app-xemacs/ebuild-mode/ebuild-mode-1.42.ebuild b/app-xemacs/ebuild-mode/ebuild-mode-1.42.ebuild
index 837d22497799..220700b9f7ea 100644
--- a/app-xemacs/ebuild-mode/ebuild-mode-1.42.ebuild
+++ b/app-xemacs/ebuild-mode/ebuild-mode-1.42.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa x86"
+KEYWORDS="amd64 ~hppa x86"
 
 RDEPEND=">=app-editors/xemacs-21.4.20-r5
 	app-xemacs/sh-script"
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index b2e8761b0291..bb4a3d06df87 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index 4da78d0bf102..f36f15e9692e 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -1,5 +1,5 @@
 DIST glibmm-2.50.1.tar.xz 6444576 BLAKE2B dbbdb79d8de9510f9bec770523ca7f4c93d287cbd9890b2fbc08712f6a2815186ee792f6339820a14aa9e4d49c9d1735c6c6651994cc4e03549f0d96b33f87ad SHA512 4f25c75c1628ca2f4db1c29cebc63187d372603066b06aa6a66c6da792f9e02cb4a413e41f058a81e2d5a2b38d625de13df76115b278f010ce2fc493fe6e6bbb
 DIST glibmm-2.52.1.tar.xz 6451164 BLAKE2B 740178b51a2263ecc4778833fa6f2fd3913cdfc4e93b1a732a1b0ec9d43eb4ed60ab6bea48e02081d75a3ec1f98a149ebff47ced54dcce07e7ae011b2d20452d SHA512 702158762cb28972b315ab98dc00a62e532bda08b6e76dc2a2556e8cb381c2021290891887a4af2fbff5a62bab4d50581be73037dc8e0dc47d5febd6cbeb7bda
 EBUILD glibmm-2.50.1.ebuild 1636 BLAKE2B cedaf300eff88a5df1e9b758ba425ad29547642a5c345715a5196b8904f1f5dba0b5c85fd7d5424c2044c9832cf817758cb0086d9deb92484484c1316a4f417b SHA512 d8c11ace8919ff16e950798269d88f83bdde55377f66ba34e47947acbb856273b42bae549393055997ce02077aaf281b1238f6a2a2d4c706d24293d9b64317d3
-EBUILD glibmm-2.52.1.ebuild 1641 BLAKE2B 3063031d75a3c739e7167927d3ba62f5a636268163073e71bc23848362d454d9839fe29956a787c7ae584d61c672cb0fec892dbaf3c025b6083440f8ee38df2a SHA512 91b048853e3c9047736c8bc9a152cc3320fe7f34a96619ba8623403b456ef840a254a7ea739e239ce45f1fb66100d7afb86b5e58b5a2241adef505e9648b5414
+EBUILD glibmm-2.52.1.ebuild 1640 BLAKE2B 0b1dbf6d90a32bb944691a8571b2960f9586c7932b97495e7e8f7e5e018df1ff76624809f66ddd95f7e1716153168c3b5cfc9a89c496f23dde574a95e2c3b08b SHA512 7ef02e6172b897594396a1f7eba85248cf7008b194465e95945f7f0c7877a0b90f5a9534a8f153a5bb687998956d1b0f08e30bf66b92a782aaa64cde84f71264
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/glibmm/glibmm-2.52.1.ebuild b/dev-cpp/glibmm/glibmm-2.52.1.ebuild
index 573b5221462a..4746c0579c1d 100644
--- a/dev-cpp/glibmm/glibmm-2.52.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.52.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc debug test"
 
 RDEPEND="
diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index 7cbce604ef61..056650409be3 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -7,7 +7,7 @@ AUX gtest-9999-fix-py-tests.patch 820 BLAKE2B a6a860b6935bd5f0bbe720f5af741448dd
 DIST gtest-1.7.0.tar.gz 1001582 BLAKE2B 3d10c1e502c2fac1500d07301031a9328b29027a3f9719137e09d2c47556cf52bbc978a8fb7b37330a94beafa27d24c3bfc247b2f0d51306b53f43e7ae2373b4 SHA512 a9f5c047b39efb2d11b55ee9913662ca402ac6837b3ad2d278ecfbd1caf32ed4546f169e3e92503d57bf3b62ccf89cd062da1c7ea3638aae98e868d2766363c3
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
 EBUILD gtest-1.7.0-r1.ebuild 1249 BLAKE2B e3b607997c3a936ed65ffd668d543e512b3aaab230499d3a209950c0ec753c4778ede5c8c67dfb77ba7bba35550813830daa60e602e19ede1b5b95aa98ff8213 SHA512 8e82ff1bcd3e53edfd9823e90ae13484ace2a649a5ab775998e05b98d7fc7246af2bd11a8bbf74aab8e4cc6b9913c34f019befaeee34778262cf88aa7b9cd2ef
-EBUILD gtest-1.8.0-r1.ebuild 1681 BLAKE2B 07485c1409ce25923c4f73f5f4b185c78cee3a7799f7c1b42bfdcea10b5990f0794c20154b1246dd470ed9e8b19369cd4c2ead0db1bfe15170c850b4bf25d765 SHA512 78be0307fb7015a6ad851e0ee6c5b5b4627efcf6c70feba8256e1e92f14890964f4e51e1813d8d75cf2d54f3159034537269b33e07431d932fa5d65e6184dc1c
+EBUILD gtest-1.8.0-r1.ebuild 1680 BLAKE2B 75398ebb76ab2c0586c8b9648955ae76b44e2d8ea31c5fcc5da5f0c0f7b7fa36c784f75fd559de8b5afc21f788f2366be05955dad3a83d1923b39d456c2f3034 SHA512 3d59c76252c6778dcc1fc4de5062b01a1aca3e18ca80b3314e0b5b47c74ccf3384f601e3ab3600b30727d76093a7133c51f8850f89adc8646a4eea664c778b6b
 EBUILD gtest-1.8.0.ebuild 1637 BLAKE2B 15153bf61b468799c48c25b300794eb3cf93d9751ead2d50d2dda59f09a4c5ea1c6a319083290cb3a93a983ee2552a3162a9c770e724907427533cfd8e7aafd9 SHA512 ac3680806d6e30e926ef29ab24042d419cd4c872b6a7d4d11b75bb50ccf64c6f029b8c59800dd92f3c5e2a8a72b4840277b4750eae8bc46021e44fc95845670b
 EBUILD gtest-9999.ebuild 1826 BLAKE2B 8751e8332d63e36f30d1bc10782c2103e7a40b0f9a454bf29cb92ec92502221cb74aee2158f54b2fb634aa119c6fd1d7faf496fac4569e7ce461205f805123b7 SHA512 9a31a176bba34993a6bbc56dd0cbc0a3b78b293c4d850a0471968c8759fd58a3ebaa1922b2eb293810a697b85894c1daee5d125a42013b6356b9a04596d21114
 MISC metadata.xml 535 BLAKE2B 892f380ec413ae33de5821d911bf34fc9e3d0e76cdc833a38c66ed85dece1f6efeec56d8f78c655c9a083e7152f1d24c018184d1e679612de43690665d2c0518 SHA512 68daeade4eb4fec4a42ec039ff000a025c48708f2aed23ebf4495b653567611342893ce79d6163d5276638af9e9915abc2cc6c2d6d07db2e86681e4049b77f81
diff --git a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild b/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
index 529cbe3e1e13..1b0a7ca6bc13 100644
--- a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
+++ b/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/google/googletest/archive/release-${PV}.tar.gz -> ${
 
 LICENSE="BSD"
 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"
+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"
 IUSE="doc examples test"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 3aa035d7115d..dc7f235f7c51 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 2c48a76e6878..6fa4565cc070 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -5,40 +5,27 @@ AUX my.cnf-5.6 4579 BLAKE2B 5d3bac1e59b6f0ca798c334dd72f7ad1d17168166e8e6d088aeb
 AUX my.cnf.distro-client 637 BLAKE2B b9b6b01195a4e2523a0a1cb7efdf5c35579d394b12b7426cc7f2e65485d8c5bd54622b096be12fb9c1b252fc7311278d79ff922ba9332074e4f06419c5dba68e SHA512 85c0b0eb4281b398ca7c010042d69b4306ccebae9838bf7a1ee53c0d6bb12b20f95bcbd3bb359b107b018d456d7bcae8d168757ff34028ce69357ce3f3fbd54e
 AUX my.cnf.distro-server 998 BLAKE2B a7f2977a96d394cb7e24d72d82a1c21095c4b55607e5ca4a2c10619278796c328931a5ec076c15b60afef370c2e5da02ca0c628f330e876b4d2c984eeb54df5f SHA512 d9ab6f7fdfe08e6c242f84410ec680ef6aa6778c4bd55fee67c644e1a7d997446d8ef2129be6fc9833d16fe40cf17e09cdf0cf015f06bb145bbf9cfecb51e882
 DIST mariadb-10.0.30.tar.gz 63433598 BLAKE2B ccf5b1650a4134cdcdd99bf52b0e6441f3255a938bddc050418ac8766e8301dadde92e7a349fa6f0b9338304790121ace7d5da9fe8bb86f2ed553f37809c8daa SHA512 b9f4bdf2b19edc661c80b0c19b09979ad765e6a7f76e038436660d29bc05c2c9882c39f557aa407828ba2917632a9a0f6a96090279912e78f04b54ca2d9f14e7
-DIST mariadb-10.0.32.tar.gz 63567828 BLAKE2B c12e5be440ff23ed600a159a22c0f925dc5308fff3f1f832c215cd32cdfad9224d03b4af8603fb7b13162ece8373b891e5c91d8c846ff55a34011e74b1d58c20 SHA512 e1ecfc2b819b5ffa72fc0d4131fc9d7b6811919e10f15608830611028746580731c653a6b3eb43c92640cd29716b6278f48d27af5322dd2084f2d5f356e6f628
 DIST mariadb-10.0.33.tar.gz 69211872 BLAKE2B 02efa97a75ff13655e9a6d6ba562c4d14bd749b4873ac2f783f32494104f00517c2af63805afa552b6ba707aa412d61b8b3561d5d4d534bf9ad5c6f67b33cfe4 SHA512 9369399553ab336ba1ab20393b69fe5ba49e88ff86d9a448034a9d521e8d85216eb1093e040dd893fc2fb15344da3d57995074bd489be66a3b1457abab097104
 DIST mariadb-10.0.34.tar.gz 69266294 BLAKE2B ee8157d1b4d5d4cc096159efb3a20321486092eb28f35d120ee99b2260e52f46d1803b62df29a4fc905de23aa009dbb4666e8457903d97d5fdb14dcbfdda4b2c SHA512 46539ef37ec3b2fb00e7d546f3bbfe48eb86d0403d33e50b1bca40c145d69ca3ac8ddaa72ddb0c1f0aa41f3177aedfe1c6c0bdb7949d47efe49aed3ed52bd47b
 DIST mariadb-10.1.24.tar.gz 61780687 BLAKE2B 38df67a1b26aab559e41f44b129f2e57388634b80a8b10637744c3d11f9cad15329c9a1725cb836f7249352d5bdf9471bc9c3f254e1ef96229716543f235f7ed SHA512 0b8d81b53f6866a81f33559ce57ebf956fec3ba25da0bd58c8bee3b2ecc00a6c370340000209d18463f84501d3ba35994b51ef99224616c37cd38d2fc87b73e9
-DIST mariadb-10.1.26.tar.gz 61887132 BLAKE2B 2397e9d0b0f7dd126ff6b50a90996da734a30b6e49028dd2ad06c93b70faa0415184ce66840fc8d92a974acd0013f5cc1b2e7d1dc8214136a95d354ae2272bb7 SHA512 a7505c579728b58eb6a92bdee1f5dfea5c10c8389cb7a31eb99fe2c6bc416593925cf9708d3dec91ede12eb4e232098a0833af2185bdd60bc593c89d255f3c0b
 DIST mariadb-10.1.29.tar.gz 67885370 BLAKE2B 40b94ed519522f16ee4687a9c569a0e52632d2aeccf65b87070de31118bf5e719cce78cf36afd4f1386166b14e418e0262ffbc3a61098c95e6ee101faf871ec5 SHA512 c169dfa2878f9fa9e0e9d12ca79fcbfa644e9b51bb0b78b8dd51d6c5679f3184d139fa96a1ddb25f3ae5d1c0489708c2c624f96a24020f77bf7e5247fac45ecd
-DIST mariadb-10.1.30.tar.gz 67930015 BLAKE2B faa36733f617f1c867124335cbac0a38cbb626444b90068ee2b52ac63602d1526d9016868fa43c833f114b8c56ed6bf3c9a38c9b4601dec729f22650d21080d3 SHA512 3b123cc04e4bb09d86b7cee2caa21cc8f94b1b562d8762137565a7fa173385b87fc31f7ca4e15ce85c6a1cb45bdca2216d4c49347b75248e2b60b3438b7cc15c
 DIST mariadb-10.1.31.tar.gz 67982786 BLAKE2B 1fabbea67345024157be4be34a50c4e9c73b1a60def452321b6e9209d9fb16aace92e7ab1c37c168e5c9f6c52b623245e9df3171ce3f84e8fd0e840948b3e57f SHA512 db37ddb8ae5daf35b37d5132860c19c4a9b51c40005d05c5107f956ac5b4ecd447375b6f3a09bf59ea5aef2f4009314ed6e969ca2ac516722702b4da286dbd89
-DIST mariadb-10.2.10.tar.gz 72388999 BLAKE2B 8d9188672b9250d47859fb0c050eb22b31b99046cf70aac334e26bc34759a73f1f4ab60c5d0437e113e21b213492202d5b5950337ba09590308bbb2bb9179581 SHA512 39c198009f8b19f4a08226ef9842b50e24636580b67c1c92d59c61cce3aa1edbd466e253c281dfcdfc58ab573ae9a59aaacb0ce3e8b82222043ddd849fc3e239
-DIST mariadb-10.2.11.tar.gz 72772830 BLAKE2B b3cd346ed1e032ed61e4499e1e6fb2adb0f0e959c296917fb55240922904872cb5d7836be8ee0ed744a753d1ae6310e537f4366209e0ce0627073b68076fe2d7 SHA512 4041ee1f1e266e8b30f85b19c5c95bcb626f965df9e0e20eb801598cc7fc5f5f37906e8a75cc86d373aa642adcccf3b75a0e67994e18908fb733cc6520d04a44
 DIST mariadb-10.2.12.tar.gz 72818636 BLAKE2B 50a72b8096ae8bd5dc635352fc35d22322a0d7cf415e45883898307050ec547a79c66d51ab0ce311f1895eb178afeb49664fb434af77f9ff2b9aedef0aea85bc SHA512 8d3d3c84d4a01d6047e4f2b6802eb802e1f6a7b0e10e981c7ef9fdd27a5a25baab0af47a21b8637f4cbb9d21ef3bcc85097c5fdb8745c2a79040ab87fecb5a7b
 DIST mariadb-10.3.5.tar.gz 70945381 BLAKE2B 10f5f08a64b3d046f8255a5ea9bb1661b7a88d130b0a89b41c8f98abbe3c04cc13154e1ad6c012ef97a396f055ca5d748998f1e7d6dc89ca73a3b61f70749457 SHA512 e7f2ffd38da4e4dbd214bc97e30216682b6f8ca368bcbd5717fb408a6110f26da4472cd7ac0d288c817eb9c6426a063cff8d582e03fe8a1219c0d70508e5a004
-DIST mariadb-5.5.58.tar.gz 45784323 BLAKE2B 57c51cf2e4574259acabb676c9aead1adfbaa0fe5cade08a41d6896089c27d401dab67598d58a00be44fe30f18d0c2252f3e4208c51508c7a20f0e5689cccf15 SHA512 c5c8b52c613a1a3f30de2cd1d8e390f8110b0891af78ee2a24ef2c4b7b8c5f2e140970ca89865e8277e7486dbfd0ad01c1fdbf8791c67a9793392247d68fec63
 DIST mariadb-5.5.59.tar.gz 45804920 BLAKE2B e24792cb5427e2c3254e83cfa355b8cf4350bc488b2477daa4ef4ee41d3c33c7d0b124eb9a615ccbccec693313fd83e3f13f633cc08ea725b78b179cc813f809 SHA512 facebe62cb9b55518fe669b65f939974aa33c308983c4c3ab6897fb500ec10aa407489e936e56d1269ea5e533655c4be8d0b5d78b3eeb3882ce1b96113a66afe
 DIST mysql-extras-20160721-1526Z.tar.bz2 301788 BLAKE2B 23ef75d0122e9e18382f708a86c61624e0437fad593b7f02ccb2b3939d710404e18e3b70617ed400e5f6947d3a92d2867a5f7d98bf61597442e99989f60ca4f7 SHA512 c7450039780e4e2684c932ba7c291c1de25dd1a64e4c6e88aa13b790768b4100955f36ae4a3bf983569ea23b43be02da6dad3d5985c1163ec9e8aa91f0efd85d
 DIST mysql-extras-20170310-1426Z.tar.bz2 307052 BLAKE2B 2c364678301c97ae5c88551a78caa633377f20dd45ce3e43516f8909f7bfa1b3ed5b115dd314540e7ea96f4232f7265d8fc50099da51934a0e38561bbeff84e4 SHA512 2dbb3e46f14fbd0be9ee0e3a8ff2e4d5325f9a9be332014ea556283c0bc5f53349952d267d6713fac5b54e3167a66ddd36f18b18b79ca6b68ede399399488157
 DIST mysql-extras-20170316-1355Z.tar.bz2 308933 BLAKE2B e515f5926a0cbba86fdaaa9295e9d1f7d5f36e401f73de0d9d3c837a7f2d2a4f48c8a1bb5dadefad73a1aa676c9c5aee3571342d594644918cfca2861f2ba253 SHA512 5bf7938bfa5989da85216fbca4575397fc05c83e1afac76bd6c0b338a876caf37194f53a2a933d6f69eb31727ca005be617e53a8fdd0a95d8f1f68684c4ba68c
-DIST mysql-extras-20170830-1210Z.tar.bz2 312079 BLAKE2B 821451c88ee812d6debed56f62102824370568999d16a469830c3ed84e9eb1aec7f823c8a422db60c9a74d20f19581178fc06ee0a483a6ea31ef408a882a8db6 SHA512 55553de3bb93b09c29ff411c135ff2762edad3498d9e8fb844df349ce8ab864969668f2bbc3ba99e2217cc20f1c9155443794c301ca064d09a1b45ddead567c8
 DIST mysql-extras-20170926-1321Z.tar.bz2 312466 BLAKE2B 3e3e19a905961570cea9c1eb14dec3780da80409e996b1aeddb08625da875f5d08798a862cb1b80566b0d8be0d9ec2aab0a390ca90f991203c9871538b11f00a SHA512 556e782ccc40d8cffb2fde8c46038c90023440c07785ec667f898afdb8c802faeb4dbfe8b3918a1e563b46d1dc8c0de1172f7843ce08ee1ded435b344f8f0cf5
 DIST mysql-extras-20180209-2142Z.tar.bz2 315130 BLAKE2B 4e3b1de9fdbb455f318962dabb4867e1f987fc5e921c9184171d0cca2176306c0153b17d600db809d5f25405edd52079873071ff5fda94fe1ea6f840c575f87e SHA512 d750020428bfff81a4275d92bb19a22804e6f4a3f60153d1fc8a31df40491f4b52d534c6123d2862737443e91d4b76741c7ec8c2aaac17eba481301243718107
 DIST mysql-extras-20180228-1611Z.tar.bz2 317225 BLAKE2B c13eefecbb5518b96390d18c1acdd5d0ee2c74d95952713d3efd047075a5164d45d4792bb4104043333278a93fddb1540443e252a82070d245972640ae7b1dd1 SHA512 cc2b940f3e7a3b988e38fdd8ae54206bf52a489d999a07e65413e042c2fc584f2901b5fca5668ed849eac3e1e70a271a0090efc463c0e99d902dff14aed0294f
 EBUILD mariadb-10.0.30-r1.ebuild 6874 BLAKE2B f599097904869476a5a30ce264a2c27683ae1c59129bc6c4e4d73d5268fe5788027a2f9056309a9b97fa00881f63b7f8b88560f38272866d0d89767b10f602dd SHA512 370fa3e79b5aea1b89e2136da06a3d7b3a3bcfb49dfdcf030346764fbcee81b4c365e43be6a994e4bc6ad067aba126bd4be66ec94096dca25eb45b8fc0a136bd
-EBUILD mariadb-10.0.32-r1.ebuild 6755 BLAKE2B a9b5dcfa04719168afdf46a93cd45e0b7a3edf7fbedc931be9b1b6333536516bb743c7c7a7c06b9d4cde59552753affe8a2b39ae32f222681df563c087002968 SHA512 b11371bd98f48a45637ed7d3645a2721a5cd6fc2bff36442c105811d637a6a0462215eea04b1bd81f22d651d8b73384272bf440c43bff9cda8b9414d14cf8e53
 EBUILD mariadb-10.0.33.ebuild 6718 BLAKE2B 46e9980c6d4143e621aee1341b88b8021bc80e42faf54f0f7dd8a9c830ba88939a292016cf07c9e39a2c3c2addcd7de6d7724d3404cab8daae4002fa81a98f7f SHA512 f46c1b1e827d283d930ad6a4059b4d3e8f8ab5cf9bbf33c0f985646119b000eca0474f2447d0bf6dd22243b859de2496e29c5b9b862ab3f8610cf5fb3a674bcd
 EBUILD mariadb-10.0.34.ebuild 6724 BLAKE2B cb3f7600d93945204e8fb533a64523f621151530f63db6aa9bc37e24987095bddbc977c8f16157c19b48574cc77371423b7eb72dda3d98dbe36aaa647f6ced4f SHA512 1e960915df95089ca1ce1a43ee313fe5f0ee2e44ef23fb4f1de85ebb745d0379d8634095ef22520a34f3069f66ced63055792f8f036f7026b87ced11e66fb57f
 EBUILD mariadb-10.1.24-r1.ebuild 7175 BLAKE2B 6d92e08b3197423710e91f0f56e1fff64b694204e40d4a89ceeee742395965067f4ca4dd301a832db5db9804237e6f9aa5da2b6840fdddfc80aee768ce32c804 SHA512 3c164ee1598deb014be1dad3ab4f11d20e4a560cb19b34f407db51ddaedb7a24f8c9910a7d4f40adc6f552c9db5594248e273c8cca13e9a3a6cef26bd83b23c7
-EBUILD mariadb-10.1.26-r1.ebuild 7243 BLAKE2B 82e3e6d8024dd89a389089a94f3e4b0f48c3e6f01b1d553a528b625e4f6445939c833c519a117f69b452bd96bbd379bcde9a08220d31888cba409c1a7babc32e SHA512 c5b884d63ead9d89de3227b73da3f3d504ba86d21a2f253855871afc8eac4078ee1256a6476985e8f0be0f784424118f6751468552fff43d8feae3991361d193
 EBUILD mariadb-10.1.29.ebuild 7305 BLAKE2B b5828f97361eb989638654f3399e1a036c12356c5cb90c2e62caf1055497b6f0e1c4f3587d1fe599d2da4cb1059c5aa676109e0aad88306d8136753c22c87854 SHA512 a0b25e416d701f557a017c4b6c454c6359406da3c43da0dda3c892020961b27888412582a892fedce4484c4412ce774fab45f868074b7ac053ba530339288337
-EBUILD mariadb-10.1.30.ebuild 7611 BLAKE2B 5c23c5ba6c4a6ab7dcf2e0c62f1feaeb2c97ee18267ac41930613185067e859ecec0c2a195af2ef6507f2dc40bbed1c857b218336124aa7e6984c28b036730e6 SHA512 27235b2f0c52a36a96457fc5ffa20fd7c3d3805dc77d0510d0c4c91d1d2fe64ace0f11b04b010256b22958ade51cfb6d3faaa7a20b23bebe59c99e549f293eae
 EBUILD mariadb-10.1.31.ebuild 7746 BLAKE2B f701cb24e8c019ee269d14f871ac2b12d04fcbb5899b3743bb16ff6b68be37128707275f2b89ee97a289d24e6e0a6df7a924c0075bb2112273fab2299a8726ac SHA512 263ba0bcc9be4b7aeca148b644e57c62ddfe2d56e9868b8852cc52b1298021e42a6b0fb320b362b9158c397037d4d54cb618de318dbc258805299bd4fb120e09
-EBUILD mariadb-10.2.10.ebuild 32343 BLAKE2B cdc6d67466738598f725ccc6ff8c39ee69923ce787b95097b1d06bc5971b21fd9e8c44f34036792beda3cb6eabfe40bdb1282d3a5432929b92496aff929341ee SHA512 5fa3e3e817811832b940cf857f18d9574ab67be23488b042591ca7c358a844aa755713e0bfa5c481e6fa6c94cbd8585f902fd43dc2dc36adcc7bd53705d51904
-EBUILD mariadb-10.2.11.ebuild 32528 BLAKE2B 4fc6c74390c572d2fac693286149078338034c8159dbeb292cd4699753920efce67ae5550868ef9dcddfa73dafad2d4aa9277466d367841eab99afe5f2d187c4 SHA512 df8e91f637b349eab91877de631cdac730629c481c3798b147af135a8609bdb7c3838de530a75b9cb791e609a332653f218642df5937a741f9e2781a4c5bb190
 EBUILD mariadb-10.2.12.ebuild 32528 BLAKE2B 4fc6c74390c572d2fac693286149078338034c8159dbeb292cd4699753920efce67ae5550868ef9dcddfa73dafad2d4aa9277466d367841eab99afe5f2d187c4 SHA512 df8e91f637b349eab91877de631cdac730629c481c3798b147af135a8609bdb7c3838de530a75b9cb791e609a332653f218642df5937a741f9e2781a4c5bb190
 EBUILD mariadb-10.3.5_rc.ebuild 32824 BLAKE2B 20f2efca03d450d572238de297d4df6976c0976586e6dcdfee9e0a247bb4ee4b506caf5825474fe56fbbcc587adea61a167019b216a93004088369290a7906cb SHA512 ef352ec227be065dd4bd58eefd97636f23e8566df7c4dc15eb51845717d89b77adeb7b41ccb81d11d1ac9f7334d3efd3e6cebe264d4e436f1755bd1ffd122b7e
-EBUILD mariadb-5.5.58.ebuild 4229 BLAKE2B 1fa5de1698d51777b18e0cca97af44b974eabeb528d5544da25dcb0c7719ba6001626e1b41ac2d1bce6373daa6990b2ce5e1b53f352df578d2f47b4e88235586 SHA512 a458aec6fbd1c69aa8548c784ed07f5a16ef80ec9d19b01d0906ded82724e69dbbcafa023c8f83d73f59987aa47ed638f7b22d3935631c3cc3a216959764e911
 EBUILD mariadb-5.5.59.ebuild 4220 BLAKE2B 15d84c6e8405e0f2339a1fa2c1dac8c5cb5d070f083219e5b0b6b6f59b83a5d147f049a7874f4109bea38a295be86f560faa6bf21b8665a2696a9ef4ff09ad08 SHA512 0397ba6f08cdedcb3812b61044d6d58b42db9009747fd1a0af53e450d530b56bbb748ffdd0a9c3de7dc535f9e4566e2513a7ea01fe893f250b9a31fa074de5e1
 MISC metadata.xml 3172 BLAKE2B 9b546b51359c0881ee5ce452c89e788ff27300471433fb9d1eb28b3f72d47cd84787eac1d7fd536a8133aa56dd4dd9c1139afb4b3e83b463ce12b7d6cb0fa35f SHA512 143381d9443b778b4f8fb5545c6e8ac59e54eaba20458eecb757e292650a1fd5a470ded204f25c173f456cc222bd32f8b9885e00ecb00c9b4abfd639c9e98391
diff --git a/dev-db/mariadb/mariadb-10.0.32-r1.ebuild b/dev-db/mariadb/mariadb-10.0.32-r1.ebuild
deleted file mode 100644
index 42d7b20c89c0..000000000000
--- a/dev-db/mariadb/mariadb-10.0.32-r1.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20170310-1426Z"
-SUBSLOT="18"
-MYSQL_PV_MAJOR="5.6"
-
-JAVA_PKG_OPT_USE="jdbc"
-
-inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1
-
-HOMEPAGE="http://mariadb.org/"
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-
-IUSE="bindist jdbc odbc oqgraph pam sphinx tokudb xml"
-RESTRICT="!bindist? ( bindist )"
-
-REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
-PATCHES=(
-	"${MY_PATCH_DIR}/01050_all_mariadb_mysql_config_cleanup-5.5.41.patch"
-	"${MY_PATCH_DIR}/20006_all_cmake_elib-mariadb-10.0.26.patch"
-	"${MY_PATCH_DIR}/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch"
-	"${MY_PATCH_DIR}/20018_all_mariadb-10.0.20-without-clientlibs-tools.patch"
-)
-COMMON_DEPEND="
-	!bindist? ( >=sys-libs/readline-4.1:0=	)
-	server? (
-		extraengine? (
-			odbc? ( dev-db/unixODBC:0= )
-			xml? ( dev-libs/libxml2:2= )
-			sys-libs/zlib[minizip]
-		)
-		oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
-		pam? ( virtual/pam:0= )
-		tokudb? ( app-arch/snappy )
-	)
-	>=dev-libs/libpcre-8.35:3=[${MULTILIB_USEDEP}]
-"
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-	server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
-	${COMMON_DEPEND}"
-RDEPEND="${RDEPEND} ${COMMON_DEPEND}
-	perl? ( !dev-db/mytop
-		virtual/perl-Getopt-Long
-		dev-perl/TermReadKey
-		virtual/perl-Term-ANSIColor
-		virtual/perl-Time-HiRes )
-	server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
-"
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
-	/usr/include/mysql/private/probes_mysql_nodtrace.h
-	/usr/include/mysql/private/probes_mysql_dtrace.h )
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	mysql-multilib-r1_pkg_setup
-}
-
-pkg_preinst() {
-	java-pkg-opt-2_pkg_preinst
-	mysql-multilib-r1_pkg_preinst
-}
-
-src_prepare() {
-	java-pkg-opt-2_src_prepare
-	mysql-multilib-r1_src_prepare
-}
-
-src_configure(){
-	# bug 508724 mariadb cannot use ld.gold
-	tc-ld-disable-gold
-	local MYSQL_CMAKE_NATIVE_DEFINES=(
-			-DWITH_JEMALLOC=$(usex jemalloc system)
-			-DWITH_PCRE=system
-	)
-	if use server ; then
-		# Federated{,X} must be treated special otherwise they will not be built as plugins
-		if ! use extraengine ; then
-			MYSQL_CMAKE_NATIVE_DEFINES+=(
-				-DWITHOUT_FEDERATED=1
-				-DWITHOUT_FEDERATEDX=1 )
-		fi
-
-		# Connect with Zip is currently broken and does not compile
-		# Reported upstream https://jira.mariadb.org/browse/MDEV-11809
-
-		MYSQL_CMAKE_NATIVE_DEFINES+=(
-			$(mysql-cmake_use_plugin oqgraph OQGRAPH)
-			$(mysql-cmake_use_plugin sphinx SPHINX)
-			$(mysql-cmake_use_plugin tokudb TOKUDB)
-			$(mysql-cmake_use_plugin pam AUTH_PAM)
-			$(mysql-cmake_use_plugin extraengine SEQUENCE)
-			$(mysql-cmake_use_plugin extraengine SPIDER)
-			$(mysql-cmake_use_plugin extraengine CONNECT)
-			-DCONNECT_WITH_LIBXML2=$(usex xml)
-			-DCONNECT_WITH_ODBC=$(usex odbc)
-			-DCONNECT_WITH_JDBC=$(usex jdbc)
-			-DWITHOUT_MROONGA=1
-		)
-	fi
-	mysql-multilib-r1_src_configure
-}
-
-# Official test instructions:
-# USE='embedded extraengine perl server openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-multilib_src_test() {
-
-	if ! multilib_is_native_abi ; then
-		einfo "Server tests not available on non-native abi".
-		return 0;
-	fi
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	if use server ; then
-
-		# Bug #213475 - MySQL _will_ object strenously if your machine is named
-		# localhost. Also causes weird failures.
-		[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-		# Enable parallel testing, auto will try to detect number of cores
-		# You may set this by hand.
-		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-		# create directories because mysqladmin might run out of order
-		mkdir -p "${T}"/var-tests{,/log}
-
-		# These are failing in MariaDB 10.0 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql main.bootstrap
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test, main.mysql_client_test_nonblock
-		# main.mysql_client_test_comp:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam
-		# fails due to bad cleanup of previous tests when run in parallel
-		# The tool is deprecated anyway
-		# Bug 532288
-
-#main.bootstrap \
-#		for t in main.mysql_client_test main.mysql_client_test_nonblock \
-#			main.mysql_client_test_comp \
-#			binlog.binlog_statement_insert_delayed main.information_schema \
-#			main.mysqld--help \
-#			archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
-#			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
-#				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
-#		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}" || die
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
-
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd || die
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mariadb/mariadb-10.1.26-r1.ebuild b/dev-db/mariadb/mariadb-10.1.26-r1.ebuild
deleted file mode 100644
index babcf78b15d1..000000000000
--- a/dev-db/mariadb/mariadb-10.1.26-r1.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20170830-1210Z"
-# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
-WSREP_REVISION="25"
-SUBSLOT="18"
-MYSQL_PV_MAJOR="5.6"
-
-JAVA_PKG_OPT_USE="jdbc"
-
-inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1
-
-HOMEPAGE="http://mariadb.org/"
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-
-IUSE="+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
-RESTRICT="!bindist? ( bindist )"
-
-REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
-
-PATCHES=(
-	"${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.16.patch
-	"${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
-	"${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
-	"${MY_PATCH_DIR}"/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch
-	"${MY_PATCH_DIR}"/20025_all_mariadb-10.1.26-gssapi-detect.patch
-)
-
-COMMON_DEPEND="
-	mroonga? ( app-text/groonga-normalizer-mysql )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	!bindist? (
-		sys-libs/binutils-libs:0=
-		>=sys-libs/readline-4.1:0=
-	)
-	server? (
-		backup? ( app-arch/libarchive:0= )
-		cracklib? ( sys-libs/cracklib:0= )
-		extraengine? (
-			odbc? ( dev-db/unixODBC:0= )
-			xml? ( dev-libs/libxml2:2= )
-			sys-libs/zlib[minizip]
-		)
-		innodb-lz4? ( app-arch/lz4 )
-		innodb-lzo? ( dev-libs/lzo )
-		innodb-snappy? ( app-arch/snappy )
-		oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
-		pam? ( virtual/pam:0= )
-		systemd? ( sys-apps/systemd:= )
-		tokudb? ( app-arch/snappy )
-	)
-	>=dev-libs/libpcre-8.35:3=
-"
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-	server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
-	${COMMON_DEPEND}"
-RDEPEND="${RDEPEND} ${COMMON_DEPEND}
-	galera? (
-		sys-apps/iproute2
-		=sys-cluster/galera-${WSREP_REVISION}*
-		sst-rsync? ( sys-process/lsof )
-		sst-xtrabackup? ( net-misc/socat[ssl] )
-	)
-	perl? ( !dev-db/mytop
-		virtual/perl-Getopt-Long
-		dev-perl/TermReadKey
-		virtual/perl-Term-ANSIColor
-		virtual/perl-Time-HiRes )
-	server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
-"
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
-PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
-
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
-	/usr/include/mysql/private/probes_mysql_nodtrace.h
-	/usr/include/mysql/private/probes_mysql_dtrace.h )
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	mysql-multilib-r1_pkg_setup
-}
-
-pkg_preinst() {
-	java-pkg-opt-2_pkg_preinst
-	mysql-multilib-r1_pkg_preinst
-}
-
-src_prepare() {
-	java-pkg-opt-2_src_prepare
-	mysql-multilib-r1_src_prepare
-}
-
-src_configure(){
-	# bug 508724 mariadb cannot use ld.gold
-	tc-ld-disable-gold
-
-	local MYSQL_CMAKE_NATIVE_DEFINES=(
-			-DWITH_JEMALLOC=$(usex jemalloc system)
-			-DWITH_PCRE=system
-	)
-	local MYSQL_CMAKE_EXTRA_DEFINES=(
-			-DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO)
-	)
-	if use server ; then
-		# Federated{,X} must be treated special otherwise they will not be built as plugins
-		if ! use extraengine ; then
-			MYSQL_CMAKE_NATIVE_DEFINES+=(
-				-DPLUGIN_FEDERATED=NO
-				-DPLUGIN_FEDERATEDX=NO )
-		fi
-
-		MYSQL_CMAKE_NATIVE_DEFINES+=(
-			-DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
-			-DPLUGIN_SPHINX=$(usex sphinx YES NO)
-			-DPLUGIN_TOKUDB=$(usex tokudb YES NO)
-			-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
-			-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
-			-DPLUGIN_CASSANDRA=NO
-			-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
-			-DPLUGIN_SPIDER=$(usex extraengine YES NO)
-			-DPLUGIN_CONNECT=$(usex extraengine YES NO)
-			-DCONNECT_WITH_MYSQL=1
-			-DCONNECT_WITH_LIBXML2=$(usex xml)
-			-DCONNECT_WITH_ODBC=$(usex odbc)
-			-DCONNECT_WITH_JDBC=$(usex jdbc)
-			-DWITH_WSREP=$(usex galera)
-			-DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
-			-DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
-			-DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
-			-DPLUGIN_MROONGA=$(usex mroonga YES NO)
-			-DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
-			-DWITH_MARIABACKUP=$(usex backup ON OFF)
-			-DWITH_LIBARCHIVE=$(usex backup ON OFF)
-		)
-	fi
-	mysql-multilib-r1_src_configure
-}
-
-# Official test instructions:
-# USE='embedded extraengine perl server openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-multilib_src_test() {
-
-	if ! multilib_is_native_abi ; then
-		einfo "Server tests not available on non-native abi".
-		return 0;
-	fi
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	if ! use server ; then
-		einfo "Skipping server tests due to minimal build."
-		return 0
-	fi
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [[ $UID -eq 0 ]]; then
-		die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-	fi
-	has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox"
-
-	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
-	# Run CTest (test-units)
-	cmake-utils_src_test
-	retstatus_unit=$?
-
-	# Ensure that parallel runs don't die
-	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-	# Enable parallel testing, auto will try to detect number of cores
-	# You may set this by hand.
-	# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-	export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-	# create directories because mysqladmin might run out of order
-	mkdir -p "${T}"/var-tests{,/log}
-
-	# Run mysql tests
-	pushd "${TESTDIR}" || die
-
-	# These are failing in MariaDB 10.0 for now and are believed to be
-	# false positives:
-	#
-	# main.mysql_client_test, main.mysql_client_test_nonblock
-	# main.mysql_client_test_comp:
-	# segfaults at random under Portage only, suspect resource limits.
-
-	local t
-	for t in plugins.cracklib_password_check plugins.two_password_validations ; do
-		mysql-multilib-r1_disable_test  "$t" "False positive due to varying policies"
-	done
-
-	for t in main.mysql_client_test main.mysql_client_test_nonblock \
-		main.mysql_client_test_comp ; do
-			mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
-	done
-
-	# run mysql-test tests
-	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
-	retstatus_tests=$?
-
-	popd || die
-
-	# Cleanup is important for these testcases.
-	pkill -9 -f "${S}/ndb" 2>/dev/null
-	pkill -9 -f "${S}/sql" 2>/dev/null
-
-	local failures=""
-	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-
-	[[ -z "$failures" ]] || eerror "Test failures: $failures"
-	einfo "Tests successfully completed"
-}
diff --git a/dev-db/mariadb/mariadb-10.1.30.ebuild b/dev-db/mariadb/mariadb-10.1.30.ebuild
deleted file mode 100644
index b191b1e8769b..000000000000
--- a/dev-db/mariadb/mariadb-10.1.30.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20170926-1321Z"
-# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
-WSREP_REVISION="25"
-SUBSLOT="18"
-MYSQL_PV_MAJOR="5.6"
-
-JAVA_PKG_OPT_USE="jdbc"
-
-inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1
-
-HOMEPAGE="http://mariadb.org/"
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-
-IUSE="+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-mariabackup sst-xtrabackup tokudb systemd xml"
-RESTRICT="!bindist? ( bindist )"
-
-REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
-
-PATCHES=(
-	"${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.27.patch
-	"${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
-	"${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
-	"${MY_PATCH_DIR}"/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch
-	"${MY_PATCH_DIR}"/20025_all_mariadb-10.1.26-gssapi-detect.patch
-)
-
-COMMON_DEPEND="
-	mroonga? ( app-text/groonga-normalizer-mysql )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	!bindist? (
-		sys-libs/binutils-libs:0=
-		>=sys-libs/readline-4.1:0=
-	)
-	server? (
-		backup? ( app-arch/libarchive:0= )
-		cracklib? ( sys-libs/cracklib:0= )
-		extraengine? (
-			odbc? ( dev-db/unixODBC:0= )
-			xml? ( dev-libs/libxml2:2= )
-			sys-libs/zlib[minizip]
-		)
-		innodb-lz4? ( app-arch/lz4 )
-		innodb-lzo? ( dev-libs/lzo )
-		innodb-snappy? ( app-arch/snappy )
-		oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
-		pam? ( virtual/pam:0= )
-		systemd? ( sys-apps/systemd:= )
-		tokudb? ( app-arch/snappy )
-	)
-	>=dev-libs/libpcre-8.41-r1:3=
-"
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-	server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
-	${COMMON_DEPEND}"
-RDEPEND="${RDEPEND} ${COMMON_DEPEND}
-	galera? (
-		sys-apps/iproute2
-		=sys-cluster/galera-${WSREP_REVISION}*
-		sst-rsync? ( sys-process/lsof )
-		sst-mariabackup? ( net-misc/socat[ssl] )
-		sst-xtrabackup? ( net-misc/socat[ssl] )
-	)
-	perl? ( !dev-db/mytop
-		virtual/perl-Getopt-Long
-		dev-perl/TermReadKey
-		virtual/perl-Term-ANSIColor
-		virtual/perl-Time-HiRes )
-	server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
-"
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
-PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
-
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
-	/usr/include/mysql/private/probes_mysql_nodtrace.h
-	/usr/include/mysql/private/probes_mysql_dtrace.h )
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	mysql-multilib-r1_pkg_setup
-}
-
-pkg_preinst() {
-	java-pkg-opt-2_pkg_preinst
-	mysql-multilib-r1_pkg_preinst
-}
-
-src_prepare() {
-	java-pkg-opt-2_src_prepare
-	mysql-multilib-r1_src_prepare
-}
-
-src_configure(){
-	# bug 508724 mariadb cannot use ld.gold
-	tc-ld-disable-gold
-
-	local MYSQL_CMAKE_NATIVE_DEFINES=(
-			-DWITH_JEMALLOC=$(usex jemalloc system)
-			-DWITH_PCRE=system
-	)
-	local MYSQL_CMAKE_EXTRA_DEFINES=(
-			-DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO)
-	)
-	if use server ; then
-		# Federated{,X} must be treated special otherwise they will not be built as plugins
-		if ! use extraengine ; then
-			MYSQL_CMAKE_NATIVE_DEFINES+=(
-				-DPLUGIN_FEDERATED=NO
-				-DPLUGIN_FEDERATEDX=NO )
-		fi
-
-		MYSQL_CMAKE_NATIVE_DEFINES+=(
-			-DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
-			-DPLUGIN_SPHINX=$(usex sphinx YES NO)
-			-DPLUGIN_TOKUDB=$(usex tokudb YES NO)
-			-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
-			-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
-			-DPLUGIN_CASSANDRA=NO
-			-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
-			-DPLUGIN_SPIDER=$(usex extraengine YES NO)
-			-DPLUGIN_CONNECT=$(usex extraengine YES NO)
-			-DCONNECT_WITH_MYSQL=1
-			-DCONNECT_WITH_LIBXML2=$(usex xml)
-			-DCONNECT_WITH_ODBC=$(usex odbc)
-			-DCONNECT_WITH_JDBC=$(usex jdbc)
-			# Build failure and autodep wrt bug 639144
-			-DCONNECT_WITH_MONGO=OFF
-			-DWITH_WSREP=$(usex galera)
-			-DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
-			-DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
-			-DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
-			-DPLUGIN_MROONGA=$(usex mroonga YES NO)
-			-DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
-			-DWITH_MARIABACKUP=$(usex backup ON OFF)
-			-DWITH_LIBARCHIVE=$(usex backup ON OFF)
-		)
-	fi
-	mysql-multilib-r1_src_configure
-}
-
-# Official test instructions:
-# USE='extraengine perl server openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-multilib_src_test() {
-
-	if ! multilib_is_native_abi ; then
-		einfo "Server tests not available on non-native abi".
-		return 0;
-	fi
-
-	_disable_test() {
-		local rawtestname reason
-		rawtestname="${1}" ; shift
-		reason="${@}"
-		ewarn "test '${rawtestname}' disabled: '${reason}'"
-		echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
-	}
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	if ! use server ; then
-		einfo "Skipping server tests due to minimal build."
-		return 0
-	fi
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [[ $UID -eq 0 ]]; then
-		die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-	fi
-	has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox"
-
-	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
-	# Run CTest (test-units)
-	cmake-utils_src_test
-	retstatus_unit=$?
-
-	# Ensure that parallel runs don't die
-	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-	# Enable parallel testing, auto will try to detect number of cores
-	# You may set this by hand.
-	# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-	export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-	# create directories because mysqladmin might run out of order
-	mkdir -p "${T}"/var-tests{,/log}
-
-	# Run mysql tests
-	pushd "${TESTDIR}" || die
-
-	touch "${T}/disabled.def"
-	# These are failing in MariaDB 10.0 for now and are believed to be
-	# false positives:
-	#
-	# main.mysql_client_test, main.mysql_client_test_nonblock
-	# main.mysql_client_test_comp:
-	# segfaults at random under Portage only, suspect resource limits.
-
-	local t
-	for t in plugins.cracklib_password_check plugins.two_password_validations ; do
-		_disable_test  "$t" "False positive due to varying policies"
-	done
-
-	for t in main.mysql_client_test main.mysql_client_test_nonblock \
-		main.mysql_client_test_comp ; do
-			_disable_test  "$t" "False positives in Gentoo"
-	done
-
-	# run mysql-test tests
-	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test-list="${T}/disabled.def"
-	retstatus_tests=$?
-
-	popd || die
-
-	# Cleanup is important for these testcases.
-	pkill -9 -f "${S}/ndb" 2>/dev/null
-	pkill -9 -f "${S}/sql" 2>/dev/null
-
-	local failures=""
-	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-
-	[[ -z "$failures" ]] || eerror "Test failures: $failures"
-	einfo "Tests successfully completed"
-}
diff --git a/dev-db/mariadb/mariadb-10.2.10.ebuild b/dev-db/mariadb/mariadb-10.2.10.ebuild
deleted file mode 100644
index 6cdcc22d6190..000000000000
--- a/dev-db/mariadb/mariadb-10.2.10.ebuild
+++ /dev/null
@@ -1,971 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20170926-1321Z"
-SUBSLOT="18"
-
-JAVA_PKG_OPT_USE="jdbc"
-
-# Keeping eutils in EAPI=6 for emktemp in pkg_config
-
-inherit eutils systemd flag-o-matic prefix toolchain-funcs \
-	java-pkg-opt-2 user cmake-utils multilib-minimal
-
-SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz "
-
-# Gentoo patches to MySQL
-if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
-	SRC_URI="${SRC_URI}
-		mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
-fi
-
-HOMEPAGE="http://mariadb.org/"
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-LICENSE="GPL-2 LGPL-2.1+"
-SLOT="0/${SUBSLOT:-0}"
-IUSE="+backup bindist cracklib debug embedded extraengine galera innodb-lz4
-	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
-	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
-	sst-rsync sst-mariabackup sst-xtrabackup static static-libs systemd systemtap tcmalloc
-	test tokudb xml yassl"
-
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!bindist? ( bindist ) libressl? ( test )"
-
-REQUIRED_USE="jdbc? ( extraengine server !static )
-	server? ( tokudb? ( jemalloc !tcmalloc ) )
-	!server? ( !extraengine !embedded )
-	?? ( tcmalloc jemalloc )
-	static? ( yassl !pam )"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# Shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
-	MY_PATCH_DIR="${WORKDIR}/mysql-extras"
-else
-	MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
-fi
-
-PATCHES=(
-	"${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
-	"${MY_PATCH_DIR}"/20018_all_mariadb-10.2.8-without-clientlibs-tools.patch
-	"${MY_PATCH_DIR}"/20024_all_mariadb-10.2.6-mysql_st-regression.patch
-	"${MY_PATCH_DIR}"/20025_all_mariadb-10.2.6-gssapi-detect.patch
-)
-
-# Be warned, *DEPEND are version-dependant
-# These are used for both runtime and compiletime
-# MULTILIB_USEDEP only set for libraries used by the client library
-COMMON_DEPEND="
-	kernel_linux? (
-		sys-process/procps:0=
-		dev-libs/libaio:0=
-	)
-	>=sys-apps/sed-4
-	>=sys-apps/texinfo-4.7-r1
-	!dev-db/mariadb-connector-c[mysqlcompat]
-	jemalloc? ( dev-libs/jemalloc:0= )
-	tcmalloc? ( dev-util/google-perftools:0= )
-	systemtap? ( >=dev-util/systemtap-1.3:0= )
-	!yassl? (
-		!libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
-	)
-	>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
-	sys-libs/ncurses:0=
-	mroonga? ( app-text/groonga-normalizer-mysql )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	!bindist? (
-		sys-libs/binutils-libs:0=
-		>=sys-libs/readline-4.1:0=
-	)
-	server? (
-		backup? ( app-arch/libarchive:0= )
-		cracklib? ( sys-libs/cracklib:0= )
-		extraengine? (
-			odbc? ( dev-db/unixODBC:0= )
-			xml? ( dev-libs/libxml2:2= )
-		)
-		innodb-lz4? ( app-arch/lz4 )
-		innodb-lzo? ( dev-libs/lzo )
-		innodb-snappy? ( app-arch/snappy )
-		numa? ( sys-process/numactl )
-		oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
-		pam? ( virtual/pam:0= )
-		systemd? ( sys-apps/systemd:= )
-		tokudb? ( app-arch/snappy )
-	)
-	>=dev-libs/libpcre-8.41-r1:3=
-"
-DEPEND="virtual/yacc
-	static? ( sys-libs/ncurses[static-libs] )
-	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-	server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
-	${COMMON_DEPEND}"
-RDEPEND="selinux? ( sec-policy/selinux-mysql )
-	abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] )
-	!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
-	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
-	!<virtual/mysql-5.6-r9
-	${COMMON_DEPEND}
-	server? ( galera? (
-		sys-apps/iproute2
-		=sys-cluster/galera-25*
-		sst-rsync? ( sys-process/lsof )
-		sst-mariabackup? ( net-misc/socat[ssl] )
-		sst-xtrabackup? ( net-misc/socat[ssl] )
-	) )
-	perl? ( !dev-db/mytop
-		virtual/perl-Getopt-Long
-		dev-perl/TermReadKey
-		virtual/perl-Term-ANSIColor
-		virtual/perl-Time-HiRes )
-	server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
-"
-# For other stuff to bring us in
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
-	 server? ( ~virtual/mysql-5.6[embedded=,static=] )
-	 virtual/libmysqlclient:${SLOT}[${MULTILIB_USEDEP},static-libs=]
-	server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		local GCC_MAJOR_SET=$(gcc-major-version)
-		local GCC_MINOR_SET=$(gcc-minor-version)
-		if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \
-			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
-			eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."
-			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
-			die
-		fi
-		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on
-		# non x86{,_64} arches
-		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
-			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
-			eerror "${PN} needs to be built with gcc-4.7 or later."
-			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
-			die
-		fi
-	fi
-	java-pkg-opt-2_pkg_setup
-	if has test ${FEATURES} && \
-		use server && ! has userpriv ${FEATURES} ; then
-			eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-	fi
-
-	# This should come after all of the die statements
-	enewgroup mysql 60 || die "problem adding 'mysql' group"
-	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
-}
-
-pkg_preinst() {
-	java-pkg-opt-2_pkg_preinst
-
-	# Here we need to see if the implementation switched client libraries
-	# We check if this is a new instance of the package and a client library already exists
-	local SHOW_ABI_MESSAGE libpath
-	if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
-		libpath=$(readlink "${EROOT}usr/$(get_libdir)/libmysqlclient.so")
-		elog "Due to ABI changes when switching between different client libraries,"
-		elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
-		elog "Please run: revdep-rebuild --library ${libpath}"
-		ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
-	fi
-}
-
-pkg_postinst() {
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Create log directory securely if it does not exist
-	[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
-
-	if use server ; then
-		if use pam; then
-			einfo
-			elog "This install includes the PAM authentication plugin."
-			elog "To activate and configure the PAM plugin, please read:"
-			elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
-			einfo
-		fi
-
-		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-			einfo
-			elog "You might want to run:"
-			elog "\"emerge --config =${CATEGORY}/${PF}\""
-			elog "if this is a new install."
-			elog
-			elog "If you are switching server implentations, you should run the"
-			elog "mysql_upgrade tool."
-			einfo
-		else
-			einfo
-			elog "If you are upgrading major versions, you should run the"
-			elog "mysql_upgrade tool."
-			einfo
-		fi
-
-		if use galera ; then
-			einfo
-			elog "Be sure to edit the my.cnf file to activate your cluster settings."
-			elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
-			elog "The first time the cluster is activated, you should add"
-			elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
-			elog "This option should then be removed for subsequent starts."
-			einfo
-		fi
-	fi
-
-	# Note about configuration change
-	einfo
-	elog "This version of mariadb reorganizes the configuration from a single my.cnf"
-	elog "to several files in /etc/mysql/${PN}.d."
-	elog "Please backup any changes you made to /etc/mysql/my.cnf"
-	elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension."
-	elog "You may have as many files as needed and they are read alphabetically."
-	elog "Be sure the options have the appropitate section headers, i.e. [mysqld]."
-	einfo
-}
-
-src_unpack() {
-
-	# Initialize the proper variables first
-	mysql_init_vars
-
-	unpack ${A}
-	# Grab the patches
-	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack
-
-	mv -f "${WORKDIR}/${P}" "${S}" || die
-}
-
-src_prepare() {
-	java-pkg-opt-2_src_prepare
-	if use tcmalloc; then
-		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt"
-	fi
-
-	# Don't build bundled xz-utils for tokudb
-	echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
-	sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
-	sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
-
-	# Remove the bundled groonga
-	# There is no CMake flag, it simply checks for existance
-	rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
-
-	cmake-utils_src_prepare
-}
-
-src_configure(){
-	# bug 508724 mariadb cannot use ld.gold
-	tc-ld-disable-gold
-	# Bug #114895, bug #110149
-	filter-flags "-O" "-O[01]"
-
-	append-cxxflags -felide-constructors
-
-	# bug #283926, with GCC4.4, this is required to get correct behavior.
-	append-flags -fno-strict-aliasing
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	CMAKE_BUILD_TYPE="RelWithDebInfo"
-
-	# debug hack wrt #497532
-	mycmakeargs=(
-		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
-		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
-		-DINSTALL_BINDIR=bin
-		-DINSTALL_DOCDIR=share/doc/${PF}
-		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
-		-DINSTALL_INCLUDEDIR=include/mysql
-		-DINSTALL_INFODIR=share/info
-		-DINSTALL_LIBDIR=$(get_libdir)
-		-DINSTALL_MANDIR=share/man
-		-DINSTALL_MYSQLSHAREDIR=share/mariadb
-		-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
-		-DINSTALL_SCRIPTDIR=share/mariadb/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
-		-DWITH_COMMENT="Gentoo Linux ${PF}"
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
-		-DWITH_LIBEDIT=0
-		-DWITH_ZLIB=system
-		-DWITHOUT_LIBWRAP=1
-		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DWITH_DEFAULT_COMPILER_OPTIONS=0
-		-DWITH_DEFAULT_FEATURE_SET=0
-		-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
-		-DENABLE_STATIC_LIBS=$(usex static-libs ON OFF)
-		# The build forces this to be defined when cross-compiling.  We pass it
-		# all the time for simplicity and to make sure it is actually correct.
-		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
-		-DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)"
-		-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
-		-DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
-		-DCONC_WITH_EXTERNAL_ZLIB=YES
-		-DWITH_EXTERNAL_ZLIB=YES
-		-DSUFFIX_INSTALL_DIR=""
-		-DWITH_UNITTEST=OFF
-	)
-	if use test ; then
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
-	else
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
-	fi
-
-	if ! use yassl ; then
-		mycmakeargs+=( -DWITH_SSL=system )
-	else
-		mycmakeargs+=( -DWITH_SSL=bundled )
-	fi
-
-	# bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
-	# systemtap only works on native ABI  bug 530132
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			-DWITH_READLINE=$(usex bindist 1 0)
-			-DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
-			-DENABLE_DTRACE=$(usex systemtap)
-		)
-	else
-		mycmakeargs+=(
-			-DWITHOUT_TOOLS=1
-			-DWITH_READLINE=1
-			-DNOT_FOR_DISTRIBUTION=0
-			-DENABLE_DTRACE=0
-		)
-	fi
-
-	if multilib_is_native_abi && use server ; then
-
-		# Federated{,X} must be treated special otherwise they will not be built as plugins
-		if ! use extraengine ; then
-			mycmakeargs+=(
-				-DPLUGIN_FEDERATED=NO
-				-DPLUGIN_FEDERATEDX=NO )
-		fi
-
-		mycmakeargs+=(
-			-DWITH_JEMALLOC=$(usex jemalloc system)
-			-DWITH_PCRE=system
-			-DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
-			-DPLUGIN_SPHINX=$(usex sphinx YES NO)
-			-DPLUGIN_TOKUDB=$(usex tokudb YES NO)
-			-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
-			-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
-			-DPLUGIN_CASSANDRA=NO
-			-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
-			-DPLUGIN_SPIDER=$(usex extraengine YES NO)
-			-DPLUGIN_CONNECT=$(usex extraengine YES NO)
-			-DCONNECT_WITH_MYSQL=1
-			-DCONNECT_WITH_LIBXML2=$(usex xml)
-			-DCONNECT_WITH_ODBC=$(usex odbc)
-			-DCONNECT_WITH_JDBC=$(usex jdbc)
-			-DWITH_WSREP=$(usex galera)
-			-DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
-			-DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
-			-DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
-			-DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
-			-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
-			-DWITH_MARIABACKUP=$(usex backup ON OFF)
-			-DWITH_LIBARCHIVE=$(usex backup ON OFF)
-			-DINSTALL_SQLBENCHDIR=share/mariadb
-			-DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
-			# systemd is only linked to for server notification
-			-DWITH_SYSTEMD=$(usex systemd yes no)
-			-DWITH_NUMA=$(usex numa ON OFF)
-		)
-		if use test ; then
-			# This is needed for the new client lib which tests a real, open server
-			mycmakeargs+=( -DSKIP_TESTS=ON )
-		fi
-
-		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
-			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
-			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
-			ewarn "You MUST file bugs without these variables set."
-
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
-				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
-			)
-
-		elif ! use latin1 ; then
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=utf8
-				-DDEFAULT_COLLATION=utf8_general_ci
-			)
-		else
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=latin1
-				-DDEFAULT_COLLATION=latin1_swedish_ci
-			)
-		fi
-		mycmakeargs+=(
-			-DEXTRA_CHARSETS=all
-			-DMYSQL_USER=mysql
-			-DDISABLE_SHARED=$(usex static YES NO)
-			-DWITH_DEBUG=$(usex debug)
-			-DWITH_EMBEDDED_SERVER=$(usex embedded)
-			-DWITH_PROFILING=$(usex profiling)
-		)
-
-		if use static; then
-			mycmakeargs+=( -DWITH_PIC=1 )
-		fi
-
-		if use jemalloc || use tcmalloc ; then
-			mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
-		fi
-
-		# Storage engines
-		mycmakeargs+=(
-			-DWITH_ARCHIVE_STORAGE_ENGINE=1
-			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
-			-DWITH_CSV_STORAGE_ENGINE=1
-			-DWITH_HEAP_STORAGE_ENGINE=1
-			-DWITH_INNOBASE_STORAGE_ENGINE=1
-			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
-			-DWITH_MYISAM_STORAGE_ENGINE=1
-			-DWITH_PARTITION_STORAGE_ENGINE=1
-		)
-
-	else
-		mycmakeargs+=(
-			-DWITHOUT_SERVER=1
-			-DWITHOUT_EMBEDDED_SERVER=1
-			-DEXTRA_CHARSETS=none
-			-DINSTALL_SQLBENCHDIR=
-			-DWITH_SYSTEMD=no
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	# headers with ABI specific data
-	local MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/mysql/server/my_config.h
-		/usr/include/mysql/server/private/embedded_priv.h
-		/usr/include/mysql/server/mysql_version.h
-		/usr/include/mariadb/mariadb_version.h
-		/usr/include/mysql/mariadb_version.h
-		/usr/include/mysql/server/private/probes_mysql_nodtrace.h
-		/usr/include/mysql/server/private/probes_mysql_dtrace.h )
-
-	# wrap the config scripts
-	local MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config /usr/bin/mysql_config )
-	multilib-minimal_src_install
-}
-
-# Intentionally override eclass function
-multilib_src_install() {
-	cmake-utils_src_install
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
-	if [[ -f "${D}/usr/include/mysql/server/private/config.h" ]] ; then
-		rm "${D}/usr/include/mysql/server/private/config.h" || die
-	fi
-
-	if ! multilib_is_native_abi && use server ; then
-		insinto /usr/include/mysql/server/private
-		doins "${S}"/sql/*.h
-	fi
-
-	# Install compatible symlinks to libmysqlclient
-#	use static-libs && dosym libmariadbclient.a "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.a"
-#	dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so"
-	dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
-
-	# Kill old libmysqclient_r symlinks if they exist.  Time to fix what depends on them.
-	find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
-}
-
-multilib_src_install_all() {
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Convenience links
-	einfo "Making Convenience links for mysqlcheck multi-call binary"
-	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
-	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
-	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
-
-	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
-	if [[ -d "${ED}/usr/data" ]] ; then
-		rm -Rf "${ED}/usr/data" || die
-	fi
-
-	# Unless they explicitly specific USE=test, then do not install the
-	# testsuite. It DOES have a use to be installed, esp. when you want to do a
-	# validation of your database configuration after tuning it.
-	if ! use test ; then
-		rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
-	fi
-
-	# Configuration stuff
-	einfo "Building default configuration ..."
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
-	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
-	cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die
-	eprefixify "${TMPDIR}/my.cnf"
-	doins "${TMPDIR}/my.cnf"
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d"
-	cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
-	eprefixify "${TMPDIR}/50-distro-client.cnf"
-	doins "${TMPDIR}/50-distro-client.cnf"
-
-	if use server ; then
-		mycnf_src="my.cnf.distro-server"
-		sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
-			"${FILESDIR}/${mycnf_src}" \
-			> "${TMPDIR}/my.cnf.ok" || die
-		if use prefix ; then
-			sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
-				"${TMPDIR}/my.cnf.ok" || die
-		fi
-		if use latin1 ; then
-			sed -i \
-				-e "/character-set/s|utf8|latin1|g" \
-				"${TMPDIR}/my.cnf.ok" || die
-		fi
-		eprefixify "${TMPDIR}/my.cnf.ok"
-		newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
-
-		einfo "Including support files and sample configurations"
-		docinto "support-files"
-		local script
-		for script in \
-			"${S}"/support-files/magic
-		do
-			[[ -f "$script" ]] && dodoc "${script}"
-		done
-
-		docinto "scripts"
-		for script in "${S}"/scripts/mysql* ; do
-			[[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
-		done
-	fi
-
-	#Remove mytop if perl is not selected
-	[[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
-}
-
-# Official test instructions:
-# USE='extraengine perl server static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-multilib_src_test() {
-
-	if ! multilib_is_native_abi ; then
-		einfo "Server tests not available on non-native abi".
-		return 0;
-	fi
-
-	_disable_test() {
-		local rawtestname reason
-		rawtestname="${1}" ; shift
-		reason="${@}"
-		ewarn "test '${rawtestname}' disabled: '${reason}'"
-		echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
-	}
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	if ! use server ; then
-		einfo "Skipping server tests due to minimal build."
-		return 0
-	fi
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [[ $UID -eq 0 ]]; then
-		die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-	fi
-	has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox"
-
-	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
-	# Run CTest (test-units)
-	cmake-utils_src_test
-	retstatus_unit=$?
-
-	# Ensure that parallel runs don't die
-	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-	# Enable parallel testing, auto will try to detect number of cores
-	# You may set this by hand.
-	# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-	export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-	# create directories because mysqladmin might run out of order
-	mkdir -p "${T}"/var-tests{,/log} || die
-
-	# Run mysql tests
-	pushd "${TESTDIR}" > /dev/null || die
-
-	touch "${T}/disabled.def"
-	# These are failing in MariaDB 10.0 for now and are believed to be
-	# false positives:
-	#
-	# main.mysql_client_test, main.mysql_client_test_nonblock
-	# main.mysql_client_test_comp:
-	# segfaults at random under Portage only, suspect resource limits.
-
-	local t
-	for t in plugins.cracklib_password_check plugins.two_password_validations ; do
-		_disable_test  "$t" "False positive due to varying policies"
-	done
-
-	for t in main.mysql_client_test main.mysql_client_test_nonblock \
-		main.mysql_client_test_comp ; do
-			_disable_test  "$t" "False positives in Gentoo"
-	done
-
-	# run mysql-test tests
-	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
-	retstatus_tests=$?
-
-	popd > /dev/null || die
-
-	# Cleanup is important for these testcases.
-	pkill -9 -f "${S}/ndb" 2>/dev/null
-	pkill -9 -f "${S}/sql" 2>/dev/null
-
-	local failures=""
-	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-
-	[[ -z "$failures" ]] || die "Test failures: $failures"
-	einfo "Tests successfully completed"
-}
-
-mysql_init_vars() {
-	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
-	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
-	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
-	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
-
-	if [[ -z "${MY_DATADIR}" ]] ; then
-		MY_DATADIR=""
-		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
-			MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1`
-			if [[ -z "${MY_DATADIR}" ]] ; then
-				MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
-				| sed -e 's/.*=\s*//' \
-				| tail -n1`
-			fi
-		fi
-		if [[ -z "${MY_DATADIR}" ]] ; then
-			MY_DATADIR="${MY_LOCALSTATEDIR}"
-			einfo "Using default MY_DATADIR"
-		fi
-		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
-
-		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
-			if [[ -e "${MY_DATADIR}" ]] ; then
-				# If you get this and you're wondering about it, see bug #207636
-				elog "MySQL datadir found in ${MY_DATADIR}"
-				elog "A new one will not be created."
-				PREVIOUS_DATADIR="yes"
-			else
-				PREVIOUS_DATADIR="no"
-			fi
-			export PREVIOUS_DATADIR
-		fi
-	else
-		if [[ ${EBUILD_PHASE} == "config" ]]; then
-			local new_MY_DATADIR
-			new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1`
-
-			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
-				ewarn "MySQL MY_DATADIR has changed"
-				ewarn "from ${MY_DATADIR}"
-				ewarn "to ${new_MY_DATADIR}"
-				MY_DATADIR="${new_MY_DATADIR}"
-			fi
-		fi
-	fi
-
-	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
-	export MY_LOCALSTATEDIR MY_LOGDIR
-	export MY_DATADIR
-}
-
-pkg_config() {
-	_getoptval() {
-		local mypd="${EROOT}"/usr/bin/my_print_defaults
-		local section="$1"
-		local flag="--${2}="
-		local extra_options="${3}"
-		"${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
-	}
-	local old_MY_DATADIR="${MY_DATADIR}"
-	local old_HOME="${HOME}"
-	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	export HOME=${EPREFIX}/root
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
-	if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
-		die "Minimal builds do NOT include the MySQL server"
-	fi
-
-	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
-		local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
-		MY_DATADIR_s="${MY_DATADIR_s%%/}"
-		local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
-		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
-
-		if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
-			if [[ -d "${MY_DATADIR_s}" ]]; then
-				ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
-				ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
-			else
-				elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
-				mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
-				|| die "Moving MY_DATADIR failed"
-			fi
-		else
-			ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
-			if [[ -d "${MY_DATADIR_s}" ]]; then
-				ewarn "Attempting to use ${MY_DATADIR_s}"
-			else
-				eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
-				die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
-			fi
-		fi
-	fi
-
-	local pwd1="a"
-	local pwd2="b"
-	local maxtry=15
-
-	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-		local tmp_mysqld_password_source=
-
-		for tmp_mysqld_password_source in mysql client; do
-			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
-			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
-				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
-					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
-					MYSQL_ROOT_PASSWORD=
-					continue
-				fi
-
-				einfo "Found password in '${tmp_mysqld_password_source}' section!"
-				break
-			fi
-		done
-
-		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
-		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
-		fi
-
-		unset tmp_mysqld_password_source
-	fi
-	MYSQL_TMPDIR="$(_getoptval '--mysqld' tmpdir)"
-	# These are dir+prefix
-	MYSQL_RELAY_LOG="$(_getoptval '--mysqld' relay-log)"
-	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-	MYSQL_LOG_BIN="$(_getoptval '--mysqld' log-bin)"
-	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-
-	if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then
-		einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
-		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR"
-	fi
-	if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then
-		einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
-		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN"
-	fi
-	if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then
-		einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
-		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG"
-	fi
-
-	if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
-		ewarn "You have already a MySQL database in place."
-		ewarn "(${ROOT}/${MY_DATADIR}/*)"
-		ewarn "Please rename or delete it if you wish to replace it."
-		die "MySQL database already exists!"
-	fi
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-
-		einfo "Please provide a password for the mysql 'root' user now"
-		einfo "or through the ${HOME}/.my.cnf file."
-		ewarn "Avoid [\"'\\_%] characters in the password"
-		read -rsp "    >" pwd1 ; echo
-
-		einfo "Retype the password"
-		read -rsp "    >" pwd2 ; echo
-
-		if [[ "x$pwd1" != "x$pwd2" ]] ; then
-			die "Passwords are not the same"
-		fi
-		MYSQL_ROOT_PASSWORD="${pwd1}"
-		unset pwd1 pwd2
-	fi
-
-	local options
-	local sqltmp="$(emktemp)"
-
-	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
-	# see http://bugs.mysql.com/bug.php?id=31312
-	use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
-
-	# Figure out which options we need to disable to do the setup
-	local helpfile="${TMPDIR}/mysqld-help"
-	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
-	for opt in grant-tables host-cache name-resolve networking slave-start \
-		federated ssl log-bin relay-log slow-query-log external-locking \
-		log-slave-updates \
-		; do
-		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
-		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
-	done
-
-	einfo "Creating the mysql database and setting proper permissions on it ..."
-
-	# Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
-	PID_DIR="${EROOT}/var/run/mysqld"
-	if [[ ! -d "${PID_DIR}" ]]; then
-		install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
-	fi
-
-	if [[ ! -d "${MY_DATADIR}" ]]; then
-		install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
-	fi
-
-	pushd "${TMPDIR}" &>/dev/null || die
-
-	# Filling timezones, see
-	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
-	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
-
-	local cmd=( "${EROOT}usr/share/mariadb/scripts/mysql_install_db" )
-	[[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" )
-	cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
-	einfo "Command: ${cmd[*]}"
-	su -s /bin/sh -c "${cmd[*]}" mysql \
-		>"${TMPDIR}"/mysql_install_db.log 2>&1
-	if [ $? -ne 0 ]; then
-		grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
-		die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
-	fi
-	popd &>/dev/null || die
-	[[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
-	|| die "MySQL databases not installed"
-
-	use prefix || options="${options} --user=mysql"
-
-	local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
-	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
-	local mysqld="${EROOT}/usr/sbin/mysqld \
-		${options} \
-		--log-warnings=0 \
-		--basedir=${EROOT}/usr \
-		--datadir=${ROOT}/${MY_DATADIR} \
-		--max_allowed_packet=8M \
-		--net_buffer_length=16K \
-		--socket=${socket} \
-		--pid-file=${pidfile}
-		--tmpdir=${ROOT}/${MYSQL_TMPDIR}"
-	#einfo "About to start mysqld: ${mysqld}"
-	ebegin "Starting mysqld"
-	einfo "Command ${mysqld}"
-	${mysqld} &
-	rc=$?
-	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
-		maxtry=$((${maxtry}-1))
-		echo -n "."
-		sleep 1
-	done
-	eend $rc
-
-	if ! [[ -S "${socket}" ]]; then
-		die "Completely failed to start up mysqld with: ${mysqld}"
-	fi
-
-	ebegin "Setting root password"
-	# Do this from memory, as we don't want clear text passwords in temp files
-	local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
-	"${EROOT}/usr/bin/mysql" \
-		"--socket=${socket}" \
-		-hlocalhost \
-		-e "${sql}"
-	eend $?
-
-	if [[ -n "${sqltmp}" ]] ; then
-		ebegin "Loading \"zoneinfo\", this step may require a few seconds"
-		"${EROOT}/usr/bin/mysql" \
-			"--socket=${socket}" \
-			-hlocalhost \
-			-uroot \
-			--password="${MYSQL_ROOT_PASSWORD}" \
-			mysql < "${sqltmp}"
-		rc=$?
-		eend $?
-		[[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
-	fi
-
-	# Stop the server and cleanup
-	einfo "Stopping the server ..."
-	kill $(< "${pidfile}" )
-	rm -f "${sqltmp}"
-	wait %1
-	einfo "Done"
-}
diff --git a/dev-db/mariadb/mariadb-10.2.11.ebuild b/dev-db/mariadb/mariadb-10.2.11.ebuild
deleted file mode 100644
index 51e0d67ccb02..000000000000
--- a/dev-db/mariadb/mariadb-10.2.11.ebuild
+++ /dev/null
@@ -1,977 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20170926-1321Z"
-SUBSLOT="18"
-
-JAVA_PKG_OPT_USE="jdbc"
-
-# Keeping eutils in EAPI=6 for emktemp in pkg_config
-
-inherit eutils systemd flag-o-matic prefix toolchain-funcs \
-	java-pkg-opt-2 user cmake-utils multilib-minimal
-
-SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz "
-
-# Gentoo patches to MySQL
-if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
-	SRC_URI="${SRC_URI}
-		mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
-fi
-
-HOMEPAGE="http://mariadb.org/"
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-LICENSE="GPL-2 LGPL-2.1+"
-SLOT="0/${SUBSLOT:-0}"
-IUSE="+backup bindist cracklib debug embedded extraengine galera innodb-lz4
-	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
-	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
-	sst-rsync sst-mariabackup sst-xtrabackup static static-libs systemd systemtap tcmalloc
-	test tokudb xml yassl"
-
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!bindist? ( bindist ) libressl? ( test )"
-
-REQUIRED_USE="jdbc? ( extraengine server !static )
-	server? ( tokudb? ( jemalloc !tcmalloc ) )
-	!server? ( !extraengine !embedded )
-	?? ( tcmalloc jemalloc )
-	static? ( yassl !pam )"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# Shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
-	MY_PATCH_DIR="${WORKDIR}/mysql-extras"
-else
-	MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
-fi
-
-PATCHES=(
-	"${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
-	"${MY_PATCH_DIR}"/20018_all_mariadb-10.2.8-without-clientlibs-tools.patch
-	"${MY_PATCH_DIR}"/20024_all_mariadb-10.2.6-mysql_st-regression.patch
-	"${MY_PATCH_DIR}"/20025_all_mariadb-10.2.6-gssapi-detect.patch
-)
-
-# Be warned, *DEPEND are version-dependant
-# These are used for both runtime and compiletime
-# MULTILIB_USEDEP only set for libraries used by the client library
-COMMON_DEPEND="
-	kernel_linux? (
-		sys-process/procps:0=
-		dev-libs/libaio:0=
-	)
-	>=sys-apps/sed-4
-	>=sys-apps/texinfo-4.7-r1
-	!dev-db/mariadb-connector-c[mysqlcompat]
-	jemalloc? ( dev-libs/jemalloc:0= )
-	tcmalloc? ( dev-util/google-perftools:0= )
-	systemtap? ( >=dev-util/systemtap-1.3:0= )
-	!yassl? (
-		!libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
-	)
-	>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
-	sys-libs/ncurses:0=
-	mroonga? ( app-text/groonga-normalizer-mysql )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	!bindist? (
-		sys-libs/binutils-libs:0=
-		>=sys-libs/readline-4.1:0=
-	)
-	server? (
-		backup? ( app-arch/libarchive:0= )
-		cracklib? ( sys-libs/cracklib:0= )
-		extraengine? (
-			odbc? ( dev-db/unixODBC:0= )
-			xml? ( dev-libs/libxml2:2= )
-		)
-		innodb-lz4? ( app-arch/lz4 )
-		innodb-lzo? ( dev-libs/lzo )
-		innodb-snappy? ( app-arch/snappy )
-		numa? ( sys-process/numactl )
-		oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
-		pam? ( virtual/pam:0= )
-		systemd? ( sys-apps/systemd:= )
-		tokudb? ( app-arch/snappy )
-	)
-	>=dev-libs/libpcre-8.41-r1:3=
-"
-DEPEND="virtual/yacc
-	static? ( sys-libs/ncurses[static-libs] )
-	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-	server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
-	${COMMON_DEPEND}"
-RDEPEND="selinux? ( sec-policy/selinux-mysql )
-	abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] )
-	!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
-	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
-	!<virtual/mysql-5.6-r9
-	${COMMON_DEPEND}
-	server? ( galera? (
-		sys-apps/iproute2
-		=sys-cluster/galera-25*
-		sst-rsync? ( sys-process/lsof )
-		sst-mariabackup? ( net-misc/socat[ssl] )
-		sst-xtrabackup? ( net-misc/socat[ssl] )
-	) )
-	perl? ( !dev-db/mytop
-		virtual/perl-Getopt-Long
-		dev-perl/TermReadKey
-		virtual/perl-Term-ANSIColor
-		virtual/perl-Time-HiRes )
-	server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
-"
-# For other stuff to bring us in
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
-	 server? ( ~virtual/mysql-5.6[embedded=,static=] )
-	 virtual/libmysqlclient:${SLOT}[${MULTILIB_USEDEP},static-libs=]
-	server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		local GCC_MAJOR_SET=$(gcc-major-version)
-		local GCC_MINOR_SET=$(gcc-minor-version)
-		if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \
-			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
-			eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."
-			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
-			die
-		fi
-		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on
-		# non x86{,_64} arches
-		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
-			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
-			eerror "${PN} needs to be built with gcc-4.7 or later."
-			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
-			die
-		fi
-	fi
-	java-pkg-opt-2_pkg_setup
-	if has test ${FEATURES} && \
-		use server && ! has userpriv ${FEATURES} ; then
-			eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-	fi
-
-	# This should come after all of the die statements
-	enewgroup mysql 60 || die "problem adding 'mysql' group"
-	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
-}
-
-pkg_preinst() {
-	java-pkg-opt-2_pkg_preinst
-
-	# Here we need to see if the implementation switched client libraries
-	# We check if this is a new instance of the package and a client library already exists
-	local SHOW_ABI_MESSAGE libpath
-	if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
-		libpath=$(readlink "${EROOT}usr/$(get_libdir)/libmysqlclient.so")
-		elog "Due to ABI changes when switching between different client libraries,"
-		elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
-		elog "Please run: revdep-rebuild --library ${libpath}"
-		ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
-	fi
-}
-
-pkg_postinst() {
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Create log directory securely if it does not exist
-	[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
-
-	if use server ; then
-		if use pam; then
-			einfo
-			elog "This install includes the PAM authentication plugin."
-			elog "To activate and configure the PAM plugin, please read:"
-			elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
-			einfo
-		fi
-
-		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-			einfo
-			elog "You might want to run:"
-			elog "\"emerge --config =${CATEGORY}/${PF}\""
-			elog "if this is a new install."
-			elog
-			elog "If you are switching server implentations, you should run the"
-			elog "mysql_upgrade tool."
-			einfo
-		else
-			einfo
-			elog "If you are upgrading major versions, you should run the"
-			elog "mysql_upgrade tool."
-			einfo
-		fi
-
-		if use galera ; then
-			einfo
-			elog "Be sure to edit the my.cnf file to activate your cluster settings."
-			elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
-			elog "The first time the cluster is activated, you should add"
-			elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
-			elog "This option should then be removed for subsequent starts."
-			einfo
-		fi
-	fi
-
-	# Note about configuration change
-	einfo
-	elog "This version of mariadb reorganizes the configuration from a single my.cnf"
-	elog "to several files in /etc/mysql/${PN}.d."
-	elog "Please backup any changes you made to /etc/mysql/my.cnf"
-	elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension."
-	elog "You may have as many files as needed and they are read alphabetically."
-	elog "Be sure the options have the appropitate section headers, i.e. [mysqld]."
-	einfo
-}
-
-src_unpack() {
-
-	# Initialize the proper variables first
-	mysql_init_vars
-
-	unpack ${A}
-	# Grab the patches
-	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack
-
-	mv -f "${WORKDIR}/${P}" "${S}" || die
-}
-
-src_prepare() {
-	java-pkg-opt-2_src_prepare
-	if use tcmalloc; then
-		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt"
-	fi
-
-	# Don't build bundled xz-utils for tokudb
-	echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
-	sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
-	sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
-
-	# Remove the bundled groonga
-	# There is no CMake flag, it simply checks for existance
-	rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
-
-	cmake-utils_src_prepare
-}
-
-src_configure(){
-	# bug 508724 mariadb cannot use ld.gold
-	tc-ld-disable-gold
-	# Bug #114895, bug #110149
-	filter-flags "-O" "-O[01]"
-
-	append-cxxflags -felide-constructors
-
-	# bug #283926, with GCC4.4, this is required to get correct behavior.
-	append-flags -fno-strict-aliasing
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	CMAKE_BUILD_TYPE="RelWithDebInfo"
-
-	# debug hack wrt #497532
-	mycmakeargs=(
-		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
-		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
-		-DINSTALL_BINDIR=bin
-		-DINSTALL_DOCDIR=share/doc/${PF}
-		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
-		-DINSTALL_INCLUDEDIR=include/mysql
-		-DINSTALL_INFODIR=share/info
-		-DINSTALL_LIBDIR=$(get_libdir)
-		-DINSTALL_MANDIR=share/man
-		-DINSTALL_MYSQLSHAREDIR=share/mariadb
-		-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
-		-DINSTALL_SCRIPTDIR=share/mariadb/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
-		-DWITH_COMMENT="Gentoo Linux ${PF}"
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
-		-DWITH_LIBEDIT=0
-		-DWITH_ZLIB=system
-		-DWITHOUT_LIBWRAP=1
-		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DWITH_DEFAULT_COMPILER_OPTIONS=0
-		-DWITH_DEFAULT_FEATURE_SET=0
-		-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
-		-DENABLE_STATIC_LIBS=$(usex static-libs ON OFF)
-		# The build forces this to be defined when cross-compiling.  We pass it
-		# all the time for simplicity and to make sure it is actually correct.
-		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
-		-DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)"
-		-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
-		-DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
-		-DCONC_WITH_EXTERNAL_ZLIB=YES
-		-DWITH_EXTERNAL_ZLIB=YES
-		-DSUFFIX_INSTALL_DIR=""
-		-DWITH_UNITTEST=OFF
-	)
-	if use test ; then
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
-	else
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
-	fi
-
-	if ! use yassl ; then
-		mycmakeargs+=( -DWITH_SSL=system )
-	else
-		mycmakeargs+=( -DWITH_SSL=bundled )
-	fi
-
-	# bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
-	# systemtap only works on native ABI  bug 530132
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			-DWITH_READLINE=$(usex bindist 1 0)
-			-DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
-			-DENABLE_DTRACE=$(usex systemtap)
-		)
-	else
-		mycmakeargs+=(
-			-DWITHOUT_TOOLS=1
-			-DWITH_READLINE=1
-			-DNOT_FOR_DISTRIBUTION=0
-			-DENABLE_DTRACE=0
-		)
-	fi
-
-	if multilib_is_native_abi && use server ; then
-
-		# Federated{,X} must be treated special otherwise they will not be built as plugins
-		if ! use extraengine ; then
-			mycmakeargs+=(
-				-DPLUGIN_FEDERATED=NO
-				-DPLUGIN_FEDERATEDX=NO )
-		fi
-
-		mycmakeargs+=(
-			-DWITH_JEMALLOC=$(usex jemalloc system)
-			-DWITH_PCRE=system
-			-DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
-			-DPLUGIN_SPHINX=$(usex sphinx YES NO)
-			-DPLUGIN_TOKUDB=$(usex tokudb YES NO)
-			-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
-			-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
-			-DPLUGIN_CASSANDRA=NO
-			-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
-			-DPLUGIN_SPIDER=$(usex extraengine YES NO)
-			-DPLUGIN_CONNECT=$(usex extraengine YES NO)
-			-DCONNECT_WITH_MYSQL=1
-			-DCONNECT_WITH_LIBXML2=$(usex xml)
-			-DCONNECT_WITH_ODBC=$(usex odbc)
-			-DCONNECT_WITH_JDBC=$(usex jdbc)
-			# Build failure and autodep wrt bug 639144
-			-DCONNECT_WITH_MONGO=OFF
-			-DWITH_WSREP=$(usex galera)
-			-DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
-			-DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
-			-DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
-			-DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
-			-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
-			-DWITH_MARIABACKUP=$(usex backup ON OFF)
-			-DWITH_LIBARCHIVE=$(usex backup ON OFF)
-			-DINSTALL_SQLBENCHDIR=share/mariadb
-			-DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
-			# systemd is only linked to for server notification
-			-DWITH_SYSTEMD=$(usex systemd yes no)
-			-DWITH_NUMA=$(usex numa ON OFF)
-		)
-
-		# Workaround for MDEV-14524
-		use tokudb && mycmakeargs+=( -DTOKUDB_OK=1 )
-
-		if use test ; then
-			# This is needed for the new client lib which tests a real, open server
-			mycmakeargs+=( -DSKIP_TESTS=ON )
-		fi
-
-		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
-			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
-			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
-			ewarn "You MUST file bugs without these variables set."
-
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
-				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
-			)
-
-		elif ! use latin1 ; then
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=utf8
-				-DDEFAULT_COLLATION=utf8_general_ci
-			)
-		else
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=latin1
-				-DDEFAULT_COLLATION=latin1_swedish_ci
-			)
-		fi
-		mycmakeargs+=(
-			-DEXTRA_CHARSETS=all
-			-DMYSQL_USER=mysql
-			-DDISABLE_SHARED=$(usex static YES NO)
-			-DWITH_DEBUG=$(usex debug)
-			-DWITH_EMBEDDED_SERVER=$(usex embedded)
-			-DWITH_PROFILING=$(usex profiling)
-		)
-
-		if use static; then
-			mycmakeargs+=( -DWITH_PIC=1 )
-		fi
-
-		if use jemalloc || use tcmalloc ; then
-			mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
-		fi
-
-		# Storage engines
-		mycmakeargs+=(
-			-DWITH_ARCHIVE_STORAGE_ENGINE=1
-			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
-			-DWITH_CSV_STORAGE_ENGINE=1
-			-DWITH_HEAP_STORAGE_ENGINE=1
-			-DWITH_INNOBASE_STORAGE_ENGINE=1
-			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
-			-DWITH_MYISAM_STORAGE_ENGINE=1
-			-DWITH_PARTITION_STORAGE_ENGINE=1
-		)
-
-	else
-		mycmakeargs+=(
-			-DWITHOUT_SERVER=1
-			-DWITHOUT_EMBEDDED_SERVER=1
-			-DEXTRA_CHARSETS=none
-			-DINSTALL_SQLBENCHDIR=
-			-DWITH_SYSTEMD=no
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	# headers with ABI specific data
-	local MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/mysql/server/my_config.h
-		/usr/include/mysql/server/private/embedded_priv.h
-		/usr/include/mysql/server/mysql_version.h
-		/usr/include/mariadb/mariadb_version.h
-		/usr/include/mysql/mariadb_version.h
-		/usr/include/mysql/server/private/probes_mysql_nodtrace.h
-		/usr/include/mysql/server/private/probes_mysql_dtrace.h )
-
-	# wrap the config scripts
-	local MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config /usr/bin/mysql_config )
-	multilib-minimal_src_install
-}
-
-# Intentionally override eclass function
-multilib_src_install() {
-	cmake-utils_src_install
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
-	if [[ -f "${D}/usr/include/mysql/server/private/config.h" ]] ; then
-		rm "${D}/usr/include/mysql/server/private/config.h" || die
-	fi
-
-	if ! multilib_is_native_abi && use server ; then
-		insinto /usr/include/mysql/server/private
-		doins "${S}"/sql/*.h
-	fi
-
-	# Install compatible symlinks to libmysqlclient
-#	use static-libs && dosym libmariadbclient.a "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.a"
-#	dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so"
-	dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
-
-	# Kill old libmysqclient_r symlinks if they exist.  Time to fix what depends on them.
-	find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
-}
-
-multilib_src_install_all() {
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Convenience links
-	einfo "Making Convenience links for mysqlcheck multi-call binary"
-	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
-	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
-	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
-
-	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
-	if [[ -d "${ED}/usr/data" ]] ; then
-		rm -Rf "${ED}/usr/data" || die
-	fi
-
-	# Unless they explicitly specific USE=test, then do not install the
-	# testsuite. It DOES have a use to be installed, esp. when you want to do a
-	# validation of your database configuration after tuning it.
-	if ! use test ; then
-		rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
-	fi
-
-	# Configuration stuff
-	einfo "Building default configuration ..."
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
-	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
-	cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die
-	eprefixify "${TMPDIR}/my.cnf"
-	doins "${TMPDIR}/my.cnf"
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d"
-	cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
-	eprefixify "${TMPDIR}/50-distro-client.cnf"
-	doins "${TMPDIR}/50-distro-client.cnf"
-
-	if use server ; then
-		mycnf_src="my.cnf.distro-server"
-		sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
-			"${FILESDIR}/${mycnf_src}" \
-			> "${TMPDIR}/my.cnf.ok" || die
-		if use prefix ; then
-			sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
-				"${TMPDIR}/my.cnf.ok" || die
-		fi
-		if use latin1 ; then
-			sed -i \
-				-e "/character-set/s|utf8|latin1|g" \
-				"${TMPDIR}/my.cnf.ok" || die
-		fi
-		eprefixify "${TMPDIR}/my.cnf.ok"
-		newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
-
-		einfo "Including support files and sample configurations"
-		docinto "support-files"
-		local script
-		for script in \
-			"${S}"/support-files/magic
-		do
-			[[ -f "$script" ]] && dodoc "${script}"
-		done
-
-		docinto "scripts"
-		for script in "${S}"/scripts/mysql* ; do
-			[[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
-		done
-	fi
-
-	#Remove mytop if perl is not selected
-	[[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
-}
-
-# Official test instructions:
-# USE='extraengine perl server static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-multilib_src_test() {
-
-	if ! multilib_is_native_abi ; then
-		einfo "Server tests not available on non-native abi".
-		return 0;
-	fi
-
-	_disable_test() {
-		local rawtestname reason
-		rawtestname="${1}" ; shift
-		reason="${@}"
-		ewarn "test '${rawtestname}' disabled: '${reason}'"
-		echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
-	}
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	if ! use server ; then
-		einfo "Skipping server tests due to minimal build."
-		return 0
-	fi
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [[ $UID -eq 0 ]]; then
-		die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-	fi
-	has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox"
-
-	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
-	# Run CTest (test-units)
-	cmake-utils_src_test
-	retstatus_unit=$?
-
-	# Ensure that parallel runs don't die
-	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-	# Enable parallel testing, auto will try to detect number of cores
-	# You may set this by hand.
-	# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-	export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-	# create directories because mysqladmin might run out of order
-	mkdir -p "${T}"/var-tests{,/log} || die
-
-	# Run mysql tests
-	pushd "${TESTDIR}" > /dev/null || die
-
-	touch "${T}/disabled.def"
-	# These are failing in MariaDB 10.0 for now and are believed to be
-	# false positives:
-	#
-	# main.mysql_client_test, main.mysql_client_test_nonblock
-	# main.mysql_client_test_comp:
-	# segfaults at random under Portage only, suspect resource limits.
-
-	local t
-	for t in plugins.cracklib_password_check plugins.two_password_validations ; do
-		_disable_test  "$t" "False positive due to varying policies"
-	done
-
-	for t in main.mysql_client_test main.mysql_client_test_nonblock \
-		main.mysql_client_test_comp rpl.rpl_extra_col_master_myisam ; do
-			_disable_test  "$t" "False positives in Gentoo"
-	done
-
-	# run mysql-test tests
-	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
-	retstatus_tests=$?
-
-	popd > /dev/null || die
-
-	# Cleanup is important for these testcases.
-	pkill -9 -f "${S}/ndb" 2>/dev/null
-	pkill -9 -f "${S}/sql" 2>/dev/null
-
-	local failures=""
-	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-
-	[[ -z "$failures" ]] || die "Test failures: $failures"
-	einfo "Tests successfully completed"
-}
-
-mysql_init_vars() {
-	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
-	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
-	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
-	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
-
-	if [[ -z "${MY_DATADIR}" ]] ; then
-		MY_DATADIR=""
-		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
-			MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1`
-			if [[ -z "${MY_DATADIR}" ]] ; then
-				MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
-				| sed -e 's/.*=\s*//' \
-				| tail -n1`
-			fi
-		fi
-		if [[ -z "${MY_DATADIR}" ]] ; then
-			MY_DATADIR="${MY_LOCALSTATEDIR}"
-			einfo "Using default MY_DATADIR"
-		fi
-		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
-
-		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
-			if [[ -e "${MY_DATADIR}" ]] ; then
-				# If you get this and you're wondering about it, see bug #207636
-				elog "MySQL datadir found in ${MY_DATADIR}"
-				elog "A new one will not be created."
-				PREVIOUS_DATADIR="yes"
-			else
-				PREVIOUS_DATADIR="no"
-			fi
-			export PREVIOUS_DATADIR
-		fi
-	else
-		if [[ ${EBUILD_PHASE} == "config" ]]; then
-			local new_MY_DATADIR
-			new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1`
-
-			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
-				ewarn "MySQL MY_DATADIR has changed"
-				ewarn "from ${MY_DATADIR}"
-				ewarn "to ${new_MY_DATADIR}"
-				MY_DATADIR="${new_MY_DATADIR}"
-			fi
-		fi
-	fi
-
-	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
-	export MY_LOCALSTATEDIR MY_LOGDIR
-	export MY_DATADIR
-}
-
-pkg_config() {
-	_getoptval() {
-		local mypd="${EROOT}"/usr/bin/my_print_defaults
-		local section="$1"
-		local flag="--${2}="
-		local extra_options="${3}"
-		"${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
-	}
-	local old_MY_DATADIR="${MY_DATADIR}"
-	local old_HOME="${HOME}"
-	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	export HOME=${EPREFIX}/root
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
-	if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
-		die "Minimal builds do NOT include the MySQL server"
-	fi
-
-	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
-		local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
-		MY_DATADIR_s="${MY_DATADIR_s%%/}"
-		local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
-		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
-
-		if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
-			if [[ -d "${MY_DATADIR_s}" ]]; then
-				ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
-				ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
-			else
-				elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
-				mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
-				|| die "Moving MY_DATADIR failed"
-			fi
-		else
-			ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
-			if [[ -d "${MY_DATADIR_s}" ]]; then
-				ewarn "Attempting to use ${MY_DATADIR_s}"
-			else
-				eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
-				die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
-			fi
-		fi
-	fi
-
-	local pwd1="a"
-	local pwd2="b"
-	local maxtry=15
-
-	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-		local tmp_mysqld_password_source=
-
-		for tmp_mysqld_password_source in mysql client; do
-			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
-			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
-				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
-					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
-					MYSQL_ROOT_PASSWORD=
-					continue
-				fi
-
-				einfo "Found password in '${tmp_mysqld_password_source}' section!"
-				break
-			fi
-		done
-
-		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
-		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
-		fi
-
-		unset tmp_mysqld_password_source
-	fi
-	MYSQL_TMPDIR="$(_getoptval '--mysqld' tmpdir)"
-	# These are dir+prefix
-	MYSQL_RELAY_LOG="$(_getoptval '--mysqld' relay-log)"
-	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-	MYSQL_LOG_BIN="$(_getoptval '--mysqld' log-bin)"
-	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-
-	if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then
-		einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
-		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR"
-	fi
-	if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then
-		einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
-		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN"
-	fi
-	if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then
-		einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
-		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG"
-	fi
-
-	if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
-		ewarn "You have already a MySQL database in place."
-		ewarn "(${ROOT}/${MY_DATADIR}/*)"
-		ewarn "Please rename or delete it if you wish to replace it."
-		die "MySQL database already exists!"
-	fi
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-
-		einfo "Please provide a password for the mysql 'root' user now"
-		einfo "or through the ${HOME}/.my.cnf file."
-		ewarn "Avoid [\"'\\_%] characters in the password"
-		read -rsp "    >" pwd1 ; echo
-
-		einfo "Retype the password"
-		read -rsp "    >" pwd2 ; echo
-
-		if [[ "x$pwd1" != "x$pwd2" ]] ; then
-			die "Passwords are not the same"
-		fi
-		MYSQL_ROOT_PASSWORD="${pwd1}"
-		unset pwd1 pwd2
-	fi
-
-	local options
-	local sqltmp="$(emktemp)"
-
-	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
-	# see http://bugs.mysql.com/bug.php?id=31312
-	use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
-
-	# Figure out which options we need to disable to do the setup
-	local helpfile="${TMPDIR}/mysqld-help"
-	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
-	for opt in grant-tables host-cache name-resolve networking slave-start \
-		federated ssl log-bin relay-log slow-query-log external-locking \
-		log-slave-updates \
-		; do
-		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
-		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
-	done
-
-	einfo "Creating the mysql database and setting proper permissions on it ..."
-
-	# Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
-	PID_DIR="${EROOT}/var/run/mysqld"
-	if [[ ! -d "${PID_DIR}" ]]; then
-		install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
-	fi
-
-	if [[ ! -d "${MY_DATADIR}" ]]; then
-		install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
-	fi
-
-	pushd "${TMPDIR}" &>/dev/null || die
-
-	# Filling timezones, see
-	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
-	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
-
-	local cmd=( "${EROOT}usr/share/mariadb/scripts/mysql_install_db" )
-	[[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" )
-	cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
-	einfo "Command: ${cmd[*]}"
-	su -s /bin/sh -c "${cmd[*]}" mysql \
-		>"${TMPDIR}"/mysql_install_db.log 2>&1
-	if [ $? -ne 0 ]; then
-		grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
-		die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
-	fi
-	popd &>/dev/null || die
-	[[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
-	|| die "MySQL databases not installed"
-
-	use prefix || options="${options} --user=mysql"
-
-	local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
-	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
-	local mysqld="${EROOT}/usr/sbin/mysqld \
-		${options} \
-		--log-warnings=0 \
-		--basedir=${EROOT}/usr \
-		--datadir=${ROOT}/${MY_DATADIR} \
-		--max_allowed_packet=8M \
-		--net_buffer_length=16K \
-		--socket=${socket} \
-		--pid-file=${pidfile}
-		--tmpdir=${ROOT}/${MYSQL_TMPDIR}"
-	#einfo "About to start mysqld: ${mysqld}"
-	ebegin "Starting mysqld"
-	einfo "Command ${mysqld}"
-	${mysqld} &
-	rc=$?
-	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
-		maxtry=$((${maxtry}-1))
-		echo -n "."
-		sleep 1
-	done
-	eend $rc
-
-	if ! [[ -S "${socket}" ]]; then
-		die "Completely failed to start up mysqld with: ${mysqld}"
-	fi
-
-	ebegin "Setting root password"
-	# Do this from memory, as we don't want clear text passwords in temp files
-	local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
-	"${EROOT}/usr/bin/mysql" \
-		"--socket=${socket}" \
-		-hlocalhost \
-		-e "${sql}"
-	eend $?
-
-	if [[ -n "${sqltmp}" ]] ; then
-		ebegin "Loading \"zoneinfo\", this step may require a few seconds"
-		"${EROOT}/usr/bin/mysql" \
-			"--socket=${socket}" \
-			-hlocalhost \
-			-uroot \
-			--password="${MYSQL_ROOT_PASSWORD}" \
-			mysql < "${sqltmp}"
-		rc=$?
-		eend $?
-		[[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
-	fi
-
-	# Stop the server and cleanup
-	einfo "Stopping the server ..."
-	kill $(< "${pidfile}" )
-	rm -f "${sqltmp}"
-	wait %1
-	einfo "Done"
-}
diff --git a/dev-db/mariadb/mariadb-5.5.58.ebuild b/dev-db/mariadb/mariadb-5.5.58.ebuild
deleted file mode 100644
index ad3d7ce4c164..000000000000
--- a/dev-db/mariadb/mariadb-5.5.58.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-MY_EXTRAS_VER="20160721-1526Z"
-
-# Build system
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-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 ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-SLOT="0/18"
-
-# Please do not add a naive src_unpack to this ebuild
-# 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
-
-# Official test instructions:
-# USE='embedded extraengine perl ssl static-libs community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-		# Enable parallel testing, auto will try to detect number of cores
-		# You may set this by hand.
-		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${T}"/var-tests{,/log}
-
-		# create symlink for the tests to find the replace util
-		ln -s "${BUILD_DIR}/extra/replace" "${BUILD_DIR}/client/"
-
-		# These are failing in MariaDB 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test, main.mysql_client_test_nonblock:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam
-		# fails due to bad cleanup of previous tests when run in parallel
-		# The tool is deprecated anyway
-		# Bug 532288
-
-		for t in main.mysql_client_test main.mysql_client_test_nonblock \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help \
-			archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
-			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--testcase-timeout=30
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 4756d703d973..9088a95c72c4 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -6,5 +6,5 @@ DIST phpMyAdmin-4.7.8-all-languages.tar.xz 6218056 BLAKE2B 879ef6703711725781fcf
 EBUILD phpmyadmin-4.0.10.20.ebuild 1562 BLAKE2B 402c8f669c785bb084a8d7af247c62cd070eced8a613b43303bb2bb44781041f3e099fe5a4ff5817e63ff8260b898f4bed232ffa7e358075991bbe6f5a5656cd SHA512 e15e47f37a54090574b4c4554ff295fb9ad73543aebed5718e28575c238b3e59c393b091eb34ddccc04be8297b08deb442d27e12c595f846d8810aa50561af64
 EBUILD phpmyadmin-4.7.0.ebuild 1568 BLAKE2B bf1ade74bd74565b12e48237ed3acd11fbe066aeae08d8336cde2dcf104e6caeefa351aa8da751673cae6430e0b96bdf93ee382b3df22e22ead06d434c6b17a4 SHA512 9ba65eb7c35fe80be1f4bfe6a967e72e4e287f868f6126120f972ff12ade1def36a6bdfe02a8ed8b9cf9fc71f8c8561de4696567fe539b414e5ddae1932a0a0b
 EBUILD phpmyadmin-4.7.7-r1.ebuild 1567 BLAKE2B 8b4612d39c9e7e62b567662a2c932047f2892d3b54f61348eb8adc0ed82739d0ee3548a8a86ed50f28c0ac975de0082e223f8cbc518f8cb15f8328432c70aa0e SHA512 bd185db33047f9aa55469dc96995d9e298739a108ec4f8723ca875331a2ad5c8e9f3f12e6d632cb924e4899060ac3717fb6f6969a07f25715bfa3977666ce8b6
-EBUILD phpmyadmin-4.7.8.ebuild 1567 BLAKE2B 8b4612d39c9e7e62b567662a2c932047f2892d3b54f61348eb8adc0ed82739d0ee3548a8a86ed50f28c0ac975de0082e223f8cbc518f8cb15f8328432c70aa0e SHA512 bd185db33047f9aa55469dc96995d9e298739a108ec4f8723ca875331a2ad5c8e9f3f12e6d632cb924e4899060ac3717fb6f6969a07f25715bfa3977666ce8b6
+EBUILD phpmyadmin-4.7.8.ebuild 1566 BLAKE2B 7df6fe7cda85a79d8805b34e096e8499ff12fc1672de43c0b86cfc9adb8396f87ec6b396983dc8ee322315c56eb7510f0e5dd6d1c935179079860af47e025459 SHA512 00923d664e86c4cde82f001c8b181d2f2552d60d0af84869d47b2a004975b8be21819b2b3072892cc44ce300f84a10fe2d306f9f97393ee5ab81df38c911b66c
 MISC metadata.xml 701 BLAKE2B aef0a047bca31221714bf27203bd720863c5cef6b7b4dd72b441761a0638bca38c03610e65b3819ca0fba6577973908d7ca40ec8baa3aac1255d19b7cfa9f0a7 SHA512 6dcb099779cd0db4928ee812c81fee762612846044e6ee3df3b661a2dce6aed01420d0bc1301c8ff9d763fb8aeaeef3290a7889b32705fc48e8c392aa8b8ca82
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.7.8.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.7.8.ebuild
index ae27f08a6d20..d21c17de88ea 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.7.8.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.7.8.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.phpmyadmin.net/"
 SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"
 
 RDEPEND="
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 234d2be2f3be..eab38e2da7ba 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -43,7 +43,7 @@ DIST postgresql-9.6.7.tar.bz2 19504886 BLAKE2B 04ed26987f3a38826b7e04bf364d8f59f
 DIST postgresql-9.6.8.tar.bz2 19528927 BLAKE2B 6aab5dbe4b13e1624befc33c2fa5241804dff71879e2d60c166db19c2fe015cd19cfc35054e6aede82bfe6b83a7146b6d2eedaabb94111c163da732526ff1723 SHA512 6b7595c0046308c725d77360b156e979d6bc469b78ac6500f631112f19b2607ca2d816781f8c5fd3bd835c48e079e79ada7af687fbd306a8fec5e160f20dd211
 EBUILD postgresql-10.1.ebuild 13697 BLAKE2B d356373a27d27fdd2447f93691847816fd089019206d7371cbd6c84a513b6d490b20278232769fe1de63d60d6bdd1e0ff9afce5fbf7b0da66296a57167d689df SHA512 65bbb3d9d6e64dbf46d8d24c0aacaa930c417b262fa01442cdb09820bf47d37e81fa272e5afe808cb96bd5a3fdad3d23540c1d08a2d5a8de8bb6e8f4b0a3db11
 EBUILD postgresql-10.2.ebuild 13695 BLAKE2B 7ce2e7da726f2dd09a908ff163d6c809ffa02843493ac1c6477a0e3fd13256301a3814adc8e73dc528c2443e0e78a7186cafdda0d9e9e9460ddb2c71545327f0 SHA512 42359ec82325fd3fbfc0963b0833fa3e8797b51da3b366328be3b1c66b3ef4fab4d4c89d861a0eafd15ab36041f663ad56d67b9f0fa20bbff7e829078c788bc9
-EBUILD postgresql-10.3.ebuild 13695 BLAKE2B 7ce2e7da726f2dd09a908ff163d6c809ffa02843493ac1c6477a0e3fd13256301a3814adc8e73dc528c2443e0e78a7186cafdda0d9e9e9460ddb2c71545327f0 SHA512 42359ec82325fd3fbfc0963b0833fa3e8797b51da3b366328be3b1c66b3ef4fab4d4c89d861a0eafd15ab36041f663ad56d67b9f0fa20bbff7e829078c788bc9
+EBUILD postgresql-10.3.ebuild 13694 BLAKE2B 9b4bab58754dce659e2c6c0c6b9e93a8af9097dfdff9efdab74eb6ed5f1533d04920a4b2bea58beba224ee38114c0cffd4e995879f0431fe8a6c66cc13a25dd9 SHA512 ecf4fdb9532135052036b6b94742be2d4d92bcfdd46b517f4882b46cff6962cabff0b3ec8ac8cf71303e44c67d433deff7e4d541a25d5909204f15919faab099
 EBUILD postgresql-9.2.19.ebuild 11686 BLAKE2B f925064291b78586507d974cf47f850cdcd900dc6a8b60432ca02f242582ff876a13033a093200f4936898d48eb2ff47d74f808c84908962cac0f8b767a9c199 SHA512 886faf3fe74308c908e8c49e7a65cac36e55932eafee581ab021ef66ab3cc7fe2e37c5e4011b33239f6c11935465a6875e8f6d5b86fe4f64e5ead807a1e73164
 EBUILD postgresql-9.2.22.ebuild 13296 BLAKE2B da5e5cb771bbd20396f1621b7af93052a5e2fb022073286aa023245c083c146cad4d911d8754a94a33f9960ab91c8219c76bc624d15e2fbb385b54ac10f34558 SHA512 e16dca2871f2ede54993d9a81768ebc5ad3391041916d42108db09617c7d5577bf0f8daabc30b4d7a6851e991886e3155320a0a1c384c55eb248de12b3f7894e
 EBUILD postgresql-9.2.23-r1.ebuild 13492 BLAKE2B 912b67da2be82aa402ff4cb684f273a1630a6b551adb66d92125bfae9c81b66a48fb7eace28086525ee1bfffa1072a2f756b374a2d9ff10018ace257ab8643fb SHA512 cfb518dd4033579b2fe7f459555809c7d141bc0e15d80d308afa0ad1d3ec92e8809f81d92b855b97d76b299b2e6ec7a48971f2a6fc052da2ec82f048aa22c009
@@ -52,14 +52,14 @@ EBUILD postgresql-9.2.24.ebuild 13483 BLAKE2B ef135a71dfb8f2349c106ddfa34c164058
 EBUILD postgresql-9.3.15.ebuild 11941 BLAKE2B 33410678e64b27a4802e11c1a5fcacadacb0b1332abdf61dfd64e0d6173b0be91ae9d457b58255dd56e410e13c9b5f778b7094acc8e1ddc1e265f685cff6a60b SHA512 3372d3801726ea6509713d79393ee59fc30eb2d832f17805f3d990308813064a59f42b7930d3342639475eeb37bdadc4952cf945e574f47c8ab7f0e9013b83d9
 EBUILD postgresql-9.3.20.ebuild 13742 BLAKE2B 8c6a98061068a6ee781f77fa994c683d80c2c7a1fc4ba7b7cf08a8a4932ff6b7d2522563a9da03b537034da7ecc84b3ab4974b5d1cbdbdab9d64f0e24779cc9c SHA512 21a54b6e8d4483bd15b464e6ab23cc04dbfe2b38fda30131b0d5c26a6cb156aca3ddd09b7228b32b64e4edadd9f24fe0a779efa9f04e633078a4153fcb11086f
 EBUILD postgresql-9.3.21.ebuild 13748 BLAKE2B 5e775828b7641bbbd78366ce5236b4638975951416d88d96a8d742c9b34819be119cd68ec8ffa2251a728f274061b102e111b7a1606e7efc8327128384ef6428 SHA512 112444352eccd357a7954361edc697ac6587a287132c98120ff73d8f74331df950f1c19df712743b1014a72326fc399c34a5da087a89ca60f84398ab556966f7
-EBUILD postgresql-9.3.22.ebuild 13748 BLAKE2B 5e775828b7641bbbd78366ce5236b4638975951416d88d96a8d742c9b34819be119cd68ec8ffa2251a728f274061b102e111b7a1606e7efc8327128384ef6428 SHA512 112444352eccd357a7954361edc697ac6587a287132c98120ff73d8f74331df950f1c19df712743b1014a72326fc399c34a5da087a89ca60f84398ab556966f7
+EBUILD postgresql-9.3.22.ebuild 13747 BLAKE2B eba1e76731b756897b9cd8b357f3f355cc70c0350cbde5648ae78705bc15255a9568d20b1e3bc6fbfde3886f34222a590073238146c9a7b618dd07c2a711aa39 SHA512 7a30b8dcb6c198b4a8e7a29bec5c6cd4c86b9886b505e72749adf826a656c0a1d83dd6e22883ac444ae54e43d908c2f415b2c87b04319b0115c2dfaabb3eaf6f
 EBUILD postgresql-9.4.10.ebuild 12751 BLAKE2B b90abd3b620ce5020b6c9af6e26856026c43204d7f15943a04c33c6dbe75c6b8aab8e4a59022a76913baa8596e0e44ffb454d8d98d7b1fad3747955d0e867ec3 SHA512 ccf11b56f79cd334fb67c13b549506c5c1bfe09b9496466d5d4d4dc976a9e5275cf9e9c1d0e579d615716f1abf320953126d531591439d5d1f777cdac8e4f70e
 EBUILD postgresql-9.4.15.ebuild 14552 BLAKE2B 5e343b4b7c24bfe2cab725491f41c4ec7eb12ca81595e268325adedad80e1266737ce3a18b5d4bd2dae8b3ebaf11b0ae55bed298aa9263eade7e2e7da00b3ff7 SHA512 afa0b8c349c8bd9c10b512f02c8dd16e6857d1a52acaa3ec7d695eb4ca3b7273c2cdcdc7b4b20f7c005570e4bdfd78126c890b6eaa60088ff9170cb5ec1b9595
 EBUILD postgresql-9.4.16.ebuild 14558 BLAKE2B 3fe4d0eefe34b6fdaeb28b9222a007104af7ba57da49184798da285afd66478b1bcbf2a886f0f50201f104fa63a6e25c795c3b6c875dd55ca56717ad15c74b94 SHA512 a81aec3713875dc2b8daa3ef0f6d72347464fb947d2985902481563aff4e58a700140d061623b85abf07e43c7566d0c893957498652a4bafe88efa2a7440cc3c
-EBUILD postgresql-9.4.17.ebuild 14558 BLAKE2B 3fe4d0eefe34b6fdaeb28b9222a007104af7ba57da49184798da285afd66478b1bcbf2a886f0f50201f104fa63a6e25c795c3b6c875dd55ca56717ad15c74b94 SHA512 a81aec3713875dc2b8daa3ef0f6d72347464fb947d2985902481563aff4e58a700140d061623b85abf07e43c7566d0c893957498652a4bafe88efa2a7440cc3c
+EBUILD postgresql-9.4.17.ebuild 14557 BLAKE2B c9478cf449e3de5e7de82ee121318e5fd5ba69932aa2a8d7f7f0071d716a77baf13e51611add88c36f645e6d79313dd49618a4bca89594d5e7534ec03892b58f SHA512 b10739ecf8688da66d712d0bcd99897128aec40f42ece1082de2bd3da5c63ca56f3bbb189c7e62fd67d3fead991be69da465ca1151b56f1e9bf5d4a6b65f7ccb
 EBUILD postgresql-9.5.10.ebuild 14780 BLAKE2B 988e6270060614715936959b06867137f0629884d98cb50643d7d0fc4314c8192fa4205125bb376b3d9ac8d0b17cbceabd89b79671e9bd78017ca13a7c40ecc2 SHA512 26f93ac88c51609e62ea3d2dce5dbbc63cf8ad52ac76f029a437befd907d17d5b343a77a651c362b3292f8cb81784c480febe3909431a2f24ac51b9335d0b149
 EBUILD postgresql-9.5.11.ebuild 14786 BLAKE2B 9be371c7adc7601540ad95689caef57c240c7120872f7fa742cc938af02b72b1a2ab449c4314df424b2592abcff521e7b60c2953e228546f0484eba6adc66a77 SHA512 38f45a1a3d9d6c0063ff58c055f7c09b7d58426c1f76d462f997c2c6ae18e41dfd7f8bb959da1a9298712768a665a211107523fa6696ce2cd679292b11cd122f
-EBUILD postgresql-9.5.12.ebuild 14786 BLAKE2B 9be371c7adc7601540ad95689caef57c240c7120872f7fa742cc938af02b72b1a2ab449c4314df424b2592abcff521e7b60c2953e228546f0484eba6adc66a77 SHA512 38f45a1a3d9d6c0063ff58c055f7c09b7d58426c1f76d462f997c2c6ae18e41dfd7f8bb959da1a9298712768a665a211107523fa6696ce2cd679292b11cd122f
+EBUILD postgresql-9.5.12.ebuild 14785 BLAKE2B b10e25f8d4586c076f49cd9e7b7874c7a7892215a316f65685b5014bbc855485f932cb7684a8bc9c77ac4b3e5bcaf33915e58b6a98b3f2902fd1b9d791556438 SHA512 d55f33f3a7a9137ab6a923212d90cea54473f35115179f19d3be9f9863a8baa5875ef6647b7cb862288e304d5da91dd20e8a2b0f134f17c80d016eb9fa43be80
 EBUILD postgresql-9.5.5.ebuild 13090 BLAKE2B cdcc7cfae7249c37a72bdb0a5c91362bc926170bc47d046f2023ac34ea925281d2f136500c1cae288b4ca2d4c9c8f90b490ddb648c26b3fbcbbf9fcdbabfc2b7 SHA512 957a4a494eb13d125867531c004193746cac0c3197ae3f45b191f78c7c02941400bd02f18af8f954ffbb45523688f5dc3cb4d804f5504020e0304083395cf8d0
 EBUILD postgresql-9.6.6.ebuild 14922 BLAKE2B 25182d0ccbf475123d876bc4ad825b9b5049b7bd8edd8e96ef7390ab8d371515df12cc95426ba503366e81fe04be01c3a4c40a688caeb60fdb972f8f5e7c8ec4 SHA512 385e3c883cfe4926be01f760205a4c0827f6f20c0e465a082cd474e7b68c2a9977a2ebe4acc90c04171ff32f265abedcd12d225dcc3215981fe59216b1dbf6a2
 EBUILD postgresql-9.6.7.ebuild 14928 BLAKE2B 5963a72b10e83b3c05c0afa1b119b38b3debbc6fc7723344fd9ae62e578c4fa6e5a02a62c60a901baa96ec4e7d50c1260f545d6d896144aa8e0f06c3d681209f SHA512 eaf54012af3c62f55227c6968b7fe1d02377f80da4aff9bb90c2d2f83e8127e6aab4bc6be52fa799e19bb4a45b3ba7a2b60db9f693b327d38195b6dcd85fbb2f
diff --git a/dev-db/postgresql/postgresql-10.3.ebuild b/dev-db/postgresql/postgresql-10.3.ebuild
index c1b263b73432..3606fab49166 100644
--- a/dev-db/postgresql/postgresql-10.3.ebuild
+++ b/dev-db/postgresql/postgresql-10.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT=$(get_major_version)
 
diff --git a/dev-db/postgresql/postgresql-9.3.22.ebuild b/dev-db/postgresql/postgresql-9.3.22.ebuild
index 8c685e7ba4e9..08f19cc0a961 100644
--- a/dev-db/postgresql/postgresql-9.3.22.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.22.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.4.17.ebuild b/dev-db/postgresql/postgresql-9.4.17.ebuild
index c13970388057..a1248b747bfe 100644
--- a/dev-db/postgresql/postgresql-9.4.17.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.17.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.5.12.ebuild b/dev-db/postgresql/postgresql-9.5.12.ebuild
index e59e20f000c8..b00eaaaff86f 100644
--- a/dev-db/postgresql/postgresql-9.5.12.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.12.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/slony1/Manifest b/dev-db/slony1/Manifest
index 604dd349a768..092e1116c51a 100644
--- a/dev-db/slony1/Manifest
+++ b/dev-db/slony1/Manifest
@@ -12,5 +12,5 @@ DIST slony1-2.2.6.tar.bz2 1465709 BLAKE2B 87e581638aab5ac9f51437fc43b65f200c29e0
 EBUILD slony1-2.1.3.ebuild 1773 BLAKE2B 40c30eb53c68f34f95a1fa99134a8aea0d4077863d8d85c11794eecb456c22aa04c0463d27b408f540c703f1a149eba8ce0b8acad8f10b3e41862a7c1e21f2d9 SHA512 feff51265613b44f13878516bbd8f5f2c1b5d1cb7e858b71163a5bf8c18bf325c99b708fd3aaf45b81a2219941eb4040066593bcec1d65cdd604e91cfea6838a
 EBUILD slony1-2.1.4.ebuild 1819 BLAKE2B 91997da5e05bb3caf47f40395f05066d9f4e8619ed257d14bdeb10a0fcf80f87d243e2c18bd37b289ae13a81c9fe5f72e7265a890fc3f8c67380249aa24ebde5 SHA512 3c878c1e8e2f2906d7ae9b96602a3431304aff3f081e372fbecf830dbe7c1d487e0f5ea7176076ef0e096081cf2b06e15eefd34089e3f3fcdf31626f631460ad
 EBUILD slony1-2.2.5-r1.ebuild 1629 BLAKE2B 8eea7920799a5617708d591ebbadd3b8bd1d31e20be24af2037d0fba007c07afc00103113cd96e16a583b32e79db5c9ce7fed9b8b874366063563fe5a67a7d25 SHA512 3ef05022f6c1af203a1dbedf4df3ac2fd6912eaf80b612331134c4503eaf0b9e49efb02f58576e577aa2a6b52d747910bd5f1bf791b907b57f68bbb3f80156f4
-EBUILD slony1-2.2.6.ebuild 1647 BLAKE2B 43cff1549af4f387eaf38b8dd95ae4abebe1c1df96e895bd91b132bf6d881a15471d9df5fd328a14d95c755191de006f796695e89df2dfe8039f4168a3f39571 SHA512 42e70f0946627238e98cd6a5589cd8aa6639c743f0d240aa0a0fb45a7d640961e779553c807ca5e613ea481b38c8f65149eba168a40aab9f2351794656ef24a7
+EBUILD slony1-2.2.6.ebuild 1646 BLAKE2B 5a0beae143f859ddf7789ac10ed16718468048713e8342393fb308383249052460e86217440f30a6a48b62261c78d36de8d63f147456cbd3d7ddfa3f108fcc08 SHA512 c32053eb6dc089c63193f3c705bcefea1299d05a83415cec3ce60efd8b86de8e5fb60a02479766b9f976bbdc6af250a4f55d55b2ffdeda925e7422cfb27ba324
 MISC metadata.xml 280 BLAKE2B 75bfaba3095bd67dfa80654885579e51053fd130ae4e3ad61ac75192eebad9fe8d08cbdf63773dad3837ef2805e0594d0823655966fde8876ba5919e01f0e698 SHA512 efb5fb6652ac8cd75fff4eea8b2b044a2c9201cce2faf3bbe13a97565d150e64f9ba0dd8bb691a44a1b6726455306ea8b6c1b121678a721a82e7ea8b6589c94f
diff --git a/dev-db/slony1/slony1-2.2.6.ebuild b/dev-db/slony1/slony1-2.2.6.ebuild
index dbb0ae46d787..6bc6c35ed41f 100644
--- a/dev-db/slony1/slony1-2.2.6.ebuild
+++ b/dev-db/slony1/slony1-2.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -20,7 +20,7 @@ SRC_URI="http://main.slony.info/downloads/${MAJ_PV}/source/${P}.tar.bz2
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND="${POSTGRES_DEP}
 		perl? ( dev-perl/DBD-Pg )
diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index addf679cac8d..dc4064dffc41 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -2,6 +2,6 @@ AUX unixODBC-2.3.5-CVE-2018-7485.patch 5224 BLAKE2B a21d659f75f9ae11a6d78a4a74b0
 DIST unixODBC-2.3.4.tar.gz 1830660 BLAKE2B 19b3b932e66ab2fea5645d9723592d881d86203fcc93a1a34bdc9d24fbb7fa606a0389b37988606ac60da71f378327380a32d4687dba16e784c9cdf0fd9b5fdb SHA512 34799777c95539905d4bbe60ad2b83631a31a68483b6be96dba25f80fa2fff4624ba170078097c942f2206873776d179d7d02a340598c4627f8723eb6f083a26
 DIST unixODBC-2.3.5.tar.gz 1633390 BLAKE2B f7c70740471b0c6ff298f2377a3895efbf160764adc4f607dfb65de2873ea3a39a2852399feaca50fc389875e20a10b3cd0389ba9e9f02d0548312d8063f5af5 SHA512 94b5ebb887571f4fa801ae4305cd6cb4eb0d03682fac1eb0422cdd13b046b077e60bff8286c578b0b5e291cfbc0bc8695495e39c3713858d2eeb7b38459397d5
 EBUILD unixODBC-2.3.4-r1.ebuild 1664 BLAKE2B eaccced362a7f62eebe1809ee0327df36978a6f0856c2b631cee32763f92b20909c4bb32bc79bd179f5d9193f34d5307519bb1880d9a94bd5a27d238a3682efe SHA512 5429a6f9ad0279d77a2a26b5a1a0752a23646922fb0f2c2a3df594e551a1e46db614bb991d126d7652f5359e4ccbca0bfe1051c1af6b80ea47dbc59ca35d7329
-EBUILD unixODBC-2.3.5-r1.ebuild 1830 BLAKE2B 00edc068a40faec558d796132fb1901e54298aaef2f3cfeae19db8587019f720c2f9068f89222456ea043725971d2ca3065e5ceec5049d001718c42e55c9cd54 SHA512 dbbd4d03b5b79c00695d63d90dd19a2967c96dfcdaae0003d3553fe072bbe8129f11fd7b18f4a1b5f369a88d64426dd6ccdb239d14db39104403efea949ac980
+EBUILD unixODBC-2.3.5-r1.ebuild 1829 BLAKE2B 581f8fb19ba7dc1d06e2dc2029e031a58cddc501f58a248130f93a765563205846a7c4b2d1d627786aac53021efbd883445f59bb2e58f134ccb8abafd956daa7 SHA512 58c769992cff2c548ab7e26e3101a449585a1119f0dc6b73b021b03973ac1301adb7d2cce0a92dee8b0c6d176ec35bb97c893e9f74991e908c8c4911b26ab9e9
 EBUILD unixODBC-2.3.5.ebuild 1770 BLAKE2B a2cbcd5f110ac341228fe52330a03a2974dcef1e926e1d117971dbc3de71e8720511ae1474b80d9acc20c8af3ef3cb3ba56b930466da906483b29286e3fe1fb7 SHA512 e3e7b84a4c432a53c467c85828e5652e3475fa881db70c754c6b5b2884e39c89995fac9f1c9f6c151057c87c63f19c4d92a41d0d2097b464190209b19a4622c1
 MISC metadata.xml 366 BLAKE2B 9832224237ae18987939d9c0f657c6666114a5ce41af09a3a5a423d666ec70d9c5cd4fec1d82134b68e2e96b1a3e390977a0cd95001d325465d75b2b9b311d64 SHA512 e47157f178b585272b5c11682cef0c7b7dec227ded178d3427e91632f754db869deb72a6c1b258dfc90f6760028d3045d1e703874ae24111f8deb9db629b8c29
diff --git a/dev-db/unixODBC/unixODBC-2.3.5-r1.ebuild b/dev-db/unixODBC/unixODBC-2.3.5-r1.ebuild
index f6f19799ccdc..007a894e64bf 100644
--- a/dev-db/unixODBC/unixODBC-2.3.5-r1.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.3.5-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.unixodbc.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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="+minimal odbcmanual static-libs unicode"
 
 RDEPEND="
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 0af20819ab7f..094c0d2e022e 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index 28c76b11595e..5ab292139150 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -5,5 +5,5 @@ AUX openscenegraph-3.5.5-cmake.patch 11029 BLAKE2B 924c464b46b58e97efc3d477742c5
 DIST OpenSceneGraph-3.5.1.zip 8353019 BLAKE2B 5f16fc4be3f7cd3c9a4214586920a3e1943a2858ee5d7d86f20a6b35c53c662b952db3596f0ab5c8be0c97c11a2d4537d1d9261b746ec67d88ce6da404b31e44 SHA512 5d419cb2e59efaf1e9b2efdb3a28e1deb5bf8b62a1be2ab4fed06e50064c4c4fb9f1332e65e0bfe0c6d8e99fe0cc134f863ba46965eda9546d125fbd22151057
 DIST OpenSceneGraph-3.5.5.tar.gz 5666085 BLAKE2B f474f7e62476c816cc9b036995f2571e65d33ed426a95eb2727994fd2c46e95457bf5392e488556e53c13c30bd46250f0c3d871678a4de234eae8953c03560a6 SHA512 f4a890bfbabab0ed8d50ad50e8f9ae5aa6edd4a73eda30d6c53ad478889608f7c980306a79549ca1e472cdd3df8061af03537c8139fa6446b00aebf47ec26827
 EBUILD openscenegraph-3.5.1-r2.ebuild 4057 BLAKE2B 5e0b940959059c119b8ec5a02883c3a2170bfd09461a0f3431629ffeb78c31f96596182077b3e02d0bf0dcf47249db0c9ac14b74b2bebae46fd72d2c7a3ad61e SHA512 f775fbc1342169a86f25d912953827b73d065d77a379c28aed6f3235637a8db98d36ac7edaf3a28362f19e78a12b5db5fc95ddd1bb6ff1984e6fec2268147b89
-EBUILD openscenegraph-3.5.5.ebuild 3827 BLAKE2B 745295ec1bbe5dbf5b6bdca319cc324dbdcbe3785900d3f48ca1cac2bc744a54c5e38daeff0e506f13c0d93acbd593fdcb650ae75f7c824c7447af674285443f SHA512 69f856a5e3df23b61905a06e67d5b645eceb034c1fdae1de406d48724743c8b12b96d53d5c960162a44e85769a4608d930289049fe2886da39fa293e217b6080
+EBUILD openscenegraph-3.5.5.ebuild 3826 BLAKE2B 839b9f194663d30ac1d3b4ccc84c738ee37ae1954dd6d89f585dc4e7b29b04ab1d0d3446e1ceec126806eca5ae8b8084d0896c591ade391fa5df046dc4289360 SHA512 ce7825f91b781aaa10d0cc8083b3fdbbfe4faa342995a0f7fdccd0f4716384c0b4935e1a1ae72472887f4cd880612b102507a90e32199040481d99fabf653156
 MISC metadata.xml 1616 BLAKE2B 1c92db1270e1785f2dc412a043102d47fb9635b1063bb2055b2c807912039c074da0b9347e4301ebed8b76823ed6c46f31bd6a27852f408402c867d9fd46128b SHA512 b2fb8a0c8df980ab7d31b04b4f0f9d7a31f5689cd3a08fac6aaa8376116c0b361994779ba04808aeba2e07f76dcfcbf41bd99068ae5f9038421c7d9d67da0c73
diff --git a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild
index 1885eb28ab68..9231ded01139 100644
--- a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${MY_P}.tar.gz"
 
 LICENSE="wxWinLL-3 LGPL-2.1"
 SLOT="0/145" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ia64 ppc ~ppc64 ~x86"
 IUSE="asio curl debug doc examples ffmpeg fltk fox gdal gif glut gstreamer gtk jpeg
 jpeg2k las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff
 truetype vnc wxwidgets xine xrandr zlib"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 57a002dd478a..7f3073356883 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/commons-math/Manifest b/dev-java/commons-math/Manifest
index b74d9795f909..c986f1898e54 100644
--- a/dev-java/commons-math/Manifest
+++ b/dev-java/commons-math/Manifest
@@ -3,5 +3,6 @@ AUX commons-math-3.2-build.xml 12448 BLAKE2B 04021b793945a00a95152ef98772dfb5735
 DIST commons-math-2.1-src.tar.gz 1099423 BLAKE2B 83c52abc10eebb6c749aec218aa435df4cd05106e6bcbead5061df7381d168aa9392ab70dce8eb0b8e254d6d95a372cacddc8f7714198a186a95a04a394bda9d SHA512 53ed8c0400402c588d824c15365ebe60bef41697ff9728270a9fdc3ac30eb60c4c397caf939ccda839eb701453d98af4eac9eae2090575fcfdee4df2d6f6045b
 DIST commons-math3-3.2-src.tar.gz 2602474 BLAKE2B a818ca5ab1b9799359bad1c84d2774329c7c2605aeea3e13769eed9f1578d412555ad90a8de68971daa42b270d4bcd5fbf0fe79714e839d41b08077e32633125 SHA512 132c4725be582e25f67a955c7b3b8c7ef155606d8f4da07770464c422ded6b5e6efd1a13a6e98cff222f4fcac73606d512ee1ab9e3b1c4befcc1ba16ab68787b
 EBUILD commons-math-2.1-r1.ebuild 923 BLAKE2B ba238f19102de7511a9b5fbfe42d4a6b9b32d035ee7f6a28fc500eb4d139f7edb9c02d1f46c1c4bbcffc8499c2ef2a4d7a75879c01501ff9d77bc7619cd2ca2a SHA512 27e322ceeae09a6b38fe639f4eada113e73ce14d86995585a2640324339b5cb9cfee77b8ad63b8b9cb806dbdc6902f5b8d126ca88e0f089d18e55cb823c702cc
-EBUILD commons-math-3.2.ebuild 1314 BLAKE2B 2091d5e19b5f125b55836e3d27fa0dbbfbcf882e05ab348a626f7ca6e89f5ae42720763a64f4a6641ef9909899a1a5269e3b751a9cb2ccce988d9d51335bdd36 SHA512 5acf238a479ebafa4d15b6fb8606b1dda8d1d6a1b2fb8e9a4c3d26fd12557b0b7ff6840b594b1e4f5fabbd5e055d81dc41e43a46dda451e093ddf7e90eca244f
+EBUILD commons-math-2.1-r2.ebuild 905 BLAKE2B b8f1b7372aacb9371321fdec06721060d3b040a15218e452365bf0871e4fc522039e37ee5792c8df7fe976029f8a24b0cd30274731b79f4b5b1a90e0f345e86e SHA512 491637d6c600a2075e5477256d7c0cf3cd77df61e2dfa402d1ec1a11e2538541869b102a07cc375fb32937dac1047579187930ec61d12765af5cbb6422d126d1
+EBUILD commons-math-3.2.ebuild 1315 BLAKE2B a0fe207cc34dae87b52df7709e27f9fc4588e591347d507f8b69cf46ded1eb0b2d23943a93af9997ab215146873fd60479628c80fbcc72dcf8cd1d3c5dc1b72f SHA512 a1f5e7f79e7b36e011a16ed87de7aecf5a9cf8ae8570cdc5fff90a79505bde6120c475df96e188129daec1c436d0409e1260136849c36edafef29e9a70389329
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/commons-math/commons-math-2.1-r2.ebuild b/dev-java/commons-math/commons-math-2.1-r2.ebuild
new file mode 100644
index 000000000000..9f447d65ff8c
--- /dev/null
+++ b/dev-java/commons-math/commons-math-2.1-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc test source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Lightweight, self-contained mathematics and statistics components"
+HOMEPAGE="https://commons.apache.org/math/"
+SRC_URI="mirror://apache/commons/math/source/${P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit4
+		dev-java/hamcrest-core:0
+	)"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}-src"
+
+PATCHES=( "${FILESDIR}"/${PF}-buildfixes.patch )
+
+src_test() {
+	java-pkg_jar-from junit-4
+	java-pkg_jar-from hamcrest-core
+	ANT_TASKS="ant-junit4" eant -Djunit.jar=junit.jar test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar ${PN}.jar
+
+	use doc && java-pkg_dojavadoc target/apidocs
+	use source && java-pkg_dosrc src/main/java/org
+}
diff --git a/dev-java/commons-math/commons-math-3.2.ebuild b/dev-java/commons-math/commons-math-3.2.ebuild
index 746cb389e319..7d4b8f2dc93e 100644
--- a/dev-java/commons-math/commons-math-3.2.ebuild
+++ b/dev-java/commons-math/commons-math-3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ MY_PN="${PN}3"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Lightweight, self-contained mathematics and statistics components"
-HOMEPAGE="http://commons.apache.org/math/"
+HOMEPAGE="https://commons.apache.org/math/"
 SRC_URI="mirror://apache/commons/math/source/${MY_P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 9c4152f54f24..7187567371a3 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 493e070afb8a..df1c1398babb 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -12,7 +12,7 @@ DIST perl-cross-1.1.8.tar.gz 98686 BLAKE2B e4fa78e99cb0b93025468d6035dfa352e7886
 EBUILD perl-5.24.3-r1.ebuild 17404 BLAKE2B 28a0cc578bc96e1890add1e89aedeace9b1b9453a21e58fdfd0d56fa8c6907115716538ba22da233af5df4a760b18c984179f03372cd250363b5e649d1a4b2c5 SHA512 8a7beef95e8e85a4f1538d41330ef4c2fd50d90761ffd74a43a62b4439ab708e50bc182ef3ee7a62ff66e97264ae5c4e3f4bd4633f3ebd49f0c4a527bdad1fb2
 EBUILD perl-5.24.3.ebuild 17070 BLAKE2B 9e99b0f9064e85d7dbd935cc3ad72b91be4ea248cd1d74fcd2f4ec93ebcffeef3ad1c94a03c0b9a36ac9956496283891bd95421aa003eef0e1b22173deaa736a SHA512 150e72fbb0c05884b2c63e62cc76f42aa1f9f6e684f0d7bcb1169e80f970bef8aab5b3f9f82c6f81a54ad9232f72e2b3bff09927de57b60f1d6b835c012551e4
 EBUILD perl-5.26.1-r1.ebuild 19253 BLAKE2B 3d192d2a79bb036593ba46bc02fa901ddfbf4b4e53692f6635fe4f94b530888aab7d5e82b3cd47a74c24828052e53647373d71749b0fce61d0756972500ca8b0 SHA512 650d1573aaf99c30f5df0cb1ca8830cdf23e43b2a20acc0b3d75a52777f5b69df874894e929802c728bdfa6c6a7017f379ee56745b1dcf43862c66564345c5a1
-EBUILD perl-5.26.1-r2.ebuild 19303 BLAKE2B 1ab7112abce21dcae461df39a9fd48e4fc26a245e13e9684cec17ba340d50627ad8f134332742e0f38d51b9771f6bebaa6b0612d1ef4ead285207c3e0b43111b SHA512 cd03c2269b9204ed72dd1ccdfa2651b11950befce222c1014591443d98e0b8610e177f66358dd18f7000734443b4ede9651754e38c1c6e1521e4b5b557ec68a9
+EBUILD perl-5.26.1-r2.ebuild 19470 BLAKE2B 2037a0dde36c6a5db536a0d648acd3145c5032d5976c521053af12dd10de4b49505457414fb0c3a5313015b0c7cc5f769c18912b5518b1791493a81826e5e1c9 SHA512 7884bbec500b42f3521c291b8956b55d7dd508edd417619757b138615f8a4ca4fb6a66b5e4f5b127f55801761b776a5263379a4407241b165a2f0856831deec2
 EBUILD perl-5.26.1.ebuild 18983 BLAKE2B ef92b27b06f0866a1e7e7a3d35f87d8378e1d6df1a42ab68e03682c978f35429f83f23beef2921a214382ecd84e706bddb4a49d1a218d5dc133b71f15faa327c SHA512 903eee39e82711ff898fc7b3628bd06baf7d5ce6ca0b685b7852991755cf7779cc869e076a14a13293eab549d60453026411d3dc2b277873184975ff9ff491c4
 EBUILD perl-5.26.9999.ebuild 19246 BLAKE2B 46e5b5a335ce98d2af68572a58453ba962c3aad3596cad0e88766f3d15c86a0fbebd00469ad90dc3f9c2cdacdc61a87392cc48ffab03cc6b86e42954ee9deff4 SHA512 2ac4f404c2080207756f74468a32c86ebceefff8c9b7b4f1b7ace2591c40f8aefe90b524d96b170f94c82f395c5fbe172a8e5f80ee83f1a1fc569ec65fa59f75
 EBUILD perl-5.28.9999.ebuild 19238 BLAKE2B 1c1ab72e0bfa03b353989e3eadfd12394a19fddef38ce694a63d0c87df4d99ab2c54d789faccd3b614711aeeb63a8146de74d373899af81c453fd46f8b00d4ef SHA512 70d8878281bcfa9d78d6ba87c8f62b575707777676f0f97e6406e2f3bad1b5ededf0e58f1b7c3b286f86291691643b7119cff4f32456c1148db32ceed3d21696
diff --git a/dev-lang/perl/perl-5.26.1-r2.ebuild b/dev-lang/perl/perl-5.26.1-r2.ebuild
index 2b6ee9d381dd..e23f6e792be6 100644
--- a/dev-lang/perl/perl-5.26.1-r2.ebuild
+++ b/dev-lang/perl/perl-5.26.1-r2.ebuild
@@ -325,6 +325,11 @@ src_prepare() {
 			ext/NDBM_File/Makefile.PL || die
 	fi
 
+	# Use errno.h from prefix rather than from host system, bug #645804
+	if use prefix; then
+		sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die
+	fi
+
 	default
 }
 
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 5d6414083b72..dde6ceee1d3d 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -15,7 +15,7 @@ DIST swipl-7.7.9.tar.gz 16794383 BLAKE2B edb99cd235529de319557d9126e459b5c758651
 EBUILD swi-prolog-6.6.6.ebuild 2799 BLAKE2B 47c0d56dae0ce19be9efd09122ef8e6e3655abd3459cd25a9a0cf4734fbb132b8725c79775942da8cb2c5eb40bc35f4c0b5a39064a5e41387d4480379fd71435 SHA512 1d30fcb84653a0cdf7cf4f5a78898d5fb29f939095d19a21324a9587ee6ca98543ae16d564ff8880cdf99c6d5a091c2f0e5dc79074ceadc5a7cd3fe340609d22
 EBUILD swi-prolog-7.2.3-r1.ebuild 3170 BLAKE2B ca7604653a23dbc9158e96e54684482fd1c82e6bea8f9753e73c91d46df95a105d70114c0aae8c86e8b9ef45debf97116755b4fc48ecdae95680045ae60035ba SHA512 fe35661ef51094ddf0aff61659f33de5be0252216b94f45e658215146dd53379881f7077c20ace1ef67b70ad9d7128ccd26e122392a1100ab8db195c9324867a
 EBUILD swi-prolog-7.4.1.ebuild 3337 BLAKE2B 6ec047c27c5f76f8cf1fe29e6c8f45d051f1b7d565217af160a022d0b3b45ecd4c18506348ec2d1d19d498953185b22941814a05559b7fa20b3666f48ede932c SHA512 d3b2fb20a92a39d5b4927cc4e2056a1ba3c66978467050817e84cfe46d795989d7d64721bb3b64a8b632dfa359e308d60db7b2c83efc2298c8318ef6314f08e9
-EBUILD swi-prolog-7.4.2.ebuild 3396 BLAKE2B abe6bab2da2c20799da3b5b6526b9ffe63d722add5e3a80df0009e725049627090276de6bf0fb1aa91e7194fdd82ce3a52a4cc9c7ce758a6e1a34eb6ac5c8d2d SHA512 c013c931da068e4c72f5391ade20e99246575e693fc841ab45cd2f7bb5d74c4476ec04ae97e7c5585bf8721f72b86985f06acfc6d5bf661f17dfc168fc47acb2
+EBUILD swi-prolog-7.4.2.ebuild 3395 BLAKE2B 0ab38dbbfbea20db81e516a60163dae56a391bee23cd6a91df98241d684880ae398247a2fb7b42b33680690c74d438d3204e56f42a81935e461a6017bf013a75 SHA512 25ff3ede7c3524a670f9f6cb7e617813826c8ef691141b42f7f07857573a69401f4555e48c98eaff98f4c30bca1938fda4b1f9e9e119ae83d8a71f517a4d0ba2
 EBUILD swi-prolog-7.6.0.ebuild 3392 BLAKE2B 77fca0aec35200f39f2dd60fccd13c9d6fbe78f14c03c0f57a5d42e9b280285b497e612d364352eb763850b38bc7af626172e76752211f195f2fa54f5d8157e9 SHA512 486bc74f0e77862452cf7bc63687cb1ba1395b9d10a2bb50dcb6334ad986d09153595a325703dc9413a2b22675aa838c66c94b5fe4ca582e1418701a31da002a
 EBUILD swi-prolog-7.6.1.ebuild 3392 BLAKE2B 77fca0aec35200f39f2dd60fccd13c9d6fbe78f14c03c0f57a5d42e9b280285b497e612d364352eb763850b38bc7af626172e76752211f195f2fa54f5d8157e9 SHA512 486bc74f0e77862452cf7bc63687cb1ba1395b9d10a2bb50dcb6334ad986d09153595a325703dc9413a2b22675aa838c66c94b5fe4ca582e1418701a31da002a
 EBUILD swi-prolog-7.6.2.ebuild 3392 BLAKE2B 77fca0aec35200f39f2dd60fccd13c9d6fbe78f14c03c0f57a5d42e9b280285b497e612d364352eb763850b38bc7af626172e76752211f195f2fa54f5d8157e9 SHA512 486bc74f0e77862452cf7bc63687cb1ba1395b9d10a2bb50dcb6334ad986d09153595a325703dc9413a2b22675aa838c66c94b5fe4ca582e1418701a31da002a
diff --git a/dev-lang/swi-prolog/swi-prolog-7.4.2.ebuild b/dev-lang/swi-prolog/swi-prolog-7.4.2.ebuild
index 216f290013c9..848c0aa426ce 100644
--- a/dev-lang/swi-prolog/swi-prolog-7.4.2.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc readline ssl static-libs test uuid zlib X"
 
 RDEPEND="sys-libs/ncurses:=
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 2da1a084fd22..7a9e984d67d3 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -7,5 +7,5 @@ EBUILD vala-0.32.1.ebuild 790 BLAKE2B 5fbcb72d246591c9ab0e0609b6b09be7422a314223
 EBUILD vala-0.34.16.ebuild 799 BLAKE2B e8c39cdb80f0516e03287e3f10b145ef03d15b893db4ec98f5cabc8044b32a77084596c3597e6fa3547b528da88b8b5066785486961f78c7f2763cebb6d572fd SHA512 1c16f86e13c2791dc892d9bea333f7bcfb0116f9a63ca667f56b1905acd5d96873c775805574ef5dbba5b1a00dfa066f0f37d61154eae17f14fc22e1ff71380e
 EBUILD vala-0.34.9.ebuild 790 BLAKE2B b33d0f4822581785cb045304b209146daf494cf7b9917628f8127f6994576a076a375a06d60106e3c7aa88e4e6830cf73998d372d2d8b274271dc100f6427094 SHA512 39a137ec6e618d7bb19340846a026955ccaa3f4a77f0cc84e24c96cf9a4da0354a6504c3d44a734c709e5586ba8fe675c569b48edaf5877cd01d45f51a017cfd
 EBUILD vala-0.36.11.ebuild 882 BLAKE2B 9b3b0be67f7e1fad290caec4e7e29fb6d841d8e171a64f790857b905164ad3ff2c29c7e010d11becfa2d7a2d4687de314589f084af29ee9947dccbb91a29ba5d SHA512 7aef7342b8cad68c744f2c5039dd6bfb4ccd02d6a9f7287e531b730b5b6bbb15e862175bae297f6e025ab6ce50788a92d51b83cbece1889ef66c386e44402393
-EBUILD vala-0.36.7.ebuild 878 BLAKE2B 42c623c2c750a52b303e63455cc55bbe0c12a8d778c1a063712f826452df05a7fd459a182011b4fba8f37aefd7409ab8a36e77c73b80d3c4b6a0f9d572a6a8d6 SHA512 3f2e04c6ff23076059adbafda4f887702b51864ef712ccfe41674878ecaf60652f7795797d1598cc5ca2ed093a4c91394c2f609a61dd0da05e156a28628400f3
+EBUILD vala-0.36.7.ebuild 877 BLAKE2B 26dfe73e16888cc41389ececbc648d48b4f75026bbeac361a249c645b2feab3e0300cd403b425f46029d68bf9e3378293a9e0d15f9efd9314da2b273b089f91d SHA512 4a3629e4c188ac132f43da6dc9e50e2bf9bc73a9dcb45a975067cb33fbe832e24056c90ae3c03a3669bae4fd3b90c4ed51588fcfef4d87c7d28eba1fe45507b4
 MISC metadata.xml 255 BLAKE2B 51dc9e0030d68ac68f075bb4a7b4c5f42122c16f354e10463d7338e652b272b26fa1eb12a144ed4a00d29a020af4df19029d909b4591162347184b1684402c94 SHA512 1970039db79f50391650a9fea933485c6102d1165946ab8efe9395403a02f49d4b17c2942795282469ac7c0306e7353002dcbaa797fb1060982b31ea3540b98b
diff --git a/dev-lang/vala/vala-0.36.7.ebuild b/dev-lang/vala/vala-0.36.7.ebuild
index a7d4b83c08a7..47b42dc89b28 100644
--- a/dev-lang/vala/vala-0.36.7.ebuild
+++ b/dev-lang/vala/vala-0.36.7.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0.36"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 9ce2723f12c8..a8fc96e0d035 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index 31aad74e20a9..2258a36bf9c5 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -1,5 +1,5 @@
 DIST atk-2.22.0.tar.xz 745572 BLAKE2B 4764a6044446de8e08b54c47400727268ca68e676aa36c01877f2b3f973614a40f209406b649f0e96f4a5b75be883ce67ac3fbf20ac0c58adfbaf3509caac312 SHA512 af3f6197eb97de869ee706f19564449b02c1444c413e5418323e4bf4c8cf1d98c7c8baa25189f6879d63606d4bc75f33799cb901f4697c087e868bb9a5643cba
 DIST atk-2.24.0.tar.xz 748972 BLAKE2B f9db7e35322cf4a1df5171c812c83eb935ba44b0167b20ca9a951109c00911392a48db88fac02a12074de4d9f458656f946e8bb7611e1d11cc0de841986f8cc7 SHA512 3ae0a4d5f28d5619d465135c685161f690732053bcb70a47669c951fbf389b5d2ccc5c7c73d4ee8c5a3b2df14e2f5b082e812a215f10a79b27b412d077f5e962
 EBUILD atk-2.22.0.ebuild 1428 BLAKE2B 09fcdbf9c0360b4028be8ffca418f4e83a839fade16e3d1a67f34b9a43ae87ab6f4b44e6f5c363f6fef074ea2d822ed3bb14b58c656dc294426c82d968db98c8 SHA512 64ed9a17da2175f795a0abce2ef28d246f242990962fef66002fab227d5553bc89ca4dbdb779c2a29a1c59e34f3f04260f8669405a9cdd166b76cf2dd9ae6652
-EBUILD atk-2.24.0.ebuild 1433 BLAKE2B 9c4f677364a2f2e01428c4f6b0d8f7b7b0854f9aadd7e47d7968bdb309d362582b9bb8f056e4fffe1c7af176889b27b793d1776422fa42417da1f603ab358a26 SHA512 01be681514bbf9a4cd85aad9370e62520511f134161932c4ec7ab41b191843898851fc282643a68c74f7c6fc76ba692431cfb0cd3259379000890fa5894fa11c
+EBUILD atk-2.24.0.ebuild 1432 BLAKE2B 8c240534bbccd78fea47e7917fe9ce77f403c3ad641176f1c2c36cb2d07850ebbbe0ea69a4af4b130fab50a672d588fa09ce6647ee55b01c6662c69a48647c49 SHA512 14bc128e9edcaa4eb34bf84a57519a851585d9ca0b6ff1e6cf3297df1348b2d5157de7490472ce5a3f7b631e9b3abf775c2c5db6c43d018b8a2c0968c39aae24
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/atk/atk-2.24.0.ebuild b/dev-libs/atk/atk-2.24.0.ebuild
index 14e9bf8f4de9..dc5521bd8447 100644
--- a/dev-libs/atk/atk-2.24.0.ebuild
+++ b/dev-libs/atk/atk-2.24.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="+introspection nls test"
 
 RDEPEND="
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 35703764e64d..3bdbb91e168b 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -4,5 +4,5 @@ DIST glib-2.50.3.tar.xz 7589284 BLAKE2B 8648e5d9e8f4c943ca3ec5a5ec01f380f55f7655
 DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
 EBUILD glib-2.50.3-r1.ebuild 9645 BLAKE2B 14c0111687ec100a63f69ccca1f3e09da4e5bdd19ecf28382dd754cb199bf71cb798858b14f21e1ecbbd720a8682de42df0903f1feab3ba920bff76d40ae8137 SHA512 867357f01c61921249afe92cbf868f457fcf5e29fcf6e7667ad7390dc9456a5d558d5fab46acc0bcf66c7d13d4a0895ac127eb37068ab32011b4b1048703ac3b
-EBUILD glib-2.52.3.ebuild 9553 BLAKE2B 81a32ef282e5e7548effa7c9edcb14731752f485564664ff95ef6730352e490c2d44266b851492bd55c8f2fb43c50ea5c9779715de65e6866b272c2e57952499 SHA512 c4ccb2943b8dacc04718045687340d4b7b151807ec752622c456a8c18d709eedfbabe3cd572198ff4e2f0ced6803be888ca64f6025deb6aa6035ed4dd536db4d
+EBUILD glib-2.52.3.ebuild 9552 BLAKE2B a8ef641d65cbc2d98cace3c6a22c77f04f0e309f16f06d45cf024af7e460c9523a6bd33f8295f659dec54c916e3f9ce6fbadce529ca4669e3e5bf359994fceb7 SHA512 b73d4ab705bca592de6c1baaca2c71b219ea9a5691fbafa640aeb2875e8d7a3bbf41832a00f0c3a9835c71a350effde31adf618f0ba9edd0080aa8abf7fa36f0
 MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
diff --git a/dev-libs/glib/glib-2.52.3.ebuild b/dev-libs/glib/glib-2.52.3.ebuild
index 5c36ee448bb0..e719aa08f80e 100644
--- a/dev-libs/glib/glib-2.52.3.ebuild
+++ b/dev-libs/glib/glib-2.52.3.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
 	test? ( ${PYTHON_REQUIRED_USE} )
 "
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
 # Added util-linux multilib dependency to have libmount support (which
 # is always turned on on linux systems, unless explicitly disabled, but
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index 80dfc297e7fc..4ec5d21bb6cb 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -1,5 +1,5 @@
 DIST gobject-introspection-1.50.0.tar.xz 1415700 BLAKE2B 7707d0affc35e60d272312debd429a96a578cc6ea4e889244a0a1dc34f23e3b686cea06076427575fa620f570141e173990ed12649cb669808141dab1fdffb19 SHA512 cb108cf3d49743e1686fe4ae99f2360799bc8825ad97bf0b97e097b3f89e2771079593de0f497a9e5b9cff892f6fbf870834a6c4d13f11bcde99162e9388ecfa
 DIST gobject-introspection-1.52.1.tar.xz 1384292 BLAKE2B e1176bff177d7b6deee3e93159425a176d8056fbac2af5038950b7bc4486785ca988fc4c8c4d6a069b2bf623092e57f096aea37bbb9a767adaa695ec8f0db4e6 SHA512 878653ffa80c064c73453ea2878a977e52f0d6a0b2123bee8c3429379366f9da3e9fd991fad0dda170d74e4241314ea6c5120f5988e68fad4bfe9c333d11389f
 EBUILD gobject-introspection-common-1.50.0.ebuild 1032 BLAKE2B 88bf89cee40bdfe0e69efe0126f65dca0133903ae4756c336494799c7a3a1b8093f7f2483560c627482d0a5dae7ec41872969c1322c0dc117df389f4e74c3424 SHA512 2f026c9d91e6300594e43499235d9fc563bbffc967cd91ebe7c7582ce173d717d10bc18a906086ac57eb82e5446c18288f091daf8a622b2e5a5bc033c70b5058
-EBUILD gobject-introspection-common-1.52.1.ebuild 1039 BLAKE2B f73bb5cc29d6ad16dbcf006797102fe4b6add636b9ae4699713e42ba818d3735c645e09f98418d71f5aa2bdb152e0415720eecf92f8af0cd7ffa82e3cf87292a SHA512 e3521c44625babf9df5760a94233a5c88548214f9022dbc334bfb66c1c0b48751a47d5de897744de79171bc4d1e78607dd5c875ee21e97d57d2400f8c01d5c02
+EBUILD gobject-introspection-common-1.52.1.ebuild 1038 BLAKE2B 868313de5aee5b5eacaacb2cb5581d4d1cbba5a8649ca80a94dbe7253e6c122f3d65a5627ea7a9e11f3a4fdc23e53f7772a8a0d74ed27b1f1cb8f4d6dfb168ee SHA512 3060ecad1934a5a0f51d324eb5bd9428a732b8246a5705dcb20ed8accd7f7747894f5454662bf3d04febb9bcb91017b4d53e940e217391d2f68fd04562289e46
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.52.1.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.52.1.ebuild
index 040e9d9d05a1..873cd6fea9a4 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.52.1.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.52.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index a0cd72f36817..53b6b3301655 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,5 +1,5 @@
 DIST gobject-introspection-1.50.0.tar.xz 1415700 BLAKE2B 7707d0affc35e60d272312debd429a96a578cc6ea4e889244a0a1dc34f23e3b686cea06076427575fa620f570141e173990ed12649cb669808141dab1fdffb19 SHA512 cb108cf3d49743e1686fe4ae99f2360799bc8825ad97bf0b97e097b3f89e2771079593de0f497a9e5b9cff892f6fbf870834a6c4d13f11bcde99162e9388ecfa
 DIST gobject-introspection-1.52.1.tar.xz 1384292 BLAKE2B e1176bff177d7b6deee3e93159425a176d8056fbac2af5038950b7bc4486785ca988fc4c8c4d6a069b2bf623092e57f096aea37bbb9a767adaa695ec8f0db4e6 SHA512 878653ffa80c064c73453ea2878a977e52f0d6a0b2123bee8c3429379366f9da3e9fd991fad0dda170d74e4241314ea6c5120f5988e68fad4bfe9c333d11389f
 EBUILD gobject-introspection-1.50.0.ebuild 2092 BLAKE2B 92e733407ea06a272049437950950d24f42a90757c4368a4e634833df2b3502c1ebc9c57297fe9b7972d2d96fc57b0b247afd624d6468a697d59bd53fbde958d SHA512 559b28837ba8826dba5b258cd3c6a1723174fbf2ec2609c002677aee0fb2bfde431fc9f18b20f888c483fd4f4980b386bebd7888f5eda1c150b2f80b002297d8
-EBUILD gobject-introspection-1.52.1.ebuild 2103 BLAKE2B 43fde154231e60ba5217590cf4cf4369aeb07ac4f5abfaef1f1b4d480a173f6b0cca4c57db06fa4b57be7af0cbcebb27cbcd177927be23ca7474d47dfbe34c84 SHA512 5d669bf7b8426016845729e65a5df8e85fa6ac120188fff327bd527e0265d450537b3461d1bc3730b9d903d2742a0a9b9b8cc0a9c09018591cf159ef8554fe43
+EBUILD gobject-introspection-1.52.1.ebuild 2102 BLAKE2B dafda08822a439948cf40e90f150ca9d9982e3fa7e810812b587ad17231d23693a1b94f070dfa8b9a829d7f391d0c9a8b14b9700420e2bb0b677ec9000504bea SHA512 b2739c58bc25eed4fdd090094823011d4d129368c5e431ac8d60b7623a1174cb5e9d204c8e28afd430fe850beb424e5e70489f7a884a5bd83da7b0a4fc7b025b
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.52.1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.52.1.ebuild
index a0fa16d7398c..343be68a596d 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.52.1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.52.1.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	test? ( cairo )
 "
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 # We force glib and g-i to be in sync by this way as explained in bug #518424
diff --git a/dev-libs/judy/Manifest b/dev-libs/judy/Manifest
index 21050d0e2aa5..447eb8f5d2c9 100644
--- a/dev-libs/judy/Manifest
+++ b/dev-libs/judy/Manifest
@@ -4,6 +4,6 @@ AUX judy-1.0.5-parallel-make.patch 6736 BLAKE2B 4ba894f81e98a02a83700a061c9fa1f4
 DIST Judy-1.0.4.tar.gz 1142724 BLAKE2B 9357a6d37a9f8a15c4e06c304e5496ae271717243d79b7a1287cd6fcea5e130dcac2b1e191fff1530fb141a1d967be404a106afa3ac5005a6c71eb61491b807b SHA512 3a2fcd14a4367910ced5d1da8b46551e2847e02c1faa19c3ecd0ee542bb89c683c8998feb79abee4999a753d26ed5e7bfd9a7e2ed343a7667c7ff0d624ee384f
 DIST Judy-1.0.5.tar.gz 1147847 BLAKE2B f5f31af2b7d1db5524ff035e9f9b733a4c5c23de76cd4c55bcdc59f7474ee02d7c7ec9341f087736ff6e39a139d20d9ab8298397aaf17f7d48a851037b8677c5 SHA512 1a0d59b092c80d95270a3089cd25ee0ddad1d591101b03784e2e46dfc73bce445a7fb495b449043544a366c09b35b833556053bf3bf65dd00abbd786d26c6980
 EBUILD judy-1.0.4.ebuild 678 BLAKE2B 136a23f4eee0c8b4dcc67ac789a07f00bf0345966aa68b60ddc79b2a6519d51aeea9cdef8f86297a4c0d75ef18e842d657191c301e5f633534d006ceb78cd162 SHA512 e5a0445240ec1eb4e1e0b654d7d4722b29224e718374404cbc9a4d452d2b3b73b80c777fab290e94548f6817c3fa1b75bfdca30126fe0cdf6bacd1085ad6e702
-EBUILD judy-1.0.5-r2.ebuild 868 BLAKE2B a68debbb1c70252e3eb34aaf704126a37e2b147a43f4758622dd04e97a171294bd4ba061bd691248be32ddb80e7b6c8988e2ce263d3339353554a8b527d21017 SHA512 23439b541e31818830b9b63087d82b32dbf93a598335f2b25f91100b07eb61d4ee21345e2e8289ed10ff40b5c8ef7909b4b386c58dcf256f26c6fae50449d9df
+EBUILD judy-1.0.5-r2.ebuild 867 BLAKE2B 045b5993c5ba073a3b8c58bb3ad44f1f308f04d12c0d5dc2488a692afc948553280952d465b6cb7b05d303014d30d9ede972dff3bf024005160db9cbb364ff35 SHA512 7a8b1d7e0e63258e60353a55d8db38fbbe7f84dd623c65484dc77f408a30ab76d70fc8af3462f82a351bd43503309f1f4cef34a44d91a562a48475352c8ee8ea
 EBUILD judy-1.0.5.ebuild 640 BLAKE2B d8a739e2a8688eaa6ba652ff123d919c341a44b74899dc375ad08a69cd7bba9399b2a2c24385f9731c0b5d12fa3c4ba6b73de5ddf41d4a59c25213a86a2b7e12 SHA512 5adb0f29c2fa930f31942cb06e6598f071da915faf6a2ff3e0790ea958dbc9cb62eb32212a5cbba8b24fd52a8b9d021bc39bc03e6ef2b5e941615821de5870ab
 MISC metadata.xml 320 BLAKE2B 7fd7a64eaec80ea91157624ff748afed6e8754407b8a0e261aac3022e2b69e2e6019ccb025c5a739f9bc005d81e41bb14be0add7323366422499aa96c8162e84 SHA512 ab0598eef76bffcdce226c8d0c20e70c723771835f20505119ea1fba9484293a28e5862f9227738284ce7a53809e4fc68fea31e2335764934e8e36b983366a46
diff --git a/dev-libs/judy/judy-1.0.5-r2.ebuild b/dev-libs/judy/judy-1.0.5-r2.ebuild
index e118223b34de..a1af11e7c41e 100644
--- a/dev-libs/judy/judy-1.0.5-r2.ebuild
+++ b/dev-libs/judy/judy-1.0.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/judy/Judy-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="static-libs"
 DOCS=( AUTHORS ChangeLog README )
 
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 56dbc8d1582d..66ef23828482 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -7,5 +7,5 @@ EBUILD libinput-1.10.0.ebuild 1444 BLAKE2B 9bbc30b14228ee7c70b5e66574664eb8b6994
 EBUILD libinput-1.10.1.ebuild 1444 BLAKE2B 9bbc30b14228ee7c70b5e66574664eb8b699413868a0ba0644d919a518b144400d79c82a6901b40d31fa9138696f72d57d4decca4afc42de6aa3dcbb5fe55d74 SHA512 201e65f2b68ce18f19d9b1656e8eb25bfc54821aea970eed17144ca8a6bbb85b3d205a49ecb515719d71482be3f926a178303f765710ed4e672ce48fbe62e0b7
 EBUILD libinput-1.7.3.ebuild 1535 BLAKE2B 6d99e610dda382651bed647c29ee8073d14879ec2fa83f22e724ff294018cecc78f16799802974aac29153924c15f922d42d188e9199eaee60a81282be840d0d SHA512 00505995c95da87e936d1473548efb1d52fd1a593e659aec308e38f937fa391a3a092f2b7e2c1c564e9be9ce506cc021f1c3f590bc5bc39623dabd1e6758187c
 EBUILD libinput-1.8.3.ebuild 1544 BLAKE2B d2fe752951be5a015ec92f907c7cf5ac2739f35c51bafcf26e2381f3d22e8a14a6bc21c3697f02e0a0684c27dc1cd4379b5390d1df9b8a083b7405f7b31b2c5c SHA512 a0a3a0aaab446d72eda57a04d8af10d5d35f54f4c47e6ee5f9c209fac3682d3d83392ef546255026b5ce774d76d33d06bf940c55da4ade4fe33ae10e9dc0968a
-EBUILD libinput-1.9.4.ebuild 1440 BLAKE2B fa5998ed4900a938c4f32882c22e9dfdd4cc7f9257a6a05ebc6ba705198799c3de662783181c06749c3ea3574fe6c3b10f7b69f1ad45bffdfe94539690f36c2b SHA512 cd157d358a065daeb04c36fc73605e8c5245a46651aef810d400627ce7f990d7ac7389501e6e877692c3473418c38216358f4120f9a7f466d517a71f69ced81e
+EBUILD libinput-1.9.4.ebuild 1439 BLAKE2B e5429b98eb1b6aecd60163206a452f8a5b5a332ce12f4c181d43bdd2841564b715883aad2d395fd17a44789a87379b61c8176265b18b2cc0ce51d99cb6c48605 SHA512 b80a37c83d6242da1459f2308b5c5235b62394effc75bfafb9ee70005525c05b5f00b670ae88cd61e21f615c010acd5b7a35a286913557e2478fd0e532f57388
 MISC metadata.xml 340 BLAKE2B b555474c5acc545a4a81d86b590620ed4eab35e091d012d740f3d0f08add99bc0b5d09db251c03e1191df719135c92251d98849944fe41f76336526a96f9ae7a SHA512 04b1dc52c0db95a09aeb061ea0bc579f83ad5971dcdb20cf61bb08ed37bf56999f784db75e6ec2b6cd47e57976c7e0651ffb040b052dd0f5ac8e1a679bee8c09
diff --git a/dev-libs/libinput/libinput-1.9.4.ebuild b/dev-libs/libinput/libinput-1.9.4.ebuild
index fa3032167eaa..8ad475f3cb98 100644
--- a/dev-libs/libinput/libinput-1.9.4.ebuild
+++ b/dev-libs/libinput/libinput-1.9.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/10"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86"
 IUSE="doc input_devices_wacom test"
 # Tests require write access to udev rules directory which is a no-no for live system.
 # Other tests are just about logs, exported symbols and autotest of the test library.
diff --git a/dev-libs/libspt/Manifest b/dev-libs/libspt/Manifest
index 35828d99ab3a..23659f4e2a55 100644
--- a/dev-libs/libspt/Manifest
+++ b/dev-libs/libspt/Manifest
@@ -2,5 +2,5 @@ AUX libspt-gentoo.patch 727 BLAKE2B a98df11f3789d5e8c2aabfd538210db025a59567286d
 AUX libspt-rpc.patch 848 BLAKE2B 982a1b8d88e2a28cb6529dd4a6c2e15c42aa7f0b0bbe34d40d91a6bb45ee2667253cabb06f31bdb757dcec7d4daf066f1271aa33edebeadfda2ba341bdd39dde SHA512 ad703547047949aa338bea0bd211a7daa3448ce728cf754be6ba4c0a058e0ab631beceb044bcce0eba9fe606b741f530fb88909891b0e86ff8898cfcf04d6cd1
 DIST libspt-1.1.tar.bz2 165168 BLAKE2B a21778ba8b3c22d7fa655460ede0d04efc98635b1be74575cbb996b33bdb27ed75479ae6a2d7bc38c1052ac23547483e9d93c03531cbfe236e1e07944bad1673 SHA512 5b2ec289ce51f1f2040b68c559ef6e1ea1e59f50c3d639a93176fa8a5f3f75481651c4d0acd393eac8d2193f2aae19f882897323caf344cbfde52e32cc3a02b9
 EBUILD libspt-1.1-r2.ebuild 740 BLAKE2B 515ea54db749d792a2340498ec075764ad3d79f5c6257b05ae3fe462fd81fc09ec35981a7f03d92ca0e2184b303203cfc5ab4fd76f8da36917a3c8ff2f938b33 SHA512 de6b47b133772e8fd2ac2b237c17296d3ec112cc5ea64515d217bb5f04f1d214d118d79637fd27ca2c71383df6b5964d079ce6a3ea71cb576c568fc61d7cedcc
-EBUILD libspt-1.1-r3.ebuild 862 BLAKE2B 6e42d0831e46f2a7f0d5f8ae5c6f0d0bb0c9cec06346b65415d6f186bebf4c0ab939b266d9743a3475512412321739a3ed2b54f10b7cb21c6f3301cef6c14673 SHA512 57b6ee8be9ab80a25dcc11fa97efc1c87d571afdef665270dbe5a915f6275c3f74054c9433387f32398dc952ff2a8209812f3d77fce85cc691c5a4b68a72ef60
+EBUILD libspt-1.1-r3.ebuild 869 BLAKE2B 8a8bb64b41dc3cf12a5fce2f7cce5c505d407deb16586c6b198a73b8ce21b81535b06c1866bc90d05d3480674bbd20cdb68363e1be67e4f0b5c70a8b53ae45e2 SHA512 a3a5f2ce6f4dd507ab33b38575fe4819b989a69a6a1fc11c4d4c700753b70c95c1ef0c1cf4733fa1be81468e7e99508f31b71dd37a36a00c59f3d8eae57684b3
 MISC metadata.xml 338 BLAKE2B b0d2cf2b1009aaab90ed70d7804808dc0da5b868905de880bf120a6b6b00ea79c0256f483dad6f3e3610bec57156e4fde3b54790dcc01c77848e62ad43a4e451 SHA512 4432f92e77ea7bd20aed61d72505de530920cc8f0d06e4e5e4e9a25a11494ca809c6662b073f05c4726a942371b678d32ece0d4e665c2bf0c66f12f57b3044e9
diff --git a/dev-libs/libspt/libspt-1.1-r3.ebuild b/dev-libs/libspt/libspt-1.1-r3.ebuild
index d922b8c99194..c19a2eea1a0f 100644
--- a/dev-libs/libspt/libspt-1.1-r3.ebuild
+++ b/dev-libs/libspt/libspt-1.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+libtirpc suid"
 RESTRICT="test"
 
diff --git a/dev-libs/libunicode/Manifest b/dev-libs/libunicode/Manifest
index 2280fc837120..883d129d4490 100644
--- a/dev-libs/libunicode/Manifest
+++ b/dev-libs/libunicode/Manifest
@@ -1,4 +1,4 @@
 DIST libunicode-0.4.gnome.tar.gz 211622 BLAKE2B 299e6ed5e3991b836ac43c07aca058b7c96a030648280792ec1c83fc590817147f577c86ef7e3138c431a3f54a175349a32a9ed3363e23d032efe8f0c7e69e3f SHA512 acfd67f80f194780ee6784abe3e41ae1557c177b8f07ee4bb9c9767499bd5f4b2e6ad7ce66653fd55b7e8ff765e5f7e8134cd5e3e28735e0c4f78cba60f6205f
 EBUILD libunicode-0.4-r1.ebuild 711 BLAKE2B b251c4b058c322f2cc50384fc361133bc7ae4c6b9d87dd25f96b4144ac01108e74b3d9743c90e18c2de8893892dee85ae34f75703f8b98f93379cba9d2b9d1b1 SHA512 d5e8758738da7b39ecb59e1ddb9f8a819e34980fe22e619a2a25a2ce9df8404d376c0b489c7d798101316d42e10167ac9f8e1acb5f7887226822997b93023c9c
-EBUILD libunicode-0.4-r2.ebuild 754 BLAKE2B a13703dc737671dea71aa522fadfe3fd62b3b1e6d6b5bc7a36fe994905b27f27e0957862126c55b2b67b404665af26d1680118182288dbfd31d23016f387a0c5 SHA512 2301f6710b72f6ae626d51270d819610c7e0300bc3e4612d5b2f146ef4acf4b946741c9e2bf69ad15bb2469f85b25dbc5b0e5188b2d36165ecaa0e98331d744d
+EBUILD libunicode-0.4-r2.ebuild 753 BLAKE2B 7c80c119efbd08a8d27a038702c694f0b8a3838863d57bd69f5de6103d4e2e6c14d3d894d37e4566f69181240f8465fb01d148374d8b6d9acdf915b559c90c6a SHA512 a3263cf37a7d6222efd30cbd6341dab2edf4ab3fceafc80f5c8652506f9f9b639bb24e6f41c06d6934718f81953f2d7bd55fbf84a883910d63abad57e5c568d6
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libunicode/libunicode-0.4-r2.ebuild b/dev-libs/libunicode/libunicode-0.4-r2.ebuild
index de8eeaa51ac7..fdae045eceaf 100644
--- a/dev-libs/libunicode/libunicode-0.4-r2.ebuild
+++ b/dev-libs/libunicode/libunicode-0.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.gnome.org/pub/GNOME/sources/${PN}/${PV}/${P}.gnome.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ~sparc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 1d119f801998..6657c19bc63e 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -7,5 +7,5 @@ DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
 EBUILD libxml2-2.9.6.ebuild 6366 BLAKE2B 30e0fc36c5ef4383cc69af26fdd8a087e058485cae8e51d4fa66ef01b0b0a635137710931396121c7dca8141e272a5dda8f5328023b4aa74f7b76b40f2348e45 SHA512 01e661ff5ce990d43f45d5ed1b0d5090f1de474bc009daa00bd43c8487b3348016a0e81fbd14f02cdcdaa395199aef9aba335682edb2ac6e03f07c3f085201c4
-EBUILD libxml2-2.9.7.ebuild 6358 BLAKE2B 2cc1508cca1e582bee18cc5fa882e8cf8056fe0a226c19a764a225691d03e5ee3b0ca7cbc1db8abdb8137c49ac470e0f65b49a87873dc520f37d012a52ee67f0 SHA512 b16ca6f15238b15aa42c4d665b69d9faa5479fc548eafd7c846fb5715c254d157e6b105a801b8fe1d60ecd2971249ab78560eb3cb5f11a26706649c04e2a53fb
+EBUILD libxml2-2.9.7.ebuild 6357 BLAKE2B 234a1fbad3594333168e2b9167c0a4c3a13bcc745f8c41ed8b68a9d7fb3766299e2d81c26a7e13498307b7439bc84ad040660fb59da20737f0a43341af34454f SHA512 4cf29ea92060f6244f88b4210d549c3d33b032af5bb4aa4ef24f970d7a0e796b8833d4dd5cc6b3941fc068bde489ab1a18734dba717bb995fdd90769d3bc98dc
 MISC metadata.xml 347 BLAKE2B 0593bb4362c2ed60dbe07c41872832992f9b993a4c155cddf82ce362f1ddd4c8eb9fa00e5b4457e9a24b22b697d92ef55dde231918fa0e6bdac0a736fce37f66 SHA512 6a094316da6ea1fb160b539788923a2dc01d7ef6304f924f628a438714663a51c8d1adaa97800516a64055a8adf6999ae2899b5a976db680967dcc298e22444d
diff --git a/dev-libs/libxml2/libxml2-2.9.7.ebuild b/dev-libs/libxml2/libxml2-2.9.7.ebuild
index 7ca24d4b70f4..a8c880dfed81 100644
--- a/dev-libs/libxml2/libxml2-2.9.7.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.7.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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 ~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="debug examples icu ipv6 lzma python readline static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 67d815349f97..dc743afcf23f 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -4,5 +4,5 @@ AUX libxslt-1.1.30-glibc226.patch 908 BLAKE2B c6df4080c1f99d72a903632bd6fe99af92
 AUX libxslt-1.1.30-simplify-python.patch 7487 BLAKE2B d4a355c285a3c62b1c96846c62bb161a52c1ce41168ef0c07641fc948480f2457345e24641f18fef84f5f34bc930943ad312c9d6c2b9da4141175c7afe320a32 SHA512 4b0b622aff880de8ca2fbdd9e61cbea117f1f497767caabcc4ab4e6532145683b08d127f497bdd41035dc7b3fa6d3ab5b53c2d8674e87f5193c652858ee31586
 AUX libxslt.m4-libxslt-1.1.26.patch 1421 BLAKE2B 91a1bf2487158d5e364247d29da4485e7b62f1838cbe1f8eabc7617b67929640280f6f2b649ea090fcc818fd5e5e99809b960e1cd69a5df42ca73abe86839b98 SHA512 78cfb6bd823805f660c9d07c4f6f83a87cf2385c48fcb11bff82792101f06b36d08f851089497f0c019f5743f31248cbabe341f78f4ca7e7617c86c4e5a8404a
 DIST libxslt-1.1.30.tar.gz 3444029 BLAKE2B 668371393a11c0c16d1549fe771fef7dea96a7208f359578b773c9e7d4c6c4accbe43500e960d58e8f2275682a839582f1f40c1bd984745b8e3944a1d9a97582 SHA512 d24e37398503b6bc29245a993738df51bf3948c4a8f052eedd7eac0a9fcff2d5b54220f37070c46f763e073c34bdb3153c9f129aa0df60c3d7cf7eadbbf15986
-EBUILD libxslt-1.1.30-r2.ebuild 3700 BLAKE2B 0b8592d19757921f25caaed0cc7c4258df1745390247a42d34526e72feb00bc7c6a2aa6c1ef0f43bf9ca2fcf667eeaf1ffc939ed849417c333730cd3b9f7f002 SHA512 7edd7e248d371802cd15baf5adfc297a302bd6d00f1b4da3209ce2a238bc23e7a34129b609e7b4aad1dab4b39bc951216090be04081bf355572d13d4d6faa4a5
+EBUILD libxslt-1.1.30-r2.ebuild 3697 BLAKE2B 1ccf6efd66585d9331fcbdafe28cc95b447319160c92f4285199a839a6f7b40cee988d6cc0a9f2c60c30b56dd1a890909f4e1b1cc39178d1146a2a338436fa11 SHA512 51c36880c9f8a6a9882c4a5b8143ab96af96e0123d4a82767d0eb8e5fae9ce24d1ebc9be6692c842cdb049c34ae3f6757494d7e4bc6f2b7e090e33002ce69ec3
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild b/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild
index 91c532152118..7b2ee91de7da 100644
--- a/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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 ~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="crypt debug examples python static-libs elibc_Darwin"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/mm/Manifest b/dev-libs/mm/Manifest
index 132e80781ecf..a264877ccbf7 100644
--- a/dev-libs/mm/Manifest
+++ b/dev-libs/mm/Manifest
@@ -1,4 +1,4 @@
 DIST mm-1.4.2.tar.gz 344903 BLAKE2B 5fec1eeea52e9ff77f94081f4e77dfd627c356cc94591169fa89f5564882e2e3a4712c90c3f1e133024ef0adf095da8063916145159e5023c4191748bd622c6c SHA512 dcc12676453cfaf19560f99fa97e905428051d72b46aeaf574300f51e64f689caa70c81b619b8794ad604e8a2efe6bde1e486a2e315263b5694d6eab1cacc182
 EBUILD mm-1.4.2-r1.ebuild 829 BLAKE2B 31dfd5f23e9f9516d531428fe89482bbe56db4a222e38941d69420f66705135d1dd98ad4c45dd680e0a72c828fd09803b217b2c1524272e3220a66367a8fc7d0 SHA512 2d8134d6cbcbf8c7fbef54dfdf6c9651c56243f325c073b9310692e5eeac3ef4f9a88612d5f2f73de8e5b6939103528ccb7cd9c7cb216b600917483f4e2271dd
-EBUILD mm-1.4.2-r2.ebuild 707 BLAKE2B 1356ac450dee6c69a0fde6fb2a24692ecb6a01d71e5cc1119e6d11fa91f5ce90613dc63de3ddf2e71174abc06742260c243b1d75e66f4daa7df283756aa7c948 SHA512 befef67d8ca25b50ca25a9c5bb5e8259cdd13c1f63a00512deea615516d51fb4e5a1a432aeb8b7b128aa353f219a81b3593be512c9fb5966ba9a9a6fa477fbab
+EBUILD mm-1.4.2-r2.ebuild 706 BLAKE2B 1e15efdbcaebb98c00459e8e7281d708f08ac2f70249c33f867a44841349eb9c73d4c8a74f0ec66e763fafbbd78ead63c4384117461b3f006616d7fba792f6b1 SHA512 6a499ab2d8c17528e751d35cc928a540204e0cb86386f79d6b5b6fededb13babfa4b638c019785b27f963297365b197ee25f7d711cbb693815a1ae208f8fe08c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/mm/mm-1.4.2-r2.ebuild b/dev-libs/mm/mm-1.4.2-r2.ebuild
index 7548eeccd4ed..529649998dbb 100644
--- a/dev-libs/mm/mm-1.4.2-r2.ebuild
+++ b/dev-libs/mm/mm-1.4.2-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/mm/${P}.tar.gz"
 
 LICENSE="mm"
 SLOT="1.2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 src_prepare() {
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 8d187898ece4..4b675afafbfb 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -3,6 +3,7 @@ AUX nss-3.21-gentoo-fixup-warnings.patch 178 BLAKE2B b51f80310db3db416d8aeaf9117
 AUX nss-3.23-hppa-byte_order.patch 460 BLAKE2B 97358cc8fbea0b0d3beee0697833e48ef01039ceb08fd00792a7f7ef68409eb076022c03764ab079fdaa971a0358130002fa11c0c182ebeb33dcdf660be26408 SHA512 ad0097bb6cf409d61eb28202d7460c87e983d6db977aba38ff9ef2749b3f7bb8fdadce4174f5bf806350ae33733097a1f444792d31cc43574b28341893642e5a
 AUX nss-3.28-gentoo-fixups.patch 5310 BLAKE2B 5f173bc4bba374c8233945293e8e944c5fc9068c71d1242bcfbac37d0c020a09cb6a0ef3f54994003fc58364285f86f08017762c0c196aa6ab03fca91ea6c631 SHA512 22fe711d4e59c41f8208b4e85eb101eb6cdd4ad43d83438841b94a57219eeb182c527be1a97bf58df25672fe027aaebeab7458da2bebafef7254c68b94c7b98c
 AUX nss-3.32-gentoo-fixups.patch 6443 BLAKE2B cfe0380832776b7e51f95f800e70436622332d90f61b6b75fcd5474faaf722342ab157694be26881acfae3baceb6d2fdcfabc0c7673101abedfe1667d3821e6f SHA512 36a6db836ab9210e8201a3987229cf18a6b1fe5adeb0d82037f9641da72e6280807123b18fc74d344c680751b04f883bc402cd1c505783c77f00f9962338da03
+AUX nss-3.35-Hacl_Poly1305_64-aarch64.patch 1131 BLAKE2B b2d9513a71011e7498a01be654c2b43ebf466158c1cc9cbcc9d5f01a48c94023a8175285c312c228131517de28bb82f436b91f332ddf3911a2a2505790aa658e SHA512 2cdcfbc223e29fb9b68237ebd7112c8121b597bd6ba77ba19045afb771dce148a39b4acc2038e17f61268462dfa9852c007d110430b5eb759f3d7ac7f0700be8
 DIST nss-3.29.5.tar.gz 7480246 BLAKE2B 9ab16cbbd95aa31358b5b686bee64cd81c8343524dad8aac084f7c86883f1eaead78912dc1021b0461d027b0085356c4b7156f1d80010c3a0ece29d542deef50 SHA512 ce18bc7e793d2b3698db412b2e5fcabbfd9862eca3def120d5e44bc67276526bff6b33ffa84b8128f8af6d35101000e6f7bb24194f63a55461b3c245fac11faa
 DIST nss-3.34.1.tar.gz 9562876 BLAKE2B 645fe06435dffa1a0dec688c7c10854dbd664e719889b36027dc2e52c4f585c2ce7bdcd947dcf5d938013246405c04e1b9dbd802b229e0acc96fc07f321bb51a SHA512 6cc4826df4202e865e903a2ed05b49f708a047347b7b4d58f9b83ed097115a128239c4596a033ddeb9ee3fbfe6345a024e11eacb6149bce2d71fbe82c0a41c63
 DIST nss-3.35.tar.gz 9620041 BLAKE2B a4115117ff017ce36f030d9f69c75111177166651968739353d112cc5d2c4732b33b8c684c5957a66bb969ecab1a15fb2cd6bb237d959d307cdee43ec638cd73 SHA512 8d466f4602427d278b6aa28af0e6bdb99326fc40c94ac6d517d1cbe7ce6b9332dadba52ea092762fac2fd6e72f17cb880cf81e1cf86bf6b4f7913a755419626d
@@ -10,5 +11,5 @@ DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a941944
 DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2
 EBUILD nss-3.29.5.ebuild 9319 BLAKE2B ef47b459596ad30812bd5406f6018ababd27e60465694055e47eedaa15245cc1dd253dbdcfcfebd13b067b72dba269440dc17cecb95c64ccfe17f4b486611a47 SHA512 73baba97dffce92ac3ff095915a853e1990788a9708f146a6894b2b8af103b205a86a70faa8e33657103754a84f85fba3d33fb1629f8f236847f898cc4320383
 EBUILD nss-3.34.1.ebuild 9309 BLAKE2B e52007beaa50881f42714e45fbd5abc15a4824a384589bdbf5866165e2447a453826159f4291e0bc07b19d26c53fbaa7b633f19bc484cf553b1f7cf9e66f7240 SHA512 3b5102b8d5be89d4f6ffb38876010408c9dafd81f47cf29fda6bbce431e29e719e952266c75a161ec742d242a3cb62ab89b837e3e2303e463dea73381e0edd7e
-EBUILD nss-3.35.ebuild 9191 BLAKE2B a6a591105620b16bcfc6be59fc116b366545c16bac3d78594bc6fccffa121a9127404d08870c4043e744fcb9cdf7ba2d37ae3a8bcf848ee3dfc237e0467d1305 SHA512 cc3f1c7ef756fdc7d4b568a037c50764dbfd404dd91ce0e6399e75f6d9a904545280ddc523621eaf2a04ada06f476c33aa57c165ed2c4c8522b58fd2236a7dc9
+EBUILD nss-3.35.ebuild 9325 BLAKE2B 09feffcecd656a0bc5daf5fb82e7fc652395e7818dec87c16ca9168e12a4e518c07b57f415343b9851fe4f35fb7f5af00926ab2fe20d910ba0999cc3e7e72bd1 SHA512 bc0b18f5be63f4a962d718df4d33c473fbf26a42aef93fa7cf218da0f9af093687dd5f6e0a25cbc0ea473263be7aa251fb0dae62f78228932a8ab8efd19814c4
 MISC metadata.xml 571 BLAKE2B 8c1d2f92910d9170240f17b28ac806d3c083fce45637526d0846ddcf0e957483fc458a4de14f239c433990f91a8996ea0be51f445a54a1a1f6a14c1f711654a3 SHA512 f6a7de1614f3bdbdea2d5ae627d82519c59e3703f293daefd9dc4692f84c3f0bc3000654b6a4fe595de95b433e698aaf1d3358897e22da283eb63b74a48d95b0
diff --git a/dev-libs/nss/files/nss-3.35-Hacl_Poly1305_64-aarch64.patch b/dev-libs/nss/files/nss-3.35-Hacl_Poly1305_64-aarch64.patch
new file mode 100644
index 000000000000..c05d103e25ba
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.35-Hacl_Poly1305_64-aarch64.patch
@@ -0,0 +1,36 @@
+
+# HG changeset patch
+# User Daiki Ueno <dueno@redhat.com>
+# Date 1516710574 -3600
+# Node ID 74e679158d1bfe05c173e995ae7dc5a05ae02fe0
+# Parent  b3feffd76f4714139f72369f82b28619a704dbd6
+Bug 1432455, Build Hacl_Poly1305_64.o on AArch64 even with make, r=fkiefer
+
+diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile
+--- a/lib/freebl/Makefile
++++ b/lib/freebl/Makefile
+@@ -522,17 +522,22 @@ ifndef NSS_DISABLE_CHACHAPOLY
+ 
+         ifneq (1,$(CC_IS_GCC))
+             EXTRA_SRCS += chacha20.c
+             VERIFIED_SRCS += Hacl_Chacha20.c
+         else
+             EXTRA_SRCS += chacha20_vec.c
+         endif
+     else
+-        EXTRA_SRCS += poly1305.c
++        ifeq ($(CPU_ARCH),aarch64)
++            EXTRA_SRCS += Hacl_Poly1305_64.c
++        else
++            EXTRA_SRCS += poly1305.c
++        endif
++
+         EXTRA_SRCS += chacha20.c
+         VERIFIED_SRCS += Hacl_Chacha20.c
+     endif # x86_64
+ endif # NSS_DISABLE_CHACHAPOLY
+ 
+ ifeq (,$(filter-out i386 x386 x86 x86_64 aarch64,$(CPU_ARCH)))
+     # All intel architectures get the 64 bit version
+     # With custom uint128 if necessary (faster than generic 32 bit version).
+
diff --git a/dev-libs/nss/nss-3.35.ebuild b/dev-libs/nss/nss-3.35.ebuild
index d21c8184ed40..dac240facdf1 100644
--- a/dev-libs/nss/nss-3.35.ebuild
+++ b/dev-libs/nss/nss-3.35.ebuild
@@ -63,6 +63,9 @@ src_prepare() {
 			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
 		)
 	fi
+	# bug 646382
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=1432455
+	PATCHES+=( "${FILESDIR}"/${P}-Hacl_Poly1305_64-aarch64.patch )
 
 	default
 
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index f7ac66847aca..96b6ab319a68 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -26,5 +26,5 @@ EBUILD protobuf-3.0.2.ebuild 3063 BLAKE2B c63eb054a4a792527a10946c512c1476907a69
 EBUILD protobuf-3.1.0.ebuild 3012 BLAKE2B 1ca83e01980372a2e6f2ac29500ece536162c64bace65414efd69c01d9484d9d76bdb93133c8b28f63bd982db074022c94c7cd1687ac9a2ff8339dcbb3c794c5 SHA512 673cb5e3ede77b7a68a1ff2c6e32fb0ebdb5b712b98253525be958a94272d340b885c6efc36c5066985667b70aae417f00f8fd7fd0816650968f10ea84e760a4
 EBUILD protobuf-3.3.0.ebuild 2923 BLAKE2B a8f3e9277cc151c971106d5285ebb1c5e6457f5ace09823c453d43cfe1197d8368ed9e6277fe29f51070098d7908689e83ed5bd99c4ac360bb7d9d59823aac3f SHA512 307008f8508679e1e54a86d4ca85547c24d5cddf4a5abbfd7835981a8194fd3d36e630eaa280847f727511211e2f9cbc532aeed8c9df6b934bd4f0b50ce341f1
 EBUILD protobuf-3.4.1.ebuild 2523 BLAKE2B a774fdcde73cd91848e3d9ce0a04af49d2716598d3437db4dad303653173aea1d0348a35e8676323d8e80c55c56423ad8e1d521ef335eb055ce83082cf03a1ea SHA512 61f7adaeb0b4c88aa3955ebeb4e703f007d1c98e04d6856becac21be0378af85dc18b60b3f8d36a5e7fb639f4a61f5c8f518c724544ce7bd2e5faed93c2e6980
-EBUILD protobuf-3.5.1.1.ebuild 2623 BLAKE2B a1b41b1b845aa6f9472e9790c3c0828711e0dee4a0e509baa6e573306648c1c51f14a1aaec21c329d586c956f8b939884c62cfcd530596e8f2c0a076f83cbf9f SHA512 663b52da356157b3eae71a33e895ad5fe5d8608e0d861762619703da3833e902718af8280fd465ccd4e410d86a7602676913605e7718519b25bf9454dc18f912
+EBUILD protobuf-3.5.1.1.ebuild 2622 BLAKE2B dc2dd62b6445ac8aa8ee8f7f893fcc89b6e373b43326a68213a8cdc2742e48153b93a0d3da37843f55bd88097034d7f088d8acdf391618aebf246bc5f661dc1f SHA512 96e1cb07c2c33fba3b87463e66c15076c89b8d4dbda4ac17b2ea6c166e75ae05b48d822c8ae8c3dbd6fc646380f414852e39954225e2e9a82197bce460c38aa9
 MISC metadata.xml 844 BLAKE2B 27a0d9277394c9dcc9a50956182bbc6f5282d805b59d8a3f1c7680cdd37616caa1f40b50cf0dcb04218d28b8e592d630da5395f7a232713b08a099a7fd9dfa0b SHA512 a9d9c398843fa2017bd16d530735824eab963119d8508570ede4523d2ea7143431bb72c964fd6be17189a0422e3747ff1208a33e8fe9f74de37e8ef204ba188c
diff --git a/dev-libs/protobuf/protobuf-3.5.1.1.ebuild b/dev-libs/protobuf/protobuf-3.5.1.1.ebuild
index 47519c697c1a..abdb879ab372 100644
--- a/dev-libs/protobuf/protobuf-3.5.1.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.5.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples static-libs test zlib"
 
 RDEPEND="emacs? ( virtual/emacs )
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 5d43f4b67445..ba8d45a59ac2 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -5,5 +5,5 @@ DIST vala-0.36.7.tar.xz 2854668 BLAKE2B 2fcb528b26a56ee9f9d362ec1891c873ee265801
 EBUILD vala-common-0.34.16.ebuild 2542 BLAKE2B 4cdc068195601507e5d82dd5aae28c76f8793af489ddee1df1c9a48193ecdd006ae125775126eafcf9caee83537041369b2b3303cf2f97f214dd27224c057fda SHA512 edf400f4a70b300b13bc1086b1ee9923979d9bc21a81a3e4efce05944842a035d1c8701bd35b026b84f062a9465e037eca70690723f8e6fe05e1608f0030eb22
 EBUILD vala-common-0.34.9.ebuild 2533 BLAKE2B 6cd8150927a49de7daa2d3a6394b72ad7e06b33a1459eea21b52e1fb751b7095d5b731930af9d22647e5767bebd5d028b3aadbdb9d6c6e097999c1c17e566907 SHA512 798a4ab1f0d5b22ee2a3cd259e89a52ef6b122bb9605f1cbcf346f8aba5bdfad4c49d9ac1c19127e3244b011ad914173123a3418121a7c2ece32c8970169c9de
 EBUILD vala-common-0.36.11.ebuild 2542 BLAKE2B 4cdc068195601507e5d82dd5aae28c76f8793af489ddee1df1c9a48193ecdd006ae125775126eafcf9caee83537041369b2b3303cf2f97f214dd27224c057fda SHA512 edf400f4a70b300b13bc1086b1ee9923979d9bc21a81a3e4efce05944842a035d1c8701bd35b026b84f062a9465e037eca70690723f8e6fe05e1608f0030eb22
-EBUILD vala-common-0.36.7.ebuild 2538 BLAKE2B ceeb38a1e5793591e8d0badec97165ffcc5f73c7c5a9239c6c264dc51cba45eaffc5ea73580c3d913b65131151f1ab3194cad15c89a707e806fe0fe86dd1b25f SHA512 9a85737ce1ca6f299ed272bb08420ec1ab519cd38fb817cdf114a853c99a1deb59a11b2d8fdfe0fd6dc2345e5a24a9115bc8dfc770579a3b58211e50f9ab6c5c
+EBUILD vala-common-0.36.7.ebuild 2537 BLAKE2B f01b7557fe002b73715c75f63faad98502faa7ee27110ea95fa294cedf6ca9bd4a3090c37df1d552415630ef1b776e91b417e49f6982c81e2b83a02ef3e0e2d5 SHA512 b2088cc94f3cc44a54678b97145827d94976c2c221f600b66b86e31837ba601c5cfccf081469fe6c2b8368a0845a93b74c80e36c3f04758819aaf798efb44889
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/vala-common/vala-common-0.36.7.ebuild b/dev-libs/vala-common/vala-common-0.36.7.ebuild
index b27a8915dcc2..7f87889a1512 100644
--- a/dev-libs/vala-common/vala-common-0.36.7.ebuild
+++ b/dev-libs/vala-common/vala-common-0.36.7.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 # Previously ${PN} was part of dev-lang/vala
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index c6c5eee0e092..5e3b730b444d 100644
Binary files a/dev-lisp/Manifest.gz and b/dev-lisp/Manifest.gz differ
diff --git a/dev-lisp/asdf/Manifest b/dev-lisp/asdf/Manifest
index aa11356db9f1..0349f2467e96 100644
--- a/dev-lisp/asdf/Manifest
+++ b/dev-lisp/asdf/Manifest
@@ -7,7 +7,7 @@ DIST asdf-3.2.0.tar.gz 438536 BLAKE2B aed96ab33e33a1aa996dd0be6cc0d230cde0d11510
 DIST asdf-3.2.1.tar.gz 460536 BLAKE2B 080398a9a2bdd48b2ce08dad939b997dea8e7f23ee0012fbfccbe7ae0f72d24b832730e5c6bf5383a6e4753cd1226f08c5450a6636266b70e7590c9970cbc751 SHA512 686881536126eb6ffb7e9db763aec02e1ad7ab4df60cc96d094bc4cebb95453e3d57273cb925471c7ee13e4378ca3c0d697c416b7374ad07148e11d89aee85b0
 DIST asdf-3.3.0.tar.gz 498451 BLAKE2B dea8e659eab482604067f5989c766b52b9bc4f0bafeb7a12508520abf686dde730225dbc3063291dd334b1a97a41d04b4207be4680ae0cae9a4207222eda7b43 SHA512 4e8b3434d9eb504af253fa39ac759cceb7ea0c3e2c364875d7259b32a9818b051fb2a3c94c188c7f38e43825e2a18107f1732211534a8b1fbbaa77b6c7f90486
 DIST asdf-3.3.1.tar.gz 479255 BLAKE2B 5161b79741a52721eaa4da80a61bbe51e924967ecb744a087fdcbd99407abcc42faf39eafe6d30af7dd8af751a80caaf23e93ce42aa5f584123a1e8b528cc613 SHA512 bf5efec4518eb5312ce743c0fbe60c587bebfe26c36c833c163d67bf8631e18eeb293f2185e547f6be10da061a17f024d9f4a3a0808727d7b9b3a7d7a0faf133
-EBUILD asdf-3.1.5.ebuild 1193 BLAKE2B de4f5c9241928b290378d27d53d107c15f8b3f2b8d3ccf8e406a7a607fdc6595cc64417801ee39d71ba82b8374d5c8f7c2ff01befa3288d695fa709271ee33ea SHA512 71f7c651f0ca141ad6de8a6c6963deb23fcd0b6cbf37e4a61834961102afe1eb660cfba6fc1d3167ab80d4856d3b46c72009b277f2bd9c96ab8511f92f5a2329
+EBUILD asdf-3.1.5.ebuild 1198 BLAKE2B c0559c8d042c5d52612e43cbe9072e42a20965e9c30878e6eb4def9679be6b3d969de27984d84d4375095836a9cabc9ebefa6e68523bea81e108e7239a942fdd SHA512 5af719f51ba017718e9e52d858dca0e10105c4a8cfcd2812bd3eb92168b2b10b447b8697c999dec4e3ce606fc6e123a023f3591917701ee171048c0ba2df3657
 EBUILD asdf-3.1.6.ebuild 1180 BLAKE2B 3ff4aae2215682fa2c524a9d5bd1b8e633a6d7ea61b8195df248d7bf3f3524ea6f8e89989454411d74575d4ae98c9d9090a3f811cf46f15f5da1334c2c9ee85b SHA512 429009487f7b97cdd7dd9c9868bfb4a200aa0d7a3e21d5f40d574c6f6c03efb27e7da3033d5a9e1198bb3fb0484dfe91e9c01d5cf91bfc0b002319bd9d5bc0c0
 EBUILD asdf-3.1.7.ebuild 1176 BLAKE2B 85d3a71de1244d5f7cd6875ab0c6d1f6d5b6adf34822e657b6055ea67ee9f25cdfcf9790884bc5511fb49828bf15d7daa524a5fdb82fb09e54ae93636bb8ce21 SHA512 ffa2180e39645c19559b2e1bd116a858e8b052ce2f162edd02f7a5f62db92f3ef1d222126569ac10294f9a29aa1711225d4f217e8529748895ba2f1aabf6de7e
 EBUILD asdf-3.2.0-r1.ebuild 1217 BLAKE2B 93791bc22a25a93a80ceb719fcdddd8fc7f6acaf2ecffdbe9602308d619e6c3569fb14b53521f938827c2603e41d38d535c40bee239cfb1ed035e3d68c846e60 SHA512 324b8406d9955edda267ab00f34d6e97fd490d48184d8c8bc925b63f73737d207b85a7b29770eb02388bdb07a9ef8d77fb7633b8cccc48dea43bcf1b4067725b
diff --git a/dev-lisp/asdf/asdf-3.1.5.ebuild b/dev-lisp/asdf/asdf-3.1.5.ebuild
index fa0e4030b4f1..bb1f58b4005e 100644
--- a/dev-lisp/asdf/asdf-3.1.5.ebuild
+++ b/dev-lisp/asdf/asdf-3.1.5.ebuild
@@ -17,7 +17,7 @@ SLOT="0/${PVR}"
 
 DEPEND="!dev-lisp/cl-${PN}
 		!dev-lisp/asdf-binary-locations
-		!dev-lisp/gentoo-init
+		!<dev-lisp/gentoo-init-1.0
 		!<dev-lisp/asdf-2.33-r3
 		doc? ( virtual/texi2dvi )"
 RDEPEND=""
diff --git a/dev-lisp/clisp/Manifest b/dev-lisp/clisp/Manifest
index c9939473f168..93991ffa7f0c 100644
--- a/dev-lisp/clisp/Manifest
+++ b/dev-lisp/clisp/Manifest
@@ -17,4 +17,4 @@ EBUILD clisp-2.49-r8.ebuild 4394 BLAKE2B e49e12b943c60d9b5c3f1272829430ecaed2ed1
 EBUILD clisp-2.49-r9.ebuild 4464 BLAKE2B d9e5644fdcdcf0c12fc0702f2c1bcd458b8781b8e1885cd0a6b28447ca7f77e9346bfc696d06dfaa5be73a2f6b4db1a4511457f5d2a780dae1976e0290fcf34f SHA512 ba4afa4101c4581ae1a866f70d8f3ed903e81f95c03c26b492296dd4cd6b997d04d8f7235c1272dece85f52e2fdda427f2df65eae67cf2c65f9171b1476af0a5
 EBUILD clisp-2.49.60.ebuild 4360 BLAKE2B e26404fbf0cc0f6c3200e8c73c8ea880b8abf7e301a151453d3abb96f54a786858042213d51fea0c7de9dbf3081233cef40b8f51bc2cb5bfa386f541e9e0ec05 SHA512 2d5f81a1a3d6b7b2b23ca01648e50d3dd661cc02105b959d31c484eca26e2a5b6814fa038d2db43a234687856a7630f674401f21716ae180d95a6d8c6b217ba6
 EBUILD clisp-2.49.90.ebuild 4203 BLAKE2B 4a352d04bf95974c6e05f14aeca8cee4f2b048ff97570a21ab762483ef4040670ac4cf6cb3abb34fb8bc650b703d0044c757edebc429e2e1261ea650e18c6033 SHA512 19c71afc4935a54f64e3ac2e6b93843f87b3d09c892ab2742bd956d9fabe50cd49558112d371daadc896521cb1d37f9a39a66db63e80b6db1886d8bb250950c5
-MISC metadata.xml 1450 BLAKE2B a2d3c5142143c8ab054826effb6a0ccfce158bf636406703b1c45c5e63ae70ea0151b1982d376fc03131d8e821a85f499f98f7643b3bfc3884916c38da58227f SHA512 08cd4868b9d6f2600b13add32c2fffda8d59be7190779ef4d3bfc64ab10f13c2644b925cef0ca8f3aa06cd5c8473ef399dfaa3c3ac2cae88d627a6ad83e54128
+MISC metadata.xml 1451 BLAKE2B 6310ef5f37288b2b3a156c9d4557c3925a6e1f7ea3622c801f4acc5832159dd32db7d7f174752b69f0b1d0eee2825b0e8e86616fa34074fc3aabdf7fc4275559 SHA512 b475d35af6509939c05d9200fa61616e38817e0c49622b82cff322f09780755c2361fcbba2e839f627e77cad558ecae2cf7f02f8010d595e74b451e5307f38aa
diff --git a/dev-lisp/clisp/metadata.xml b/dev-lisp/clisp/metadata.xml
index 256106c8ea32..a78f41563fce 100644
--- a/dev-lisp/clisp/metadata.xml
+++ b/dev-lisp/clisp/metadata.xml
@@ -21,7 +21,7 @@ changed at run time.
 	<use>
 		<flag name="hyperspec">Use local hyperspec instead of online version</flag>
 		<flag name="new-clx">Build CLISP with support for the NEW-CLX module which is a
-C binding to the Xorg libraries</flag>
+-C binding to the Xorg libraries</flag>
 		<flag name="pari">Build CLISP with support for the PARI Computer Algebra System</flag>
 		<flag name="svm">Build CLISP with support for the Support Vector Machine module</flag>
 	</use>
diff --git a/dev-perl/DBD-SQLite/DBD-SQLite-1.540.0-r1.ebuild b/dev-perl/DBD-SQLite/DBD-SQLite-1.540.0-r1.ebuild
index f47acda4c61e..d6989f7fb30b 100644
--- a/dev-perl/DBD-SQLite/DBD-SQLite-1.540.0-r1.ebuild
+++ b/dev-perl/DBD-SQLite/DBD-SQLite-1.540.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${SRC_URI}
 	https://dev.gentoo.org/~kentnl/distfiles/${PN}-${PATCH_TAG}.tar.xz
 "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="test system-sqlite"
 
 # NB: Get min sqlite version from sqlite3.c
diff --git a/dev-perl/DBD-SQLite/Manifest b/dev-perl/DBD-SQLite/Manifest
index 96d1665e1f18..b5c91088d110 100644
--- a/dev-perl/DBD-SQLite/Manifest
+++ b/dev-perl/DBD-SQLite/Manifest
@@ -3,6 +3,6 @@ DIST DBD-SQLite-1.54-patches-1.tar.xz 8376 BLAKE2B 95df8ada4a1d1b2e730414a6a5b5f
 DIST DBD-SQLite-1.54.tar.gz 2136219 BLAKE2B 76700a1c695036951ed2ccd36319d509be6292554b7b7aa49da4ec07f1c15a75ae84886bddae96b536351a381b0cf52350d48ded836e1c4627c57d4dd9fc2bdd SHA512 a8daff59679973467dff80c013b6ff9d7229a505b62c0312bdf7f9288af64dcd2e99f889b66eb98103b0e6ac7a9b0fa7c9c517c5c2673ee7f84b3b6b5d26173e
 DIST DBD-SQLite-1.56.tar.gz 2248699 BLAKE2B d6af8efed8149ff2ec5c68cc071355805f4a24e234e015c180d5326a4def4eab33352d168e9e41c06b2de28a0137f0d39a864749bfa972d28f8ec9221379bdc1 SHA512 1c9be3557691f76a9e543fe4bd6656a6b82f53fba4bc05261a55affa0a38b4eaa1cf876da975234c9c09985ba25b21f6f7a735f1cc47104169edf7fdd3a2e314
 EBUILD DBD-SQLite-1.500.0.ebuild 1194 BLAKE2B 43ab9a47864bf04e7674caf842c0dc3b9f39a0249918a3ff6f3645c2e84cb419556b1a853a416ce57a3ea6a0c81b539de5a6fc46d5c0f74bfb67583c2ea945a8 SHA512 19a2bf93c244af7eabe768629d2578e937e4531cdbee3b809eb16cc2ae70b6235ec1946bdb29a85b4fb2cae63def640e1146845da0d63131af5aedb01a6a74ff
-EBUILD DBD-SQLite-1.540.0-r1.ebuild 1527 BLAKE2B 6835db8e8f0e2c1d78c3851758f95114af2e9f14c0793d4b3ce59061061696051290ed7e89abecdf15a94d4791809436b779ea5112d893edd70e6143675da3df SHA512 79f7efc8f38aff3da9064f8f7c7eaca72badd0ced50e93a37c955e1ff16f367d265ec34e8e1972a92839c8a001ded0c5caa16cc00bd1b342de335887e48dd029
+EBUILD DBD-SQLite-1.540.0-r1.ebuild 1526 BLAKE2B 7724c76103081ad759753ee80438b772bfc64201d35fcea1288d5288c2738a63d8ae7142269411903edfd3b3cea845670c080b0999fbcd2dc73f50675218da88 SHA512 889fab743f6d672a5c11ab1a68d18689ce4f5d10c7f07fa6618967a815df5bfea9d04bcbb65eac99325ae801411efcbcd31a09817b5f020c9c27327f837d17d2
 EBUILD DBD-SQLite-1.560.0.ebuild 1300 BLAKE2B 5d4fb9df3d4fb011096247b0ba6f435aaadb588818cf637f381b445ca1d745bebd1252a60f61bea2112a0c12c76cf4ca947b52ffc06d004da50b4f5e297fa3cd SHA512 2638845ffb4ee5540644d0e5a21f91f1a6e2f6d84a04f499a1c0175d4a36d8de0808cb19f2c84788cf965df6dc5b8dcd7207af45cb315cac9cf1111b8eda5894
 MISC metadata.xml 1076 BLAKE2B da1e831d74cde4db051a301cce34e8a64ade0f85accb892a72f5480db33ce3672542932b455b69f8cb7c0abf792799639f8c06c572e89a0abdba64561d2aa4f9 SHA512 6dc34ac81f2eef0a16be36407d29a91f341f19706a9660d751b5d4b289b44d6595f31260a4987b2cff22c4b02440cd07dfbcef48b1422da5ca96a5dcfdea510e
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index a15df2f71bea..7dc63fbb9857 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/PadWalker/Manifest b/dev-perl/PadWalker/Manifest
index 498a786b4053..4312e13c1b91 100644
--- a/dev-perl/PadWalker/Manifest
+++ b/dev-perl/PadWalker/Manifest
@@ -1,5 +1,5 @@
 DIST PadWalker-2.2.tar.gz 16158 BLAKE2B 6ae785c6549607e1ae863e350d2fc92b9dd5a797e386ccdbfcc0a53826c6ca516ea048b9903898c55bee9c9853607334da304277a9703baebccc787d2f16b203 SHA512 b0bdfd4f1ebf63e71618dda0db6249fc6b4a0165cc829a9a90e68353f31b61ec6c5873b598b67b085f0a7fb8be40fd1f890e57de85dfdd1bee5543146cc1a3f3
 DIST PadWalker-2.3.tar.gz 16177 BLAKE2B b809448751e907083cde30ab95ab6229d47089044ac20695968b3488f7a45beda3b1567ac96d7d76a49c06399307419088a6d3d727a537dcca0859efe6d73843 SHA512 0a222dc2ed26825bc031b0e4b4b78660fe9d1a5a5d98552f30e730aa4c8e5c38577da9a960669258a11cfd712f6e3827bafa23162aa1101f01b47b08e303b4b0
 EBUILD PadWalker-2.200.0.ebuild 412 BLAKE2B 3ece533d06ec461f9c71204a76535958ea8d7900cbc385803cd5e063f257c6e3735c96b4a10f282def21e8b448de79b41eed3835132ca523e99648e28b4867a1 SHA512 c81bb6465d6048d61df07382e057ce2eb494df62bacda75f08b105c6557739c9bcc3ec681705189ea5d9ad8e4969541d843f57a6d5d3a927c5472e71b419a37d
-EBUILD PadWalker-2.300.0.ebuild 415 BLAKE2B 810d684db6775ee249347bb2d6d114bd50da0c73b464d556732310f794b3e994ad72b39608df1faaf3c10ad83d4ccefbbc4c868a34600cd476d30c49dfdda542 SHA512 53c9a7dc53ad79a4a940fa1f2cdc5744ca61e3205d725677571d1021bb4a62ae0ecbe8c50a5292846c13941ca2557cbe7c705be8e2ab2c5c8462ed24d79ae459
+EBUILD PadWalker-2.300.0.ebuild 414 BLAKE2B 2a6edebf35651d474291ec86d9cefa0b01d532045877298aacdab24a24a5b62926898f93197eb473073236b1de5f9b12edf2f5ba95144da932d4bb94024e6193 SHA512 4f36e1d4abdd0c340a785b3781ccbb4baccb2f04fbf8b1b1b99cce187aa86f5c09d10e418fc3813a351ab825444cf5d49a5dcefe4eedc893ef38a5007d3d7904
 MISC metadata.xml 389 BLAKE2B 7c98c1fe323f72769d7d734e454c205631e44cba76754b44cba8dcd3ee863c90719e0d9aed5f9579fee035931066b728ce7fcd46e0559cb5728e6c9bb7a8e869 SHA512 a85027bbaa6c174e996335493d2959a26edeb8147dc2ff5fb89a4580c9d13c590cca322a94e24e1ba1ab19129dcbc298802a4cb26b57e0c421c12f006c5b5432
diff --git a/dev-perl/PadWalker/PadWalker-2.300.0.ebuild b/dev-perl/PadWalker/PadWalker-2.300.0.ebuild
index eae3984e7fb0..6950d1be5362 100644
--- a/dev-perl/PadWalker/PadWalker-2.300.0.ebuild
+++ b/dev-perl/PadWalker/PadWalker-2.300.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="play with other peoples' lexical variables"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/Perl-Critic/Manifest b/dev-perl/Perl-Critic/Manifest
index ec75271d81c6..a56b0da7b2e9 100644
--- a/dev-perl/Perl-Critic/Manifest
+++ b/dev-perl/Perl-Critic/Manifest
@@ -4,5 +4,5 @@ DIST Perl-Critic-1.126.tar.gz 646552 BLAKE2B 4c40181e0f787ac28e7ad657296b29d420e
 DIST Perl-Critic-1.130.tar.gz 647052 BLAKE2B 2b0905636486531dd8de50af6e490701f1785851744b78a5164539797e6d2549b46c9daef05d3061b53f82005ffc1fa47b7e2dccec613f9a5490c597d61072f4 SHA512 b443ddbb5905a61835061f49d7f10e2e71579e5df96778eb183c3d1e9987342e1536db61196b32e66a192c92916eafd9ebb7b713b0be71ce89c1f93155e89828
 EBUILD Perl-Critic-1.123.ebuild 1002 BLAKE2B f8117fd1abdc500fe60e9e911644f2e369527d04dcd6b947beb85a42af8fae139bc378160525dbac52a366ce9967e65adf5ad4b33078233b61c7e73f79bc6ab1 SHA512 0d82d9907cebdb548c42b368ef92ac59811df0a01f800a184ed13f7f764fe433a3ebaed5c35bd50b05128b50d4c9e3146c9e7e69583aa82e7d270c4b8eea7a1c
 EBUILD Perl-Critic-1.126.0.ebuild 2049 BLAKE2B d3e38a5ec8be3636015f1a1a603068fbd83d0c7757b6e3f78dbc225ecb820c174b8e1be30bb587808ee6ca79a9a3650ba09ac412bece2fcb1dab17629987fa54 SHA512 eb8a62954965e402efe612a69e84e52dfcd32b233ec533b0b2a1f997c7e5e0eb2f1288b583b8b6c0675d3f07f269e4e0f8df5965375f86d42262857595e3e005
-EBUILD Perl-Critic-1.130.0.ebuild 2047 BLAKE2B bfa019b432c6cfa5384f1778765ca79a145f7e8b58e20f35fff5a47ae5c253b5b3c5e98bede651941fb254e511f67ea2d28c4cd8a9b257b2d6ee88066573cac8 SHA512 e8a3aee9395be2c96f34f409a535419178dc8e924b4c7e9fa083d9caacb72b39ccddbf53a255aa0b0827d36f8d6ca89d37fc5f285c0e6a574f682b217e791bd8
+EBUILD Perl-Critic-1.130.0.ebuild 2046 BLAKE2B 8e538e76ec78a7d02aa3cf2dacb80bf044960fa5b1a377f7ee214e7c52be16152687db4b3c85f1a9d341bba83af55907d5d018b0595b194e205cc07b22c5cfe8 SHA512 6e788133923bd90b20e11234a90730d8f8bc858da661f9cc1546c39e58de5c22e53cd454f3ddd0388193ed3ca5059da7af4b3016eedf4e7540c14a9d447f9fd6
 MISC metadata.xml 20125 BLAKE2B 102686a85bf6f17bd0687bd5b05a4701c7b782c93f6b4fe7d3f4b181360067778c28911c85fa101e8cfc4e44174410b7b75bc0138a9b0e20a6ec38b2b956bb42 SHA512 e98d510b1a6d7e95b6558fbabb7857a2b5133958d790c87d51716be4214b60b091360de6e4e81b71aad14d4f94dcf7c3529087d32f052add0736c2fe4f89372f
diff --git a/dev-perl/Perl-Critic/Perl-Critic-1.130.0.ebuild b/dev-perl/Perl-Critic/Perl-Critic-1.130.0.ebuild
index 3bc0106863a0..cb42b330d25b 100644
--- a/dev-perl/Perl-Critic/Perl-Critic-1.130.0.ebuild
+++ b/dev-perl/Perl-Critic/Perl-Critic-1.130.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module elisp-common
 DESCRIPTION="Critique Perl source code for best-practices"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="test minimal examples emacs"
 SITEFILE="50${PN}-gentoo.el"
 RDEPEND="
diff --git a/dev-perl/Test-MockModule/Manifest b/dev-perl/Test-MockModule/Manifest
index 7a50cb3791b3..ad0717d52bde 100644
--- a/dev-perl/Test-MockModule/Manifest
+++ b/dev-perl/Test-MockModule/Manifest
@@ -1,5 +1,7 @@
 DIST Test-MockModule-0.05.tar.gz 5608 BLAKE2B f81b4bf18044553f3186484f0c463ca5016db0a9eedc919864b445f2a30ca355a6999dda3795620b97d6ed457c9f307daeef24be713229ad35b81fdc6d099354 SHA512 8cbd2461dd0d9e9107c48a98be615c10dd77401569065a14cec555cc92f22c7211e7a7fb40149bd98c624bb1da838aa7be22a01391e2b6a70e7e58ec8af24da7
 DIST Test-MockModule-0.11.tar.gz 23756 BLAKE2B 1edabcb0f8b0627602be1dab9c572fdf0648360bad4debd4f1c632695938e9a2bb23afbff6f43c07339f0c066835eaee65af0914070643bfa53a1223424b55aa SHA512 417a0de701458e3e26ea194cb2de7756d9a1665b2b7283a375ee95362ee2d7b77996801d4dafd8ead12e97d59c2a57ffd1e98620446d5f47a1836c8ef18983b4
+DIST Test-MockModule-0.13.tar.gz 24561 BLAKE2B 2ae6f41b29d78c88e8632fecc560d0a96cf38c7b25c7dcc63f935fe98a718fdea41997ef9663d8838edab89fa815a0696d49439a7b99304332f1b636bea0be0b SHA512 17c2aa7b67fcae2a333788db74fc94da9a680ad83786705e70417cb78df0cfa32e6fcca44962dcc9d7c2ee27c45d8f142ce03b62691da4940ccc405a0bb26472
 EBUILD Test-MockModule-0.110.0.ebuild 690 BLAKE2B dc12a4ab2c2d5c852bd742dd2d63f7d26ad4268eea9bb89617145a5c74662d1f890924b7138ff1d870636379da89ba9fe0200002f0f93da481e07f99dcc7851f SHA512 06548739e6bd1689fedcbf95a51a8762996000a7cc6a3ed5edfc6daaeb7cf24027624ba9c66e7594ee23e42052fbd5ce30e6aef8d283e824fb29fef0f49d3638
+EBUILD Test-MockModule-0.130.0.ebuild 669 BLAKE2B cbb7b56ee28c49efd08ef79c38a2db178fe444234c5532c2ada8d0126d6b98cd85ec52e0b7b62684b1f272c644e08c73157411780ba29d2e1030b133ba9184a9 SHA512 90a5438af30720e96a0557b76aa6a52e88fe41770bb2a51f7db4f55f93b87de3551e153c663d6ce7d05453a3779270fc6ed66e85ba12d625ca3bb20ba46fe5ca
 EBUILD Test-MockModule-0.50.0-r2.ebuild 651 BLAKE2B 3c39f324496cbfdd644750daf68dedcfc01cf08e3c7d483d6dd230dfad036b20dc73efde9d6d7818016eeee8fc65e9496840a07e7c37d7655f67dbdcfb6732c5 SHA512 bdfa62f5bdc29ae5f187b366573671dfb370ab32113a4c567893cee815c8164baba90a0171b8c8675dd1d9871744051c698d5270c91aba1aaac92dd65adc04cd
 MISC metadata.xml 402 BLAKE2B 61ad5df007d8ce18bb2c8c06b3dea6c52967d70a0956c9af51feea0afc9c5e616c92165540d7eaaa043774ae10d565bd892b48fa825eec37d03816de5e292422 SHA512 1035f23a2b634006eea4e5292fda035b6db107289703d60d71936898242b6f4e819de4081f6e5c2b4820f94ba9562f916a881293acc216742334e935310102a4
diff --git a/dev-perl/Test-MockModule/Test-MockModule-0.130.0.ebuild b/dev-perl/Test-MockModule/Test-MockModule-0.130.0.ebuild
new file mode 100644
index 000000000000..4cf173bb4fa6
--- /dev/null
+++ b/dev-perl/Test-MockModule/Test-MockModule-0.130.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_VERSION=0.13
+DIST_AUTHOR=GFRANKS
+inherit perl-module
+
+DESCRIPTION="Override subroutines in a module for unit testing"
+
+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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	dev-perl/SUPER
+	virtual/perl-Scalar-List-Utils
+"
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.380.0
+	test? ( >=virtual/perl-Test-Simple-0.880.0 )
+"
+PERL_RM_FILES=( "t/pod_coverage.t" "t/pod.t" )
diff --git a/dev-perl/Test-MockTime-HiRes/Manifest b/dev-perl/Test-MockTime-HiRes/Manifest
index 2c492907619f..f18a91beedda 100644
--- a/dev-perl/Test-MockTime-HiRes/Manifest
+++ b/dev-perl/Test-MockTime-HiRes/Manifest
@@ -1,5 +1,7 @@
 DIST Test-MockTime-HiRes-0.06.tar.gz 10608 BLAKE2B 3719a7a1c08031515df40bed298b6ce32ce48c8b258e47eff09b89118ff81ae045da8c3aaf509e8cb0ca39d2604c956e84bb78c013ea1bf4eb11c35bda642795 SHA512 38eb89b371e51c742e494f3515b8183a536c87caa83fb5bf3cbfadf9b814741f54419e68397fb8b86d68c3002eb3dbca75e136984a66cdd1d309e78eacae028c
 DIST Test-MockTime-HiRes-0.07.tar.gz 10986 BLAKE2B 82236e5c466a77db1c3f80cf8e56b9d7439f5d0ce6e83464e1b6e8f48aa5b1cd9d3c6c2f65910cdc12c62d4a2edc6e3078094cf334475bb5887e1ade2bbc529c SHA512 7e87bd4ce696d14bb2091ea612865f31dad578c07baae0ea7a57a230e0b1755eb0494125095b80f46620ff2c0f7440335c6ef38d8a1ddab6adcf9cf4429933bc
+DIST Test-MockTime-HiRes-0.08.tar.gz 11191 BLAKE2B 1ed672c707f4e8f0b7f6161309b62cb9c09158dca20bb9156216da3a4ed59dcd5576bd4dd0b52a5ceced00dcf5799288b5f1f36d16848e384a5bb05eb2aa5e3c SHA512 8a533d3650fe59ebc7852f5edb07d242d4c8833ed8ea918d4e0fb999e51b12ca6dc12567f55b47a6a37b65821b922e17e0208726ad3afe75a895fc84896fcf9f
 EBUILD Test-MockTime-HiRes-0.60.0.ebuild 513 BLAKE2B b0f3a277a9153f129b05379a22f8fb2b99853515d24a97ce7769801c6d27f62a55711de403ca901092a8386aab537d3c90f0c443dcc3f6ea53e379e33b1cb300 SHA512 77e46e4b07a074bfc78cd4922f7d15fb87902d2fd75145d8dbe82763c4981cdae220a9a06751c4ed5dd76764d393a6ff311a01cc0581d72bc76bde499dec8e38
 EBUILD Test-MockTime-HiRes-0.70.0.ebuild 523 BLAKE2B 5ab40d1edc3fe22ee65610b2144d6f2a186123c833fd790b98f1ee3d2af07764a4adef1385e0cea6f18257ea7a6c277ef8d27a7de80acec308322b0134ea593b SHA512 752e43fd7936b0a3d6e797723f708f3f1a9dad47edaf85881bcb54806eeb3c357f5697394184fe5dde451e7d299aecbce9162fd1058dc131def8f9f164c68070
+EBUILD Test-MockTime-HiRes-0.80.0.ebuild 524 BLAKE2B 2302a181abd8f04915f237602faac58102ef5f5a9b98d2b55be6f9a52bffe9395302c88f4fc0e15bddb2dff392e7385770e1b17250db3af20ca0268160eefd72 SHA512 f5cc1538c84f4163e835b553269e41235ceb14af7d83b81ec09c3ba7c83c1a6a3cee0ebb7ae9de7b4340c7e4b71752e1a92f64860a9408e915e41b99012d8e19
 MISC metadata.xml 411 BLAKE2B 1473d2d0bfacdca8944cb7b4a8b3c779bc00b53f6b6e9984944c2a87a7493761c22e76b996604842f1e38b5478d67f91136b340cae7b3b70a62484a8aebb545e SHA512 0ebbf1804d3151006da7c7e1851b4319cc914120446e8ddcc5ab74c510960ba61135fc7219922bf54b10a18abe706c21619e9cec64c4a61293360d53124ef25e
diff --git a/dev-perl/Test-MockTime-HiRes/Test-MockTime-HiRes-0.80.0.ebuild b/dev-perl/Test-MockTime-HiRes/Test-MockTime-HiRes-0.80.0.ebuild
new file mode 100644
index 000000000000..f7a035ca5afc
--- /dev/null
+++ b/dev-perl/Test-MockTime-HiRes/Test-MockTime-HiRes-0.80.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=TARAO
+DIST_VERSION=0.08
+inherit perl-module
+
+DESCRIPTION="Replace actual time with simulated high resolution time"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/Test-MockTime
+	virtual/perl-Test-Simple
+	virtual/perl-Time-HiRes
+"
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-Tiny-0.35.0
+	test? (
+		dev-perl/Test-Class
+		dev-perl/Test-Requires
+	)
+"
diff --git a/dev-perl/Test-MockTime/Manifest b/dev-perl/Test-MockTime/Manifest
index 19aa4ceab0cf..666cf59a976d 100644
--- a/dev-perl/Test-MockTime/Manifest
+++ b/dev-perl/Test-MockTime/Manifest
@@ -1,3 +1,5 @@
 DIST Test-MockTime-0.15.tar.gz 5658 BLAKE2B 8f8ded72e882e9a4078a5f2189f3ce1f531d1377f7893ce11822a0a721f8f05c27defc62a96e342cea7d96cacdb1836288f16e4ee4ff322f0df167556211a1d9 SHA512 8a91eb39e7ff68d6ac1cbd149ee8acdbdc2bf6c99bcd71decc38fb2c71f5ed6bdb32336c4e07a922e7d8dd1b2d084306a232e008a0a8587720fff60a3ba325d0
+DIST Test-MockTime-0.16.tar.gz 5804 BLAKE2B b6db2a275e57f494ff5908df9cfffc30b577096b5eb21c3f4a1064754fbfcbf7d082c968826aa5be66babc533256d81af20fbe1ef27df4106a7581984da70fb8 SHA512 158026f9b1590131b51a004c0b8ecc7e190d0bd90da13ae56f645909e30ce6830deae1821874d71a1ad4d0dee84cd9e2b50aeacf7ef1d9cd465332823da0f927
 EBUILD Test-MockTime-0.150.0.ebuild 498 BLAKE2B 7d136f78aa524c45a643b722436f48689032366faa9d3989b06a4ecb96dfb6969191d0b212f3bdfbe69ca58594ce67deb7a5523193ef055a511c5bf958b48799 SHA512 7ea964ec5e3876ce39b05587cdbb6934332a19158a658b7f2bc86090fc2958737c32995bc365ef6f97283aa71195873583099685739fb4cba7445988a5dbe271
+EBUILD Test-MockTime-0.160.0.ebuild 439 BLAKE2B 32bc9030e82f6ec5dee18731c76a6e373790c70f43195bd8a03e0dc4b1f6306b98854a955db0dd477800be60a08dfe70967fd1f2138cf03c55521a6c2d81273d SHA512 b9c1c48be9dda6e730e285828742fc850b98128ab551103a80db3485102f5798971efdbf00973cf90e2dffa073fca689b4df5bcaf083f2188796698dc5ef7d3e
 MISC metadata.xml 398 BLAKE2B ebe5183b1a999c9c210b48f1024e82da3d50e54bbe99e1f8d77a4fd5e67ccb1cc52d704a2a290e051ab2297a86628dc5617f7eb43006693d79572fd604c1c42a SHA512 005f91d8b87b85f094072d581bb91a8183575df73cb0224a1b4950a9245fb58001e8e6df90977cb6dda0c41b051028f8066ab80b7981794219f628f17d8ed6df
diff --git a/dev-perl/Test-MockTime/Test-MockTime-0.160.0.ebuild b/dev-perl/Test-MockTime/Test-MockTime-0.160.0.ebuild
new file mode 100644
index 000000000000..11ab65aa68a9
--- /dev/null
+++ b/dev-perl/Test-MockTime/Test-MockTime-0.160.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=DDICK
+DIST_VERSION=0.16
+inherit perl-module
+
+DESCRIPTION="Replaces actual time with simulated time"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	virtual/perl-Time-Piece
+	virtual/perl-Time-Local
+	virtual/perl-Test-Simple
+"
+DEPEND="${RDEPEND}"
+
+PERL_RM_FILES=( "t/pod.t" )
diff --git a/dev-perl/Test-Most/Manifest b/dev-perl/Test-Most/Manifest
index 9883a06b0681..a83bccd27e9d 100644
--- a/dev-perl/Test-Most/Manifest
+++ b/dev-perl/Test-Most/Manifest
@@ -1,5 +1,7 @@
 DIST Test-Most-0.31.tar.gz 18272 BLAKE2B 19cfa7c0c9d6bf66656997e6e94ab5e23f18b00dbecb53652eacdee698d16b939379b0d2233d0c301049f6b93c5331f6de182eba3bbfcf6889ee641fe06cda0d SHA512 ced22dad96c14443cd17f35d51cc22847647859e03d80f68159d35f35f34215310587320de13461d7f4724cd8da616620c56433a178c99135f6488b129765765
 DIST Test-Most-0.34.tar.gz 15919 BLAKE2B 2daad98526541c8c84c76dd8dd03f57350fb077b6854f3dafee7bcaaaca59f1ef0d521515f07f6c9af9604554388d0a221caf9f71e2b7953e3492f9d78d252f0 SHA512 00706bb25e6b9f806b536f75f66356413cdbcb19efd1c8b163fbd3357f61abe9e06e57c311eff216d36962ce74beb996db6cd4f0d2e5ed58fa5c0a0af32a33ef
+DIST Test-Most-0.35.tar.gz 16074 BLAKE2B 7b23fd0a7a2c529d7408c288047de795cd670b1ba107e274729dc215c277748e55ddc1793018500f11b68bdfed91d3654b9fffc76788e882c4883db96620c05c SHA512 1b2d201811e59d7afce47ff5f7da67c170d4685ffbec23360757b5cacc9fe72fc82609bc46cc9d8e351fdb75715696457c201dd94fadaeca70a6f31690236291
 EBUILD Test-Most-0.310.0-r1.ebuild 604 BLAKE2B 3f2ee582772a080c5e8463d797e1d7396d95b39b73618ebd4635ba2550738f49ccf02fccbb49b8b14eeebee3edc3cd91b4bd14be80a00822e7007508be15046c SHA512 69a38b8fa1bde21393eb33c9d5a8a7263c4f751e9775e666c33ab3de1d3e08be8a3eef5b17b45d6550451016f168e0676bc184631277f680021c2dbaba3e96d3
 EBUILD Test-Most-0.340.0.ebuild 627 BLAKE2B 465ee536c256335022fbfdafb3dc76ebcab342871e4af6345e975fb77503d40ba1ae39919c18e2c96d7d33a1d69d2b9f366465af1bc87261c520636f4f123879 SHA512 76c32311d7446f331e764321097772313dd108eabbeb4a23e3325daa9924d1ef8c6d2e0ef1b36b5a53936c13c7dc2313036223a3a5a44fc2a985cf0609a8b47f
+EBUILD Test-Most-0.350.0.ebuild 623 BLAKE2B 6f1868d7c94b428c83cb1d513f2080e2eabf96d874b523f9588bd81508bd086d6c1608bcf0f5841c4f6571e8bea8e6453bae3ab4c52c738767aeabdb1f9afc3b SHA512 4ea3547054be3fc025fb95361e00d1ddc5917c23ad6e823ab39d627f915a9fdccf5093e45efcdccf080afd4d1a779b4502956ef13d2f05053815e9baafefce3a
 MISC metadata.xml 458 BLAKE2B e4e84393b6d1fc125360550f4a268e0a5986c322294f56431e6536e2dd28f87d43458bb7f05d7e641bfc62ebe17b96f6015df755fcc878ca5a7d37460f4c248f SHA512 1afe4ef45e7004699c32ed8a282669bd829bcf526db54b69e0bb7becf7b7370fb2a5db641825b82fd7602e681481f6c388c251954062807dccfd172b858b4d28
diff --git a/dev-perl/Test-Most/Test-Most-0.350.0.ebuild b/dev-perl/Test-Most/Test-Most-0.350.0.ebuild
new file mode 100644
index 000000000000..c87845f4ec18
--- /dev/null
+++ b/dev-perl/Test-Most/Test-Most-0.350.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=OVID
+DIST_VERSION=0.35
+inherit perl-module
+
+DESCRIPTION="Most commonly needed test functions and features"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-perl/Exception-Class-1.140.0
+	>=dev-perl/Test-Deep-0.119.0
+	>=dev-perl/Test-Differences-0.640.0
+	>=dev-perl/Test-Exception-0.430.0
+	>=virtual/perl-Test-Harness-3.350.0
+	>=virtual/perl-Test-Simple-1.302.47
+	>=dev-perl/Test-Warn-0.300.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Test-Needs/Manifest b/dev-perl/Test-Needs/Manifest
index b9464db4b0f4..0c58d22db709 100644
--- a/dev-perl/Test-Needs/Manifest
+++ b/dev-perl/Test-Needs/Manifest
@@ -1,3 +1,5 @@
 DIST Test-Needs-0.002002.tar.gz 8106 BLAKE2B 76f68912fec154f78995bf940380a9b5e311e5489f1a71ad9aae5c1e7d950d924baa67c8e1eeeb4b171b613194d1419985d3dae10871bce1244ba9b01fe0bb3d SHA512 ac8e1a14e55bbce3747a6bc424216ebf2f35eb657b107492ff47afb3a1fc909bf385dcd79114a0be4b9bbbe0f3a60a56d6f9b4998f7394b6b96d80f46c63a875
+DIST Test-Needs-0.002005.tar.gz 8505 BLAKE2B 783130e726a469e850541d1569ffff614ab38defb2a41df564f41a573e641986b9825963c22b8e7979db4fabc6f547adfe95741f83546afb46bce6e5249c2fc8 SHA512 b3023067d1f8726b0ae2162d0b3722193a3b56d12d5c207cf9558f1552ae8ab554773b843d00f1c481857c259fa869b8fdaf5a4838ab0768f38726ddec4130c6
 EBUILD Test-Needs-0.2.2.ebuild 524 BLAKE2B a514bc50ced7b1540e6321aebc0039d85e4774fc985cb43bf5f6f143a14d69ee209a0008ecfcadd19cf70c53b30f9d27301f479ed9d6143257e894dedf07a06a SHA512 b322da3975adf52815b5bc8c97b260cbe3dc9c791d4e7e33ed425988d32469862d9d0550b877e12e93f613ce31f55650403e1cc2579647b79142befc7afea7c9
+EBUILD Test-Needs-0.2.5.ebuild 524 BLAKE2B 47ffae84245632f2f532a2f27bb6541a5404d42b0a3c259baf13df945c3f8ce2cca23a999ab0b94a2866d6cf5d20a623d78b4a18ee87393ee36a7293517de8b6 SHA512 4a305a5f3e43bc8d7ef8e72153bc6fbb67ad44f69032023ea1fb02d91a28f5d00b59056905a5804d37a3f55fdf9a3bb93ffe8c33d06aebec1bef5aa59cc71268
 MISC metadata.xml 392 BLAKE2B ad442022b213e365a4894d39b8b49e9487e426e09f8ff1614bc17d8231932aa12077cf523305394836a36ffb0f1b1546f14e1c3d1084b8f3a2f1644a97f7dee2 SHA512 e958e6bb79542efe25d44fc5f87610d15342fc397e3be4829d137a6e6fbcbab06c558dc4034ba4de6c7a96b4f10137a57906a0278ecdcd782f60faaa6e3b4fd7
diff --git a/dev-perl/Test-Needs/Test-Needs-0.2.5.ebuild b/dev-perl/Test-Needs/Test-Needs-0.2.5.ebuild
new file mode 100644
index 000000000000..cb2d18415bbb
--- /dev/null
+++ b/dev-perl/Test-Needs/Test-Needs-0.2.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=HAARG
+DIST_VERSION=0.002005
+inherit perl-module
+
+DESCRIPTION="Skip tests when modules not available"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( >=virtual/perl-Test-Simple-0.450.0 )
+"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index ba1b543dd071..b20128cd7a94 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index ebc8ca2308b0..624fdfcc4907 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,8 +1,7 @@
-AUX PyQt5-5.10-qt594.patch 972 BLAKE2B 4a51b1cd661dc71be287b6ce76f4ec894e931e45704548a52f87890c8f6ee95cfa604a63ec4009741d8f929f1e356b5204eb99798f5694ea6c81d8e299b2c21b SHA512 ac4fe4bce5767af524529d68bfd6307d75f40d61710934215703dd9d489afc5992cf14ec080b885245b20e55df3e1e884cf9708fd5735025fb4c09ac7d4053d7
-DIST PyQt5_gpl-5.10.tar.gz 3109934 BLAKE2B 96553b9a6f93c9ff86dc574e44f989d1aa371a5bf28cf3023ebcc9526791d28deab47e6f76ba70b46d33d80fc00d0b4df47cd4bb53a649dc98b8d0c0425d6742 SHA512 a86520870536618857ed3ee1601af45f5a0b456de192a5d6a3f8fa734e5cf49b8ce373928c0f4aeaae365d3fa95db03b5f59ae2903bc5eb2304b7edf22198033
+DIST PyQt5_gpl-5.10.1.tar.gz 3110469 BLAKE2B 75e24bd8c0739d47eff6212435aa783eaa302633beb0494f099edc3f8f99600cd03dc3cba5152ed7ae703cfe445ecae06ec5d2281dd7c0640c71db041659bd6f SHA512 04cd0292f7a088f9c0d088d7c73ec96cfc40253f771dfdf194eb92be7635e6fcaf04863fa24215e9c34a096658549bb2feeb8d8fdca1e39ed87f0256ef0f790b
 DIST PyQt5_gpl-5.7.1.tar.gz 3733746 BLAKE2B de8aea058876d740f391901434fa2c7ca1760b323b555efb48b06f8ba3213baccec676bc3984832e0775b28f0d2b2ddf0c37fa35317c237ed9af2e20469ff9ae SHA512 7498713f73807522e58ae38ff58548cf80c2f2c418d6c55e20ce613cdc997e4ee7139076f1f152c7c3edb970bde14febc3496009f934e31ff71f01a1605f558f
 DIST PyQt5_gpl-5.9.2.tar.gz 3102848 BLAKE2B b87f25693aa2b20211119f89cf13665bf88f14de8827d43ba757344ab9bdef0b0c197abb8386308c72925da263cabb6efd3f104db8a350c51fca3fba8c7c06b6 SHA512 5af2e65addaed7dd02d8dbf7a7c63767e565fc8edeb7b51e5991a00cda29f75b666529097646e821aaff556f350a929fd451f548bba76e97355b7fe10bd913bc
-EBUILD PyQt5-5.10.ebuild 5678 BLAKE2B 1254d629ced2d4abd4097c78d4016f4de2c56f1d625400db25ff3356cad7847d9de475e5b17fdf2294e87de43aa24c39e6973bb863b42bbee5176ed90b67d790 SHA512 211a0de1ff763ed1cf1431a97927500dbc06b3856b9e9ba3383ee133facc0f74594da760836e655afcdaac341862fe2dce9e15f4825329401800c76de13713d2
+EBUILD PyQt5-5.10.1.ebuild 5635 BLAKE2B 4355cdeca43a532252f7746dc1a6636bc9465e20d294acf27596057678f69da09caf40b683e1a841a4d85c6ba3c14c59155f0f86bdcc0fb84044245f6e96a6ad SHA512 2375e07b1fc8c1cd08bc40199f892b01f943ce92d14ecac0576dfabf8e630f59f57dba2c66dae02341dd57428f4e592fd8d6032ece3f2a888ad4eebb84177d52
 EBUILD PyQt5-5.7.1.ebuild 5547 BLAKE2B 29e51fddc17c2cb03213d244f929165cc95d71b870fe121efed70166f0aeef5a6fd6d2ea9803c0038cfd37363e5abf9de66e0ac89d8e186a9c3fdad988809188 SHA512 187e6664388e61b62066e95797d0a467b30941441ff83872fbeed16abfdbacf5d4bf5ecc575f93ca83fa09e3be16af993d358bf99f3c16f76610aaceb27b1900
 EBUILD PyQt5-5.9.2.ebuild 5684 BLAKE2B 112240ab66ced96c8dc49a1df6df80ee9833297db2a23e22e197acb78e034ee0e6ed45ecfeae136787ee0ca808bd977eae315c37ad1bb0bf54375be2dd4c28f4 SHA512 3df5af3b273a243b23d883a6ef8541551d1195f8ae035c2bba578154488fc0301b8bdf54ea144936841a32cde92dd0319d6b36b64a08614b287c6fe6ffc85d90
 MISC metadata.xml 2458 BLAKE2B bbebf12bc59da0f7b6737598e9c683f6ec45872a7207c23fd5b47c73c68a9eeaaf9ac0d4fc18c05d3e79b22e333bbb43d2bb7bd70aaba80288d0fadf1020d8c1 SHA512 8554c97aeb873a2a7e1d50b8aacc3638a87fdc0fdc367d61123b63bd506b1376873d88a967773e8f1050f0e8c35ae180d61c7eb2c213c345e5b17a3c0e4c7df8
diff --git a/dev-python/PyQt5/PyQt5-5.10.ebuild b/dev-python/PyQt5/PyQt5-5.10.1.ebuild
similarity index 99%
rename from dev-python/PyQt5/PyQt5-5.10.ebuild
rename to dev-python/PyQt5/PyQt5-5.10.1.ebuild
index 16b925075fe8..809e464ee4b5 100644
--- a/dev-python/PyQt5/PyQt5-5.10.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.10.1.ebuild
@@ -94,7 +94,6 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}
 
 DOCS=( "${S}"/{ChangeLog,NEWS} )
-PATCHES=( "${FILESDIR}/${P}-qt594.patch" )
 
 pyqt_use_enable() {
 	use "$1" || return
diff --git a/dev-python/PyQt5/files/PyQt5-5.10-qt594.patch b/dev-python/PyQt5/files/PyQt5-5.10-qt594.patch
deleted file mode 100644
index fcdadab5521a..000000000000
--- a/dev-python/PyQt5/files/PyQt5-5.10-qt594.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix build with qt-5.9.4
-
-Bug: https://bugs.gentoo.org/646580
-
---- a/sip/QtCore/QtCoremod.sip
-+++ b/sip/QtCore/QtCoremod.sip
-@@ -22,7 +22,7 @@
- 
- %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", use_limited_api=True)
- 
--%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_10_0}
-+%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_4 Qt_5_10_0}
- 
- %Platforms {WS_X11 WS_WIN WS_MACX}
- 
diff --git a/dev-python/aiohttp-cors/Manifest b/dev-python/aiohttp-cors/Manifest
index 8305984184a2..2b0a1119994e 100644
--- a/dev-python/aiohttp-cors/Manifest
+++ b/dev-python/aiohttp-cors/Manifest
@@ -1,7 +1,9 @@
 DIST aiohttp-cors-0.5.0.tar.gz 40018 BLAKE2B 774b3da8f459828145253f21dfcd10741b428e5594b2e02c42d3b46fdc8bb3821ec53f93547665d4b56758684358f3626d811f4dbe6490a01b40b4f274ba3a0c SHA512 86c24a1fe18fb3b2b8fca38ef9aa7ebf07fc1b202d353a540b7d651cbf618c57c5afbe125d91c0d72aee937909dbea0cfb1baa182eebdc5402b66f9800706bee
 DIST aiohttp-cors-0.5.1.tar.gz 40081 BLAKE2B f491bcebf406b089baeccb62c1ce113fc3ef485f3103a24ef93b08b1b33b66c2f419f58dac80f8d6c262e4826762a27dbde479c8de6c17fe991a3b084f0dc061 SHA512 a06f65a479bbed50022394d51345e08bdf98a099f4b6efe355f4a4762155a564eee3d4e10ddb417daa7498ebc1abb93a3437b1a2cc6af9c2ad5fe8a8714c237c
+DIST aiohttp-cors-0.5.3.tar.gz 40266 BLAKE2B 701886b291a1b89f88a704ae04e3264cf2afc51f63f03ddd4464d40ba7bd3a1c6b5fe3f095b634e8c6c36c5a967e9a6b9b88335ff23988fc8bcd726c037fbd1c SHA512 0813ea48de714c85e361dfdaeef1a69526f7446dcc4ce637139cd333dedea58c635f85cfad1c3ccfb0df6e573f0351f282fdbd9726211d5915ed2ba120206b09
 DIST aiohttp-cors-0.6.0.tar.gz 42507 BLAKE2B 7b63916b983d3dc208058c8b04445a30762eebc4999135ae802d1ceeeccc476a335eae66126bb3fd16f938af3649e8b9096433c2df09e82bf4e5d4ba8e38c42c SHA512 75453ebbc074d5f25cc8efc46ffdb76fc90b0a96a9e6fce0eee5a5f28dba31cb50301289cac3b36c70ccdbc10c8f4ba9e362d8e9f350ba7f9dfacd06e6f5e699
 EBUILD aiohttp-cors-0.5.0.ebuild 1160 BLAKE2B 6891e4427a74557d3a662513094f3c9d46cd4cd4ffc4c8265ccc502ba10448f73d57fe4378315ee62929d9701f747bb5824ec94d7500cefd843ffc2d1948f19c SHA512 85a4063f92210c47539b42ab05691c23af1bc9c70868057d635ec27419b0da48e7c63250f02586baa0534ddfd2ef245d4e14d795a3334d15cea2201d85bb3764
 EBUILD aiohttp-cors-0.5.1.ebuild 1165 BLAKE2B cc5cc061965901922276beae4224d1de4441d8cb9636964ee52b7f26936ca9901150595f5d79534ff5f654804f15b046153ae188c8403888f00d6d3892e380c0 SHA512 0f71d31846275cf8b7998367f2f897f34dc6ce409633004faf31a3ebb6b09825f9efcd4d21a7c5f39766743fd68ce307668b6bdb4ce8dd52ae3070e636cfa050
+EBUILD aiohttp-cors-0.5.3.ebuild 1165 BLAKE2B c24df6c14aca6e8df1681fa5514ea9977adbd58208bf84bda8ec59d558cc26d63de505ba43308c57284d244f5d798db28cd043f108c09e058d189f8028eba7a2 SHA512 a5f75e622c7e94d6a15536782f6c027c417d7e5135494789870b32f31ff3aa5fae816253d5e6cc51fdd2b79b891477129ec5680806e7290079110c0d34ad1f17
 EBUILD aiohttp-cors-0.6.0.ebuild 1189 BLAKE2B d65e97ff6a550be7ce563182e09e19de5b3e120dd2bc1046fba3cfd032072162090606ec951a7aa4320fde3cedbbbf7d28fb6aac204396b966e3cece4501fa16 SHA512 6cd255d7989b7250f74516938d71ec6b9aa1c383734af09a0801083cd0408d6815ce829a1a6204df2d2b6dbb32e292949239d3219e7b8a8864e54bd75f902195
 MISC metadata.xml 253 BLAKE2B 0311910d10e4b501d39c01678bb1e58bed2e6e3252e6c3195d3284cf2e9652081b10a83f045689a56c69a4d318b209bfdac0a63ff6dab2a8fbb0160ac9c7e2e2 SHA512 bf75301ff2098e846a7d6dc9166d1c8b6e77b4f92327e5c5aad0edcde6274e6aa224d89c2c5ed7efc6fb7fcc7258a2a01a24591a43688679c4109f8cc89fd9b1
diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.5.3.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.5.3.ebuild
new file mode 100644
index 000000000000..974f16321d80
--- /dev/null
+++ b/dev-python/aiohttp-cors/aiohttp-cors-0.5.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="Implements CORS support for aiohttp asyncio-powered asynchronous HTTP server"
+HOMEPAGE="https://github.com/aio-libs/aiohttp-cors"
+SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+EGIT_REPO_URI="https://github.com/aio-libs/aiohttp-cors"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python3_4)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-pylint[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# for some reason, it is installed by 'setup.py test' on py!=3.4
+	# TODO: investigate
+	sed -i -e '/typing/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/awscli/Manifest b/dev-python/awscli/Manifest
index f12b96400b4c..128e71e6dd38 100644
--- a/dev-python/awscli/Manifest
+++ b/dev-python/awscli/Manifest
@@ -6,6 +6,7 @@ DIST awscli-1.11.154.tar.gz 553172 BLAKE2B a9c46453407efa6a2f5170105a24f108bcd69
 DIST awscli-1.11.158.tar.gz 553030 BLAKE2B 9a36fa3fd4fca2df9b561965fff92f2679f8714f7618026900449056e1c91c5e586e89250afabf620516f9690a98860b31370c9ccf9a5a0aede2aff07f5601c7 SHA512 25c9a3636e7a83e0f9e090906354d2f4a8e44bc1de262987eb3f071b303d64056f2b149954097e57678e0a5553a136a1289c81999ea19a757ff3bea15fad215c
 DIST awscli-1.11.81.tar.gz 544970 BLAKE2B 583a821298c416e8cc9dd9af9d55457fb1eb61cd415159aa880df1a78fd777f1b15e11dce3b712401bd9e1ed2e3ddc5ecb44652870a23f0e0c35aa25e7a07c70 SHA512 61b355247d75939d2814ca0594fb1b4498d7a1dc008e27302328c09bbe4ce72a6eddff64712410bd2023663436fd41d405a6a19a1c53c872a0ae6e68a0718175
 DIST awscli-1.14.16.tar.gz 576598 BLAKE2B 708271155f54dbba643385513691a9fc1cf406eae2d87108a0081b46f84914acf79bb398948daa5df02433904d644e6f0e3ac623859b57a270ad8f1e240b0e8c SHA512 6ad7b908cb1b858a7837042322f59a5aaf71c909d87e783e2f07ab0624b2ca9110cf879c292f9a39012f9e5dac95189a7401d319b3f088662d15c827e9396a06
+DIST awscli-1.14.50.tar.gz 587829 BLAKE2B d98f0ea4fe135f6ab5b458d251e763bd2d3c75eaa3edcadf0deaf33350a01e384b7f3a797069d631bcb3338b5a6b77c29d704e4a83946bb65e4c47fa523d8f8f SHA512 c42cfb3ffd75ca4b472b62ecf7917fb204190363b62cbc55c19afe43293258dc762ab3133fea38fd20efc4625db5d97ef274517168e2a2b3cc53d0081b2945aa
 EBUILD awscli-1.10.51.ebuild 673 BLAKE2B 9ca5320955d387ae29963c45e45ef05f79e4de6a4337f713a100a59f2ecb3966fe3a813b07921ef436bcab2662b3a7f6686aba2cf84b0817a89bd06626d7658d SHA512 e6bc2f4ca40c10deed7fcbf49d66930530a362e00bd2c5404445f39f06125c70f8abbd2e153d509f275efc04ec754dd3501bd6266813462f56640cdc409a1eca
 EBUILD awscli-1.10.53.ebuild 673 BLAKE2B 9ca5320955d387ae29963c45e45ef05f79e4de6a4337f713a100a59f2ecb3966fe3a813b07921ef436bcab2662b3a7f6686aba2cf84b0817a89bd06626d7658d SHA512 e6bc2f4ca40c10deed7fcbf49d66930530a362e00bd2c5404445f39f06125c70f8abbd2e153d509f275efc04ec754dd3501bd6266813462f56640cdc409a1eca
 EBUILD awscli-1.10.59.ebuild 673 BLAKE2B 9ca5320955d387ae29963c45e45ef05f79e4de6a4337f713a100a59f2ecb3966fe3a813b07921ef436bcab2662b3a7f6686aba2cf84b0817a89bd06626d7658d SHA512 e6bc2f4ca40c10deed7fcbf49d66930530a362e00bd2c5404445f39f06125c70f8abbd2e153d509f275efc04ec754dd3501bd6266813462f56640cdc409a1eca
@@ -14,4 +15,5 @@ EBUILD awscli-1.11.154.ebuild 726 BLAKE2B 005eb8588a83cab59c3e5db314daaaa99129a3
 EBUILD awscli-1.11.158.ebuild 726 BLAKE2B 005eb8588a83cab59c3e5db314daaaa99129a336ae55b46057f7525af16e7bf7e7694fd4c6bdb96a73c183a2cc9b1acc5ba15be94241f9c09f8745473e2aac5d SHA512 d52c7b261680789f9160dd6801520d0f4e8b933aee72e309729f7917b10aa4f5389a7e1272456e39f583257dcac86f6cbf18244f15e4c3b828e0b3b45143c8ad
 EBUILD awscli-1.11.81.ebuild 681 BLAKE2B 349ce2cda522a2eb6019e85c7f7f11f8beb8521e2b2f94b0d15b9ecd5fd18f2636d44390706b562eb15b2a372ddea28bdc7ed44dd3d6d3658c8cb8c6af4ecbcd SHA512 b886a434ff4b057e11be9d46faaae6f5e2847f1cb24cee87fb21fac8fd8d9ee6a9553eb308fa6a22681ede683581485d2a4df0d7b71f5e64b0cd2baa56a701df
 EBUILD awscli-1.14.16.ebuild 736 BLAKE2B e04b71c9eaac8f1577bfa40f82127eb31004396ac5ef504552822d8f222cace0bcd522d5a7fb40ced80700f59e6bb7dba93967905b827dad36f22e4edbe59475 SHA512 edc515f0d1bf19437678ef2d6859e2c5b40d3158ae1b92df03e4817d0762a43fd490d1ed391e6de3bd5426b220df4981361ced4b1dad4c09f5257f9d17f69908
+EBUILD awscli-1.14.50.ebuild 736 BLAKE2B 82fb69eaafdb5c7f60f4810427cb7968be6b0c501b9c8951c330bdfc3aebbffe483dcbf124cdbd449a5362d1d09fa70fa45380bd28f120b1dfe67c1151a9380e SHA512 98937967b390d5f7dad9b0c4873eff46dd653ce244c8146f62ce9a77557e27f0376731bde0ebd57f6a8f0abd72af8fc9e799e77e0d282a8dc52636242f7e794b
 MISC metadata.xml 316 BLAKE2B 29c8ad67f4e7c5db4439aeae00deda8b57bb36bea7bd6490ae60efaa30cd2db1f7b2cff5b21558cdadea05f9caa8a9f4ee580fe2ea80959fe6ef7ef6f740c550 SHA512 86b3359e64e41ac4f2216e5bbcee6468100df3cd6e9c25595527d6819a2c27ce327797163a3a43bab11516a4826cff47825449cb797d7fe845794700a3a2bed0
diff --git a/dev-python/awscli/awscli-1.14.50.ebuild b/dev-python/awscli/awscli-1.14.50.ebuild
new file mode 100644
index 000000000000..09f1db16250d
--- /dev/null
+++ b/dev-python/awscli/awscli-1.14.50.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.python.org/pypi/awscli"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/botocore-1.8.20[${PYTHON_USEDEP}]
+	<=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	<=dev-python/rsa-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.1.12[${PYTHON_USEDEP}]
+	<=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
diff --git a/dev-python/cliapp/Manifest b/dev-python/cliapp/Manifest
index e2f65820ceff..89ea4d6e492b 100644
--- a/dev-python/cliapp/Manifest
+++ b/dev-python/cliapp/Manifest
@@ -5,5 +5,5 @@ DIST python-cliapp_1.20140315.orig.tar.gz 51107 BLAKE2B 3ff4b1203041fbc5ff0ad67a
 EBUILD cliapp-1.20140315.ebuild 619 BLAKE2B bb2d6ab798d93d38d31be45d4ba0d5e986a4ed2ba0fe9fed8ebab3fdc3c924347c1603ed5f0b1dc1bfd23482b16887f1d338eb62d6b2b48050dc42be67feafc8 SHA512 1c1d1e3b682ae148e5111004fddc77dbf8ee710165409e484a7cad2e9d086334a7d17d601c68d294c3c2ba28b6adda6a3df8b1ee26b46287dfde7102be2a2a76
 EBUILD cliapp-1.20150305.ebuild 605 BLAKE2B 823c4863996f55a48074590d0c2d910d9255fba57bdc325480d720a0f4e79fa4eb641daa4bcbf6a7ef507aec6fbd1459cfb7ba4d9e672d58ce6d3a625aecb152 SHA512 64d7a3a2f2af67354eab0d78a092e04fb9b7d9640e587d76681578f13d9feab832b567328c30f92ec8653d7d4759cdca37f9c39fa899f130348d28348aab61f3
 EBUILD cliapp-1.20160724-r1.ebuild 732 BLAKE2B 1e5428927cb789cf7bc6b71c89a6e737beb4243d7179ed5f30a945969df818f7eae2e7ae806c4235fde69b1d1ad5732f4f21d8d1565806cb800ba25ad2376427 SHA512 4d2221382e5484e5f65723f05f4081975d603e11d2ac44186bfd800fa160d49c444134cbb7c0781f422006d630685879a58ec0d8e2f206c998e6c831f475783d
-EBUILD cliapp-1.20170823.ebuild 675 BLAKE2B e95e3ee453f54466f0e833398e91d6c510c58025442fc9aab03c9c5f48bfede6b26aebd06f0af7fdb0acdc13a2724b050d2825245b98efba3ceb58f341da6522 SHA512 cc7a6b0c5305618daae1900a48e41dfcae3e72ac1c20e68ffa79ed0c93d19c1fa5a789b7fc5505a11faf6dd0a169c6a567c7040d3f52de06d6d4d9c853529454
+EBUILD cliapp-1.20170823.ebuild 673 BLAKE2B e30a17d7054b444ef5af5bd49ba141c6c8735bdb4d9a83a960281b7031443f4e221ecbf9306db42748c58911742a363ebcde3cc1d087f81124c5863ddc050d8f SHA512 5c44a243b52891538de2e94c2b8c2065939ae3beb40e597297f9387e6d1787c34c0365c9eb505e4cdf21a40f5b61465e2ab35fb5240c36c3d852e5f454da6087
 MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
diff --git a/dev-python/cliapp/cliapp-1.20170823.ebuild b/dev-python/cliapp/cliapp-1.20170823.ebuild
index 56e9ecde9dd6..13f210c692c0 100644
--- a/dev-python/cliapp/cliapp-1.20170823.ebuild
+++ b/dev-python/cliapp/cliapp-1.20170823.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://git.liw.fi/cgi-bin/cgit/cgit.cgi/cliapp/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
diff --git a/dev-python/configparser/Manifest b/dev-python/configparser/Manifest
index eb0dd6bfd282..38240d2f9844 100644
--- a/dev-python/configparser/Manifest
+++ b/dev-python/configparser/Manifest
@@ -1,6 +1,6 @@
 DIST configparser-3.3.0r2.tar.gz 32885 BLAKE2B 395a6fc69b1b4c8f6d59bf088ade94f0573faf26964a38a64393912fc8ea7279d4d8bc67d3f7cba5d754cbe82572ddc12e2fdef1ae3ce18cd216f4705eb78b85 SHA512 86c095bb64766e87ba59462a99d0287ec52073f27a1c9be7d37568516bc0cc4af6f362ca90a1b90f52aaa4342dc275d769c77f18d80c0efb114ba6fce37fff5f
 DIST configparser-3.5.0.tar.gz 39573 BLAKE2B 100baa33268376e44bc8f7f8e875e93f081baf71226fd84430823617805c0c983e49b5ba08261ba0d73e92d30e0151a9ef9733031673e16fc4012f4020881298 SHA512 490b9f7807bce02667f41a48389b51f550818d2bd4296b528833d65d4b04bdbe5b906e7584e55eee4495405267a697ba26a056e6504fe6b3f8cf07ea8f55f7d3
 EBUILD configparser-3.3.0.2.ebuild 500 BLAKE2B 7a2d3c01e3f256c953e6d5609572e3aded6f23d0d8420b9e7a701aef341833822345fca08e4d2ddd417bd56f593fe4deee2677bddb912c36ddb46f2051cbde60 SHA512 16602bb08b32942017d65476aea2599975e1aae9cdef2cf883d4e7be1521ab9cf2d6a92c4e4e556893d9c10fb5ee9a1df40d3e45e1f6e77aa1d0550f77589d95
-EBUILD configparser-3.5.0-r1.ebuild 700 BLAKE2B 19f58496ee275161707876e2e096514716fe677b939862a181d9f9a6400077bf4303c5f5c784ebba1d4b4fc24b378fb6fb9b0c651b9591c7f2324febb5317251 SHA512 fc8a4194d677c8b955aa29cc4ecc6f0e794b330f7bded7f042765bb1c3f0a5bc8979dcaef8fc71130016f4e3c21d07ffad994c7f18d678ec631986a3ca1b9089
+EBUILD configparser-3.5.0-r1.ebuild 699 BLAKE2B 5bc70c54c798c1fb30c16ef523aa1ab950132117495e175a522e72007222606aa6cc4ee2bf8e10b8dd5263c12a562605a391f46f02666ff186a0238157214586 SHA512 ca6a0b1e114d19c9e00b555947f29ee2b8949a8c490fd85ec8b29f5e1beca9be3f638c84af60614aa476a86d51e80b87efc6859498c3d1daff8fb5c2446de2f0
 EBUILD configparser-3.5.0.ebuild 480 BLAKE2B 1df85570e677a345ef4b97a1d16f4c32e56e0f6bf78512b8291c95a48a60237f3ea6ec224045cac8d7e34aefd4bcfb12b3547bac7c4328c1f75eef6eeea4325c SHA512 0615d9e1b734c60f996b8e0c800e3b0434497e7f3def8e2a48c5126bd1716e724e8c7681d1a5bf16c9d373f063d2edaba50b6d9b1325e6e4ad809fda3fc8b384
 MISC metadata.xml 325 BLAKE2B 8b2c0dc1df941bc82398abee2ba3521a98bf318d2cb7ab34105eae2f10582c94d9d6c14dfc4eb9dacf1a87c0e4e0b80aaedfcf8d172205ed2b945abf1d3578f7 SHA512 84ae4fb022faa7158c67ee9be02019edf93a84b0f97d56e9bc4384bb57abc4f7c93db747627cd87696506383922101f3f5c58ed8509111b75eb6f3574cabc75e
diff --git a/dev-python/configparser/configparser-3.5.0-r1.ebuild b/dev-python/configparser/configparser-3.5.0-r1.ebuild
index 3943953f644d..12ef27784d47 100644
--- a/dev-python/configparser/configparser-3.5.0-r1.ebuild
+++ b/dev-python/configparser/configparser-3.5.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 989be2f2d3cf..f95d1fc35fc5 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -5,5 +5,5 @@ DIST flake8-3.5.0.tar.gz 140608 BLAKE2B 938ad4406370da27155512355432edd23a824db1
 EBUILD flake8-2.1.0.ebuild 1073 BLAKE2B 1f90fcc6a57da202d9b8026f89c5657a85efb0e2a5fad78057362647ee384907208fa8de6624f5375739c0ec386959e2936fc985d100f7ae2dd40f150d2b918c SHA512 0f7cd9b30bf9b095506af3796ce2927d2b14572a9f42e34021a205c090388ef08a6ce091aaabd19441b32e18c0d43c94cc1fd274f80e104c465d1bde88b46f1a
 EBUILD flake8-2.2.5.ebuild 1102 BLAKE2B bf6ddd7b789b57bf23f653c405b261a16cd5cb783f91e07dd5b62ddca82a891766ace4c727c1df9e178c5912e4bf963e0275a0f7382edaf74a002a7f2d4b775b SHA512 0cae93c37085868960eeca63c005c2c8d0d191e3deef5e223f130c2f9ed6712002815fb4da27b239f47f41fed37d82f4172e4b31842b75aa7f00666e5176c415
 EBUILD flake8-2.5.4.ebuild 1608 BLAKE2B 57c5b33880c3fbeb57dc00064d1417a256697864f5baeec45bfd7a802e58c812452abfbe3134a24193c2d6dba4241af87f2306e691c3e365b0b68bbb08b027ad SHA512 55f6fd53f6d4525af92cdd5bde0f6baa634f4c607583e2c9b89074964ff31a71923502d0e661c6b280d34708e1fcd2edf2474edfe894211507fe54dbb1e526d6
-EBUILD flake8-3.5.0.ebuild 1641 BLAKE2B ff28f0250ce356d072ff25ee6920a9d8bc9e176b7dbd1fedf2e0fd9150b751bf912e6098b176f45e815505e15cb449eea17383a190fb6685493d093e46d71891 SHA512 cc32dd0690558c96bc16a8ebc6239b7a0a7cadd7be2c4f99bd5daf1018e4abe30cb21ba179a055678f154b9bd106142b385a69fd698314982530d1e60b7d923e
+EBUILD flake8-3.5.0.ebuild 1640 BLAKE2B 91f01cce7595c6c366d41d8378a772d78c86daebaca208861a0e985a80fe843345c8d3e76064b325d13d4ffeb0709240534ffe33411870f27a6e21b85c533dcf SHA512 64f5c0ae973ed7a7d7b921e16f4c9032d5007f76149dcb7373f8aa0dcf2e610aef92c838213323934fc8cd457bf0aba22b5768d115599d4d730de0592017c8b1
 MISC metadata.xml 373 BLAKE2B af4d7678c87281f631048d3c49b0a642ceee1d771be2b662458888659b7c8e262c98adcd7bcb7f6ab251783998950725729ed35c887c004f8d8da87da81eda7d SHA512 449aa40152590e7103a4bf10006a33e6a0d5010a7846b0c5fbee8a78d99a3539995eccf441845c205bf48fc1e9b35cd7b1d6af0d98b469bdd06989baf8b88646
diff --git a/dev-python/flake8/flake8-3.5.0.ebuild b/dev-python/flake8/flake8-3.5.0.ebuild
index 9e49398d7603..20834fd7bd0d 100644
--- a/dev-python/flake8/flake8-3.5.0.ebuild
+++ b/dev-python/flake8/flake8-3.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 # requires.txt inc. mccabe however that creates a circular dep
diff --git a/dev-python/funcsigs/Manifest b/dev-python/funcsigs/Manifest
index f8364305bbc0..0f448d8e8458 100644
--- a/dev-python/funcsigs/Manifest
+++ b/dev-python/funcsigs/Manifest
@@ -2,5 +2,5 @@ AUX funcsigs-1.0.2-fix-pypy3-tests.patch 3154 BLAKE2B face7accdd8bc2c5d3ab9dbcf9
 DIST funcsigs-0.4.tar.gz 25697 BLAKE2B 0b57ac0ce3aa8ff16724af9be94f297c15c94ed9083e2dd78796f134054db0e5f8213d1671352e0122a90bb2e8da78937c7a44f2e231b64de29afbb0dcf8b6d5 SHA512 64d821e94049ae906b9e5c8a2590f80a7d1d819554258e20f4170207576e5c8f65d32759a3f65bcb05fe721fa502658ff5767cd435932ea926c792c62ebe96d5
 DIST funcsigs-1.0.2.tar.gz 27947 BLAKE2B 3006d46018ae040b930e397c3f11575ae0ef18a8b2c9b6c10075804d83d23bea1fb81179de85180146673e0bd4c775a68c0ff624cdaceb1894efe5b2c8fd753c SHA512 4e583bb7081bb1d6c0fe5a6935ca03032d562b93ef5c11b51a72ce9e7ac12902451cc2233c7e6f70440629d88d8e6e9625965ee408100b80b0024f3a6204afda
 EBUILD funcsigs-0.4.ebuild 648 BLAKE2B 79ce679e541a72b4501707c69332ae2bfc961df050d6d3ce4d57792746b57c658b90ccb719d829718d901c35f47e29b4cb31277f82846c36e3205dd452487799 SHA512 153be4574e0d49ab639c6778049faf267ef0646910da3c2034a196896edcb67afc9d07142dae276db525c65b558dfd0a4ec49991f84bd6418fc3d5921553ac4e
-EBUILD funcsigs-1.0.2-r1.ebuild 894 BLAKE2B 8138c8c38b956fb11eb3d7db62cda5ce8ef738db6f243fb693dea0437413b1e5882ec2785a3eeeb5c9d1365954bb6fca59dc16d50375368d06d4cc9f22099f93 SHA512 8ffc8fa5fa4ddde883a44b5c3555c86354e2d2b1a2df286c57eebf8daac5f146c98a90535855a82b51f3c561aa0d99f16770396eeecc8de3199d0ac91a67f6be
+EBUILD funcsigs-1.0.2-r1.ebuild 893 BLAKE2B 60921c0303e9a4142e6ab25b9bb4bce3ea1a140e8abe5b2bd777325d5fc2edac16e70930bc2f0ce3605931f7a42b089c72a49ce70082613aab3196b70f5b3ab9 SHA512 f93790644b00b01a02ef1541b4d957ef99df73f4da321f703e4263ec1bc440ae48a6072bd01b758c8cee6687bca136b610a56db5f8e3a5fea9353d9256a844fc
 MISC metadata.xml 321 BLAKE2B 8aa6245455756e5d3a197dfb37bb706551ff8ea0c6beb047d0c59c54d2ed74853e6d9857d37a531a5313a7a85a0849f5e0b308a58fa98a3cce6040b5b91a1a80 SHA512 a3df23a85e33881f6ac0da0b0e33fd69de760c79e636574982606964134d303bfa219f429006a54ad71622c05c07b6eb233a1e8918f4703257b0e8c389acb6d8
diff --git a/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild b/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
index 27b3464b8267..f300a92655af 100644
--- a/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
+++ b/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 21f12cf66131..fec8a0c72b15 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -7,6 +7,6 @@ DIST ipython-3.2.1.tar.gz 10884249 BLAKE2B eaeb5ad3cb1cfd38c5f81e0d312773e0ba617
 DIST ipython-5.4.1.tar.gz 4973571 BLAKE2B bbda7b5a172ea1e80a9867f036ef68d1d0ec0a7340d77d8b4bbce63c5db7d3aade106ee5a6d59fb7e2b773c37d8263e51e1eaaa81d582849a70de60e93b7205a SHA512 b37dae27a558585ec4f42fa22e86380ac81990207ec680fc7b0e6f97ac81c99d915cfe77488bc0b91a61c34e0c00b323df08aa06b142ce0fc88ce30203102907
 DIST ipython-6.1.0.tar.gz 5066094 BLAKE2B 4f68776ba15f50b2f0fcc1503dd5c62ac464d9d0ace0801f572c9cdc1a0ddd7d840369a3df5940551c848376985cc74848002cef53869014adb2fd9714989acd SHA512 6b1d9713b5e8c3870ac8cd8bea9d3a6f0c0302e3983017516128ede9f0baba21372890873df29fbba3f9d2f47ba16bfadb1c611f9de23b71595c0ab8f917695b
 EBUILD ipython-3.2.1-r1.ebuild 5049 BLAKE2B dfa09c80e7b558bf7efe9fafda23b2555987b196844b9707ce8e8b564a6e58a8d132284d0a16eb9f9b91896b361a0e2327849cdf7c5863de04a5c726604e7d0e SHA512 687dc470606dd48fd2128c7f8d1850cedb95bc4bb18be81f72b9656a06889741cad28c10a6f13a73b069c43794299c8127a33ced778eb350f367db5399352f5b
-EBUILD ipython-5.4.1.ebuild 3645 BLAKE2B 42e25bb5e0277e79af42cea13c17ab0a9e061928b3bf7676f645528ebbc432a5f48bcab0d7f9fdec048c3988c2b18a8773f6532fdefbcdde3094da011f323429 SHA512 db674c38e00c44a040bd90432a869e142fe138d00ec06144522de5f91db3e6c1cbf1e73fec262b59b2968be527e2600f39d628b844c42457f793a6a8df86c4c1
+EBUILD ipython-5.4.1.ebuild 3651 BLAKE2B 1864902bcdd51a44a978e2f4581deace47e7ea96282ddb06759dd06f946f8f0d7a2c924bbbe9ea3e7267af64ca4f802d9578526056ca59c4137426dabdd5fa8d SHA512 88b0c0f779a6fd9c8af80d9c03de517c9965a0e3b12efb712f698247cebbba8c5e4683abcc94e1078b47710aac8a6c17738d8aee4cd85ab05592103b0985950e
 EBUILD ipython-6.1.0.ebuild 3387 BLAKE2B 546e96ad93f0e43c8f433f4cd6f8c17a0336edd8194d355a41e7333774f32dc881b0eaa24a648bc5249a7ca72ef7a2612bf7a433b0538941801bfc0eb5b77758 SHA512 b8a6305d6f8de92ddafedbdfa695b51275349c2a1e1da03f674d94e67a5e62d48d0c38c84c9ecebd5fc5d11ce394fdb384d7a6807cf413855dec0516e5dbcd9c
 MISC metadata.xml 3035 BLAKE2B 02b40c2c8b11edf3e5d24f4fcec3e99369924cf1067e72c5a64d3a8e2373e318e2d8131b3b47e09527051fb6027af833f29488cab833dc7b71d2a76367b5e5f7 SHA512 a841d52fc997a447ec98335dad7cbb2971a0498754eb86942d6a9aa9f14cdb3b8687f78e882adc8b84c1967a16f75239e8fda6bfedc58622b052bdadda719dcb
diff --git a/dev-python/ipython/ipython-5.4.1.ebuild b/dev-python/ipython/ipython-5.4.1.ebuild
index e7a438809ad8..2c5b24121289 100644
--- a/dev-python/ipython/ipython-5.4.1.ebuild
+++ b/dev-python/ipython/ipython-5.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test wxwidgets"
 
 CDEPEND="
diff --git a/dev-python/ipython_genutils/Manifest b/dev-python/ipython_genutils/Manifest
index b3c1254f6ae7..a3a6354e9ce3 100644
--- a/dev-python/ipython_genutils/Manifest
+++ b/dev-python/ipython_genutils/Manifest
@@ -1,5 +1,5 @@
 DIST ipython_genutils-0.1.0.tar.gz 22255 BLAKE2B ee24a3b226894d51c36d2e3e7ec5a0422c571b46670d7822f0555b2f5551be176560e76682d4c7e7e167cd0bbd9b321d4dd936495ee824c7e49a4d5aab1a9f85 SHA512 714f850783d5e3c042da409217c0e213cbce249a42fd689c3559745861a991fecb5dbf98a012a4186053d9bb7ca4d52dad742b676eeb5163bc4dfbf256181081
 DIST ipython_genutils-0.2.0.tar.gz 22208 BLAKE2B 1a898e11cec26787f530f72e2d2a79e7834664e0f6be6a27ddd426bc2d0b3f39ee46e9ea10ad03e01a08054873c9752007038e863d7dd9e501613a68e40e1635 SHA512 0e5a9f8be17d98dfb74ec77d1360ee79276a13fe1914e6d31e8740f06375ed1671c49356a77f118495f50823b8384c1e2c5b6fae73965e3d4249c831b9a2b095
 EBUILD ipython_genutils-0.1.0.ebuild 606 BLAKE2B d9ddbdb30e69c6b62bced05c2b2234858b06fc10d5d1fae422ddac8bf3ec0a9bcf1d558fc8a76dc7ff0b639bd4b0fb386ed829ce57a11325acf3bfb23dfd2319 SHA512 1a303a98bfe7f8d0eb2c83e9da1d7f507ce697d31e7da2066f302f74f5982ebb756c3279e8ba6a02e2ff5e7778654d9ee780029082309162936c32903bdb5cc9
-EBUILD ipython_genutils-0.2.0.ebuild 607 BLAKE2B f0d090049022666b30d57818a7cf95a3dd61a1e423f81e192d9729de6cea64a7f9fef588cf9f916ec282fde10e5d9143abf1aab4cc6b2365a767f91f8a7b0ee5 SHA512 6788f720f49ca991b2374e34e32abf69cab9cede676b0c285d77a1543f7df96ca2bf6a7d3c1ee5514d9915c83f47db283339cebbe9bed452e61264c8d8f9fe14
+EBUILD ipython_genutils-0.2.0.ebuild 613 BLAKE2B 0537697771545a5b20919aee7418e8c2907da9ba98474c26d55375432d0561fe3c7a8183ca84404ec63f5656b4d8419cbdebc0536daf0105a0b902e594515dec SHA512 006edea2869a17dac50ce058f5fd3fb78f5cd25b4f8fab19c6b5ada99698ebdc002135a3be10a138a8fb5de374b1d5d616b6d9a2ce99593ffe9a2cc018a405ca
 MISC metadata.xml 729 BLAKE2B 91bb45e44e2ccd4686308049920a2a9bc9a0334af7b2cec5365c35d3462782c9f1c95b5496d364ac1b92bf1514102b4e5d6755ff8beabdf5887f0262cdbca889 SHA512 13724fe12d5a5053947c38bec58984747985fee21954ff33072c954bf6e9bb53c4b9d23dad194c4cc6b1151ae83d1f8f53c9f91368a370aa51f84c7ced0178fe
diff --git a/dev-python/ipython_genutils/ipython_genutils-0.2.0.ebuild b/dev-python/ipython_genutils/ipython_genutils-0.2.0.ebuild
index b8767f4bff24..45197675d733 100644
--- a/dev-python/ipython_genutils/ipython_genutils-0.2.0.ebuild
+++ b/dev-python/ipython_genutils/ipython_genutils-0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index 271ec252bc29..26b3eef54fc1 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -2,5 +2,5 @@ AUX jedi-0.11.1-exclude-tests.patch 940 BLAKE2B 2c5540b62529a27a8beb8c3ca1b2f2c8
 DIST jedi-0.10.2.tar.gz 373879 BLAKE2B 8007b31dc6c96d9538ab141b976fd4554ea16f01bb277692534a2972a6dcf61ee809c7573a7a3f7c0eceb29505de6ffe3ec0a7234a427579333b453fc9cd9dbc SHA512 847b000894b5e17cf5582c88245989ce1f0e17b595c79a2cdf4cc7a805fe7360ea08f28ac31473408be795c9ea210c85541cffa5fc7e7119da8c0228eb509351
 DIST jedi-0.11.1.tar.gz 332402 BLAKE2B bc0a8df89c3d8b6cccc387a22cc08f613c990c59e360c58ae1d2becf521a755892afa4972195f6e40ec3bb48b74b20a966034d0e5bcad5051f90e5b4cc082270 SHA512 61389704a318f89d12b053b786bfb6bda21d2696830c001d6d6e66191fc060d731bc05ea71f2e70725532dcbe109c5c7346a36d227e6f8ab0eb2512f4c1a8945
 EBUILD jedi-0.10.2.ebuild 988 BLAKE2B 89b371ff6dd445e36936a5cf43a334a352e9480d41616d4cb0dfa0ea2b10343a6ee2744b654c5ccc020313a40a00b2c0e0ce6fdbf528bf6c82e99e3dd0b829c2 SHA512 e354c07d1f2378b94675b59476a9bab9ef7db19eff2be6fa5f86fb931fadf6c2de55f9df43203481957a42f622d75b0867389523e3d3dd7e2267c1d02797d611
-EBUILD jedi-0.11.1.ebuild 1159 BLAKE2B 0c9ef5c572d68d2d0e7b33bac99aad787cd2839ea2d12fc1403f02c1fec4cc6d99a5657ec6f90a9dc1cac9d5813bb984f8b424553d393bddbe9fe37c37100091 SHA512 deb21320d18956edf0669ec60c29c48b25d019c7da7d3c61ccbd4e198b2ea7dd245b9cd40469a6322b23efa05aa12efd331015654ec6c2c9bcdf449b774b755c
+EBUILD jedi-0.11.1.ebuild 1165 BLAKE2B 347d4994b8a7f454f9d89b95a5bad3a9397e160eaecf29afb79e0e7297f939701805c343cad95ec93d586d4efb18937569b5c2c65ed3b41d1836dea03386c642 SHA512 a322b16e8e6dec54c9371177e52f4762f10d674a383718e00910521ef1a3c19d904fb4d41180da44c1be6b33990dca6612c03c844214a29a0b64d721e91b4961
 MISC metadata.xml 375 BLAKE2B fd65a43f1efc2cbde98dd68be5a47415ecec66d4d2b2c878235a1e77b24311062d6d9c16da79bdaa358b7910612a6460ea5cbc9efdb03a6fff5d2299d734841a SHA512 16271d48499888ad36f71d79301ddc361831a7263f3d0ad19d12c29b51c52c24806a7a366c6e263b4b6d43e28856cd336b0bd728fa00a5fe5111b505fdc50977
diff --git a/dev-python/jedi/jedi-0.11.1.ebuild b/dev-python/jedi/jedi-0.11.1.ebuild
index 7aac943f7a2f..fd79ffd6a5ff 100644
--- a/dev-python/jedi/jedi-0.11.1.ebuild
+++ b/dev-python/jedi/jedi-0.11.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
 IUSE="doc test"
 
 RDEPEND=">=dev-python/parso-0.1.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index d00ac2d34a88..482c32e5bcf0 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -2,5 +2,5 @@ AUX markdown-2.6.8-dont-build-docs-default.patch 387 BLAKE2B d3ecf07d57d8aae13ec
 DIST Markdown-2.6.5.tar.gz 301781 BLAKE2B 527a84bc8c4a891e64749bce273bf10c439376386c27355f386de8a0dd89e2bf0c1d6cadb0ff937fa3825655ab6220901f7b17ea2d184f3b3d178cbb54af58b8 SHA512 d966136a7184ada4eec70af661aba441694a8c4f59e57d59a28dfbc1649ca1e90cc1e4a29b354b3caf35362e1e0c96eeb3f46c68f82d7a898b76c08866d459d3
 DIST Markdown-2.6.8.tar.gz 307330 BLAKE2B 6867f15425bd84bc030ab52000dc2f83bff0c9885854cec4a2a785f80b18129160bc57da30226fe17f42043b4938482e2e4eff9cdb3d4370b0146cc09f1ff576 SHA512 85c1a16ebb50af79f378eb2fa936342df6174a4f597a74fee6d0495ef2bc4c7c8337463799e427cb6788b3429e400309958b5c4784f536593047ab2e47ac7c23
 EBUILD markdown-2.6.5.ebuild 1413 BLAKE2B a58769e42e854c1904f23b3a6dc72465d330c453a3f40737df17e29e98c3d7478352c106d02a97d400ae95e8c70cf8be34b6591f79a9665d3ec36cc9a9172c31 SHA512 0447c35221a7aaa7ea6a2d9f82a6114811f6c468bd6d6d09e3faf788b696c69ae39253e1293b2a1b44d6a72a53b2e203d8280780706b37258980094c0570d3ca
-EBUILD markdown-2.6.8.ebuild 1468 BLAKE2B 346be0e1d9b01611bc7fb32c03b7954065518822eab026651e93492ae6c476e25661b26dc69e3d6048e48e6b1fb6e0b16f140f13a6628024b35e8eb5e83aba81 SHA512 112480423b59874679ea8cd43cf5a5f08e3345b1715a9b3143c61aa95ca810361ea8533995f7321495f70a01d006c470c74a4e5de28c4f553f8d3161bbb6b862
+EBUILD markdown-2.6.8.ebuild 1467 BLAKE2B b2395f8bb3f941babf2047fbdc5a7d6c850c5ec0c7ed759e176f30e7dd8a79fbcb840d62f20b84cfd38c8e23d3aee3212c4e1a47fd00c646aafd2904ae301774 SHA512 fd8187243a96ea34738e7359f57c04aed76fb2ab2e45a28f298e262b36cbfe8e7aceaedd338b73a1e05b1d7ab4c316b7da38aec13b918dc67f5dccfd1fc3ead6
 MISC metadata.xml 465 BLAKE2B 8eadaf9d2733b1b3d93a389b0009652eecc3a0c3b6347ada4f27d99bd69b0de1be199eb1da7854655b8814a946f40a711e8fc092b22b214c18dc696dd3c0222a SHA512 4c9a52b62e49040fde94cc2d3d9edf88c42d085639d893fb81d119b8c216100f912e2725a1bbb31b1136b505ef8102f560989289da5aadc6c8f433f0186da44c
diff --git a/dev-python/markdown/markdown-2.6.8.ebuild b/dev-python/markdown/markdown-2.6.8.ebuild
index e3924bba4da7..8dd931931a63 100644
--- a/dev-python/markdown/markdown-2.6.8.ebuild
+++ b/dev-python/markdown/markdown-2.6.8.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc test pygments"
 
 DEPEND="
diff --git a/dev-python/mccabe/Manifest b/dev-python/mccabe/Manifest
index b3793df5e9f7..b2af93ad946d 100644
--- a/dev-python/mccabe/Manifest
+++ b/dev-python/mccabe/Manifest
@@ -1,5 +1,5 @@
 DIST mccabe-0.2.1.tar.gz 5031 BLAKE2B 6f52106337ed534933de0c98fc103cfe209bddb30623a3b710681f4f0615a964c4d0472d4dc56f1ea4e60dda695eee540f9f9b441111808684f09fc8207b69d0 SHA512 7155e52063e786c140c541f1410d0c319387b4b5f24ec3c60ba3d5a963a92d0ee545254559941ac0dbe961f46750c0e61271fbe82653c6b1465c0a13b31ec325
 DIST mccabe-0.6.1.tar.gz 8612 BLAKE2B 6828dfd852cf9b47de10bd889dd4c32dc1ee95910fbd27e0921cd7d9975a0831b1c2763eda5b2d77d7e4b44b5a9d0e89f0818cab71de655954cc87cacfe8d382 SHA512 d8fc251a29790887c14c5932c5172b4cd578cd37ccf14cb96e80f0b97f27023427ea032d14e1e2a99d72627b055eb285f60db69e679ecd79d90a34b0255703d8
 EBUILD mccabe-0.2.1.ebuild 553 BLAKE2B ab9defb8f678c26edfe4abedd8cad4b6603d6fb40ae874c267d24e4f550e7fe8276604996f40cc7b62faf65bf1e8186a2d37425ce3e65e0d5f65a514f299d562 SHA512 5ac2247052ee959a29a582884d4d8d10df032925ed6eeaf0c950081dbf05e091975952fb2394e6abb7e0f5f3ed93b4201bc90029e8c84aa34165bda8bfeefda5
-EBUILD mccabe-0.6.1.ebuild 882 BLAKE2B e4eee214f4d940c180524abcf9a60c41fc5789aa695e3cd0b93d1a91ef4fba32f65f3357eba2a349abf2935cd47083c8a8d02d22f7910ae5b215648eff455f57 SHA512 33a2e29ceea6e6ca645372c65ec3bcc52b14a7634560609d58a06e553cdfaa0688b7a89ec8dce33455e1e721df90712155b8d39c7062d2fac3b40959cbe78b4b
+EBUILD mccabe-0.6.1.ebuild 881 BLAKE2B b1f47b49554ca0e9f00c53e63b963b62737eebbd2845fb20c80039648ff6cdb6237305f5830695bf90059be2511d96e25b45fb4eda2c7ae8df0aba2e3b252b40 SHA512 2ece64bf2ef9c7d5bd83503b17ff6fe3b96fe0de0159011e49b30a979af5cba789adb0ac318aeb4e10a92c6b326dcba196d042d52084a13f7bf8788bd350cf97
 MISC metadata.xml 373 BLAKE2B 0a0d03ce9752401f11326bd24a760ee9f18b792e6d6cb6f229513eff68f35acc943dde6b9b842a508e7bd7344c13e1b8d74b38ef1ef1401823ee106573502412 SHA512 9672aa38d9c5e31835bd0b7b1d3463f2e625ff71b4ee79d39b939cbae4df67241ba64f17cfa928aeb6fbcd0bc787c076dc078b56c92bcc1a46ea26f873472fc1
diff --git a/dev-python/mccabe/mccabe-0.6.1.ebuild b/dev-python/mccabe/mccabe-0.6.1.ebuild
index aab43eb5d671..d8680e1ff0b7 100644
--- a/dev-python/mccabe/mccabe-0.6.1.ebuild
+++ b/dev-python/mccabe/mccabe-0.6.1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="flake8 plugin: McCabe complexity checker"
 HOMEPAGE="https://github.com/PyCQA/mccabe"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/mock/Manifest b/dev-python/mock/Manifest
index d1f5d77f173f..8be25206745f 100644
--- a/dev-python/mock/Manifest
+++ b/dev-python/mock/Manifest
@@ -4,5 +4,5 @@ DIST mock-1.3.0.tar.gz 70908 BLAKE2B 4df669c5d54fc835c70d6190362d4dea9cc0d2e7ca4
 DIST mock-2.0.0.tar.gz 73684 BLAKE2B 970bebe72b6969b58acdc2856b53054f992d01f9f3ca5f91b73073d0a1c9ec89a5c94fd66eab85b258f23f33326825ff6598bb2ba8e07eded1e6540a26ac5fa3 SHA512 a08007651b749d2843b94f5045d74c122958888290aea21930455538a854e6b04c07115e21d82edde996154bf597d7a8784a2f4213cbabc49a98dec22dd92238
 EBUILD mock-1.0.1-r2.ebuild 1125 BLAKE2B 90ef59e9b9f97961b83e5426cdbd82c4cfa8b2bc901b18f2588c71238c93418db084ca5ad2177bd71748167258e8e69baea2e5e22ac0baeff968710a08fcf40d SHA512 32f957b31401e1e78f575a4facf63168fa6d6e64d4f5947929c79491ed1997081b02a4ea176351b786dbb1c73e061167be0037885cd951800fd2c8ed6e71839a
 EBUILD mock-1.3.0-r2.ebuild 1073 BLAKE2B 04e814e0e3babe2b9bc187d0a30d0e81f0292306fe05f370b4203d152f10d251ec36a79c139722395e020c17c7f7d267a2f219779d85f9b7ac16ee58d89ec837 SHA512 601b41f1e291903f62a786900aef41e815396c21c2536ea1d9d0acfb27b305765bc3ee7ec2fa8270f14d6f70f76361cc007cd9cc926fc072b1cbcee145913e39
-EBUILD mock-2.0.0.ebuild 1084 BLAKE2B 437b23e53565ea5e99ace98ce18cec4deddf23180725f3c48a002e3f0c457abd85ddbb4b5fbdf43cd551fe079ac32e46255350f79b7417aceef998faf928bc9f SHA512 45e9d2983daa5a90142c2cc1da13418f5c89285685eacac271fdb76f2eada9e0f6d6a9e8a1011b4939b9c6ec78a3a0242a05e9d35614b3cacb412e970747a04d
+EBUILD mock-2.0.0.ebuild 1083 BLAKE2B 0cdd29d7a241f4ac1a9fdbd463249f535189f28f4413c4ec85aaf02c3186fa3bbaeee16afe5e9cc8d02db4c3b407896e34760f6bef3dd12b6e44a1371988e769 SHA512 3263046cd68566214a17d0ed14dc6ea6a428903529b9908503f3aa72de9ab967307d4cd5919322b4363fe72303d78442dfba31e5c6fc61bbfd8a41f41bf0337e
 MISC metadata.xml 365 BLAKE2B 80ce989b7585192744838e804490286b598d6a4e082a2e88fce1efdc34c3ef3185478fa6ce3f08c81dd680c62b4de0c7eff3fe7c926d96479ab856aa46c69250 SHA512 89eda97d1f0ece91d573a9fc4fb5d357733b757b1214a56c7bb14a10f84e1c275d2cc49ed773597c4e320df03f751fb093fef7f3805deb450380df4dd83d875f
diff --git a/dev-python/mock/mock-2.0.0.ebuild b/dev-python/mock/mock-2.0.0.ebuild
index 9c5af1506b58..36df22a66043 100644
--- a/dev-python/mock/mock-2.0.0.ebuild
+++ b/dev-python/mock/mock-2.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 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 ~x64-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-python/msgpack/Manifest b/dev-python/msgpack/Manifest
index ba4b2aa40f20..983ee44f3619 100644
--- a/dev-python/msgpack/Manifest
+++ b/dev-python/msgpack/Manifest
@@ -1,5 +1,7 @@
+DIST msgpack-0.5.6.tar.gz 138292 BLAKE2B 6a3b8472b785d77e142d21464b9e52c55166a8eff56009f63df5daa8cd5b6dbce4406a06ffa8d478cb44dfbdfab2f3b4b29cd11279ea82f67906b97d507f7eda SHA512 bdbd193bd3bd02e78d9c6e8d9d8fa687d13583dff2813bc77c5e6cbbe0d180765da3c9a80d176f9993589e35f548ad04973e3d523d0b6d41ef7916ecd86195aa
 DIST msgpack-python-0.4.8.tar.gz 113641 BLAKE2B d22efe13302e28d0701b95b2dc4cf4792f9e045efdf77b31ac5c6170b503c885c265ff63387fe76a1aa67b1624963aa26d76dffb15fc2cb10cfe672b59e71b99 SHA512 59e9c43be6b92e6d10f40999e0902c350137e67a83c43bb15b273eca856a6eb39f24b625b02b40188a9365ce3101f03bfa9aa3dfff56c5c3b551533942183481
 DIST msgpack-python-0.5.1.tar.gz 138953 BLAKE2B 1fb7e5be33992808319e1444ff7f84cc13f034e60ce0ef2f72161bd4ccd0cd1ede27382bc1f365f268557c8ffe503fd12de66eb5840e79760d818e7e2f67fdcd SHA512 e5172e20bb25d2e12ba34ad2805ba4ea0776397986e8bf8e26d21353f57a2dba59a9c6669c817e4e91d5801558a50f95d81e02343f8f0292a01ec5d822fba61c
 EBUILD msgpack-0.4.8.ebuild 770 BLAKE2B 5572e7ad6442ba346ad3e1d9288ae6721b3587424e843474aabe0b806778e8b34719b1bb8f716f4e679234641028090ba4cd73c9d9f5e121e2189d7be4622853 SHA512 96b0e59f74fb4d05d4c88572e74a0a87d8bf7db4e4945aa125b60521b7f74857acba19ace64fc759e65a1295ed63b319c3d3046511f234f4a0bf4517d4c15df9
 EBUILD msgpack-0.5.1.ebuild 771 BLAKE2B 5b9c60a88b72bd5bd238e4474cb7662cd07d2f24df53edddf17967a856ee25a170f50f6ec23738ce205d12b1a6cf65a4bac9c3075389d731a2743f0a86a58647 SHA512 3aedcb271f0699ceda59908af275aeb9b72b68e1d8122512a96872bb92c91b5e0dafb3d63447957488ce4c9b1df677a6bc99784dd976a830d1f082ba3f807442
-MISC metadata.xml 391 BLAKE2B ff92d277a83506f36ed8cfe23dde10d044925d5e92d35e1ab09283d6ae2d259886982434d96898b570ad83abdf9ed3c02e695998464b9bed596ad95aed6f7daa SHA512 3001105274f7bcc446a3ea5d0e278073a51b1c480a78127574dbdb427e656719673f7a9543c8bf9b3d8181e414612f3f186e7ab192fa0fa9333a988f17593f79
+EBUILD msgpack-0.5.6.ebuild 1022 BLAKE2B afd46cbd4e5328e449c46187777f68dabd68fbb59273ccb0f5b18d13bfb5949ab2333bdbbf34d7fa33acf0d210bbb3973fbffcd903669fb611c6b4eae97514cb SHA512 36580b2fb443be2c6de085f2a02614c9572ca54d403fb9bac2f359abf2f860b3581613a04ebc1cd7bcd8820e1f82a225cad4bf8cc2acec62d29ae6e656959ebb
+MISC metadata.xml 801 BLAKE2B 8455df40b89a2cb103d06cea5d334a70a2f9f913786c046533a3415c7dbd71387b72133ffcee0d9d2a5e2a70890c602453a4550ca2f9b5dd183f3103f278fa5d SHA512 c7633faceb2c6da02e144af13aad5256376ca60842e674f835c28f9eef9a34665ef5094fd8f1269b6d7a8b2355a9e3fba11863b1940d3ae152c126e89ef9c60b
diff --git a/dev-python/msgpack/metadata.xml b/dev-python/msgpack/metadata.xml
index c0744d424d52..9d8ee9118cdc 100644
--- a/dev-python/msgpack/metadata.xml
+++ b/dev-python/msgpack/metadata.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person" >
+    <email>lluixhi@gmail.com</email>
+    <name>Aric Belsito</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Gentoo Proxy Maintainers Project</name>
+  </maintainer>
   <maintainer type="project">
     <email>python@gentoo.org</email>
     <name>Python</name>
@@ -9,4 +17,10 @@
     <remote-id type="pypi">msgpack-python</remote-id>
     <remote-id type="github">msgpack/msgpack-python</remote-id>
   </upstream>
+  <use>
+    <flag name="native-extensions">
+      Compiles native "C" extensions (speedups, instead of using python
+      fallback code).
+    </flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-python/msgpack/msgpack-0.5.6.ebuild b/dev-python/msgpack/msgpack-0.5.6.ebuild
new file mode 100644
index 000000000000..c983343b0e3a
--- /dev/null
+++ b/dev-python/msgpack/msgpack-0.5.6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="MessagePack (de)serializer for Python"
+HOMEPAGE="http://msgpack.org https://github.com/msgpack/msgpack-python/ https://pypi.python.org/pypi/msgpack/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="+native-extensions test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	native-extensions? (
+		>=dev-python/cython-0.16[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Remove pre-generated cython files
+	rm msgpack/{_packer,_unpacker}.cpp || die
+
+	if ! use native-extensions ; then
+		sed -i -e "/have_cython/s:True:False:" ./setup.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v test || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/neovim-python-client/Manifest b/dev-python/neovim-python-client/Manifest
index 059c72775b12..130480fb8010 100644
--- a/dev-python/neovim-python-client/Manifest
+++ b/dev-python/neovim-python-client/Manifest
@@ -1,7 +1,9 @@
 DIST neovim-python-client-0.1.13.tar.gz 41413 BLAKE2B 819c3e7763cfb357d45130928dab23ad149a5f9d8efb0df8699a805bc394662447837ad3edc869705a95d74a37f2eec4f155212da918ac779d389c150a0d7189 SHA512 ecef42601632551c98f8de019bfdf4dbff3ce1f0e1b6943b78a506b710e5810f6a7e611adc09435992b97288ff365a416870a74202a5c68236b5daeb51d15c8b
 DIST neovim-python-client-0.1.9.tar.gz 40599 BLAKE2B 48b43d344ed0c7aa3faa95a16c9714f2d105a916364db55d68263db7b8307a90d084bcf7559dd17277bb8dfbe6d7bbab8d3dafa250b4825b2cebddc00d130dee SHA512 043429407d140b37004d5344f9244c8cb5a37e2b5d450454e6535bece7fb05f037e5eff2a63431fad55ab2470372c4a17e0a608a94af65a2f400f2158b736ce4
 DIST neovim-python-client-0.2.0.tar.gz 41892 BLAKE2B 0ae59548ae1e376c618c24edfa73f3f68f5c059b2772be8ba3aae08d38c7a368d8b341da0221092ec8fb132843e1ea2d313bedf0c51fd202d5953e530f205d3a SHA512 b8363be2892f4dfaed0251186a3f370ec31be51710b659b71f52575da773e254b388afec2f5999a6b526d722b5232a16c59d7e28e49df30b4760ef030238d068
-EBUILD neovim-python-client-0.1.13.ebuild 828 BLAKE2B 2e50b899049660e8ccc4df26221f695db84bb814999c9ccce6656dad07e01208e4b0eb514ec319df1caa8aabd76e2a3afd1a1038049d81e1a1a48d7fa7445dd4 SHA512 80603a381d4f66cf1f1c05611cb87a3abe64b2e0e64dcf3534e777256194b497820e11b060c2218a3752b099072abea494b21cf0a3f9ef7e1665c0eb0cea41ed
-EBUILD neovim-python-client-0.1.9.ebuild 675 BLAKE2B a92e8fc5f69e7beb65032e66452aaf93e280f74a480e2ca1e8ea9dc0248f62c54765389128d153b10edd36cdaef21b0092fcd4a88f7b3779bb73de5e70e29cc2 SHA512 cbbd852156edcc2fd27365497cee82e741ce79750a2e337df3f4bd52f1689f3b9a62724c1a55623b44e08924357502ff0344968d515bf0a6ed996ecedb7840a7
-EBUILD neovim-python-client-0.2.0.ebuild 667 BLAKE2B 03872fffba5a240fe3248537d8fc0bb43ce34e2a02c62828c9b49cad8118831e067f9229b2086810af6151e6b8497950a878571f313139fcaeff0c0267117ef5 SHA512 62012b86095d9f8ad659d048fe3a19e512b5deaface4ca6e653301a2c01cb357e9186ea7fbbe7987ea8446839ff7dda7190bc8fb4e4fb10c3fd20ec34dabbfa6
+DIST neovim-python-client-0.2.1.tar.gz 41971 BLAKE2B 9ebff937e08963cb8c764c4dcfcef8b6e28e8d0219635f9602ccc77b0bf4412a797de71fbf149bcaafe85bd1122a0d3cec1d8bfa81217c8c2d5a89bc1772c572 SHA512 710be7f5355077fa1eae256c541a06d475902492a19638c5786e25aafb9181f40afcc8df70aca0da15a569a9d6b095ab7bd8008e4f947725cf081954fb7c042e
+EBUILD neovim-python-client-0.1.13.ebuild 877 BLAKE2B 1e30bb66d30a8d733bdc6708c65357f8711cbc9a176fc7c1a0f568ea43962e97311aa18e527bff268d7335de77938d1ddf1c95c8f7b10caa3023bac03b95776f SHA512 c627687a3faf385941d038c4f8424ebd12d59e1cdd9568912151bb51b3d46315dc3a9acf3905a17a6b90ab144dee439354a9a37cfe0f3ab3dfcf1b3c2ff60142
+EBUILD neovim-python-client-0.1.9.ebuild 716 BLAKE2B 9318d75183c0e887c6492d5faa90abb7dc9ff3eb83018c6f25a21099d869a3f104b22c9c808e695319e095a94a7bc1a50d9203deefac29c4dc76091a7a040697 SHA512 e3b179414eb6cc66fdd22225ab748e274b3602efd3bdc89afd577ed34561c34f6a95e895edfbdbf81d81464171081fff6103e2ca935fe65948f832bca9997e21
+EBUILD neovim-python-client-0.2.0.ebuild 718 BLAKE2B 387e6364ab57ecd10b6649441f30814d610b9e49bc95b1d4c727699756b09ff1186e009a9e8f5e7303ba12d75a0a6fffbbb8ec9fe466d67a3ff0c542d24415a1 SHA512 946d41d26aeb586b822e5d36cdce38f7094ab4f2141dbf541a08b50f82d2154423b54773cd4e399dc7876741b5872aadc47f4ee0c7c960e5702e7dd2c60a8ce0
+EBUILD neovim-python-client-0.2.1.ebuild 669 BLAKE2B be2d2739dc178847d527dd32df525a367409f9556d5a4a6f5230e0fa6cc7c864e341c9955c92833948a47e7f122f51442593048ce6c933eb911c1354fa48d3d6 SHA512 7dbfd180271b06cfd18a31847603b5fa1fa9e895e908fe21e879ecd056114ae8c59601ecc338297df241017100d6f42ca901d6e2bb66508cd31d2ebcaf25a67d
 MISC metadata.xml 451 BLAKE2B c2317fb2bf039a77c223c958dd1238ed934621c556c9c8f565bca643a73e79bd036b71bf104146e810300bcfc755328365982d44fc4b4c46676e64d8720ae64c SHA512 cf9f4169ee1ea2adc6f88b17461202cfe120c20a5367ccc0da4099b8792841d13057d8c133c85179b1c5b00ad4bc9954a0e9202b3810a6342f8e052ffa3dc2f1
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.1.13.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.1.13.ebuild
index 0e7fd586cc31..996030447e49 100644
--- a/dev-python/neovim-python-client/neovim-python-client-0.1.13.ebuild
+++ b/dev-python/neovim-python-client/neovim-python-client-0.1.13.ebuild
@@ -16,7 +16,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 COMMON_DEPEND="
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	<dev-python/msgpack-0.5.2:0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.0:0[${PYTHON_USEDEP}]
 	virtual/python-greenlet[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python2_7)"
 
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.1.9.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.1.9.ebuild
index 8ad3f64bc344..2560f7bfa1ac 100644
--- a/dev-python/neovim-python-client/neovim-python-client-0.1.9.ebuild
+++ b/dev-python/neovim-python-client/neovim-python-client-0.1.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
 inherit distutils-r1
 
 DESCRIPTION="Python client for Neovim"
@@ -15,9 +15,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	<dev-python/msgpack-0.5.2:0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.0:0[${PYTHON_USEDEP}]
 	virtual/python-greenlet[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python{2_7,3_3})"
+	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python2_7)"
 
 RDEPEND="
 	${DEPEND}
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.2.0.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.2.0.ebuild
index 9199fbf0576a..036143b5f005 100644
--- a/dev-python/neovim-python-client/neovim-python-client-0.2.0.ebuild
+++ b/dev-python/neovim-python-client/neovim-python-client-0.2.0.ebuild
@@ -15,12 +15,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	<dev-python/msgpack-0.5.2:0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.0:0[${PYTHON_USEDEP}]
 	virtual/python-greenlet[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python{2_7,3_3})"
+	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python2_7)"
 
 RDEPEND="
 	${DEPEND}
-	app-editors/neovim"
+	>=app-editors/neovim-0.2.1"
 
 S="${WORKDIR}/python-client-${PV}"
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.2.1.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.2.1.ebuild
new file mode 100644
index 000000000000..3814f0211ef1
--- /dev/null
+++ b/dev-python/neovim-python-client/neovim-python-client-0.2.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+inherit distutils-r1
+
+DESCRIPTION="Python client for Neovim"
+HOMEPAGE="https://github.com/neovim/python-client"
+SRC_URI="https://github.com/neovim/python-client/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
+	virtual/python-greenlet[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python2_7)"
+
+RDEPEND="
+	${DEPEND}
+	>=app-editors/neovim-0.2.1"
+
+S="${WORKDIR}/python-client-${PV}"
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 9e23ba9ffc72..566143dd86bf 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -18,7 +18,7 @@ DIST numpy-user-1.10.1.pdf 406114 BLAKE2B 88d43e87071eb88223c84720001671677c6f8c
 DIST numpy-user-1.13.0.pdf 580593 BLAKE2B dcf86d0a87ceb7062b8fb339d37bfe3c3fd5e166f3079a079d50f6afb51bde9754d050c97b3e4aec237aaf797d70a2458fe0f26beeeeaf1594330e08c07e181a SHA512 d3891d449b72c2d97af28182e0bcb12559abc114f8dbf0e0c68362c1af50e6aeab565b31b4aa44ab079e8d47f550081a79a4066c37fc52a1c70c05be45eb5c11
 DIST numpy-user-1.8.1.pdf 408305 BLAKE2B 2956e42ebad45b021f72c7e71d357d953ea8a26639b4c6e81dbe1718052304ac5ce1a7f96646d94ad48bf737ddc6962fcbc304e31dfce32b85cb8165b0ada6e0 SHA512 9e646e89e7e67834fa596e43082b43842d1c59287d22fd8d20c9f0a1d3d56a518a08cc2c036de4972ad0d6d9d3c2f56e2210f76e7244d3f7547b5204d84d3c7c
 DIST numpy-user-1.9.1.pdf 418111 BLAKE2B 683ed35ca9e123387a08a88047ad0cfd8bf3698efee7c17c3b57941f57f86297798787f13b142a1bf806f775e70bc116109decb281ab82959c08932c06aa1f3d SHA512 724302468a8e93daf70d379bb1ee7369953e297c40ea260f080b7aca3c9c81e619a81705bdfb2ea214da5b5325ec2b48e953eceeaa1d60c07593b00c35989f45
-EBUILD numpy-1.10.4.ebuild 4070 BLAKE2B 67a91881682dfd8e6b80c5c18b1e53c25bf742907857a755c9f671506601b9d1ba8ce96f62b0582f465cd4f442a34258c25877922e1828e613fd9eb36872a7b9 SHA512 fa27a99853a99fe5568ed5a000c5ef2894792aa6b927b4df20698178603dc187633973a6a72d97d10e04128e5722f5665efbfa8be56aebceed8a438b9049485e
+EBUILD numpy-1.10.4.ebuild 4069 BLAKE2B b696f6b5ac649576e7a43ebdb29c947be31d0370d3a6248ea90db8b729ef8b0fae2d0547a4ff8f4dc0ea47a218b41adedf2aad95c3ab03deb448d59f7d0ddc43 SHA512 c54637ee7acf4a3f400b186df07bfd8e949d5883d789c8978d39b1709a8251b5b0660cb95ebce9c7af217a2abb2bb4181b8c3f3de77a92461380e70236267132
 EBUILD numpy-1.13.3.ebuild 4621 BLAKE2B 2889f3b8969c4dd2e72ce7bb51973a89cd17636f055c17f8adeababdecf132cafe788715a54bc117ca0140d48c04bea46fd2ed8394cfd6fc75c83071cc9ea5cb SHA512 2a14957f44d34569efe69ffbdb2c6ec688080fce67c2423da9e4670648f67b6f7b9f9f01f5639d5a82f0c39e8d13af8f83aba89ca31446c57758faabfde81c02
 EBUILD numpy-1.8.2.ebuild 3958 BLAKE2B c2adc30c2fff21de615af9341824e59e46d0a5b5d5e0d725e2b37ad50cdc98c32e5a9efb00e7c77194a9386ace2389453cd963ab954b87f8ad481f20e645f2e6 SHA512 c2ca2bbae41ae787a7d7c0bfdea213a217a67be2cc0c4f8e399ea9c81f0b777563194d733bd350ff0af6c2218c0f1a4f1792e1d77c1472ffdd9eda37e736277b
 EBUILD numpy-1.9.2.ebuild 3971 BLAKE2B 1f26245296aa824966a93ff8f2881a0a4d6559745d8e39bbcbbf1ba94997193bf9c3b57cfe1d752e7ff1973beed34fab482818445c107e9bfb645ac09d95b0e9 SHA512 b8228e945ed92b73041a676c412e66566333274612dec1f33ecbeb9b5a7ccba377c906fe429fdb760ceafc25fec6ff6a9b1c93655576af04c5ce3b8baa4010f0
diff --git a/dev-python/numpy/numpy-1.10.4.ebuild b/dev-python/numpy/numpy-1.10.4.ebuild
index a9b753959a5e..51072638494b 100644
--- a/dev-python/numpy/numpy-1.10.4.ebuild
+++ b/dev-python/numpy/numpy-1.10.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,7 +24,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 # It appears the docs haven't been upgraded, still @ 1.8.1
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack test"
 
 RDEPEND="
diff --git a/dev-python/parso/Manifest b/dev-python/parso/Manifest
index c40fc79dcd62..4dca6c274dc7 100644
--- a/dev-python/parso/Manifest
+++ b/dev-python/parso/Manifest
@@ -1,3 +1,3 @@
 DIST parso-0.1.1.tar.gz 376876 BLAKE2B ad0b9492273d23da1f4133a2f1e6edd2fa7f2213dbe12868f891863e9286fa0281de7fc6c6924b78a5820f94867971bbc09f18b3d0f2e4832c9c875850205254 SHA512 1199651136af1c9f0801a031a197e367f7fa73b5878b863103a506481e8b325e6b305e4260510a567dccf91f298fd7e9e5674f4dc410765ae1f9112f742aa6a0
-EBUILD parso-0.1.1.ebuild 871 BLAKE2B b55ed106e5bc74b0fe06b8c3e642abba305d5fa39e34aa50f6ae9564dbd68c7ac2ecfa0364f41739c94e06571c1ed8778fe6be937e9c92f784388e3c46bd740a SHA512 ac4aa43c7bd671aa48c74f139078f1ab9d5f8de49f0b1bc8424aa8b22547195f573f2b39bf03a993f44eeef2aedf86b66e4bb6db57e228515e4efb3735565fbb
+EBUILD parso-0.1.1.ebuild 877 BLAKE2B 30f7d9436ab8174101194d971da04fbc9e9d23eb5551e610d03f184fb3d384452f9407598f6a7e01b62971f46d6ec30f96797f1f7c7ac6303e15f670ee776226 SHA512 163b86af3c132714bbfc65123e82bb22ef3ac941281e4f540c4d930313ff3a112f2edba4242594110235c3d23d1370049896dc2b96fce87029cd96277d106155
 MISC metadata.xml 377 BLAKE2B 0ac7d9c46c0b591fe46ff373bcb8942261cf0b819d9397500928546c4b07541c958edb116ecf1ff79f0a83c2f02784b019e7d64bd8a82bdfb397ef70fbbaa0c3 SHA512 7d719c633f81372caafbfb0a913fa455fd1d150210ea09713a0888b38d18ccae646b17bbe32a66b931016ee6e4bc826a1670a033466c945a2591e77f9d6d7b7c
diff --git a/dev-python/parso/parso-0.1.1.ebuild b/dev-python/parso/parso-0.1.1.ebuild
index 99e6a66edd99..db4201381c7f 100644
--- a/dev-python/parso/parso-0.1.1.ebuild
+++ b/dev-python/parso/parso-0.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/pathlib/Manifest b/dev-python/pathlib/Manifest
index a8066f72699a..683fcf039b67 100644
--- a/dev-python/pathlib/Manifest
+++ b/dev-python/pathlib/Manifest
@@ -1,3 +1,3 @@
 DIST pathlib-1.0.1.tar.gz 49298 BLAKE2B 918b363ebd4101fce50927dd83200cf94b44d820e9f422489be8b06cb5dfe732aa9373b936606a07efbfe0c624b685d1c9efe8851ba74aa60df9f45c08cd33be SHA512 d85e45dfcc85ce75a7e7b609163dc8c75c688f279c1833510185f280af5501e473376dc09bddc6a804d1fcc3177a939db85af37b7b8d5b183b9bc2b85b3b0f8b
-EBUILD pathlib-1.0.1-r1.ebuild 496 BLAKE2B 9ed6155c6c52b31b7e5ab435eab94b779f3ea1e436f4a057d8e58876d14f5001b3e4ed6cfa75310f8e2bbf110cd6f0e7eaa44a435ff33778b5b54b13cf7261cc SHA512 6f92fa81043f13f327ea6886981862164c9ca82aa5ccbc36c022a54f1aebaa9b1798b2bc92343f21a320d71173f7431fad7822a4e3501913db46e246a3f7aa7c
+EBUILD pathlib-1.0.1-r1.ebuild 502 BLAKE2B 8ad6c8b81cde6fa2bb8579168ab68dbea5f80042c342e5ad67349990206210aeca27654419958f3dee1d22281843198443494e61b11d776a3fca53a8239d0552 SHA512 d443a5415143ec9986774f9ec866f1941ead576f18bc323fcf1af4eb0bbeeabc57ba53bfa401b5f89e6f0708913b3f1310b3bed5fec53786abcdec2293f9a325
 MISC metadata.xml 310 BLAKE2B dfac529133f0a3fe4c0fc865d7f7cc9d70a7b37dd2d8fcd4f1c87a44ec6f9ade254454e01cfd4dbd57a04f9643f079bdbc358d84cfcb0c09cb416d3ecad2db99 SHA512 462b029410c6c013f274599ee749a79541f9a40a1819b168963421d0b8bfbeedae5590a460c7295f0e9a249fa9298e7526b0cace165a29f82383d8943bd9842f
diff --git a/dev-python/pathlib/pathlib-1.0.1-r1.ebuild b/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
index 21f2f1021ef5..d6d9ca198dd9 100644
--- a/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
+++ b/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/p/pathlib/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ia64 x86"
+KEYWORDS="amd64 arm64 ia64 ppc64 x86"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/pathlib2/Manifest b/dev-python/pathlib2/Manifest
index 7d3430f635bc..8e15a293df60 100644
--- a/dev-python/pathlib2/Manifest
+++ b/dev-python/pathlib2/Manifest
@@ -1,5 +1,5 @@
 DIST pathlib2-2.1.0.tar.gz 30390 BLAKE2B e009fa866dcdb2a6f078d746c423484bd90df049d59c89427c631cd63ac11376bb5549f45f0e98da036b15c6674040ffc8844fc08b95abb1d677783dedf9e126 SHA512 5dad54d4bf7a37a2c425afeca030a23d802a8a450186292f3d80aa9ee5c2985701871a0386a2f58e2b05b4bbfd7734a238d0a73625c5839237e4f3984088a8b1
 DIST pathlib2-2.3.0.tar.gz 34291 BLAKE2B ef1768f8a9cc9b28f85ef84c0dfdbfce0b0087c1ffb6718e2b13eb007ea3e0ab0eebe946a1bcc2683fed7db46867f415ad2b52abedcdc87fb67bd45d5998aea5 SHA512 715fbd981d42767862dcaf2cc0fee31b9ec5050915ef7d909d14587609a7a5939e32b39736b586a890e7625443bb163832896fcf138b5c2863c451b71c36a124
 EBUILD pathlib2-2.1.0.ebuild 581 BLAKE2B 62d3e1f8e2705db80933876650fa594a8986cf3b74c78039925ca9dc024ddd979491ae254a7b09c1ed83cce2464fbfeccc16106724254373efffc28987aa7f4a SHA512 e14f2bb06e96e63d9812e31da3a27ce9b9d56f1405515c29df695167e48e7f4122f778688f66a20b8ef15630b5dd4fa7affea9b9946362b7124ded7ff0ae2ce3
-EBUILD pathlib2-2.3.0.ebuild 1046 BLAKE2B eed3ea4805e1cdf0e70568c172f187e206e20f58296a2d6a7934f3414194e193bb98e9ed98ef2ed1807ef4bf9ceb72d028ed33e2423662d7125b18416948fe9f SHA512 e70e4c6776f888c921c6e07150a8ec3a6ab40fcea8e0ff1965c94fb27505dbedd773bb4030b1a49117aa026d888c9c95ec47a96e1878aa280f60e55ed5545a39
+EBUILD pathlib2-2.3.0.ebuild 1052 BLAKE2B 895eafa533a0e41c38a82cfcea046ecdb5c1d539262231a9db4d41fc914190a877c429c279176a96bd50de5b4c125cfbfd400d0463d4a1b70c92f81f85cf419e SHA512 b215543d5c7c97a413cba74ae2014769be02eb4cc0e84304766d2881ebff4453d58052fbc9f8b304a6872baae0823446ac5a1a5d1392f37a4090c20751d06798
 MISC metadata.xml 371 BLAKE2B e2a18977882b53d7e6588147a17a9fe2c2a1b0850946b15036941b908ece241cace91e66373d5edaa4ac2ba46935413b223ea78cb6ca01b758673ef719b76966 SHA512 dce5315fa4bc25047346fbf06a9f2da5828475bf0b36a1dcdd6ea9917f29ed4bbefc22aba699a43d7b3c5f771939bd81b3da20df54537b22aa4811a19ab62a6e
diff --git a/dev-python/pathlib2/pathlib2-2.3.0.ebuild b/dev-python/pathlib2/pathlib2-2.3.0.ebuild
index 1a09a8dd7c8d..1308182a31f9 100644
--- a/dev-python/pathlib2/pathlib2-2.3.0.ebuild
+++ b/dev-python/pathlib2/pathlib2-2.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/pathlib2/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pickleshare/Manifest b/dev-python/pickleshare/Manifest
index 74ecfa946429..c5ddcb57e0b5 100644
--- a/dev-python/pickleshare/Manifest
+++ b/dev-python/pickleshare/Manifest
@@ -1,5 +1,5 @@
 DIST pickleshare-0.7.3.tar.gz 5930 BLAKE2B 7cc8ea436af6c7be2ec891882fb42ff67aa71f82ec7beae48a9e37cd1bfeee24742d1a83dfcecf8f27bdf6c4d86653f9374b869960699565789ac4f435f62255 SHA512 c49f41b2778783c0de69838db0c916bbfe88eb651134959bf43a18233a4f1747599e51bdbe4b0cc7f7b13c92fc202c2159a0cdd2331b099034afbfe0df61c19d
 DIST pickleshare-0.7.4.tar.gz 5981 BLAKE2B 12679a29db75c772ba78d9c83061176bdab4ac93fb7b122ee803650e0b0d0fb951ad43f75b73ba303b6c637184ef7cc304935abbb2aebdf6928b5d47d83ee1ab SHA512 6cd4b70f63378c4f668f3428262aeca66a38ec86ef9069e3fbc5e7b0b8d7a06341e99b387f9cf29502decbb47c188b7b2183fe7d249e68914fead7e6628d7154
 EBUILD pickleshare-0.7.3.ebuild 682 BLAKE2B 1fbaed914848645e062f3cc218f46e462c8a425b3aa4fc49b56d11e3e84008cf62f044c2e5df301d1ac19e3d4332824f2f8f72a1b6479279002f9bfb99908432 SHA512 5741e7c3a0d1f08b904310c601ea3e3807f7c26028c937d18dcec698ceda1eedc8d7ee8a77b1856b4433e55cc64a9d077a3f55a4f03925225eda4aaed47a82b8
-EBUILD pickleshare-0.7.4-r1.ebuild 677 BLAKE2B a7236246b7c8d7a0eeaa67a8f10b37662e0ab0fbd98ef0205fbe9a46f1014cd1fa2d92e7411d35136214cf44e6d78817515463f87cd3630a28b9edf4cbfe5399 SHA512 f0d7fd9a8b1283cd63fbf441ae07862c89591b54625f119f6b9dc3b5555a32d61d825698e2a7e1844430c205f9ea4ee78f0ecf8ea8ba64adcd578ed500f4c7b0
+EBUILD pickleshare-0.7.4-r1.ebuild 683 BLAKE2B 00dffdab4305c06fd3adb32765fbd8f42e4efd463bb20c872ff2d3778ed92109e72eddcda5c20bb97a7d8470f4eae74c4ec24d4dc10723b6d72e048d8cc8ebe7 SHA512 95ecbae7c4dc70dedf4ddd9b1b610acf7b10ce35bc678b74adf488e51d699723b6f4e932f8977a77914588a9dd7435d99fcb774d20bd43512b556badf874ae0a
 MISC metadata.xml 862 BLAKE2B a7c04e6cdf8a9c5a074a790da324591984286ebf33fd13950d8dc7b070f750069f88d5f0d9235b5ec824c1dbac834a2e09e29b74bbb8eb23ad4c1d99c9d8986f SHA512 0f9d4a8f540699c18af10123696a2ff91002a9af8ad675769fbbe12fb3fdf160077a1932dcc5ddee5427051a6467054220cab958fc32d4c352a46bf9f4d8aa5a
diff --git a/dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild b/dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild
index 20d4ad5812d1..d68fb86d0f40 100644
--- a/dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild
+++ b/dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index 1ea4e36b5b5f..6bb8bfcd2c24 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -1,3 +1,3 @@
 DIST prompt_toolkit-1.0.15.tar.gz 243734 BLAKE2B b27e61bb444360abe95714e2014fcacf2355da0540b21af35cc40cb0f0115d0a3b027236235a89a95c1ec1fa947bf5b88b236b737fab5de78e7bd5fc798aa764 SHA512 10981be2ed8b71d0cd9f663c4de047cec9664d9276968c6eec40dc45b388d1acf8eba07d534369254f178931079bf39b04eb2ceac06aa63a2021ebf62387b2f5
-EBUILD prompt_toolkit-1.0.15.ebuild 742 BLAKE2B 56882169bfe07782cd617425dd5db062440c8e2f87426d47969445848b9df93716c9f24caa6e0ce8230e91cb2eb2f6bc5006ba0ce3af0d478a0c39b9941a008c SHA512 46c14c24182d3c99daf7b9ad38584fbca7a9ef38ae3cdeea87444d3187b49347f3972c11848ffa27156f6c79dc5f941a1859f142d4a8061d735005088d9fd1b9
+EBUILD prompt_toolkit-1.0.15.ebuild 748 BLAKE2B 220894c7a9cb4b1f4e58dd407826256ad6b08bbb466ddb6a6dcce6f9f048ac4a0d8e6706dd56e8075a8a3435e1285b21a4f9ccb992a6cc9f0cd1512ac4e85af4 SHA512 24eedc749a6cb84daa88d2903e9dc9b4b08f07d694b5ed0ddb14a5982a88608f29e9d77018c87ba77b745a5e4e08ea9dd05b3c27d61f679d2785a5b1fc8bf6a4
 MISC metadata.xml 407 BLAKE2B a53543e0383cf16a19405b6722f7c5b430c69b0ac1a0863681ca700c56dba8e630f04e27fe682ecfaa905d6fb8ac4b4fbc78cbdc3e2575647071c2662ad5fe5a SHA512 7322ba928408db64bb54edf92fd385bd2fc41dea2a857bd2034d3b3e3bfe23b7fc82fd8048a41bb65f0aa103153e9f99f64c5f6abc76cc01a3d2db139b0a98ff
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild
index bc789a6bfbbc..f7c782f75314 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild
+++ b/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index 840cb1899f60..b1e9c11b8538 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -4,5 +4,5 @@ DIST protobuf-3.4.1.tar.gz 4490100 BLAKE2B e2bc1ef2ee1a0af44830b3c65a6c9e73883fe
 DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591 SHA512 f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496
 EBUILD protobuf-python-3.1.0.ebuild 1299 BLAKE2B bd2effe2b42ca7613e7b205ba330a5bcd4aa2834486884d481d5c85e81d1d6d119090a5f215a97d5539a4277b8eb6513128a76533de30104c3592d0f3e8c9543 SHA512 762debb1a599e1fd75f61d17cac6afcd3813b56c543cca50c4a6c63b44c962f9aca3cda7a02b94de2bc21a130245eda91a346d2631c508aba15575347e33bfe8
 EBUILD protobuf-python-3.4.1.ebuild 1250 BLAKE2B b531ad3c2ace5bf9a2ca33b04d7b0f977b78fa47a3f0486183e938a85cf2583c06698160996946c80e093d3f7b9abac4cb66ffed9167875a37d0268b7ad72d07 SHA512 a82b7e00afb6408dfeaf3c70fe5df077792daadca9e0de3b30689fd5ef49405e81f615fa2e586f14548715e189bc9db1a013b69bc17b599a0119801f74857d14
-EBUILD protobuf-python-3.5.1.1.ebuild 1247 BLAKE2B 8c956b27e174e3df513c2df6c059236078dd3f303e5c5d9ef7d9cf4ef9320c25f36856eb07805fac6a658764b42f7159909edd9bd994d2dde5b00b5b3254ed06 SHA512 0120e7db713042775b34b18fdad46e1a0e4ec3132ebbc8bf7441550f222a57f282fe5668c0461709c79316e172f346791e8be98339c9620b858cb420c07dfb8d
+EBUILD protobuf-python-3.5.1.1.ebuild 1246 BLAKE2B 265b9ca2e93718358f0582057c6f8ff418e8727256e78ea75a233f246f5a8b05f3d2a892f76793ee791d0fa0bd364fee15879acea79693eaf3bf639d6d49e615 SHA512 dfc737a11bd29912adf3eed671aff853fcac6375e5f52de86f118bde06af6b18fa8d167f0840d4a87850a588eb99f3d7f41d2c6e511342c0532e1a88b2e0ecee
 MISC metadata.xml 724 BLAKE2B b7a8c45edd03f5b00c7533f4182bb6af85ad3834256e7ad41863dff09f51647eb198964c423a548dd285f063b70099dd10c7dec63b5b534ed398d25611e3b0f6 SHA512 f2bb4ce27601eac610b2b7314a1f41a030db84a28f8fc9a4a8ea7657b4d9273fe4a4ccd2d98f973c26d851ac60a4cc9203aaecccde0df9efed1e389457f654d2
diff --git a/dev-python/protobuf-python/protobuf-python-3.5.1.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.5.1.1.ebuild
index db097c8fc623..25ad0038bb71 100644
--- a/dev-python/protobuf-python/protobuf-python-3.5.1.1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.5.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}
diff --git a/dev-python/pycodestyle/Manifest b/dev-python/pycodestyle/Manifest
index a44dc9d8171a..cdc50c5987d7 100644
--- a/dev-python/pycodestyle/Manifest
+++ b/dev-python/pycodestyle/Manifest
@@ -5,5 +5,5 @@ DIST pycodestyle-2.3.1.tar.gz 89460 BLAKE2B 0b7e23be13830954277d521262e9504ade8a
 EBUILD pycodestyle-2.0.0.ebuild 1106 BLAKE2B 65f08d6fd9194e73178dbaccceaeefc5a45edf33a9198a507e091c243108237ea810ed433a715b304f938f6e9567756f10a977f8f21cadfcc0b1d6cab8048883 SHA512 3b18f5f5eb919ddcd8468733068d95647ec5950fd322fc4ad029a91b2d172c89d6ae187132f9bd62c9d856fba60b405fc9ab7526244701481d8e6ca8afb910e8
 EBUILD pycodestyle-2.1.0.ebuild 1106 BLAKE2B 65f08d6fd9194e73178dbaccceaeefc5a45edf33a9198a507e091c243108237ea810ed433a715b304f938f6e9567756f10a977f8f21cadfcc0b1d6cab8048883 SHA512 3b18f5f5eb919ddcd8468733068d95647ec5950fd322fc4ad029a91b2d172c89d6ae187132f9bd62c9d856fba60b405fc9ab7526244701481d8e6ca8afb910e8
 EBUILD pycodestyle-2.2.0.ebuild 1111 BLAKE2B 65db9daf06f8c947a0a62e6d14e84c5ec3920105379f57476b4d1cc7468c4fd61ea7ecfc131287518ffc1eb5211f200c7fb8977ca9081be9d0cd848c1e19e28e SHA512 5878087454217d7e6c8afdc50a74adf2e3193f0055624fff79dae9de349ca41154f8240af31028b9d4745304629affd54416056873c6551e64412ea5a2115cf8
-EBUILD pycodestyle-2.3.1.ebuild 1128 BLAKE2B 3a9af6a718d0dd25db4ce4964483be3db597de933f63bf313305534d4825474a7072c2ab4068b0cbff077357332d981357b625665431c7b06a056eaddb011908 SHA512 bb5be3e0c8acc56416fa266d77d0e19bafa1f3fd5e6fd02f1838735cf43af907284692dbbd0dcead27bd7c46d428b3faca6517916d3c99a5c7f9f2ac0a29b2d3
+EBUILD pycodestyle-2.3.1.ebuild 1127 BLAKE2B fd19e01d8d0b4021b7820359d37574fceab451f633df277aad721a68a5bd4880400ca1307a87e0d68d1ea988de49705136b3ce15a0dc45012631a781b85f9899 SHA512 5313a769831a60119c08905e0e7195c7191c4edfd78b73cdf4d44a7096d090dd8de1255fa258b3c9e7df25ea22225a35c9565994ee044baddf468240c7cb688b
 MISC metadata.xml 335 BLAKE2B 9ecbe193a8f7aaf12005920847cd3d8a34b868636a943ba30465a4eead591ce46d422bd0b0e777a86f0d5c4efd5ed925a1476f18f659f18e622dfab057df0d8e SHA512 92e19ab42f44fe1a1da2c8407214bb447262a818b2051e644851178cc7f2274198310a85d7c094839b1764664bd8f8463a6a7a96df83447768082c8ab44909c4
diff --git a/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild b/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild
index 4098cdafcb61..b977897d1a8a 100644
--- a/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyflakes/Manifest b/dev-python/pyflakes/Manifest
index a938a94e8d4b..9a8c68ec9b18 100644
--- a/dev-python/pyflakes/Manifest
+++ b/dev-python/pyflakes/Manifest
@@ -6,5 +6,5 @@ DIST pyflakes-1.6.0.tar.gz 48184 BLAKE2B a5762c23521aa68ea92537fbc2903bb7af64faf
 EBUILD pyflakes-0.8.1.ebuild 736 BLAKE2B 2b94946fad5fbb8055fdb298976b57098641549a0d85bf10b1be9a076eed57dfb7917909dc4f3e8bf2d00d43797dba92f3ee085061957cd354cd4dca4b82a4aa SHA512 4e3b513ee627ccdfd3a23efee00e6622c9b150b29ec88ab4589d76fe8f13bc7c602d74f505484eac92cdbe65c386c2c92ed00d998a02c0628fb6aefbf8673bb5
 EBUILD pyflakes-1.0.0.ebuild 767 BLAKE2B 1798e80d675884b4e4953ccc5309d3609b83387be33e4ddde3e19388b1a35aeeee17ddf39d813395d03a32eece7ffcbeb379d43bf28b9ed8a412a667b1e65da4 SHA512 98b81862a97d297990feefdab5d2aaec5fac235b7a723a292b7ff41631e1c2144e3ee681b4970c5eb931f2fa0e2ea24ca7d85832d56dc54899a33905e0eadf73
 EBUILD pyflakes-1.2.3.ebuild 709 BLAKE2B 1a199e9e9a6c88eaf701b7b14e504a07ffa35b7f41c9705f7ee788295a18328ec0f23378d305a541c25fa8053d0ab7b30e65ff9eaecaa421c99503ffccf11395 SHA512 24d34c8c7530f19c76d5a75c72126748b42b5a0eaed26c4fc21a6d2a901499f0fb09f6ceb8aeaa0fe0e2c1e6212611c0d9907ed39589374ef6b473643b9c1fdd
-EBUILD pyflakes-1.6.0.ebuild 729 BLAKE2B 3cb4abbb200101ee1753763586c26d13aa375c790bca09f13583993bc616e126ff8be1234779abb856a671e92cd810b1b61ba5ec483ba3a80b0e028202282ff5 SHA512 43753453f9b703463a0259ce82e491b0329a41e32a4cfea838acb83418d1b8c5d47a5be517a0555be740148bae66e89b7e9aabaa06b64006f9ccf19a10d18829
+EBUILD pyflakes-1.6.0.ebuild 728 BLAKE2B 8b467ecf955c3c527c11ade394521588456d71199b6151e665ac11bb5eb7873e46997ceddb2b1d79fdb88deb18d0f7e122fbfb06c76d7085b3133a2b247f7804 SHA512 a481ad564ca06482c59cd33398986aabffa573f2d068dbd26f7cc742618825f57a7f4cca4b9eccb39333359ca7f3816054d339d9d9bfdf3bfdc4e20420c8e808
 MISC metadata.xml 738 BLAKE2B 5c1e0cb1452f9aebbefe7edd7a054cad85373344f834fb88ea37414ef69b12a36f774e6da05e73b898d6300a56189ec80891eca7a3c225c95b0fc8755daf18b6 SHA512 6ac45c3c5d1fd3eeae5c8ad9950a2c97ef31d0bb72e6034a1f8b75d2a28e997660df20719431ee138a76544942bc20d609fb6e4a26a77f0ef30f912c6d2c0257
diff --git a/dev-python/pyflakes/pyflakes-1.6.0.ebuild b/dev-python/pyflakes/pyflakes-1.6.0.ebuild
index ccea8c24949d..e0b9f73ab1bd 100644
--- a/dev-python/pyflakes/pyflakes-1.6.0.ebuild
+++ b/dev-python/pyflakes/pyflakes-1.6.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 07d17f167c1f..65e98efca37e 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -11,5 +11,5 @@ DIST pygobject-3.22.0.tar.xz 756820 BLAKE2B 2030b9106c082bbec4418c97945df68e20f4
 DIST pygobject-3.24.1.tar.xz 758648 BLAKE2B 95e3bc6d022b70053549f8a780aa372d8964477e881b825299ca82a7328bbdab58b037a92d36578915ac622b7c223d47cc1c35fccd3ea70d7840841eaec6860d SHA512 f35968ab12b872c85af6b2410cadedcf9fa7e17352a40f3dc557c86203aa1c38753710aab9ce55e986ee2c98b64e14123c65083655445e993d0b53431db6dc93
 EBUILD pygobject-2.28.6-r55.ebuild 3541 BLAKE2B 7d20bfad727c2f1e56b28a2d01ac354c3becd1529019eaaaeccb35083c74b8932ee14f061b249d8c02f601f880a8455c3064cd89e2be137e9eeb0bcd3f2a2799 SHA512 d4c7e7a96b5151472b20bb1663b94383acaa526c5df4d545289ca9fe0cc18889238df8b1aeaddf19a1a46cd046b43c46268a65b0e820dc7ebe403d05d664b64b
 EBUILD pygobject-3.22.0.ebuild 2940 BLAKE2B 3a5281e9483d976dec0854b885695e6b612782a4f0c1766ce416b0d1ea8d0c27b00853e71d9ae87c7c96d4ee82f94e3d9c657932f1f87231b3768f5a1c9e28f9 SHA512 999d60141ed662a29b0a8f28c57b4bf3e2dbb2770cb82d573553ab18cc7e45587989b99d740bcba4908724f9c2095fc8665b3a24c1bc1185a20b334cb431bf48
-EBUILD pygobject-3.24.1.ebuild 3163 BLAKE2B d59c93b6b2d559818b07c5564c2f00b5ea30ed4f7a5ec9014a3da97827d995af08db64f84795ad30a06bafd1eed63804bb1654a5f2d7d27738ef037753f3d4b7 SHA512 6ff9d844d2bc7aaeb120617b7f8d8b76a5036a0335d61bf6bbb4613b9a26703bcb159c957b3e6fdda77a9c311a9a673c08535339c64857a68782de99d2f4354c
+EBUILD pygobject-3.24.1.ebuild 3167 BLAKE2B c4a3f6f9ecb9586edc4aec3684ec0494f03d8abc2a3b5359a428e2a18eb985386cbdcf0740209680bcef79fe9370293c18b445df379c5b4bb48156c951807a32 SHA512 696ae9e200cd1c5b3eaa9e3fbbc051acbce5834fbc78d03c862fdb5dff07748e130c40f0e8474a09c852193eebc541743c745b2063023034a8d4fbf52f10a5d8
 MISC metadata.xml 353 BLAKE2B 20a18942138d7ceab468b01a639f92248bf94f0e6a015a0c6c34872cf60ab56ef91d9b36eebc74b3d3133ecbc6cfbf2aedbc24369165d0fe9a4e832394beb022 SHA512 abcb7bb015ebb246584f60f388837ed0638040f730111831b52716cbc5a9c4ab0c422397702e1d87e56b2947108d5cfa5aeac7489bcd6f89db480c68c572bcdc
diff --git a/dev-python/pygobject/pygobject-3.24.1.ebuild b/dev-python/pygobject/pygobject-3.24.1.ebuild
index 38ffb321ce51..9313d35bdcd5 100644
--- a/dev-python/pygobject/pygobject-3.24.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.24.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test +threads"
 
 REQUIRED_USE="
@@ -36,7 +36,7 @@ DEPEND="${COMMON_DEPEND}
 		media-fonts/font-cursor-misc
 		media-fonts/font-misc-misc
 		x11-libs/cairo[glib]
-		x11-libs/gdk-pixbuf:2[introspection]
+		x11-libs/gdk-pixbuf:2[introspection,jpeg]
 		x11-libs/gtk+:3[introspection]
 		x11-libs/pango[introspection]
 		python_targets_python2_7? ( dev-python/pyflakes[$(python_gen_usedep python2_7)] ) )
diff --git a/dev-python/pyqtgraph/Manifest b/dev-python/pyqtgraph/Manifest
index 796d582abebd..944a4d822380 100644
--- a/dev-python/pyqtgraph/Manifest
+++ b/dev-python/pyqtgraph/Manifest
@@ -1,5 +1,4 @@
 AUX pyqtgraph-0.10.0-qt5.patch 439 BLAKE2B 8c0b5f766adf64d67800873145223ed8f9dda75ce1d5d62784129d827c4dfb9d44bd5532b44dbe42abc6bd67d5b13082c1691d8796c3a53b4ea873faaa2d7f00 SHA512 792a739e1cdc2c7c1ce059945c4a5280f1187a88dd767669fee83fbbdb5c315c022b99c5312c9c53d88afc6d24767fcb93426f6e05b9a5d08db084ba3110cc93
 DIST pyqtgraph-0.10.0.tar.gz 704972 BLAKE2B cb1295608536b06de32ea72503b2df2be7f4ae3065b42431542539feec5eb37412e3a7697e2ee97309594b9aecc19c692ef7b45f843f37bd50148a3c0b6e1d31 SHA512 d995da7b4f13ae0009582aebe3f753dc78566dc50ba9314d3a2d37ad4ed8f2fd8bb497a01bb8b37b6d96bf14c071aad018bcbc7224d9dd9b47589a7b5b640d30
-EBUILD pyqtgraph-0.10.0-r1.ebuild 1237 BLAKE2B 3dc58bbc85b60d9b88ec7ca91341c953a6d5c94f53e9b5c2205cf13398efb966947a7475d7848249217d4c04add068b27e8daaed03a85c436199d8823255654e SHA512 6e30b52cbc500930ed3731ab46d876587272d27a73623714d82f4aedaa33003f8f18ef212b2a05d5ad447f46e233d8dcba953cbf653d13260dc44f971b2e5d77
-EBUILD pyqtgraph-0.10.0.ebuild 1222 BLAKE2B e0daaed27a5710a98e09508fd047492c89ea01fa8303cc4c1f370148d8b530da6905e7ffb51d6c4cdbd7df9ca24e6c07f66e366a7488a36fc92a7d3a40af4ac4 SHA512 8bd56a0d401ac1bc1d5ed34e258d912cfac4dfce5ee5f483710716de73bc072c9f94a342478bfc77c50140b3bd90bc4fc0141dcdd568c5aa3fd7a6d4aa58bff8
+EBUILD pyqtgraph-0.10.0-r1.ebuild 1236 BLAKE2B f3bdca2e131dc2f66f93a024dbf2278b2e9a6cc3b452c29446e01926640a9ae04e83ca1d8428f55b68a6fa9657680ea06f8e37c6658655dd326de959576d2e0a SHA512 9d5d5b9a638fdd915ffd3994096c6fb7fde512b2d27c4db8a926fcd8d7ed7e2193324ae85f28999618730091ad0c0c0389ac0aa38aecd34670cdf7a02643289d
 MISC metadata.xml 725 BLAKE2B 0126a36d5645e5fa0ddcbc46924f78284cb03de5632f84a790415278a91ab650b2e3c7994467e106a0bc4e900f98b0f40ca70416ea2d515b15d4f74320600e70 SHA512 51fdf4a875bc629230c1040ae34cc6b37225dcd18c04a23d3bb6b5da30c79dd7d4c10ee46fd671941d86ee15d548e7a0303bcb48e7796b20036ebb928ebd9078
diff --git a/dev-python/pyqtgraph/pyqtgraph-0.10.0-r1.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.10.0-r1.ebuild
index 83947b7c8a91..86bf6f65bbb3 100644
--- a/dev-python/pyqtgraph/pyqtgraph-0.10.0-r1.ebuild
+++ b/dev-python/pyqtgraph/pyqtgraph-0.10.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.pyqtgraph.org/downloads/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples opengl svg"
 
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/pyqtgraph/pyqtgraph-0.10.0.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.10.0.ebuild
deleted file mode 100644
index dea43636c817..000000000000
--- a/dev-python/pyqtgraph/pyqtgraph-0.10.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="a pure-python graphics and GUI library built on PyQt/PySide and numpy"
-HOMEPAGE="http://www.pyqtgraph.org/ https://github.com/pyqtgraph/pyqtgraph"
-SRC_URI="https://github.com/pyqtgraph/${PN}/archive/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples opengl"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	|| (
-		dev-python/PyQt5[${PYTHON_USEDEP}]
-		dev-python/PyQt4[${PYTHON_USEDEP}]
-		dev-python/pyside[${PYTHON_USEDEP}]
-	)
-	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-S=${WORKDIR}/${PN}-${P}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# fix distutils warning
-	sed -i 's/install_requires/requires/' setup.py || die
-
-	if ! use opengl; then
-		rm -r pyqtgraph/opengl || die
-	fi
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyserial/Manifest b/dev-python/pyserial/Manifest
index 071cf1967898..b506b238296d 100644
--- a/dev-python/pyserial/Manifest
+++ b/dev-python/pyserial/Manifest
@@ -1,6 +1,6 @@
 AUX mapping.patch 495 BLAKE2B f9a2493c2ed0f522000b2ddc774c931138adda0c7d6f8d53875532fed631936436f5ec8cd572e8fc47bf5d9ada2663efdd315d6102cc5ec873d198a53c75a604 SHA512 2a0a86462291ecd78d06c9b88e8971502a58efa61ad9d47f0df2c94240245a41e7bbf9bfbd93e7761560a16fe15203cf8c5c52eaf3eb24e1499b00dfec3808f8
 DIST pyserial-3.2.1.tar.gz 147338 BLAKE2B 6c377d1527183fc48e1369f206f409d312e4488bdb15ae1d1ed93249073ffc56529a9e6059ef57c8f2ebb867cb6d9c0b7dc3a74eafbf653463a05e603b25d69c SHA512 8d3e580cc7781fc6549ab6e408642f4321eb90aafbe593f5dcf953001730f89ee32ce6592728764027a7944bfe4a0ebe2cfac1fce071777aac7c4f27ac94ab7f
 DIST pyserial-3.4.tar.gz 151657 BLAKE2B cf47aba4a6f3bb2fe39d99e72907496faa1c9f37857810fef4d826cca72c361d0e43dbc33d9cf2291a589bf0193d17355d149e6eb61b4f9e28250207708ef09a SHA512 d71dffc330704e41caac6054adf192bee2f1c119691faf2ea93fe22e8e3ba000dc4a1434293f6f80d05a5577d85b96791f656e28d5c63fb0ce6a6605467a117f
-EBUILD pyserial-3.2.1.ebuild 1148 BLAKE2B a57e45d1ae6f68bf0c381a0e41eb2b3879a0b24d589a6863985c963bae243c5b10d38b7d5591e23d9fdc016e177110be4fcd59b918dec36e947acfa168ed7712 SHA512 b4d57606a5318c733da926ccfeb2b82e8d779b75316cd56ab8a24e577953d05dd501c8e7b86cb320949e60120577940958c3adb5ac8be760e193c91200faa686
+EBUILD pyserial-3.2.1.ebuild 1147 BLAKE2B d6c1ea4326e653e9081407d4acf6624df41db23895972e6e0242ae3f59de630c65c58df62181b10ae9412dc06d9c33d17db16dfa86132225154170f1de1fd100 SHA512 5f96006dee57b4a4cc491bff4be32c574aa941651f5e13e4966807c66069bcda545a9f03501e0a4bdf0d16f2557c78dddb7f8740ff713ea339bcfd00aa5b4d47
 EBUILD pyserial-3.4.ebuild 1157 BLAKE2B de971fce37ae3a95fa115c543c152723c01930c0b324cb1674628cb7f6c72cf60ae27f4ebc5f3024fb45811becaab3912e8065033fe47e6a21261379bf562918 SHA512 6e1f44a648c924fd0c36670c5a96936c3656b81c0a7bd8da6c79a8f1dedb87bde994c7570a126df2ae6c7408018bac5cd24cf7b931720851936a420c2f28dd87
 MISC metadata.xml 421 BLAKE2B f3c94b0b72c3df17d9c539e8b76e1f644e0b4ae1bb3d905652b568084e449bf11cab07f27e7775031eee857095671debd28bf1d2eb8c1992c6b980620b32109b SHA512 30c1232aed930c665c2603443cbff9efbb843b1866d6a4d034a517e0669f28f1e6e7562103a8badbd8fb1efd9e69b058870b9c4fcea8fa5e74e7a1ec8ba17fde
diff --git a/dev-python/pyserial/pyserial-3.2.1.ebuild b/dev-python/pyserial/pyserial-3.2.1.ebuild
index 59ef3d4e7035..cd5a0cd07d00 100644
--- a/dev-python/pyserial/pyserial-3.2.1.ebuild
+++ b/dev-python/pyserial/pyserial-3.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc examples"
 
 DEPEND="
diff --git a/dev-python/pytidylib/Manifest b/dev-python/pytidylib/Manifest
index 19eed897ca6f..8d486b3736ac 100644
--- a/dev-python/pytidylib/Manifest
+++ b/dev-python/pytidylib/Manifest
@@ -1,3 +1,3 @@
 DIST pytidylib-0.2.4.tar.gz 86650 BLAKE2B 15212651c83ebbec5b74418f37bfcd0366e9b6cdfc0820953e34ec3142871248df02618a51415a36b84ac8c2e5a12d996ff7301b5bf3a001fb42297df3a98202 SHA512 443e9af0fd458d4f041e3b72415839838a4edc83f8a978e5cc0bdf53202584e269f1ad5df10967d8ae4b98b24dcffcf9f5a54e0e3f6cd620a8a6a20171da0811
-EBUILD pytidylib-0.2.4.ebuild 641 BLAKE2B 0facd0ab0203e8ec51eb7f2048119bcb2894fcd3fea0ee0733a1db9f14078403fccf856d1b4fcb6c89efb6d62b62086237d7caf8eb026c44d731f5d29cfdcbf7 SHA512 80384b879bfdda941976934f255504eaa95c8b68f0ea1a3b58d3aef73cf85aaedac4aa5d3c83914fb2a815342f41450a6f209646cc2c8d0b3706a30f8cd45e8a
+EBUILD pytidylib-0.2.4.ebuild 640 BLAKE2B 2592f38ce16cbcc65bf2a16741a4006a4d12b98e4140b7558539cbc4119e728ee27a5cf7df7045c1590e5097acc0998cbcfb4ca7f851ee5055888052362861f1 SHA512 c987bd0531902490041b112f875ea56241af8b9353238512f25319e816cf4837bd0903aeb9f77b21ed9841be2562b094fadf181468559c2f97e80d03cf228674
 MISC metadata.xml 385 BLAKE2B 6c53cf6462d81e85c2a9facf85c0fd7b6c0c870656fdc4cc63bcd67e646d51e14fc9246a7b75a527eccecaf4385677ea63b56dfa04aeab708b41b83c8bc4fcef SHA512 e41d4897a343c45e469fe4cd52a7ce93d525ea208dd570fe0517feda8f445fa9175d971e4c37b8f1941a7cb6931ff6473526ced82384489f02a11c4040fec933
diff --git a/dev-python/pytidylib/pytidylib-0.2.4.ebuild b/dev-python/pytidylib/pytidylib-0.2.4.ebuild
index c31f5facef4a..af2a120838e2 100644
--- a/dev-python/pytidylib/pytidylib-0.2.4.ebuild
+++ b/dev-python/pytidylib/pytidylib-0.2.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="app-text/htmltidy"
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index 19e572c2b93c..b3c0bd75e048 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,5 +1,7 @@
 DIST QScintilla_gpl-2.10.1.tar.gz 2663446 BLAKE2B 720ce990b4e3dd65d47cd26b473bffc07240d76b2c10d393cba41331c6f160472d87b9b22985fd45b5b8064d5358b3b25f0decfe8759542a9c987381249bca42 SHA512 ea9b95ca371a8af9262493ab59ecaef77e1697ba21d1d594aab39e836917884fd829aa4f6c4e72cce60b0d3f40eac654157cc507d027945f0034881855123ccc
 DIST QScintilla_gpl-2.10.2.tar.gz 2665138 BLAKE2B 1c6349ea717997681e678cdfa6cc590a6a1cfbe652f2dd52d57fefff71229251c46cd4554b546d2e272deb7c3f970c44f657966ad08e45279813215a775c637d SHA512 755f486d62275acb5908262c4a50ad31dd9d8fca0501eb1eeec1aa2181872f8d16179b42f4213b207fd6b46fd8a72d25af7ce6c5cc10eabb363a92c0600ca972
+DIST QScintilla_gpl-2.10.3.tar.gz 2721287 BLAKE2B cc85eea17e563ae5f4a130d26ca88bec3e1a6cbff7bc0af096c63789384d03149105641d6324f53b37a2bd8ab4681a285ccb76e6063a06e5db30d070d3fd8219 SHA512 a1b9d6869797ec074e4e0727164804779792fb77b2230aae80e6d6b5fb3a3ff9d84e17d775d18ab74c97b78bac454511fd2cb49be1fa36f71d9097abf88045b6
 EBUILD qscintilla-python-2.10.1-r1.ebuild 1977 BLAKE2B 06efa137a2b74ecba71b7a42ae696b0fa873a528f68ca216d404f81e73f4088bed21338e97275e20c94a2a206f00c284fda5df91f0b84eb88f14ae276753f3e5 SHA512 af165c096785ced3ffcf5c0f0332b445c0e9c75102ee880e85a12d087adface591caa19b11b25d7626527ae35e952a1e645bf24f7837d3900d8e5eb1bec82c5a
 EBUILD qscintilla-python-2.10.2.ebuild 1979 BLAKE2B de320b5b36a55ae2d38a44a85cba8188acc74714fe635ddd77fd5875281f787da70f635c518526df0b3f47ab565c9799dc043f7be5158f03fb9426bd13cde2e2 SHA512 0f71ca4bed1f084fde43e3a6b3bab93510a8d359c5239e936f2f5537d10a51a6158ec2db1d0e7c06c491f944542cd48a24b293c823997df7c67c0941fc860d43
+EBUILD qscintilla-python-2.10.3.ebuild 1530 BLAKE2B 468794c93a97f20d91bbe6bcabfdb82a978934321be5afad31a81f19bae7877b21644648c7490407f6e4cae72a7816d0503f9cfa90ff688f474a83220293568d SHA512 7c0fad99f6959f05258a6f5dba489071f0cd53982fdcde2967b69d8589f6031e24e76ff8172453caae1f03e27ebf61e21787ca5cb625f5c4a1d2ef150e2003d6
 MISC metadata.xml 666 BLAKE2B ca3cfedb72c4bc624270f669034a78c1fd41ed48a261b6d2fd84ee9994d130d1b558578925028eed57a85db021f3cfe4b70e51eeb9a42f4f71392994f7bade82 SHA512 f78ce18443d32b17307e96f8177bc5fb46f5b9f6b4d797e79dcacb6eb76bba578f7d666469576bd5e326717bcd9167fe34a5e1bd1ead5679619816ef8f0363da
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.10.3.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.10.3.ebuild
new file mode 100644
index 000000000000..ab5f9388efba
--- /dev/null
+++ b/dev-python/qscintilla-python/qscintilla-python-2.10.3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit python-r1 qmake-utils
+
+MY_P=QScintilla_gpl-${PV/_pre/.dev}
+
+DESCRIPTION="Python bindings for Qscintilla"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
+SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="debug"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/sip-4.19:=[${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,printsupport,widgets,${PYTHON_USEDEP}]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	~x11-libs/qscintilla-${PV}:=
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}/Python
+
+src_configure() {
+	configuration() {
+		# Fix out-of-source build and installation of .sip files
+		ln -s "${S}"/sip || die
+
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			--pyqt=PyQt5
+			--qmake="$(qt5_get_bindir)"/qmake
+			--sip-incdir="$(python_get_includedir)"
+			$(usex debug '--debug --trace' '')
+			--verbose
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		# Run eqmake to respect toolchain, build flags, and prevent stripping
+		eqmake5 -recursive
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake INSTALL_ROOT="${D}" install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+}
diff --git a/dev-python/rtslib-fb/Manifest b/dev-python/rtslib-fb/Manifest
index 603b399651db..e67c7ee8d9e0 100644
--- a/dev-python/rtslib-fb/Manifest
+++ b/dev-python/rtslib-fb/Manifest
@@ -1,11 +1,5 @@
-DIST rtslib-fb-2.1.57.tar.gz 30746 BLAKE2B db8cafe226ebaa32c9695ce85de748ae935b629ecf534c8bf04532fb46bd1a3abda3128bb1269f4c1207803b1918daf838c5fb5a0c13368420a36ea67de2ef59 SHA512 0b46b17498bf2a5f4853c9d989bf6a192280d95416b195c0c9eaede4759612b6c3800fb1d3f44979c10e95ba0c3f06dd9756a805d63f61b292a611003f48059b
-DIST rtslib-fb-2.1.58.tar.gz 30706 BLAKE2B 242c308da8be784bc7c232588a4dbdee084e47ab5bf6e7e98333383d957333782ce446f248a55bfb1a7cdf66d53f8c586e02c3cb690f2fffaef52ecd639a420e SHA512 a3f4c22d42b4b76bb9a5ce2d1027c4964385fa427ec55cb92f1acb0f9b647fc0788307354144534e3f216fc12f3fc1a0a55fd4454225324aa13488f21df092c5
-DIST rtslib-fb-2.1.61.tar.gz 31144 BLAKE2B a9d8d9355c373d1f4476ca5489a5dcbb8fc848f469e3640d13a87c4506f43b7e5d5e66042e9e683634ad04ca93d795c61598d17f2b2371f37d9c2a796d2a770d SHA512 5c2423fd315ca00aede358ee18a7d0b61019c5dbd8f68134b04bb0c3ecdcdeb4117dae9f1421a38dbd4b612b563e733dd683b39fc3e47a3e87affce1f423e508
 DIST rtslib-fb-2.1.62.tar.gz 64481 BLAKE2B 121da0560decc4297e1b695038dddd83cb876bcb0c7523b60119d74922cb10b0389fb6d9246a86b79dcf9b6dc55e263834adbc107146a0e96fdf7eca0dd2a0f3 SHA512 12202f828234aaaa3a4e86ac45a2e3771baa76406d57496765c4789bae00f7043f0105c71f1f5501a37eff8004788a41dbb788532f93ebee2ab79b3e5eb00c76
 DIST rtslib-fb-2.1.66.tar.gz 67612 BLAKE2B ebfddc235ae2492f6e9f44cff4c80f767fb5fae34833ae0027cc0fc0fc32df49393d55e553ad326e64a53280108256374f486f10cf22db3ca8834f382b5a2cca SHA512 36feb8614edda50fe91b9c9db18fd3d73c8f7c8e0cfb9d397f5b928dcd6683586b0a8a6e446d56a551d04a7d27243ab13d7ccb51fd906bf4e8ffba7cb8fa4bb6
-EBUILD rtslib-fb-2.1.57.ebuild 552 BLAKE2B 39281835b1f92878934102d49a153839931e4f61aab15c78b53aceb9cc683746491029dfb13b9e60ad44774fcd1b12a30384a9755666eed3367ef48313635006 SHA512 4ff2679ee9786945df311f7951fb6c644709b78ec6119440d41b4991ec01a24316e2d937363a4244d49e117285e831b527146db63dfde49da3106eaca32f6e60
-EBUILD rtslib-fb-2.1.58.ebuild 598 BLAKE2B ef846cf2206ed591c28501300f894fa48332e3c5a90e18948fa36df3040920bc6a2c7951e51d28c8a20020db37635814454888cba51cceaca4081e3d0e07c993 SHA512 e08d61fd1246cf30525997064248085d64ee81d86adc11656979c82862d9c294366ff6455b9e876118078fbbcd544ef09fbe9531d121b4e2cdb1e81e7d5b0785
-EBUILD rtslib-fb-2.1.61.ebuild 638 BLAKE2B 7c2ada7e1b12b151c1bea9ee8583e5b1541fd9cca631a1d847095de86891ea2623e30a8913540d255dc000776346fc2b80836942148b5fa629cf96dc79ad8d8c SHA512 7ca06ff27d74afaacbd4967193a091e20f6cae61b5f8aa963cf7f6abc7fc7c75f9becd3ec38688d30a311e4fd569d78343f02143066723c815a4f1febd9a7979
 EBUILD rtslib-fb-2.1.62.ebuild 616 BLAKE2B d6e4333fae6eb964572fca087152a46994a1b4d9f7b001dbea502b8f96716336adf3aa26e7899c57606270344aa1159fb7c6e27c4f59bad26d273280cfa017f3 SHA512 685ae458f4eda8dd89f652ae35230c3c1491852bb4b4d14a914de1957c320ed93f5dacd92f0320a1a0165938407776b8f9339e349a6a28b06dbe30961bf35fc4
-EBUILD rtslib-fb-2.1.66.ebuild 618 BLAKE2B b97de837ccd7b8af42b79ed1f96587f96c518ba558631114b67a0f27c4cf29b5d41daf0d234bc6874aaad47b42b51b7d148baa66c3ae4fa01096faf3b888364c SHA512 169d3a4805aa04dda67da9b77c7314941d7739b25fb57cdeb5efdaa8595e5274085f071d5d265d58fbf40a758e39f8966d7ab37509f75b9255b49467ee5a3d1e
+EBUILD rtslib-fb-2.1.66.ebuild 616 BLAKE2B e2697dbf353d972ec65d9a4dea042de06980235eeb1ae61becb67a0359fd2345c5b45bbdf680b0d66ccf244238da9083c45f8ba29f48137a16313fbc8964924d SHA512 bc244364b854c8e84d36456c4ab2c8fc94dcb3b135a0769d3df26f2dc6d7d0e227095c823bbe3f61174995e8a95266b03ecb5cfbb1bdd25e8c16c7527cfcaa7f
 MISC metadata.xml 625 BLAKE2B 849b1694d5f8fbdd1ca4b54990c7d9feb00d4465cfbcf97672a2f3315288b681a7dd15d9978e99d8c438d229e933d7e7a4cde7095d8a0f864268dafb228930b5 SHA512 838fa39adceaef8854dd2b5f873e0f2253bb1fdf616da974154166d7fde861d11806ae439c573b6cb7d392ec37de18956bb119bcc83e48ce0a9602d6d559e0ec
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.57.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.57.ebuild
deleted file mode 100644
index b11341189bcf..000000000000
--- a/dev-python/rtslib-fb/rtslib-fb-2.1.57.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python object API for managing the Linux LIO kernel target"
-HOMEPAGE="https://github.com/agrover/rtslib-fb"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	!dev-python/rtslib[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.58.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.58.ebuild
deleted file mode 100644
index aaa9c0649ce1..000000000000
--- a/dev-python/rtslib-fb/rtslib-fb-2.1.58.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python object API for managing the Linux LIO kernel target"
-HOMEPAGE="https://github.com/agrover/rtslib-fb"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	!dev-python/rtslib[${PYTHON_USEDEP}]"
-RDEPEND="!dev-python/rtslib[${PYTHON_USEDEP}]"
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.61.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.61.ebuild
deleted file mode 100644
index dfc864dac90f..000000000000
--- a/dev-python/rtslib-fb/rtslib-fb-2.1.61.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python object API for managing the Linux LIO kernel target"
-HOMEPAGE="https://github.com/open-iscsi/rtslib-fb"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	!dev-python/rtslib"
-RDEPEND="dev-python/pyudev[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	!dev-python/rtslib"
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.66.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.66.ebuild
index 63d56223ca51..d87c93d7bc41 100644
--- a/dev-python/rtslib-fb/rtslib-fb-2.1.66.ebuild
+++ b/dev-python/rtslib-fb/rtslib-fb-2.1.66.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/scandir/Manifest b/dev-python/scandir/Manifest
index 036d6052667b..f63d1b5593a3 100644
--- a/dev-python/scandir/Manifest
+++ b/dev-python/scandir/Manifest
@@ -1,5 +1,5 @@
 DIST scandir-1.5.tar.gz 29351 BLAKE2B 12cd7d18515ed597d0dc68ff435a442397a23691a0ad2d11d700f28b8abba58517859808190466fb799bb51a4757c4223fad0b1426c1be19bc1cd8f4ffd2601b SHA512 e6535e92011cc2c5f888ddd083a9dc48921609fd59d9bf9a4bcd596c055dc0510d48f6d3571605bbade3bd0e232e8bae94b44b20ba935e7ffdeec268ba3d2ee4
 DIST scandir-1.6.tar.gz 29670 BLAKE2B ad8c231783c14246341cd23bd79185ee10894bb29107ba7c0bfdf51982bda99fd8ce45ea52ff42687371d56b3e6d43cf1d6cc65bdaecf43da9059e524a801e6d SHA512 d01e0551696787caded787a430eea787a69a27c725505277420fd607b3fcc892218377bb340651fd906bdeb3a57e99879df3c86aeadd2399fcbe45cb2118b9db
 EBUILD scandir-1.5.ebuild 545 BLAKE2B ca19e8deaf84cc3c3b98e8addaf02a1d025008e6d0855a01f107b0f8c87998a954e4e243e5bc9bf9d40886dda014876fb5eb8ddc38b6c178d1c33adbb5c8f47a SHA512 9900677ca6b68ce43222ba4b24eb50db03e012cc247d3f17326e73784e2de770ed079f51072aac89a342dd524009454d099122626d4694c4d7eca18a4fd67799
-EBUILD scandir-1.6.ebuild 554 BLAKE2B c0c69bbf0d16f995bc29f50fc88dc2c620076397940344d88b93c65e44c86744c5df8fa658573dca8a88e5cc7ebea787aef9eea790c6bdda972714c77dde42e0 SHA512 91a40929cc6f258bfbc7d900e32009ea5b9774ecc353494f03600a9b4a19d0a03f330c97e1e2b6db3cda4493c1e37a16e2a05fae27e91181debc93046413e701
+EBUILD scandir-1.6.ebuild 560 BLAKE2B 9b717201f3a06952d0b7376d341e0291b2d650921e8fe8c8cdb84af143a7c698172533cc7a5f1971beee44387b4cd3618266f626bc88634540291a36fd3f3890 SHA512 1317a3a5cb141a01dc0a9d09d607d6c56a23e9829b063c7139ef9f07bcc76e0ef54b8b1a568e887d96e3ef4accce4dafe435a57069373f4dbc05d9b9695a0c2b
 MISC metadata.xml 495 BLAKE2B 7137cdfc395a1e80576885adb3c870ba25034a657c342b3819328f276d55ebf6d7756e57644a6ff4d45ca07cdb561078dbb1deb1b993816c7088850dee45c3bb SHA512 e762fa761b5b00288870eac3af8aed0d05efba207d83138adc873da902a7e197b710caeb87a3083e5f23436f4a2c799996fe07201195de065bd430b9c35183ee
diff --git a/dev-python/scandir/scandir-1.6.ebuild b/dev-python/scandir/scandir-1.6.ebuild
index dc46e4b8dd2a..3f45a2d140a7 100644
--- a/dev-python/scandir/scandir-1.6.ebuild
+++ b/dev-python/scandir/scandir-1.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 8ac0dd8a1e5b..bc064de061db 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,9 +1,9 @@
 AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
 DIST sip-4.19.3.tar.gz 1007481 BLAKE2B cf4d53c956aa046f165e9ec05126fa9b6ca3df688b16ff79520da8ea82f7e9622e03448030db14b0d21ba090893375814f39d6b3fc62343880aa169c2680394f SHA512 b2dea0cb5e1b23531f35e94bd604ec9874f0875badb5b20eb5abd2732a1005b2dd15bb42e0007b65053a2153b50659f24671abd83a434991661168a5778b94bc
-DIST sip-4.19.6.tar.gz 1019295 BLAKE2B 107bc63b8c0f200c292bbf465507602904383a1d3fd0b76da907cda2dcf0e79edb9cbf835bc15dbefd991db6a7eeff97462965d88704e3c926ce9e0dd5af829f SHA512 1bfd2da8b0ece6156aa94713d5e9ced6226b7f49427ca4a11b65452a67e9c740b93a1f90c00a0636d4eef8a31324988a84373c15194f64774b6f8c084d0464f7
 DIST sip-4.19.7.tar.gz 1022209 BLAKE2B 51b29bd436ce7af2d4a3b45ace100075bd257c23982c6e1fcd3f8b2998ee360f1ac42683fbd0e3a371cb044a682c326e00e907db0961aebc70bfb6b583ad2bc7 SHA512 0cead34e129d25ee3d908e503a3853289bbfd77c58c563a2046ce7b65bd8f0b318b20af72346cbf4cb7a17e76c9c1374f686b5dabc284d7247897a1648c15f97
+DIST sip-4.19.8.tar.gz 1024548 BLAKE2B e43dfe542061db9f1d5981d0cc172d9c8420c4e66c282c52974ab28314c33bd28e6056b61f74b04680c1735c9bd2c4656e1a541f4bae94c858d18713f6222914 SHA512 9c0a9722a9a9dd23e2eabe751d622cdd31b376b7987b2c991f5ef4a8d11853c5c6e9f1c24a0d2d864d3990e2a45c2a159ca8511efd4a7e156a14937ef3c680f7
 EBUILD sip-4.19.3.ebuild 2120 BLAKE2B 83b365b259bb57a09a645afaf1def7a57096cbcd6d5aa56eb066b9f680746a49d0528c364fb3aac4d73050bf570caa3ec2a70361f0561f28fec49bafb003bd41 SHA512 de1ff1f0dd2701e4e40b12aa0ffb5fba5f2cd380439eaf292a835812a08a449517769bfbe9d74374b18a0122390ee5449b9fb135797782344aac824e56f1ee23
-EBUILD sip-4.19.6.ebuild 2776 BLAKE2B d1fbabcd47a7b90975c684020df39eeeb5b5975e541249046bd297a8b42895415bcec6390886e9b88c747354cbe1cdb8293a895f9aca32a2fa91036d4b8ce0b1 SHA512 3ccbd79cd1a8004364afd688b22a7920fc58ec9bb9271555c1ffe26fddbf97b612a4bc0e614b6797d085584e780d55e25b10603088439ccb302c67624b4b91ff
 EBUILD sip-4.19.7.ebuild 2776 BLAKE2B 787ad402476cc19ed1a690d0c2fcf748b7c12429f9f61f6a2008dd772c21853745c2f110a3d1f4c57bfac8116636301ab1481fd54652d76b8fbc3c0b257e1f5b SHA512 a82ee1ad2f33b3b4df3b2816f0839a9ead6d52c55c23f9fdc0e79e68319e982d8827db3aa51c9334852e9ae5ae948fb692174e2234541d6c5d2d67f851c63f1d
+EBUILD sip-4.19.8.ebuild 2776 BLAKE2B 787ad402476cc19ed1a690d0c2fcf748b7c12429f9f61f6a2008dd772c21853745c2f110a3d1f4c57bfac8116636301ab1481fd54652d76b8fbc3c0b257e1f5b SHA512 a82ee1ad2f33b3b4df3b2816f0839a9ead6d52c55c23f9fdc0e79e68319e982d8827db3aa51c9334852e9ae5ae948fb692174e2234541d6c5d2d67f851c63f1d
 EBUILD sip-4.9999.ebuild 2648 BLAKE2B 8e7fdbfc969f73f30cf5c26282f06439be6e7d01e9ee087e0377d946aced09295c01ed685e4988a09967c604c3d378e2716552076ca509f6d808fe3a02d470bc SHA512 be5b35c951f7a93d8fe1dd751d4b27132f0249a052cedc4877a3ea7bc56b646744a174a4e0796b127ab0c0082fbb2bfbb1dcb8ef4fd02ff5c10059b44eaf8ae7
 MISC metadata.xml 593 BLAKE2B 3c4b5ccd30162027c913070a54eb9b836a7add04532e1c5b03dd83f0e4e58da0d2e19aee90f1fa4a97db0008a06575a5b0fe33986e1b0c9d473e4adff056afdd SHA512 91f8918bffb715bfb1def9aa6717a8c4149b36e6a1f79e7e3d4c56e0edc51a6585dad3a93698e956f1ff0e659c1f975c3f23be5a498479fc5052369840ac83d5
diff --git a/dev-python/sip/sip-4.19.6.ebuild b/dev-python/sip/sip-4.19.8.ebuild
similarity index 98%
rename from dev-python/sip/sip-4.19.6.ebuild
rename to dev-python/sip/sip-4.19.8.ebuild
index 8782d5f10654..08a8e8d93775 100644
--- a/dev-python/sip/sip-4.19.6.ebuild
+++ b/dev-python/sip/sip-4.19.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-python/testpath/Manifest b/dev-python/testpath/Manifest
index f8b5d63275b7..8f008447c2de 100644
--- a/dev-python/testpath/Manifest
+++ b/dev-python/testpath/Manifest
@@ -3,6 +3,6 @@ DIST testpath-0.2.tar.gz 13732 BLAKE2B e7a20fdbef3dff25d8e2072167d4eb078832c7b55
 DIST testpath-0.3.1.tar.gz 91333 BLAKE2B 86787b9677e8baa6d45fb5e6f047f2ab448e385201f20af3a3a9f33d6edd6c67e4eec09c178e815626096ad77d417ef99ddee562bf0fd7947b3f7ae1862f8156 SHA512 ab826cfb76d9a3ed6f1b178240f6bf61439bd792be26b5ad407b5c3efaa455b48965ceaf17e4ca6a4bc706465a8ed1c6c31a1572df5beeea2bb8db7814dc04f0
 DIST testpath-0.3.tar.gz 91250 BLAKE2B 88ea7ad9c67eef9aaa49e435a4d56d86b8c87818a416f3630f8d34aecd85f478aff778b1fc3c13f1ad0aafb524dc649393a73ebfb6f74dd3391548f36f1c2e4d SHA512 71a3266e17616c4df4a4c465151e9d48b89f573e4562132e85982b62446396884a270a32b5d4956aac1f0be1a00096cab9d0dc1718ae8b6312b0436eca683bdf
 EBUILD testpath-0.2.ebuild 1117 BLAKE2B 593c5549b9934d2206421a63dec23baf08f7d6ea84dc2c6f3d73a4e276566fc6be7fd7de2c45f1aadee2b0148c686f73474766f9de4ce525ffa72c277b5c2288 SHA512 e59d7221078325f902df0f5eebbbad473bd90c0498ab458d7f2ab46b8efeaf83fc873902548f96aed289bee34d3d7d8386fb52376a97db2119c12a2b44078f36
-EBUILD testpath-0.3.1.ebuild 1066 BLAKE2B cfa42ab270e10feb59e626e3285f05e0ba7acc2592cfd9e07ed04d8aa89e8671c965b755c36667893a467ec365c36499b446b010fc86779de4669466e710908f SHA512 f56e3b5c7638472310d8d41169436cf942e2b7e8a7052dc2ca3df14301e5a130650a1289b005b1fe807552d7f2c2aa05173aa8fc08be0704becd934e6194cc7f
+EBUILD testpath-0.3.1.ebuild 1072 BLAKE2B f46481c25d2809860bd1421cc2a11c66b7b94a2606183a65abc69c4384e2e50e531afb31c00aeaa891cc81bc5160fcc35f38933b40d8ee9fe60a43a987eff2d5 SHA512 2969a4537e57720cff4011a5d9f79baac8f228d70e91337677d76e0daf9d005288c6135638b3578aad3ae2ae339d2e2fe90f017ee27e14f83815d98416431f87
 EBUILD testpath-0.3.ebuild 1131 BLAKE2B c98c7bc36473f006ddcd47d772e08b06f8fb4cc5ed916332f6d300dfc0d334bc850fb0f0773ce64e3e9ad5991e82eeaa7d81dd56c92a15ce6b30d50c068ea9d2 SHA512 da68e5eec7b29fa5846b1dff424e657b987aa0f39a3767f158431fb66bfd93e542fbe9211329285fc1d1f00c72e6936236c7b280b79d49dd7e8ae450deea5bc9
 MISC metadata.xml 613 BLAKE2B 46ccd59fa5e42a573ba9fe1219a5e5a103876ef3e73363b3e003f76fce1138b7f6a9ef3a023be5b695bbbc1244c047d3f70b23b553b3412695a9791dac83c540 SHA512 c251993ded801317c638b460520800bc7fee9390a3c581c01a463da661eda3c7348117aa98c19efd7eb577666dfe580fc690e2f30d2001bd98e49f2baa33248e
diff --git a/dev-python/testpath/testpath-0.3.1.ebuild b/dev-python/testpath/testpath-0.3.1.ebuild
index e00dcfd0d7da..b1f7aa8642f4 100644
--- a/dev-python/testpath/testpath-0.3.1.ebuild
+++ b/dev-python/testpath/testpath-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/tinycss2/Manifest b/dev-python/tinycss2/Manifest
index 4c3aa6006370..54be1521cb85 100644
--- a/dev-python/tinycss2/Manifest
+++ b/dev-python/tinycss2/Manifest
@@ -1,3 +1,5 @@
 DIST tinycss2-0.5.tar.gz 61802 BLAKE2B 2bb6093063e6a1b2bd9f78484db73d34c2336bbb00e9aad14a9c4c589e315ca377a5ec7f1b50b8c28f91d496bb668a65032a422ae9c9fda62218bfb7560e0a46 SHA512 321af21a80dbdf8d1ad218e33c87edbe7c0b4c1bffeeb38a9b14bed9064749f71636bf70775186e8785587d5fa96e3488465a76b59f643658f84b6bdc1c5c4bd
+DIST tinycss2-0.6.1.tar.gz 59548 BLAKE2B 9c80ea593ce4831bb4846eadca44595a5b30247a9a4ce9608bb4c505cebe47d151936361e0d9d4af124ce9097dc664b6a4eb7f926ce28c4336aebd08450b71cf SHA512 fa064bbb06d641a497a3c1eb35118bbf8ca8c4d32fbd3d8c64bb10d6cdab24387e77cd4c3277a957f23de2bd527a407836245f4387d7f880958858bd9cc7ab89
 EBUILD tinycss2-0.5.ebuild 676 BLAKE2B 4ff92717cb59a8782d909875582022574ee8663213318d429f81ea0c7414c2814732010890a89e1191c214ea1e594d17dcb3af4a1059d820b81eedd86ff5b8b8 SHA512 f1334f62d608a31672963262a54c3d23edff1f4308883edeae8676107a5ef3faf7d5edd09c55c4dbcd2ac5e08a82440647d041448cf35f34e34e7896ccf67162
+EBUILD tinycss2-0.6.1.ebuild 677 BLAKE2B d2db0d6f3b2b3b8d72358738666600fc9874f68b86517e8b886c141c06243572444c1054d4e325710e3670955afaf0ec4a8efb515f9d005066601d9c8cd2efac SHA512 839dd6db45fd56b50562581e288fe473857b884a1a78f41689a177d6c7ef871ed3fefa3c26fb465efb7c98d2fa8d275213dca80a8398035df88e2f65e58d5308
 MISC metadata.xml 502 BLAKE2B 683c99288181a663a49a9046df435933df6e1c634ec258fb34016ac877b208f4d250fd23a4616451e2da5adb519ecaa38696aad15093897824b4232a80988cb1 SHA512 7f9daa5d348f1a239e5c2cee779789405263c09c86b32dd0a8efabd97a77793baf800741f3c2f8660f9721dcef4f47dc6a2cfa170588982df0fd092377dd7233
diff --git a/dev-python/tinycss2/tinycss2-0.6.1.ebuild b/dev-python/tinycss2/tinycss2-0.6.1.ebuild
new file mode 100644
index 000000000000..74e68319492a
--- /dev/null
+++ b/dev-python/tinycss2/tinycss2-0.6.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A complete yet simple CSS parser for Python"
+HOMEPAGE="https://github.com/SimonSapin/tinycss2/ https://pypi.python.org/pypi/tinycss2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RESTRICT="test"
+
+RDEPEND="dev-python/webencodings[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+DOCS=( CHANGES README.rst )
+
+python_test() {
+	py.test || die "testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
index 37be21c6267f..64049da4e66d 100644
--- a/dev-python/traitlets/Manifest
+++ b/dev-python/traitlets/Manifest
@@ -7,5 +7,5 @@ EBUILD traitlets-4.0.0.ebuild 1150 BLAKE2B 6d21d7d1fbbebe981caa31e33835de4f14c7f
 EBUILD traitlets-4.1.0.ebuild 1122 BLAKE2B 2f0c0aeedd6dc5af57dc10c662fb1a15b0e57cbfd25a9265ea642537ac1af3103b142cb281ec97205f4e9bc4b8da844bdb7f2c0c2f3fc8baceb9506df4163b9d SHA512 88f98a66aa92593a8ae06c733ae90a24ac9f08fdb891548dbb993e202d7c6fdd6adbc343c39857f3b68712036f8fc09552ea08ba5a592b824eefb5519c265203
 EBUILD traitlets-4.2.2.ebuild 1278 BLAKE2B 77e6061429b362a282597ec8964599dd248de0d0f79c5bd0c1be905d23d8013910fcbc8cdcf824776a9a8f2014c63b3286dbb8e3e8a8fb0a80697f335e2b8e89 SHA512 69988da029fd6e8ca554aba88896f15c9e13581830c3474c1d157fb8d6c4b5c8739f6d1e1a44f9058cc31a08bdfc0e1f0ecc22b56bfd7a89e1705126387563ac
 EBUILD traitlets-4.3.1.ebuild 1279 BLAKE2B ae947e8355dcb364ad6c8a37fabd9c8f0be77bb361b67ea837d25bbc1c5476d424ed15d1db3782eb96ccd8674ac858635c75d818f3426fbc36e2b5411eb7a728 SHA512 296ac6bbacd945bfa58854043fdc471b4abca44b5b414bcafeacae6d354f83883466ab2fa6acbf16312afc89d275a1ac0d89d187a5dcbf2ab7d3c584931e72a7
-EBUILD traitlets-4.3.2.ebuild 1225 BLAKE2B d03affd4ac2c93682b2c192545c9c7c6f2d0732371becc24afd4a03404ff3e526f165a79531eeb992854f8db5f061406d8fcb269a65b65d19889ba3ce01476a7 SHA512 1c78539e5186c4e3bf0892318a19183c0aaec2301cacd31aa198b426177efdedaeabc6b840a00c4345ff6f7dab0db6bcecd4fc2bd0f104ba02675cde4e6e10f7
+EBUILD traitlets-4.3.2.ebuild 1231 BLAKE2B ae22f64f3648e8ad1bb0b9816d3f689cacde063bf7a44d3450f436d430b3530924e32799e879b2bb55fe358f084057d79376d00fddd9c2bc1ae4df2eaeaf1686 SHA512 1c5a54db8f420970912d57c8c6a8212f4604886a97a5c0be9a5aa342e2ad578fc1d09da4d8f84cb6c52b9d8734b51c8c393cf87e23ac304e1772d717e036e5dc
 MISC metadata.xml 604 BLAKE2B cdae6c5e9ea3e7b98e44d815f1f1865c83c78bf3457e3a26e5132fbb3648ec585e9224faf7197e0736e7ba98f19ef2ae0a3fb32f2b9615a2efa0fcaec80cc37d SHA512 0a7e7a4383b50e9c362a5135315d325f226640255521eb507ff7741a61ffe7a91a8a5896e641596d6ee83c1b70e8727e1820e8b29d53e466239d007b1155e221
diff --git a/dev-python/traitlets/traitlets-4.3.2.ebuild b/dev-python/traitlets/traitlets-4.3.2.ebuild
index d343cd093c62..e45bfeda0007 100644
--- a/dev-python/traitlets/traitlets-4.3.2.ebuild
+++ b/dev-python/traitlets/traitlets-4.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/ttystatus/Manifest b/dev-python/ttystatus/Manifest
index 83c36ee6dd5c..2ae42925bfae 100644
--- a/dev-python/ttystatus/Manifest
+++ b/dev-python/ttystatus/Manifest
@@ -5,5 +5,5 @@ DIST ttystatus-0.35.tar.gz 34144 BLAKE2B 92a11676525f2db5b3bc09786ddb3651f72202e
 EBUILD ttystatus-0.22.ebuild 480 BLAKE2B 030f109e34d4554372ddb24a354681aa5fb276b156be9f74799e6dd4b10baae6aa9382bf0089fa1b86a0fa76e0bbe08d8d2d7323112356ff1e240c1c92ad34d2 SHA512 a630abd0fe622181bb23db23c8e52b01bdb24fe4a414414070632710b0763039b592bd1a8145e0f3521295dde51ee08072b3a0df0d89803d8b9b63d90c55abd1
 EBUILD ttystatus-0.23.ebuild 489 BLAKE2B 9e320dac4060af471dd967728883d013ee4c3b8c056bef0bfba467bde3a10ec77ebda6098d2a47196ced3b06df5032e7e83706e4cfe2ac8c4213523f300de0c3 SHA512 9077281c7c4ee294c290952a5a50e37dbd89a1c7793bdf9a3c5eca922f6501df644fc145f9dde228d8a1c69518992ac19bdff0dfee6c0061eb16449d61fdc7e0
 EBUILD ttystatus-0.32.ebuild 483 BLAKE2B dccb177d2f734037efef5020259ae9aeedbe5f85a1d3b7474f126c54752c271a45431e505a829bcbf3466757e413f40b37419b02db9982e94721648869a152aa SHA512 7b107179d287c56fa9bffc3057d9988cf179e49aa4b4a92edcdc31dc7bdeb7fd69b37e1932a56fee7905e2e305787320aaf1c62fccf4194648def62f4bcb40c6
-EBUILD ttystatus-0.35.ebuild 544 BLAKE2B 6af471b388b5143e512ace71201335cea3f433f6adc76afa5800603e9b8724a8ce5b35389c220aec506f33fac7101c90af3be78979989d4d922a61d20d4fec4b SHA512 f1ddb25341a285b5c8ef577f6950388c173cf8464ca4a9880d2e1cab8ddc0d7c2afb35f09315cdb040e55f6c5931897f907a7ed499410ee2eb74f631810ad192
+EBUILD ttystatus-0.35.ebuild 542 BLAKE2B a6fa9ed9cace257d5a801a9e8fed5f3a040e5e69dfb1cfeb6abf99f91d749d55bb87e5e60f198ed94c8d919188871f9eda2bfdf57140413edabce94ca8ba510e SHA512 2f2199eaef88972eb9e6f3e28b87a5019a34d9e280b031a5a92f98822a3ed70a3e2af75e331888b5a2e99ccbfef5a0b9d611182576d422e2f2c7c7bbb1c45cac
 MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
diff --git a/dev-python/ttystatus/ttystatus-0.35.ebuild b/dev-python/ttystatus/ttystatus-0.35.ebuild
index 04d33dba1bc0..cdbfd12ec2f3 100644
--- a/dev-python/ttystatus/ttystatus-0.35.ebuild
+++ b/dev-python/ttystatus/ttystatus-0.35.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://git.liw.fi/cgi-bin/cgit/cgit.cgi/${PN}/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/wcwidth/Manifest b/dev-python/wcwidth/Manifest
index 5c225bc050b9..bf9ceae8c6fd 100644
--- a/dev-python/wcwidth/Manifest
+++ b/dev-python/wcwidth/Manifest
@@ -1,4 +1,4 @@
 DIST wcwidth-0.1.7.tar.gz 22884 BLAKE2B 6d51be31c6cf11a23de48bfecd00d8b95e15c80b83559f67689611ac0d8406c18e3a761dc57a868e8c991ee07e286aed66fe77d905483f63ee998ca431fd35f2 SHA512 5bc9625fbd10721a50a3ac7d7f91012cca8e4f83533f265cf56890498bc52a53b155c82e67d6bc5523a5593c8d7992a1dec2a0f590318170eddf987c56f9c368
-EBUILD wcwidth-0.1.7-r1.ebuild 671 BLAKE2B 6f87dcb276149e7263d5e0b072e93cb84c49c33b3a414d2445d06c55828d9e09f7a36717dceddc0992593f7a722f22c0952b35f3c49076c26ec4299cbfac9148 SHA512 f2abc12252cca4bb3cf449bd70f0c2dabb1a4f3b5d39fd46c827d6b2390f8307af4a6e217a68641689664edb59f7ed328f01882efc8d5cbce259a80093bc940b
+EBUILD wcwidth-0.1.7-r1.ebuild 677 BLAKE2B 7de715f4307eb0de50dea2f21d36e23b779d25331b0ea7c8d0dec8cd6d0b89c5aa756160866cbde8a568163fc0d413df957c9b3916c39439645a922ff9c52049 SHA512 5457adebe7a5badc2309499a0929e6ef43b96a1f94101de349b12cc6ee6f182d0d103f552c2ca4c54e26a403c6e38e6b40debd2b86d664ececa5e96ffe0a8dcf
 EBUILD wcwidth-0.1.7.ebuild 662 BLAKE2B c41fdd3d6a40de1fac02aa149ca315e5e19f5feb4d673c788f85f050a7a4cd5e288e057a4746c31b1cadd2bcbb30b828a9dbb952756923a968098984dba167bd SHA512 8d261e73fa8a4082ae43b5b30dcfc3902fc94d2672b79a10a765e4e05bae28d96c4ae1d80d512baf6fee60e5f4acfd70fadfaf59f38810ac14526e239694daa7
 MISC metadata.xml 376 BLAKE2B 94917ec41c518ca9b328d9be7afbcba198376b1c28c3f24e24e3e994aecd877db745b07377bbba0a1c7d7b00e21cd53de31ca9ee4a0f08696d11b922cdc98771 SHA512 9f797fb27ebf7f1fd99d2c9a8c61ccffe1cc40f46991d9437dae121366da1edb31ee6ada3c202ced30fde0a90766453e72bcbb43a48919519f3de0b31681e213
diff --git a/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild b/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild
index a0359fe2f967..4621755b92f3 100644
--- a/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild
+++ b/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/zope-event/Manifest b/dev-python/zope-event/Manifest
index 3923393167ba..e7b8ab1f1406 100644
--- a/dev-python/zope-event/Manifest
+++ b/dev-python/zope-event/Manifest
@@ -1,5 +1,5 @@
 DIST zope.event-4.2.0.tar.gz 488532 BLAKE2B 89c2c2e9e75a57afd43f7ee984cbe8f7add3cb4eaf1271695b2a5c31e77e5fccb0c884d3f8c44c54fbd06be209e4556bc2438cda9bc987124d46e795822bd841 SHA512 e39cbbccf679328db190f0641e3cb0d267fc606afc9cdbd4fb4100bde482f12f594319d885db101dfd98741225604bb49ef77094011bbe7edaa16877038f9989
 DIST zope.event-4.3.0.tar.gz 17829 BLAKE2B 5d508c834321c70399eb9888bc2b000f5b18de625c68dc089f3ab8571a7948c1e43e76c62811c955777fc2caa65585347c124e24f2afc46b23e9d30b6c4a4599 SHA512 dad303d1b76c75dcc98f1164c6dec8f8458f1adc4109146942cf9ff40ed3f92579b2da742b10798bc720ab17cbdebc86e54008cfa5155616e2ac68b332e62571
-EBUILD zope-event-4.2.0.ebuild 870 BLAKE2B d1946503b6997987273603f7ae1d4a0b42c9958441fc7b5e600874cd160b431590c5b6ae676754ca5bf4e85dbd204776e027c907c7798f9e62b5a22fb090dd0c SHA512 ef4671edac3eb8c7796f3c00fa04457f67cf927e2076a501a2cc3f9a9a15453e045626c5c254934249b6942dbb3be6521ff2b8f418f80bcd41735c6464d5a24d
+EBUILD zope-event-4.2.0.ebuild 869 BLAKE2B 8ea1f0050b13e3f65a5d7575e78ce1d0f5e1cb0da128031676aba13a90e6edee488f0e215861ecbc382a80355b51083a5c5e33d07fa33f06d2a6e24036a38af1 SHA512 c522d3536a55c0f6bc85ec5cff427fb4332c97f4b60244b4b573f06fd7a89473d5ea621277fe9bbf4e278c4029a10367779e262863fdbad182d23135d2d3a33b
 EBUILD zope-event-4.3.0.ebuild 1103 BLAKE2B 379f5f7c3b2d75dfe45928eabf16c7698d5df040ada9cd6fbecf90a96437810b78f13ed144725394427ad7ff45a7b8678d1e9e8d914287487a85729ab115b5b4 SHA512 7203951d157a0072c6f8491a180f79dc1b4522f4b014c0c3d7d1552bb12199b2376dbc8febf9f82d929164de4b2e3e3bf454db1115f24f8d221b94f883c9c8b4
 MISC metadata.xml 378 BLAKE2B 53e40f9f0e2a3c17be6503b23c943f72c4221f8d131e56378bc7aa56ed8d889706a4e09f177e137fd1cdece259a2b13a2c6aabf4709b57e20d7e3964fdc580d7 SHA512 b04f8e3a6a16e89458912a27c16154f89067883f11c35552a00cd273095b30ae085b19eb0bebe860055db4876d23085b062b57f937eca21bbc98098a8a06a831
diff --git a/dev-python/zope-event/zope-event-4.2.0.ebuild b/dev-python/zope-event/zope-event-4.2.0.ebuild
index 1a533c01cc40..1e495e37dd31 100644
--- a/dev-python/zope-event/zope-event-4.2.0.ebuild
+++ b/dev-python/zope-event/zope-event-4.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index 8aa6d3f39b6a..48d8aec5f1f1 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -2,6 +2,6 @@ DIST zope.interface-4.1.1.tar.gz 864139 BLAKE2B 5531be26538fc54dc1108130813797ac
 DIST zope.interface-4.3.2.tar.gz 143139 BLAKE2B 60e8d1ed360192cfd2bafc5738f1a5278216d1ca55ca7104d261078915f9ea1966a1001ceaca02bff9359a69b38b402a77c42e872b1a64f29f61a80805587b4a SHA512 4a9b0f8b7e3157f29aca3810baea13d880b09d80945f23953e13325afe6780c2c1a5562a875f97958c1b33a28e009dd495f608aa7af79aded4f2ac2d61d3a251
 DIST zope.interface-4.4.3.tar.gz 147052 BLAKE2B dea636ebed2f66035510d467615a9532a7c082ddf4ad3bb26fe0101f790db667817e12c4fd3f4a0b654151422e6ff8cb156f3d2e4310e0294ffdc7b5b4e836f9 SHA512 29d9f3f1fe9af8a4ffb1e6d2f067bba1fa1bac7b02690ba8429985aa6ca76d3f337076bc8c48f39d0f338ccd855800b2f28b319a183a285191cc007bf8d9c9ad
 EBUILD zope-interface-4.1.1.ebuild 993 BLAKE2B e709e515f10e58ed57515d8c866e0a34475c79d09b8548c37565b745a9d2c0f637f0228ac51a745fec2782f5a6ab4a5addd74bcba7cf00a6e7d43467cfd421d9 SHA512 fa53ced7cdf0829b345a6b52f668a3ffbd7abf58391920eaba4eb8c74a0aaf5cac04088f013b764dd25957f410c50836b96ca7222ba7a31659a2289c416ed2be
-EBUILD zope-interface-4.3.2.ebuild 1039 BLAKE2B 74000afcc3768d0651939e139f2e49b0a9ff4c40eb3ec14085f81daa424627b66c8c41874c5469ca48d59bfff6217ec5a05c63b74b6a3d7851bdea745ffe769c SHA512 c2b714b42e1989d55e9b3e81850a9c9ead83c1e20f59c4d21ba7cbf001e380d0d1341f9b0c52aa7821b03c28091df64730672b1369c907790662dc3996b67b82
+EBUILD zope-interface-4.3.2.ebuild 1038 BLAKE2B b0dfd3fcd1a29def213028625139bd5caed857421f438e981cb4f428c4487645f36003cab56648c60b36fa94a02c17af4aa58d2707bd0f2261a38cbd01a10169 SHA512 99cb0386184e0da0fac0dfe03e8f569025566aa5677939acdd8d1cba22adc1b50ef0986d619ee3917300c55a8793c24473db99154ce0f5d75d7ff631c5c7af41
 EBUILD zope-interface-4.4.3.ebuild 1293 BLAKE2B a2adcb5f936a0a03dc019ea0cf17e8b5d9935a9ddb737d4b3ddc09f6fef50263527f8937d742172f80fd3f8e77711f1e90891cefdc230ef99e3629fd18cf6573 SHA512 fc686ee4c4ee08d7c8a8f4254e9a38a2c7bf236b5723ec93c7ab6d9f72d12c81829fc134b04e131e9d88d0dd7c15f9d591505c1c7135c0893430962a5d9f9af2
 MISC metadata.xml 386 BLAKE2B f8454bc6cb7c55f203d75f44428b0fe404d050e4938f80e5ca1e0504811a3ea73980ab474d12b47f31a87ed508a2f23143d6393eaf2f66eaface7b35a2058a61 SHA512 fc31e083f990006f9a4bdf1cdef5b8efee3e69e8444f614dd5fdcc0d7ddb8291cc1e45c21ab1418668c2e247068a39467e837aa8b869cc050a856635b8789fdd
diff --git a/dev-python/zope-interface/zope-interface-4.3.2.ebuild b/dev-python/zope-interface/zope-interface-4.3.2.ebuild
index e75e331c34f9..fd8aac319be4 100644
--- a/dev-python/zope-interface/zope-interface-4.3.2.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 28c7ea276e88..cfb1e2f1f7b2 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/axiom-types/Manifest b/dev-ruby/axiom-types/Manifest
index 1dd2f9b64f15..22adc011d0a0 100644
--- a/dev-ruby/axiom-types/Manifest
+++ b/dev-ruby/axiom-types/Manifest
@@ -1,3 +1,3 @@
 DIST axiom-types-0.1.1.gem 23552 BLAKE2B 26a9c7f242d331951a85d8a5819eb00bdf599c7f891eac2a7478d0f28d11a6f90c6c81a9beb4c6cedbe540684fb99382148568d28bf5cb55aecc85987c8913e2 SHA512 1d1eb7680cc7370e81506acf8a3a5ca2e40e8c375cc6e91176fca2b5ba388b87792b0e0872e6847b7f8ab27f3fc52f4cd4792875c97f579ffa4578e3c414d2e5
-EBUILD axiom-types-0.1.1.ebuild 734 BLAKE2B fcde962ddf86c6446db5fa64fd72aacb920314da4f70ed3bdadca7fec734d8d0dc2f32bf9f59a2552c1d91527ac56126dc921e444e44246d5d05ae3391ce145e SHA512 6549083a4e4a01c9d04cfd176b42c99fec69c12f5019124c1884a88db4644a6a8353e7deb543a64106f578fbce3aad7f9e463eb95eac6e14ef4ea48d39c052ec
+EBUILD axiom-types-0.1.1.ebuild 734 BLAKE2B ac591243f3ba1f4c39169ea55d4163174a4cbe74fa6eaa45ccb6426c4cb02f05dbfa6fb319a32e94d722e1ac86d7f6d87715fe2d53d7646949a50d8f0fd1935b SHA512 1d40357e9db9912b784a37d9dc40a21ddde60d645238c877281b17e1a913eba347b99588511047c8f9433887cfb65eb5cdc9bdba443a33f0dbb88910c3755d46
 MISC metadata.xml 398 BLAKE2B 53ab62259975f7b7aa7413bfce595b9c05459d9fc2052fce262b5921003bd3a2915627b57fd325c4422d2bc5b7125c80b609f0a8ca1af6a565a705a88311dcca SHA512 99d1d06e2af5c9ee6ecdadeceac40ea7ec7f3774ed5de1b817bb2d96db7ae1d2b147755a32f3b16c721afe0c28470d8e7d19e31af841d919d44b0ed6969f31ca
diff --git a/dev-ruby/axiom-types/axiom-types-0.1.1.ebuild b/dev-ruby/axiom-types/axiom-types-0.1.1.ebuild
index 0cbbd0250d81..ee5ffa99775b 100644
--- a/dev-ruby/axiom-types/axiom-types-0.1.1.ebuild
+++ b/dev-ruby/axiom-types/axiom-types-0.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING.md README.md"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/faraday/Manifest b/dev-ruby/faraday/Manifest
index 0be7b622482f..808ca06dff98 100644
--- a/dev-ruby/faraday/Manifest
+++ b/dev-ruby/faraday/Manifest
@@ -1,7 +1,9 @@
 DIST faraday-0.11.0.tar.gz 59736 BLAKE2B a4224ec6bf415bd535695561714f247ea9005db622145d7f6f9e5fee19ffb9c5b5f14d6dfe62bc6ed8396d1171506a40cf38ad5c4d1a1d344aaf16bcad412fc7 SHA512 d7e66f7d634b5c517dd688e874557839dbd7f720283dbeb27fd118c8cbcc596898545d62548d3c7c94d7cf49bdcda0d2fa705a1d20fa4d7ce238b38688d5cc62
 DIST faraday-0.12.2.tar.gz 62809 BLAKE2B 4dcd60192df36e1b9766eab3bcbacd729239b0e09d9e82a73d825c750fdbcfae8161cf803f078b841236a5e18b1849b4cdc34e6adebb9eaea0f0442cd65b2e74 SHA512 966fc419d529a8bba5caa6d3932ee94f7b248110edc880b532860c24abd70cb50182e40b94b4143e26575c6db7ce046fa71ac0d25010385d7f0c3dda87f39439
+DIST faraday-0.14.0.tar.gz 65105 BLAKE2B bf5101083bd828e2ea98dcd487c7c082f8b2d2eb4d03ac7ad04e1873666db9e2cec1e6eb9887364874ea5f32d0313019d1eada5e05e25e0415bdd5aa2bcfca97 SHA512 25bba07e76a2a8bf02b0c81c045329e72d5911a2aacae56611db33dc25c89bd48bb1b4de9b20c6edc1514d3ceae8b06fca6076c85580533047c222cb30ef8dc7
 DIST faraday-0.9.2.tar.gz 57013 BLAKE2B b153188e32ab385c22b011a916125088f56e8dc4ddd5f5fec3b7d0b8fab23900dff4610c642dbe80db0989244952f938d3dfeac0a022493855d6e4ba778d2482 SHA512 12c4ead8dca6baf6292291943ea1aab1a534509bf92c6e0a621c1c69e3493480fced68aa529d8678847028f2fc2a7672411df7e4d09e65a5e764c957fed1ee72
 EBUILD faraday-0.11.0.ebuild 1894 BLAKE2B 42b66ab1eff06f53738c22f7bf0fa8fe4e0e1a170354fd5c9f4a9d7cfdcaf7a155b956e716bd3d5a5cb81c5170a5c67002410dc1061335d23a4c5af870b3a3ee SHA512 7effae5fbd3d5d896e246584cd405bad0e24a934c48955ca49e2dee5db7006560d2655cb74583f98493b2fbf0b7acd322bdfc7286a7c2f3fd12cdd28e74fd3d6
 EBUILD faraday-0.12.2.ebuild 1901 BLAKE2B f686b6d0f5faa8b778b2e80e802c3126dacfea7b06849a7d95b9de0157db54846eac853b31b3ab18efb4e6f09749dbf0676eaca5b952725ae7e5d3417cdead5a SHA512 5a811d93fd62ee14ccf0425a2e59aed6ec676e81b85d994ad437e7f11a29848c4c978a3f235d5a0a76b2435d0aa1952cde1e2eefe9724f8a55c04493376bcefb
+EBUILD faraday-0.14.0.ebuild 1913 BLAKE2B 90c822920672463392a693df515f858879274a4478696dfe44c9065654e2da8fe30fb54f9c65d35f749a88a9f35216995f9f17d295b61c40bcf5384051ef42b7 SHA512 d4b2cf609bfac846889ac1c07ca816ddfa38236c90ab1e5a024cb06eacaf56ac074679e6b83d98f0a949a15c09f997294737cb4aa24f6e4b432562eae154c5de
 EBUILD faraday-0.9.2-r2.ebuild 1852 BLAKE2B 224eb26b782e7f9dd3ddb581e171327808a6de0f0d3b033043f795436e78320798ebe64894fe0fa94385d63eb3aa340ba2733383e2d722c4cf695c97b419c7ec SHA512 a3a63ff39b478748b03ecbf3ff3a59246d51b1f421655893c6432c3fb5f4da7218ab772ca6e8900a260d2d5e6d8a920edfd06d0656328a9f1b182a8a3314925b
 MISC metadata.xml 344 BLAKE2B 818dc9570594eef636f7b37ef9322ea083998a0905c0f9f55e758df3ebfa9e36efe5a42d95a666fc5c613a38b9c3a28d55ef0b3f48573dedf786883957d1adb2 SHA512 10e3c69f600e5be2306aef49c4466e399a52e2db52c8b53b7430bf72d6cb8696a71fdaa3a212eb37d2dad86480ea949447aee3f3e224f020e0629e56b35582e0
diff --git a/dev-ruby/faraday/faraday-0.14.0.ebuild b/dev-ruby/faraday/faraday-0.14.0.ebuild
new file mode 100644
index 000000000000..c3f9a9825f02
--- /dev/null
+++ b/dev-ruby/faraday/faraday-0.14.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_TASK_TEST="test"
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="HTTP/REST API client library with pluggable components"
+HOMEPAGE="https://github.com/lostisland/faraday"
+SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND+=" test? ( sys-process/lsof )"
+
+ruby_add_rdepend ">=dev-ruby/multipart-post-1.2.0 <dev-ruby/multipart-post-3"
+ruby_add_bdepend "test? (
+		>=dev-ruby/test-unit-2.4
+		dev-ruby/httpclient
+		dev-ruby/rack-test
+		dev-ruby/sinatra
+		dev-ruby/net-http-persistent
+		dev-ruby/patron
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler support.
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile test/helper.rb || die
+	sed -i -e '/bundler/,/^fi/ s:^:#:' script/test || die
+
+	# Remove simplecov and coveralls support, not needed to run tests.
+	sed -i -e '/simplecov/,/^end/ s:^:#:' \
+		-e '1igem "rack", "~>1.0"; require "yaml"' \
+		test/helper.rb || die
+
+	# Remove tests for adapters that are not packaged for Gentoo.
+	rm test/adapters/em_http_test.rb test/adapters/em_synchrony_test.rb test/adapters/excon_test.rb test/adapters/typhoeus_test.rb || die
+
+	# The proxy server is already killed, may be OS X vs Linux issue.
+	sed -i -e '138 s/^/#/' script/test || die
+
+	sed -i -e '/git ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_prepare() {
+	# Make sure the test scripts use the right ruby interpreter
+	sed -i -e 's:ruby:'${RUBY}':' script/* || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true each_fakegem_test
+
+	# Sleep some time to allow the sinatra test server to die
+	einfo "Waiting for test server to stop"
+	sleep 10
+}
diff --git a/dev-ruby/http-form_data/Manifest b/dev-ruby/http-form_data/Manifest
index 1a4955cb1774..7ce8b2cca970 100644
--- a/dev-ruby/http-form_data/Manifest
+++ b/dev-ruby/http-form_data/Manifest
@@ -1,5 +1,7 @@
 DIST http-form_data-1.0.3.gem 14336 BLAKE2B f58410dfa309fbec55e97f5bd10e56a7be0d915a0e87d4873c66a2d0f112552450424fe3a54529bc77e8bfbd5ac019f9ec231881d48942eaf55725d618203d56 SHA512 6e438a1c0c56116555737785d9b0b624f2cbee010146d0683c94e72473ed6f8a872c2ecbd878bc71f4aa378ebcd820d2743e0f6236778b65aad99c14e9c79fdf
 DIST http-form_data-2.0.0.gem 16384 BLAKE2B 813fb1d14074304786fbdb954141f914859b3898280f31fd6f205b38b32041ffae07d4ce790e6563a33a9d2cb09ab0427b46e5708f4c11d708356f61d7e905bd SHA512 2abb3742da142bfca5ad216140ad70493885ddceb258c7af1e14fec57172bdc976646e90de4b3d51c3af7eebb5d820771cba7d7a1798100ceb3c696c971d5ba8
+DIST http-form_data-2.1.0.gem 16384 BLAKE2B 7ea011ae83e6d5caedf127e55dd2ba4539e4c0d58a2182b7331b1aa1eba9d7e1886fce3d2fcab6d2b5fcb8ebbf56cc9bc3dafee5050238b4d765eb9238c10ff8 SHA512 ec01035d7bced9ad624019ae5d1290becabcb35670cba52b450f379aac3cc68b3c12ef0128930022e75d3c4de430e8595af0733dcce4a4a531898722fb0d34c3
 EBUILD http-form_data-1.0.3.ebuild 581 BLAKE2B a07a130ba1b58acc67a48c4258eaebde98eef3be9215fe9ed1ca44185390830a23352a2d5104fce1c933434df1593bc229c8e5f7ddc442ef569b5dcbff7dd85d SHA512 7ab881dc1a9b1b5faaebafaf14124c4c3d09a9115409b95ef09cb9ed16d3f4be641d262d345703ae0ce8789812e53abf47a2a1d6b6ebf3a2be552f3c03aea233
 EBUILD http-form_data-2.0.0.ebuild 573 BLAKE2B 98dac57705957e8c19a7168b3ec7dbb6d797ab62129f2e946c988598444c092c6d5bd1e73080471f6286a2312131dcd7f6a25c27b37965921f70ffc313702b86 SHA512 86eba9ead1dfd5516c4a8e0f84a60851e8986d7a9769d083341cf616afda646a334e8c8cab8dd263b6a71b3a56f88796288a99a5f08b17adcbcca0b70deaee90
+EBUILD http-form_data-2.1.0.ebuild 573 BLAKE2B 96dc5edfb6cef72d814e2049da7c1c65e11d11fa993bfda745b4fbfcb0637a316ac5559217c94e72e6c5d972ff63cab247dead069623cc91c0df0652d0e5bdab SHA512 5bb43c76b83e9832ea8c0e2aca6ec4a654a42fc56f912a107a5980095e4a0164d6f86032dba67cbe3242ec32c29844f0a27ac087e7e8dbcf5fbe22e35baf0ba6
 MISC metadata.xml 345 BLAKE2B 6301add67db13bd0df4d236cfa4042737f0216c1255a92b10ee272a3b4bfeeaeb0d9541013a460a3be689058ba31683854b3f0308232cfeae7f4d560d207c10f SHA512 6d157ee3fe1a775733ea0a808a81d68c0061319b30c6062e181cc4a19d1a5142027ddb2145fcb78c44feddd4e36682ce39306f0ade0fb5c13436cd9351e45bd8
diff --git a/dev-ruby/http-form_data/http-form_data-2.1.0.ebuild b/dev-ruby/http-form_data/http-form_data-2.1.0.ebuild
new file mode 100644
index 000000000000..b2dd0dac9cc7
--- /dev/null
+++ b/dev-ruby/http-form_data/http-form_data-2.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Utility-belt to build form data request bodies"
+HOMEPAGE="https://github.com/httprb/form_data.rb"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/,/SimpleCov.start/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/parser/Manifest b/dev-ruby/parser/Manifest
index 974467fea65f..8bd70b188289 100644
--- a/dev-ruby/parser/Manifest
+++ b/dev-ruby/parser/Manifest
@@ -1,7 +1,9 @@
 DIST parser-2.3.3.1.gem 544768 BLAKE2B a73ef5c73d4b09e19c931668bda8d55b8e94ca6c86c4dfbfe4e8a00ac43656d14f6251ef5d58670c8dc00fa47aa7b73249d666dd82d529b6b758d8caafeae833 SHA512 7b55b61da5b03153500a57bbd6afdb61c09a8c70b2af7bdf637d7c191b9781e601f2450dbcd31200de4b0bac655b9915a14d05d77b981dc0c4e80d0f020a3623
 DIST parser-2.4.0.2.gem 591360 BLAKE2B 77a832e444e70853fe2aab27c0dfc99536aeafac78e3b4f36d3b1863d5498b656ccf62c55481e9fed763828bd4212b1688f06d77c01cb216653a925081f45cf2 SHA512 6ad62084437556bfa3bdb862bb031646e25ec733ab0e34432580351562a72a71507e454da9fd4f53e590163ea9d666c8076ecb7c92a7f5bf5579ca46cbb28a55
 DIST parser-2.5.0.0.gem 601600 BLAKE2B d863de5b898e1110f3b1121afd83aa11b5c116c494a45c4ba4fba82a89605acbbf0e52db6f7dd9b7d65c49ddd00a3af8c716f2f348a7bfe50b39c55a95dd7adf SHA512 51ad3b7d56d0f25385ab6ff8510857b7c8a689c65087be68441a4699a12371717de9360f568804fc818c0fde8535f1c92067532ef7a4d751b183d61aac3ddfe2
+DIST parser-2.5.0.2.gem 604672 BLAKE2B ec4a20218e0707a9791b173a7b7b1f33845e20b23c591bb9d5a51883f9b105fff136ae3808f62fddbf43ce57b0b6b13c0fe80af5496dda655074900a3790b108 SHA512 5ea67f986af8b31eca601fc812d64edfde14843f92cc79d72333cd581d20f53661f621ac513e71db6320ede8ac696778266138e66cddb3cbfe1b61684538953d
 EBUILD parser-2.3.3.1.ebuild 733 BLAKE2B 9aff409e598a7154a7e430d7f6f142763b77eb9573227c0db90060d512e6212bbe9600192f1c5a11dc94d953452d811720a867674829afed12a6f28dbe57d91c SHA512 91817827b10e0238647170865930a0147e734631ed5b2ab01af418dd2fc8e11adb7b25e180b25a42b52d13cbce80c937be9cb0f9a9a32e4a184dbf15a10480ef
 EBUILD parser-2.4.0.2.ebuild 726 BLAKE2B 22565d48789c7a626bd3d94c44444052358d6d265f7b397e4b71bc16ffede9c21879d30eebeac4faef30ed0ab9f93dcc54e9305150f21425e266dcb73d8eece7 SHA512 183978bc420a988967be08320546002e5d2bb69b1b22c3cbed49beef1c010c59bb02f4cf6325107f4e2ed7efe03b5392dd1ffdb359abaaf9748943f34478d9c3
 EBUILD parser-2.5.0.0.ebuild 724 BLAKE2B 14410ef36bd1ceec5e3c9292be6731141005d279741ef5c9671591fbaf2147980c9ea6b1e0ce0faf3d7f963520886380118ed8b3b6d8a3064e5744f1b9b17ec5 SHA512 dace08c61adc85a283636b3946007b6301e96de432b70afd3455abed067d0fe9e48ab6d0db6285b9a8f978171c00aa4e658f5b24238f07873263cdb674d7e355
+EBUILD parser-2.5.0.2.ebuild 724 BLAKE2B 14410ef36bd1ceec5e3c9292be6731141005d279741ef5c9671591fbaf2147980c9ea6b1e0ce0faf3d7f963520886380118ed8b3b6d8a3064e5744f1b9b17ec5 SHA512 dace08c61adc85a283636b3946007b6301e96de432b70afd3455abed067d0fe9e48ab6d0db6285b9a8f978171c00aa4e658f5b24238f07873263cdb674d7e355
 MISC metadata.xml 343 BLAKE2B 7da9e267560e7a67c7a8afd5c283389dea1d4db2cb0ca65e4fda61a576036bb8068005b5e31ba9cc8fe7b68b8f8af5f93bd104e6d63412842dd7d0030b83fbd5 SHA512 f8dccc996237113d4add61dcc46e1407ea6edf156b001994e31d920f688dfcf9efe8d3d991ef31dc0084b7695b57b5d51471c57e9e945308279dec7909c69517
diff --git a/dev-ruby/parser/parser-2.5.0.2.ebuild b/dev-ruby/parser/parser-2.5.0.2.ebuild
new file mode 100644
index 000000000000..57a57952cc4f
--- /dev/null
+++ b/dev-ruby/parser/parser-2.5.0.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_TASK_TEST="test"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_VERSION="${PV/_pre/.pre.}"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A production-ready Ruby parser written in pure Ruby"
+HOMEPAGE="https://github.com/whitequark/parser"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/racc
+	dev-ruby/cliver )"
+ruby_add_rdepend "=dev-ruby/ast-2.4*"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e "/simplecov/,+35d" test/helper.rb || die
+}
diff --git a/dev-ruby/ruby-glib2/Manifest b/dev-ruby/ruby-glib2/Manifest
index 81826fd29604..33c7fd9fab24 100644
--- a/dev-ruby/ruby-glib2/Manifest
+++ b/dev-ruby/ruby-glib2/Manifest
@@ -2,6 +2,6 @@ DIST ruby-gnome2-all-3.0.8.tar.gz 1732574 BLAKE2B c41acfae9b48056047a3cd1f1b4341
 DIST ruby-gnome2-all-3.1.1.tar.gz 2233259 BLAKE2B 2758a2b34bbb96a9b2aba73f576d6213c9add2bd37ac85ed083a2bfb050d5327d7332ee1b9a8445e69aab0c4721ba446b4cb66c26273818ba930cce389eda152 SHA512 be264505d254248e0e6190b28c5311d10384c2ade19ac56f249bd17284b153368e6007862c4e19e6d1015ba3e441f9bc502a5dbcc45b7dc8036611ef554a6de9
 DIST ruby-gnome2-all-3.1.3.tar.gz 2202172 BLAKE2B c5da99d3e8901d7307c676f0c17e95418ba50abcd9218785985899757126f12830ddda32ebd57ca0300b55da84ec3895c155644e382ec85ad4153fb2c9b44dbd SHA512 e9f87ed8648742b601758be9c9395a57bed7c0b25602a09432e9da1158a79caac20e46c54d5b5941a4f41f562e202e6837c9ea5f6e19afb4289aa68ceb2e0a40
 EBUILD ruby-glib2-3.0.8.ebuild 741 BLAKE2B bb8e9e7537c4c1c3fde2c23e05887ba66126f9a1c97090695468a3eba8e3f3928ebee403ccdd0b62c890a7049cdc4e7e29853ef935529fb1137d0698c941e16c SHA512 d1a902188747caa187e2f316f54b14913dd06f13447337d70f1a911446513bc244cf5fe6f3d36a24e076f36909ab680cb0fc4a379be6540b5b904344c821a7cd
-EBUILD ruby-glib2-3.1.1.ebuild 748 BLAKE2B 7f4ea51f91eba70e33e70e43a1691771bc125252038c7bc3f5849a4308c0ddb2da22d4e6f5e7e30b9cd55ca037d6b00853af157cff03223806746fc839cd6f40 SHA512 eecae57ecf3c766dc253951da785e44d4f3f4699275d71692cd178218cb26f6dd0240abebf28fa71d8c94952c3fa27a2882642bef4519e6f8ffaf3beeda0c557
+EBUILD ruby-glib2-3.1.1.ebuild 747 BLAKE2B 8df6857b2456e644faeeb3102e8529996d554cebbdd1506fab4f901674ba137fbdfbabc3658e04a8cd9dea0bfe56ecb0ac7a1ad7d74666530a40053e4dd1242c SHA512 1c14758f6325bb04ad8841a5b6eb583ffb92e793559c9d95e02ba191965e1f3c31f8426a2bed7652cb467efa90d8f8d9382d997cffe87f23e55ea3faf459db19
 EBUILD ruby-glib2-3.1.3.ebuild 750 BLAKE2B e4312d180e9b3f62fb6144729f4a567d14b6732f155600687931e82ec0539c859fcb4d2c1f4ce4bddf97a62c4a4ca9cb2f17ec8a0bce02d755b4dc9f2275ceb4 SHA512 33feb81185886d6878dc450cfceae44596bd50a9f14d89d4ab0c5f3d37ddb0615b08c81165ee4eb24549d13a09e99813f76745e2c69be17e8178c2246ca670c3
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-3.1.1.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-3.1.1.ebuild
index e9cda664d77c..2eb65c4ec81d 100644
--- a/dev-ruby/ruby-glib2/ruby-glib2-3.1.1.ebuild
+++ b/dev-ruby/ruby-glib2/ruby-glib2-3.1.1.ebuild
@@ -7,7 +7,7 @@ USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 inherit ruby-ng-gnome2
 
 DESCRIPTION="Ruby Glib2 bindings"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 RDEPEND+=" >=dev-libs/glib-2"
 DEPEND+=" >=dev-libs/glib-2"
diff --git a/dev-ruby/slop/Manifest b/dev-ruby/slop/Manifest
index 0bd2623c2f21..b5061c6a582a 100644
--- a/dev-ruby/slop/Manifest
+++ b/dev-ruby/slop/Manifest
@@ -1,13 +1,9 @@
 DIST slop-3.6.0.tgz 19570 BLAKE2B a65b4bf689d48f7a97d00a9a06a926d5cd10a62053e9ff3e64e5593eb0adf54a7f6f4a56fb6078860682bad5809922f915aeddd6b8b37b447825aed0545ede9b SHA512 48bc2f56070a6f65b865b76dd5ba2e0e434c2ac5f9efef89301833746c0d01e5d9769ae02cdff8a4cfb0ed67d4306d921eafe086f49dafa0af8521d14bcee2a6
 DIST slop-4.4.1.tgz 14506 BLAKE2B 2750bba5b58e56e333cfdb5397bda025e6d55cc08411ad2c50f2def00c2dd9830cf9e3078ac0fc34d36e0d940e7985bce19539ba47ac7748cc10a392238cde70 SHA512 fc0675ee82664195823e5fe465d0812324722b1ecf8d998e13cdcd2cafa7f5ddab3b10b2912ecaf6213f44edfb8baa09e6437596bd4a9a3d7d329efa52bcfc1e
 DIST slop-4.4.3.tgz 14763 BLAKE2B e0bfbf296b5c17fe9b8a96c3b8c579444084882cfa5cdca6a9aee8dac6e1290959b00e12078a79c64c1dd1fd2ca5282b9efae57751a1a2a1435bb3dce617724e SHA512 ef34bde9a11734b833270a7a2e5e41996c448d02ab4af37950abfd053c817d1075f0ec2fb8068642d784e2e285b9cba9d6e002f97a1a84cc7dba84a319624544
-DIST slop-4.5.0.tgz 14916 BLAKE2B 21cb8052ffec4ff7a6ac748381ee5f0b54b4df62854b37b3d6f7ae02b700c59e24d53397538867ac7a4e85f6b42ddf707985d514b1ce91f98b8c8470c3515602 SHA512 bef70f384ffb55fe9c1610a0c15af625966772a1525b4c81ca08f943f8455e0180af1a4028e3c34044084537544e34a3b400bf0d3587235c4362e7ea6048992a
-DIST slop-4.6.0.tgz 15285 BLAKE2B 1a54c51e18e57abb92395c181b9863308a7433a7d271e62a7bab9b3f004302db36e5f441354700b9a04cebf1bc3c44df7b3eb7c16a20eed1ad21fb644beb3181 SHA512 1495a55843d1e33a8c9b9a979ee848b9c43eb86e9c93922e4143e160b7faea561b1d641879b3f4a5f3439c7ce8f5d1a69829a117086b23432a941ab1468cdd84
 DIST slop-4.6.1.tgz 15670 BLAKE2B 688c01b03489902fae3e5528b3d33618e28f9d26432834a5c92bd7aa9fc1065688d980e2beb0c92bf81a27e5a372bfdd7739e1311954272571a17e7902be709e SHA512 c32714dd54f65fc5f0da680a94a74c0acb573e3fe5bf36770d849180b921e9794bb0a5dadfe340f7177cc91b433c895cf5d22ff078a9b13d872a24a153cf7236
 EBUILD slop-3.6.0.ebuild 656 BLAKE2B 627c4444d2d8c2e3a5c0157f2abdb1e0a1858f4354e6b0cf23442f81e6c0d964dc5c9e732c4a63bdebe6e062ea1beb23be2a27515c68f4175fc8de6f11760b02 SHA512 460cda11dab55d6cd58688c9b9541b89029f952a433aca7ec5bc2b44b1aace86edfcd60e6b8b00f281856a12e8b3fc3adeaf99573465a0775d7a20a3b0ac900d
 EBUILD slop-4.4.1.ebuild 638 BLAKE2B c41a98e00bd8ebe25b64155de10970cf574a030d921f4c5232f3f539f05e35041adaaa2ed31ed70c3e99d06c505e43cffc060cd7631f22f7996fd04c1a04a018 SHA512 1f60ec3040012d284e5b606a7ec910d585134497f51acd5edccc44c9c65b9e52a32bc158cd378d3a5e52341e8e63759b73f67403da7a29b5cd94bfaf2256f161
 EBUILD slop-4.4.3.ebuild 638 BLAKE2B fce7884ce43ab0c83990a4a025e7ddc81aaf7c64b0f84b61e799f233cabe13cf1c3a8ed4757962d2a0b93fb405cf656883cccfd6e3e87b0dd668bff749739308 SHA512 9d9feef39f49c71454dfd5ea982d9046678157c4041a09019076ce283038dec8bbb8c21b73d821d18cb549c576875dbda16af48594cfa489141f6ce5eccf1115
-EBUILD slop-4.5.0.ebuild 638 BLAKE2B fce7884ce43ab0c83990a4a025e7ddc81aaf7c64b0f84b61e799f233cabe13cf1c3a8ed4757962d2a0b93fb405cf656883cccfd6e3e87b0dd668bff749739308 SHA512 9d9feef39f49c71454dfd5ea982d9046678157c4041a09019076ce283038dec8bbb8c21b73d821d18cb549c576875dbda16af48594cfa489141f6ce5eccf1115
-EBUILD slop-4.6.0.ebuild 631 BLAKE2B 6572b6ee7a3c86b55530f546a06908d97f87392dcefd6f6dced041e87f289309148687caf2e4be3cad8644bee5ef8c2bf046ef6aae06014d3ea1dbc7372e29f0 SHA512 91555e6d6f23cf8c667def9c84818c58996b00268d7840a3e25643a52b5cce41a60a87e01a65401011c2391be258ac45d2b84e9d6fe0ab37c6d8f4af675b9d36
 EBUILD slop-4.6.1.ebuild 638 BLAKE2B 3105f2474174daccf3e2f86eb9fe2feecab9eafbf19dc8180585025542fa56922a6ea9c1204daaa3ddac6a51a08aace4ddd14a21b1f3ad6baa6ed42f54eaf46f SHA512 c6e0d293939be1879f3e7c2cb5b5fb59deab829b7f3e3090328e45a686bb8168ec5f59691736a7c553417c4676330267a5a5d34d735cc4c54df3b81edb7099f1
 MISC metadata.xml 337 BLAKE2B 257bf07d00a3f336c737c4135fae690b12a7b383de865d09fca95667efdfc4d66adcb55343b064c1fefa190f1f7c21c7b3f18ecde8d73e9d7632209ee8adc720 SHA512 2036c518a80c08e41ddec04f397959241a28fdbec0071c98120bbe2fade6e69ef67b1aa46191099520dced091d5aa0d16ae1484d831061c0681315cb0fa3b35a
diff --git a/dev-ruby/slop/slop-4.5.0.ebuild b/dev-ruby/slop/slop-4.5.0.ebuild
deleted file mode 100644
index 2ac06d921083..000000000000
--- a/dev-ruby/slop/slop-4.5.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple option parser with an easy to remember syntax and friendly API"
-HOMEPAGE="https://github.com/injekt/slop"
-SRC_URI="https://github.com/injekt/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e '/git ls-files/d' slop.gemspec || die
-}
diff --git a/dev-ruby/slop/slop-4.6.0.ebuild b/dev-ruby/slop/slop-4.6.0.ebuild
deleted file mode 100644
index 1d555e7413bb..000000000000
--- a/dev-ruby/slop/slop-4.6.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple option parser with an easy to remember syntax and friendly API"
-HOMEPAGE="https://github.com/injekt/slop"
-SRC_URI="https://github.com/injekt/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e '/git ls-files/d' slop.gemspec || die
-}
diff --git a/dev-ruby/sparklines/Manifest b/dev-ruby/sparklines/Manifest
index 1d7eea797c2e..a90b5cdf5546 100644
--- a/dev-ruby/sparklines/Manifest
+++ b/dev-ruby/sparklines/Manifest
@@ -1,3 +1,3 @@
 DIST sparklines-0.5.2.gem 150016 BLAKE2B 408a8a5348e0bb3a331087066dfccbb42a58f68b839b7ba24b7577e50d5ad8f9c33c8befc60ae4577d2f8b5b809e52d13c5e11f61021a1d3eafff4d5c1fb2a32 SHA512 2666db1c2f4dd97cad10fd6b9b2fc938ab6b2e619b968f93b86090db4a77cc356cb97bd5ec01582804412c214226ed99cc0f65196e2a26ea1a395b29288cc715
-EBUILD sparklines-0.5.2-r6.ebuild 744 BLAKE2B 0014cafb4a3707422a10efa0f3a26014d1895d945ef8d4c7530de15a8ada593182b3a048911729c3cff99fcb514e952cd77d40a76ec566f24bf43ad238401152 SHA512 bde752dc1d68b516a86e549dcce84e1686534f3afcad7292dec5f6773aa2ba023ae7e833850696ff4f3c61b6df39fcaf9e027a1a024ef3fae8f4ee9d2148e647
+EBUILD sparklines-0.5.2-r6.ebuild 744 BLAKE2B f17e0a55423c55f13bfb531cbdcd97e1c3e2f663e79bb3f879e09ddff1f6000c23cf0a0d692ec720d7fd4519bde44d4ca6272ac695941501d69b949dd09c6c18 SHA512 e387c68de977a9ef799d9aacd2551ab838709b8ceffc876914a1131fafdb4c07b2fd9f22ca0455b569982d445cf7797fd5c81478b90a9110a73369ef75e263f6
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/sparklines/sparklines-0.5.2-r6.ebuild b/dev-ruby/sparklines/sparklines-0.5.2-r6.ebuild
index 172146d38f26..d2bd7956746f 100644
--- a/dev-ruby/sparklines/sparklines-0.5.2-r6.ebuild
+++ b/dev-ruby/sparklines/sparklines-0.5.2-r6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/spring/Manifest b/dev-ruby/spring/Manifest
index 31b118ff504e..b023289fd652 100644
--- a/dev-ruby/spring/Manifest
+++ b/dev-ruby/spring/Manifest
@@ -1,7 +1,3 @@
-DIST spring-1.7.2.tar.gz 41340 BLAKE2B 93ceae1cf7fcf76cfa8bb86f34bf1abc423af7edc4acd006b6fc8a1b09127b340b89a6b78ce595480541fe33405613aedf93ef3adf294ac3c50c38c708cdb1e1 SHA512 737bdd3597eeef2c2a832a4060c626f83fe2bc3d6941421c8451408bbbb6392cfe91f408d9e5cceadfcda03d62a589b6758da6d9c029f5336fca5130e6b6857e
-DIST spring-2.0.1.tar.gz 42129 BLAKE2B 6be76b0cb5f103f0bab0c5335d28d329a0c80b7dc8630fb1940b8657c52432c2402b7f2b10217bc8c5a7f086cc8976a825c561e839afbe09b9b8b5867dfd7afb SHA512 9ce940fe1a3a6f1df209f8fc7301e37dd68f50e2d50b455d2914131b3c5a8f8ac46a555f8c3f74d441e7e4f552dd9154b0afaee73575f62a37d17cc7f6036a17
 DIST spring-2.0.2.tar.gz 43318 BLAKE2B 91c032b6e4573721de559f7cdd7013656fd39b71b7d0776b0518ead3730044b6fb25b2900931023a920f1afdf555c2856e4748f052856515ad5fca83df356659 SHA512 73d6eb241807dd9bd20e0e393773da77fa22e07c72cd8d909e7ef1330a6c3d1e5ae483d2a10bff5d99f57214a96f87da2eb784c8532ed9e680c1d679dbf4bc0c
-EBUILD spring-1.7.2.ebuild 836 BLAKE2B a03582f96aac6f13853a663c936d43f4380e946f41578547ebf4cd99e1b64a30bb8a7d81128ed1f1582ba58b125dab76e26a15d1406f52ab45f8e5c99db22757 SHA512 0463dd9a4575a517638f229261e0e95545787f5cc4ccd2005b0a592c84180e2a7e3e0e5ace09b5747f293328636c49b172a934607b61cc9f2c93a8eaf04f6b12
-EBUILD spring-2.0.1.ebuild 834 BLAKE2B ac74feb5d4b0920d539d17623a925f3e36e627ff3832af27cd14aac680efc0f23b6e0965c9d3e1a4b9313812c6eece1f90f0e84dde6d19acde1368c4b27e6a4a SHA512 e729ff9e17b0c88d28c69b471a05697751732dc4a1af441b3b07918ccc074f175d5edf0a55d3f4e9de339a30090fa9951aa09ed3714b7ea26a21a7c1ff044347
 EBUILD spring-2.0.2.ebuild 839 BLAKE2B 5db6887b2b721ad73022868cb1143f13c19629eb94d3c250599eeffdfa058e9d8b8e5eb62c243dac62cad449bd392625e616855e7d53fec83071d3e63eebfd24 SHA512 8bbfee56b84a20f4801cf88715b2b2af69a0d4a8ee73a272fd5650e0f79e14ac067c8aeffaf922f89ab6fef6d7aeb2da70d6e2e490aba7a33a147f3dbd34297c
 MISC metadata.xml 338 BLAKE2B 6800daa1cad935214edb5051dac7470efb061ef6fc0ad534b8e52d024ffc8474fe3a04a329de4394b7ce673a9e8bae71aee52fee2fc4def484c287085ae51c5b SHA512 ed274c75491299ebefa755f0776c8895c7640101c22652f92defadb839d0a476a0e00ad407d1769a62f20d56da532f750bf639e7f5d75831c50f2957c17cc9c8
diff --git a/dev-ruby/spring/spring-1.7.2.ebuild b/dev-ruby/spring/spring-1.7.2.ebuild
deleted file mode 100644
index aa7cc03b51a7..000000000000
--- a/dev-ruby/spring/spring-1.7.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_TASK_TEST="test:unit"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rails application preloader"
-HOMEPAGE="https://github.com/rails/spring"
-SRC_URI="https://github.com/rails/spring/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rubygems-2.1.0"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/activesupport )"
-
-all_ruby_prepare() {
-	sed -i -e '/files/d' \
-		-e '/bump/d' ${PN}.gemspec || die
-	sed -i -e '/bump/d' Rakefile || die
-}
diff --git a/dev-ruby/spring/spring-2.0.1.ebuild b/dev-ruby/spring/spring-2.0.1.ebuild
deleted file mode 100644
index 5c9b85ea5883..000000000000
--- a/dev-ruby/spring/spring-2.0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_TASK_TEST="test:unit"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rails application preloader"
-HOMEPAGE="https://github.com/rails/spring"
-SRC_URI="https://github.com/rails/spring/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-4.2:*"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/activesupport )"
-
-all_ruby_prepare() {
-	sed -i -e '/files/d' \
-		-e '/bump/d' ${PN}.gemspec || die
-	sed -i -e '/bump/d' Rakefile || die
-}
diff --git a/dev-ruby/sprockets-rails/Manifest b/dev-ruby/sprockets-rails/Manifest
index 5798789ee58f..5eebe4bd88ba 100644
--- a/dev-ruby/sprockets-rails/Manifest
+++ b/dev-ruby/sprockets-rails/Manifest
@@ -1,10 +1,5 @@
 DIST sprockets-rails-2.3.3.tar.gz 103105 BLAKE2B a0dadb2c323f5e012de961adb46eae1450c195db437614d133efc858a683525cb102d495f4894d94cbe6e16759a09b64e8f29d2ab2d84c471db7464a252ce4e4 SHA512 42cdc359d523049adce47a490add5a60e034fa8743d60f6ce1ae0036812c236a1151a0cf51137d8f5dc405e274cb318c9c669c2224ac7eaa22c02d8727654e6c
-DIST sprockets-rails-3.1.1.tar.gz 107802 BLAKE2B 0b8698c1081339dc69ef852d3b5ba003b29669fef764eaea764a46af51d236e5d9cb2c0d244152aa7c033f84eb011a0b6cd480ec5364092043e0b4a8faebcba6 SHA512 1f6d30dcc2cb924aa1850a2de2d640244cccb95ef8ae35c045cb4cf4eddbc653f37859ef251bde2203c8a0d2e8367a9278d9088f0f2a1d01551230bec7932d45
-DIST sprockets-rails-3.2.0.tar.gz 108390 BLAKE2B 892726cfb30ddac21331353b42f2d15852037698bea3d98eac3881a8fa1fe5f0a6f77bdd28c5f4f119991024de57d4485b0dd7b034f300afc53bd8b86c7b9fa7 SHA512 7fc3a34305ff17b53a932d2a90f3518827eb99c7161c86598163617d7295dd245abfd83623e9244557f0bf9d630a880eceb54741234e466b2ae7a9353ff0052e
 DIST sprockets-rails-3.2.1.tar.gz 108682 BLAKE2B 842ce4560c7537f12c3aa2c068da89d99b410c4ad27f44b69abeead90518a4d9bad92fe6a70406c2f52d1124857419e845e3a1468cddcdce8a534c5f1210c3a8 SHA512 2c108370dfbf945e912505e854cdaf799f08d4374aac57a33bfc298d6e9bbf136877978458f7a8f48e5d120f578d3c7a88d91c058c12f520dd10b8271f82c49b
 EBUILD sprockets-rails-2.3.3-r1.ebuild 798 BLAKE2B 4ca9edcafe99da7d35ce76057600e8af3ff71b28a5f927ddfcdfd37e852ad6c96899ace9094f3e7890c8c282165446d59cb7170c446c512cab56e74b4dbf50ce SHA512 4e57922e0c2d8585c211969c6a4ed19e00ea3f0714ce6e9c2c8e1a37cd9579498168c86f86f6a3021a7ea4218603616ffc86e77be67f8b477df2f12d34acf530
-EBUILD sprockets-rails-3.1.1.ebuild 934 BLAKE2B 265869172dec3bfe5a649827b067a028f81203573604c83a688fe71ab2f378179b6de301cae220e39e9855dd4a286df162528a37f95d92a5ce35983b8e6209cf SHA512 fabdd55fb3f27f18bf2b75fd3c0214531633d0888156235091fb10d92be7d16848abecd0dca805737cdf2a8be107f14724d7337adb6863e46879d5481049e528
-EBUILD sprockets-rails-3.2.0-r1.ebuild 941 BLAKE2B 67e67590799f513211e15308bb0b0218e817bac11bdc13ba90ae6a2f5d80e3c6021dc4cd1a700ca3541cad0ea3872c76c464d06c6014df647caf1d5526796214 SHA512 0993ecf73ba0fa55757c777cd658c936c747896fc93d1e447c7cbb474039f918c0b880d3821a2c6ac83071fb37bbf7e0254cb0398b9390a6c64cbce6aaf34e4e
-EBUILD sprockets-rails-3.2.0.ebuild 941 BLAKE2B 14bc496494d878fd92f3716678eb63838d3ce2e24c46393affbed5bff5dc7e27bf0d1859061edd588fec62b5960a892103d428fde883c63fc4957b37ea0f1e46 SHA512 1d751958eae8a32ecca98fc39069d00e6caac3bc0af3e498bf06ff003ca58dc98847ae037a14a68bb22ff401ea592fff762a3150905191c465f6e2ea1cdb3b99
 EBUILD sprockets-rails-3.2.1.ebuild 942 BLAKE2B 5c6e3ce6778f4145e9ae17478c336704d470081f2e6e091ceae7a01f82364ef2dc8c2d2a49e822f983787a13776bcce7c67e036789338c78d9fe881b3de1a4d2 SHA512 d32922962c526e631c15a3ad9437fa3d0b65ba6a453e09f3b77bc5f585cec21c04f4223adf4d98dcd1ac213a7cc6e2ebdc6a83f8afbec100f37504ceaf03b4c5
 MISC metadata.xml 347 BLAKE2B 762b3943d802321b3eba7cb5bc4f47093dce9890fa79d7c8ec25aea5c352dfc4509718465d6791d7c194975b3a4c4653ed0d9be06e69b0cdef5aac1713d44412 SHA512 3eb588d32f48bb0f9e497c1d219314b2edfa33b48f245e35816fb34c46f0796b437d2064fed4c32315ee93fa6ed904be0a46fd136e820a3965a4240bd9db3c81
diff --git a/dev-ruby/sprockets-rails/sprockets-rails-3.1.1.ebuild b/dev-ruby/sprockets-rails/sprockets-rails-3.1.1.ebuild
deleted file mode 100644
index 7610161d67a9..000000000000
--- a/dev-ruby/sprockets-rails/sprockets-rails-3.1.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Sprockets implementation for Rails 4.x (and beyond) Asset Pipeline"
-HOMEPAGE="https://github.com/rails/sprockets-rails"
-SRC_URI="https://github.com/rails/sprockets-rails/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1)"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux"
-
-IUSE="test"
-
-ruby_add_rdepend "
-	>=dev-ruby/actionpack-4.0:*
-	>=dev-ruby/activesupport-4.0:*
-	dev-ruby/sprockets:3"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/actionpack-4
-		>=dev-ruby/railties-4
-		dev-ruby/test-unit:2
-	)"
-
-all_ruby_prepare() {
-	# Help load correct rack version consistently
-	sed -i -e "3irequire 'action_controller'" test/test_helper.rb || die
-}
diff --git a/dev-ruby/sprockets-rails/sprockets-rails-3.2.0-r1.ebuild b/dev-ruby/sprockets-rails/sprockets-rails-3.2.0-r1.ebuild
deleted file mode 100644
index 04ffd8533dbd..000000000000
--- a/dev-ruby/sprockets-rails/sprockets-rails-3.2.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Sprockets implementation for Rails 4.x (and beyond) Asset Pipeline"
-HOMEPAGE="https://github.com/rails/sprockets-rails"
-SRC_URI="https://github.com/rails/sprockets-rails/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux"
-
-IUSE="test"
-
-ruby_add_rdepend "
-	>=dev-ruby/actionpack-4.0:*
-	>=dev-ruby/activesupport-4.0:*
-	dev-ruby/sprockets:3"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/actionpack-4
-		>=dev-ruby/railties-4
-		dev-ruby/test-unit:2
-	)"
-
-all_ruby_prepare() {
-	# Help load correct rack version consistently
-	sed -i -e "3irequire 'action_controller'" test/test_helper.rb || die
-}
diff --git a/dev-ruby/sprockets-rails/sprockets-rails-3.2.0.ebuild b/dev-ruby/sprockets-rails/sprockets-rails-3.2.0.ebuild
deleted file mode 100644
index 3b2f242e6804..000000000000
--- a/dev-ruby/sprockets-rails/sprockets-rails-3.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Sprockets implementation for Rails 4.x (and beyond) Asset Pipeline"
-HOMEPAGE="https://github.com/rails/sprockets-rails"
-SRC_URI="https://github.com/rails/sprockets-rails/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux"
-
-IUSE="test"
-
-ruby_add_rdepend "
-	>=dev-ruby/actionpack-4.0:*
-	>=dev-ruby/activesupport-4.0:*
-	dev-ruby/sprockets:3"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/actionpack-4
-		>=dev-ruby/railties-4
-		dev-ruby/test-unit:2
-	)"
-
-all_ruby_prepare() {
-	# Help load correct rack version consistently
-	sed -i -e "3irequire 'action_controller'" test/test_helper.rb || die
-}
diff --git a/dev-ruby/sshkey/Manifest b/dev-ruby/sshkey/Manifest
index 622c587e5806..eca6f831ac53 100644
--- a/dev-ruby/sshkey/Manifest
+++ b/dev-ruby/sshkey/Manifest
@@ -1,5 +1,3 @@
-DIST sshkey-1.8.0.gem 24576 BLAKE2B fb9c992924a75e58edd6c2589f355adefde58722f29d34ec712104620bf9124f202bb0441b82ed01e84d6964bdb47a986c308ba2a560d411636089f69a6e5671 SHA512 90274b506959e1433ebcd902ff7b4c6d5f29f4a120b85e34d81ab10e680aeacc3916f30ae93a3efc447b1b0717caeec6c23de08c4ec897b91bc7fcb902169fa7
 DIST sshkey-1.9.0.gem 25600 BLAKE2B 8d20f10c7bbb243ed6a0eb41ddf07b06af803fb71ad7fe49c5b0a90fffe0db167e0b527513401400d12486fcf3fa445db1934b2eee08a5954cd2347dbaa03506 SHA512 d8cebd1341ee70886f868e4f7b4a524b1781a229e80261172b8c9a14ae665cc5e84b98f7b476cd62e57af430247c172a08dcd219956adc95a42caf88aab1b0b7
-EBUILD sshkey-1.8.0.ebuild 400 BLAKE2B 10a6ddd78b5da71ebc0ec03b15f61a92b1aa8e7a82a46a4fe459db5063cfb5e0d9666bdcb3a4e96ccf394c6c9149d5f26985345487617608e55009403d3d84d7 SHA512 13d4211acb5c36dee72c97f50f6840e5bae116eba5b9afd4ed58654451c38be36b4383967aa108e82193e79545e9ad9a292321aea8d811513583c8a025a4b77c
 EBUILD sshkey-1.9.0.ebuild 379 BLAKE2B 6bf09896919c30bf7f83dc22cf7fe63f9192863ff898bce4d491cb0e3a9ba31844578cd1d190c3074ad792e52d053b650a3f5d9204b4d14bb47fba088dcb11fa SHA512 f55c2faef59fa491a4eeaf5f409f8c388cab7d1cfdbcd08e3f7523415003e3225fb41f1eada6146d24b598646f3387bf90cf875761239fb62d9b56a4fde90e8f
 MISC metadata.xml 385 BLAKE2B fbc4e3d95d9b9daf6730d746905abb421dae2ecfd755ccd8f27ea57c295edb4efa6bfe61fe1b404341a76851d3b6802ae748485b30c3275d408900ebf164ce1a SHA512 74b48960f9e2ce4390ab3919d3f0334a5633995dc437613ca2ed13e3f2de8f0e76fc79cbc5f5c8b1526976e72ce3abe9eb1bc44ca4c1721500e14ee27f63a39c
diff --git a/dev-ruby/sshkey/sshkey-1.8.0.ebuild b/dev-ruby/sshkey/sshkey-1.8.0.ebuild
deleted file mode 100644
index 799e3e497444..000000000000
--- a/dev-ruby/sshkey/sshkey-1.8.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="SSH private and public key generator in pure Ruby"
-HOMEPAGE="https://rubygems.org/gems/sshkey"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-#no tests
-RESTRICT="test"
diff --git a/dev-ruby/syslogger/Manifest b/dev-ruby/syslogger/Manifest
index 492e3223dbc1..5c2350af386a 100644
--- a/dev-ruby/syslogger/Manifest
+++ b/dev-ruby/syslogger/Manifest
@@ -1,5 +1,3 @@
-DIST syslogger-1.6.4.gem 10240 BLAKE2B 581a904ddec4e980a38fd25aa4fc9c0096dffab9c90a78a4fb5a0e4e40c8b081ef8e1167c737fc51e656208395950568856c347fd9f557228c55c62af82c5c65 SHA512 2e92cd1b1be45929db820237ddaa7a027779dd224d9dda844267f7261b4dc734441caecd20518c25c85bb577087c1697a4768919c68b3501b3967f84dd6c51b6
 DIST syslogger-1.6.5.gem 11776 BLAKE2B dec37278ea109dba53c44a5c285962d78890ed972f1cd14789435b8bb3b922c7a3fc7b18238ee9aa239143453be3d6f73eea6c62d0bb83eb7a8901225ff2e49c SHA512 60dc7be93092196d68d154cfdf90a3393c9883ceaff35640bd0c0dda01f692953c7d1d8243d7b9327990a368d320c474af1711ba33a6b69381f56030800cc297
-EBUILD syslogger-1.6.4.ebuild 634 BLAKE2B 46e3ce092236e4c3b8a991e04b737c233a5d81b87ec7b2df5a6c76c39b3df8be7b85c393ac9c1fb758a9c3b742758b2e056c4e39a5d04906e604af6c72146ef2 SHA512 1705588e20090daf70104f1f8a57416f2988dbf64fcfd60669e7e976bffd6da464f98cc20f99fc09c738286b5444348f83aeb5a37cdbae954a7202525ca9242c
 EBUILD syslogger-1.6.5.ebuild 653 BLAKE2B cb484f2fe4528616c155ebc7fe909eb2a05312cd8829f22dc95e566bb873864d1c4206575e4a8c69a5dd68742d9d97266b483050925d385f666b4d0499033975 SHA512 98e4e64d3860d17041a6720d5c654afd36be92897041402c9a5e67ed6b3d35b1b66ccabe416789aace65b972489d1c36c5cc7da343da615f3bc2691c49c46e3c
 MISC metadata.xml 341 BLAKE2B 54755e425199abb421469b9848f48a06de0e3e6a1d6a17a1e8f139a4c71fdad50f0f28e0aed181ec0af406713d83a4bfb7c61ac80484d167d18abc4cf4cf6925 SHA512 b3bd5651096851bd53bb83cfc11d74c10686b6e74cf8636c43c3dcbde677a924623f7929ba3c25d8483d42bcbd2524c35673dac328257b6e1400e6d62810dd8b
diff --git a/dev-ruby/syslogger/syslogger-1.6.4.ebuild b/dev-ruby/syslogger/syslogger-1.6.4.ebuild
deleted file mode 100644
index 86f694bcc813..000000000000
--- a/dev-ruby/syslogger/syslogger-1.6.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-# if ever needed
-#GITHUB_USER="crohr"
-#GITHUB_PROJECT="${PN}"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Drop-in replacement for the standard Logger, that logs to the syslog"
-HOMEPAGE="https://github.com/crohr/syslogger"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "
-	doc? ( >=dev-ruby/rdoc-2.4.2 )"
-
-all_ruby_prepare() {
-	sed -i '/[Bb]undler/d' Rakefile || die
-}
diff --git a/dev-ruby/temple/Manifest b/dev-ruby/temple/Manifest
index 1c677653757b..df62a7005d70 100644
--- a/dev-ruby/temple/Manifest
+++ b/dev-ruby/temple/Manifest
@@ -1,7 +1,5 @@
 DIST temple-0.6.10.gem 36864 BLAKE2B ae3bc8d031f2a2d8bf1630d7a4536fd4422115bb92b8f005a7310d069392ca35a3cfb8da89ec12a91f2f3c4b89452d3526edd797377b35b2bf5702d530fa8af8 SHA512 668d4b12ff2f5b28fa70755036c4b2d4612ee6fd0f66382cc534d5e1555e0105e6efff58ddfdadc62dd0a0f0066fe37ac9228299258a045ba7af7ad73600ba83
-DIST temple-0.7.7.gem 38400 BLAKE2B 186d235d23a0e3430b1794b5d3fe288b81d722b3d9631eef376608d9ea8dd585473883c3a011d102a48e953455024efafd0a5a1cd1c2d9eb99d0e2f9da5f9b11 SHA512 e7437e3b39cad78c20d9f99c8b00344a86589d38a964f2a55295099502d2f1a7bfdbe6ee98b63c4e73e1ba886107e0dd6f511d8e4e0643b96f77bbd9093e4955
 DIST temple-0.8.0.gem 39424 BLAKE2B 48df1f38a2df12871b13a8592afecf93fdd7c13497491d86c52eb2e06d47768403a1c8e7ca6201d73f319a9f27d65ae08f15c6c177b1b6e5d73b37483f01a4ca SHA512 ad57c484de78f029797fbf4331fa9c24247d6cec2e3dea447d394a104eb9496c91af45f505b720da1c4242845d94b34b626ca586c625cd126f72d1e4296ab2a6
 EBUILD temple-0.6.10.ebuild 790 BLAKE2B 92a632232a398dd7017a06e7c11ef8d005911bc4191ea128f0e16324eeb214d10856ae459d49727c70adec20a08784a2741cf492fa193bbf7204c9edafa5e126 SHA512 4b88224c70d2d4647ceaea3ea5911e99f7ba6f9d9b6a2596430fc07d015e9f2c1eac1eb0fc8203036c68811ba41aa5d4879a016a880c221d3dcc7695a470b780
-EBUILD temple-0.7.7.ebuild 646 BLAKE2B 9993071123cedb2eb740bb7b236a4d9d22de5fd455615b0762a0d5541eeb95dcde01c257242062c34e9e44b923454f281b3e6d7a280d616dff8385ab51f25f65 SHA512 c3f6f544c7279820b557580bcc669efa8ddb21a1fa61496e54e37023ae4cc602be854770d8b32feaffb8aa6536a294ae768a3e133bcca9466850a92ac4ffdc9b
 EBUILD temple-0.8.0.ebuild 656 BLAKE2B e1dfd796b3c3c5ca33b9de3996ec6c6c9e4686bd1f2fdc504dfd23097cebf0f6982ef78b4ff92ebdfd6c8a75741972008cce154a5891625286616282d94c00a1 SHA512 f5abbc92e5beeff917349bca0db321d50ef3ea895b79c8ef93711a01e2062a2d5f10076a94c080e5f8ee5f43d35c6ab7a844e7602ac4b62a56acd596b84031d1
 MISC metadata.xml 340 BLAKE2B a58482ba0cb0351241c6826bb2014b49b554b28625c9f202dff5dd2c877454bee5a2f11c90cf05ca735def15bc9c7b05edab1ab77fa4dd1f2bf0970c1cc49e1a SHA512 ce7b6d2b6cd7c1d004cea2ffba1a8f74fd53afa3886f9fe248e30a066822cbfb0cf0782f8de1404ac11f492e496bf0ce1b4537aae9804108fbccf4e7382e41fa
diff --git a/dev-ruby/temple/temple-0.7.7.ebuild b/dev-ruby/temple/temple-0.7.7.ebuild
deleted file mode 100644
index a035f9f7937e..000000000000
--- a/dev-ruby/temple/temple-0.7.7.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES EXPRESSIONS.md README.md"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="An abstraction and a framework for compiling templates to pure Ruby"
-HOMEPAGE="https://github.com/judofyr/temple"
-
-LICENSE="MIT"
-SLOT="0.7"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bacon
-	dev-ruby/erubis
-	>=dev-ruby/tilt-2.0.1 )"
-
-each_ruby_test() {
-	${RUBY} -S bacon -Ilib -Itest --automatic --quiet || die
-}
diff --git a/dev-ruby/timers/Manifest b/dev-ruby/timers/Manifest
index d1e88a63957f..a580d020f891 100644
--- a/dev-ruby/timers/Manifest
+++ b/dev-ruby/timers/Manifest
@@ -1,5 +1,3 @@
-DIST timers-4.1.1.gem 15360 BLAKE2B 4f77e91087dfa1c4e6b15c0e4548a8bed1ed4f9d30c2c59cdb69882bcc909758d6c725981bfe035b407812d964563a41f6cbfd00041222e1d8ec79df86b48602 SHA512 7652612737b1d20135eae02f02bfefa57c8a6cb6923ec69af32810d6f0fb9e924d727efa66b0832424bc35b6d7099a968eee77dfd2db3803959f517e1ca7f683
 DIST timers-4.1.2.gem 15360 BLAKE2B 2480b6051825e26c9c30418e4acd7f9d8d0173d21038349ff16c086a2712eff7e9349720d270ed6505d8f90b14fc4dc99cf06d948922a222196d338b7933b5a8 SHA512 8c43f6ab09b918fc047056de20e85371929cd6841d7e26dedf54d565585eba040e23cef83c8747eb0ec43df8c9d9cf5915b5ea0ac6f6d551a0b086de3a9f3499
-EBUILD timers-4.1.1.ebuild 1051 BLAKE2B 1b402a35a921ccdd2dffbcbfa1ff4cac13b936f761f5b132cc68b01eb10d45cfcde064f7d3658080820c9d8e63d44d784b8fc63dd05671a99a3573a5cccd5c50 SHA512 28c66cf75eb2d89b3b14d40bdc22d7802a3905e00d482d00e79de28b6e74cdca328853be05d2615022c9edef21ba10fdd1771de256d8762ccb9b60ff5dcfdcdc
 EBUILD timers-4.1.2.ebuild 806 BLAKE2B 8210d5421fa8301fd28683da6fbb356e31a83afa8bc318d70f20f60d71db9afed8af80ec1459a96a5ffcf472567e942a015bb845f139b0d6ba58707af9a65137 SHA512 897265282b8375342d63efc1d529fde772f0aef73f61efdb332322fb4d6598361062e9a93e8b27182ff26f48cb97cc82c376e6b159d5bf152c7963f1530532b6
 MISC metadata.xml 341 BLAKE2B dfe2c9228e7b666d6b7acb9d9f0cdaa70263a6d5960ecbb144699e62c94ded1b613a8d22f82e5125f6a2e954901a65da57bd432823d922d17164e273b809d8a9 SHA512 b863e101e06e7a8827cd6166688dbfdf77c5bc84203294d0ab63315fe5b5b03fe1898d02b9f219bbbb3f3cddd3d5185c34d9e4079bd993631cc849eae9ac9be1
diff --git a/dev-ruby/timers/timers-4.1.1.ebuild b/dev-ruby/timers/timers-4.1.1.ebuild
deleted file mode 100644
index 9e9d508fb687..000000000000
--- a/dev-ruby/timers/timers-4.1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pure Ruby one-shot and periodic timers"
-HOMEPAGE="https://github.com/tarcieri/timers"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/hitimes"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
-	sed -i -e '/coveralls/ s:^:#:' spec/spec_helper.rb || die
-	sed -i -e '/Coveralls/ s:^:#:' spec/spec_helper.rb || die
-
-	# Remove performance spec due to dependencies and being to dependent
-	# on machine specifics.
-	rm spec/performance_spec.rb
-
-	# Remove rspec3 configuration so we can still run with rspec2.
-	sed -e '/expose/ s:^:#:' -i spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/totoridipjp/Manifest b/dev-ruby/totoridipjp/Manifest
index bb11c7996028..870a47b75533 100644
--- a/dev-ruby/totoridipjp/Manifest
+++ b/dev-ruby/totoridipjp/Manifest
@@ -1,3 +1,3 @@
 DIST totoridipjp-0.1.0.gem 7168 BLAKE2B 9a78da0b8309c9886506a80b7206530f3398d1591eaa75a32a4085bbdc56492da7465e6183fe5979e5e3e9ff486a089d1495ae2105f694c407fce40c29809dfe SHA512 5298fe39b0705a0b913f7f6cad452be48480a6832e9451d86a7fe9a1248fe893a76af2f56c0bd6d3a65c756d4ed3fd29b4483ef82beeccfc78dcf9dbf43ed748
-EBUILD totoridipjp-0.1.0.ebuild 464 BLAKE2B e58753a7fbc0dee8f5ee3c3dea975d7b974d06a547f766b981653f9e9ccf3345e124c0dc1b58e66e9e63ea9bcc1f6edcba70a3970f0ebbc3981108de6450b10b SHA512 ed2ff69fd8407b769cc29e4cf6827733fe8e841cb559c2acb0a0ad9b3a570c9ca2dab3127f61ee4da6221aecda8352647b24ffefafb799059afa0e384d73d1bb
+EBUILD totoridipjp-0.1.0.ebuild 464 BLAKE2B 89bd7e90ea4acc8b36718ace31eadbbe89cb5740cb2d2f71405cf9b49faf813ef6a2ebde5908f4e804030da62f23b8fe82103a7a6225c14bac9a8bbb1cc0f480 SHA512 09409dbdb76bb5db75d2f0cf9f967907961cc595f4a9d833bb8d8f17d7a002fdf5d7f531b2e0563e950195e77b3705f222567bfece264369c95e70c1b26eed80
 MISC metadata.xml 406 BLAKE2B 995f3e6b7697d832d590765c25c96a0f29e04dc75799b75a6541f41ce48b6b001793475c7dd1a501c06cee5bcf6871abf32188bec019e58dfc2fe03bf2120341 SHA512 11b57cef52e1a45bc8e9b3862faefe9c4a19fa0dd74abb812de2ef710a41dea0cb05ab0b6e4c14294783b4a2026b2f371eb86ea3f8046a3a6d50109b9fb4c5b5
diff --git a/dev-ruby/totoridipjp/totoridipjp-0.1.0.ebuild b/dev-ruby/totoridipjp/totoridipjp-0.1.0.ebuild
index db6e5069bdd1..fa62433f97dd 100644
--- a/dev-ruby/totoridipjp/totoridipjp-0.1.0.ebuild
+++ b/dev-ruby/totoridipjp/totoridipjp-0.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
diff --git a/dev-ruby/treetop/Manifest b/dev-ruby/treetop/Manifest
index 885de8301764..e526583a4e19 100644
--- a/dev-ruby/treetop/Manifest
+++ b/dev-ruby/treetop/Manifest
@@ -1,5 +1,3 @@
-DIST treetop-1.6.8.gem 68608 BLAKE2B 095080a4cfc3e876e3d63c6bb37b5f662c22be8b6c6cb68ae3a2df31ebed296d1e3910e8319be2b30f3f2a010d77f562c3add2f1a4ad35d56c9a962f3b3c1be8 SHA512 c0f46695e28ea0c6ff4bf9d646b94e6caafa00828370840320bd9799bbb417dd0721bfd06d330d2b4537b88d963d4249233b3dc7cd2c818c818e542015526ee3
 DIST treetop-1.6.9.gem 92160 BLAKE2B 4c2a748ec1cc153aab8ddadf536200a6cda4d1f02245b7e0ceefb7ef9bc85b91810820b8cd557a82490e5e4b5606fb714b3f5775029743dcd2d64e6a601ab5e2 SHA512 faa0b2eb0a8bfd0c47b7acf03d7585fe56d02b9726630fc01e533c80ea796de158ff7c6a008fe6a30b979b2791944afc598e81c17cdfbfecf1083a9436b54fdd
-EBUILD treetop-1.6.8.ebuild 812 BLAKE2B ba76c8c8880fc1c7edea8a1a067a5fd195a98063ff7148b20b5b283c07b18cb0c270d310152b1a2ef5a10ac3c979a958eae588b9223e68a1d8d605bb005ebe06 SHA512 7f797215687352eae380c620e7b25dfff8c579969ca765bb634d7d0f96c81afb9d0ffd49a4c60bdac117146124f6b3b92b2a144cf5fea4c7b15e5789a11ac03c
 EBUILD treetop-1.6.9.ebuild 805 BLAKE2B 55a2489776ff3a7bb756ba78b9dd8acc89a3de0bca437676aca44732c02f43e3d35410358a540560b926ff3f2ffa786bbee88e3c8cc36fee94b101d32e3da921 SHA512 8b4ef6dd5e34bb2279227ef0147ccd531c2071684849e195e461a22fc436526ff23e8ba5c4c4616ef036870f28d28bab744f26f4b63697f17236f37f084324ee
 MISC metadata.xml 341 BLAKE2B 56ec962d821e9e80edb0a650e3f65f9cdfc8ef0bc866a378cfc285b4bc83b9f705f6cb33e54b53fdb25d0b9e96622c382fb972540fffab4e0a2ac9199212edda SHA512 7bbdf48696d2aa4cdfecc5ab84251ef9225ff2ed0dfa9fb1cd2a827b2da3f74e684642423546b0e9e8f182ff155c0963632e1194de284470854e53dce2a2e45b
diff --git a/dev-ruby/treetop/treetop-1.6.8.ebuild b/dev-ruby/treetop/treetop-1.6.8.ebuild
deleted file mode 100644
index 3d0257c0824f..000000000000
--- a/dev-ruby/treetop/treetop-1.6.8.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Treetop is a language for describing languages"
-HOMEPAGE="https://github.com/cjheath/treetop"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/rr-1.0 dev-ruby/activesupport )"
-ruby_add_rdepend ">=dev-ruby/polyglot-0.3.1:0"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}/examples
-	doins -r examples/*
-}
diff --git a/dev-ruby/ttfunk/Manifest b/dev-ruby/ttfunk/Manifest
index d68484f4ceb4..ae880121576d 100644
--- a/dev-ruby/ttfunk/Manifest
+++ b/dev-ruby/ttfunk/Manifest
@@ -3,7 +3,7 @@ DIST ttfunk-1.4.0.tar.gz 784076 BLAKE2B bf2a9c9a54127eb922e2d3f4e98033092adb8c9b
 DIST ttfunk-1.5.0.tar.gz 1454334 BLAKE2B 207fffb2ff9df88ceac83a8270bf65edef1c31ddd7a6b5e29b1753c4f653f9418f70eace5727e6eae7164b4f2eadfada55c9124f1a5edc1781b467ff87c73566 SHA512 824cbed423144b2057d9f1ae6d268d2aa43bffef3b35e076a660cf9359c1751276672b2892cd75b7cdecb71df511d18daf123e6c6885b63553ef847f674d5f72
 DIST ttfunk-1.5.1.tar.gz 1454516 BLAKE2B 08bb349f4289977b7391013a6686a05f27b4faea9f4b005a5056e525ce02fba2de43712e4538ccf17d967d9cc2c29cbb95e6fc39fc11b6c17291ceac54f63849 SHA512 6f2ffb30200b5b5d36150fe8e81e376e8f4ceec3ac4b1bfe9363191f37616f7a22849a826c19a87458ea5ca70c381e6f976311964bac113bfe5aa767d9e459d4
 EBUILD ttfunk-1.2.1.ebuild 696 BLAKE2B 8465d4a1500fc81f9ddb7bee961b67e622fb89203e5665a9b32c4b379f2f689385c3b6e763978814713c6523f63762bc5e7d3a21efd73df6aa42d1494e3b33c4 SHA512 c7be9639b7d5ee7679be8b02200dcd00b860384ebb94bd4492c446aec43a162b1c0efd85ba831a80b2bf3a28f3eaefa605648220982f9b4debcb445f5503abea
-EBUILD ttfunk-1.4.0.ebuild 703 BLAKE2B f18668a2c3d27935a85c52becd91fb3107972220b6248e59c2e36515710e52ab66c20220f41e530063d39397b82d36241c0e3a90d620096d7e6f9f495c13ac42 SHA512 46621b31fd420038152f595ce26a5fef40c8aa019c3edf5de0b78fc648acd9446411ef4347cf96e8f2ba208dbf9b36dd2ef5742617470bb39a98650e8e873705
+EBUILD ttfunk-1.4.0.ebuild 696 BLAKE2B 8465d4a1500fc81f9ddb7bee961b67e622fb89203e5665a9b32c4b379f2f689385c3b6e763978814713c6523f63762bc5e7d3a21efd73df6aa42d1494e3b33c4 SHA512 c7be9639b7d5ee7679be8b02200dcd00b860384ebb94bd4492c446aec43a162b1c0efd85ba831a80b2bf3a28f3eaefa605648220982f9b4debcb445f5503abea
 EBUILD ttfunk-1.5.0.ebuild 714 BLAKE2B b30c095ab73485c816c230468125a50541d7f98152abb83897db6d6066481685a1b5d1989bfd92bb12d37aae1b36015878af2fa3dd22f9defe7da0ff42a3c722 SHA512 f85dde7d19ff0dd80e38dff574b4238c97de6baa1aa9a8b10bffd99fa5a055eff5b8b057a255cde1ea2a9010b6540a255d061eb44542e51fb9d6e14d8ba2f95d
 EBUILD ttfunk-1.5.1.ebuild 721 BLAKE2B f4b8613ec0c0fc18cf06bfb3b212d5a3ba1b816187a8ad5aa2702a04db655f533d9981e69032afc2f736934915c29b56cfc7f99680e8d77c5f68bcd072c57db6 SHA512 46d1169e4e47e9792dee6cd00bf6103197bd65d862ac482cee9d974badcdc9e7563048946f77b78d85b96680d3bb2f204328b60b799c1aeddc27d2165b9b8e65
 MISC metadata.xml 341 BLAKE2B f2ba4efe120d15cdc09a481265fa0e6bade218338cdaf5115d4c4ae6dc833326bdc2fc380e2c8ae366351c829119410f884a75a1d00cdc606d80e761748f5dc5 SHA512 971e696df378c8fa1447ce18eeaab4e9ada79d046764818c3f764aca29f127f8f704258690c3dd63b60ec7cc3424ca7a4b9d10858248cbd2688b3ce76b1f9aa0
diff --git a/dev-ruby/ttfunk/ttfunk-1.4.0.ebuild b/dev-ruby/ttfunk/ttfunk-1.4.0.ebuild
index 70a258318fcc..c635cf8d8606 100644
--- a/dev-ruby/ttfunk/ttfunk-1.4.0.ebuild
+++ b/dev-ruby/ttfunk/ttfunk-1.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
diff --git a/dev-ruby/warden/Manifest b/dev-ruby/warden/Manifest
index 280f59f83569..9713ffd6499e 100644
--- a/dev-ruby/warden/Manifest
+++ b/dev-ruby/warden/Manifest
@@ -1,5 +1,3 @@
-DIST warden-1.2.6.gem 32256 BLAKE2B cad24360b2cec74021d456d151f196929b0d8854703c32e3132a6c2f3433898ec0851222ff32a746496ec366f8615bcfdbff1d6e5b361f7a79afdc10eda031e5 SHA512 dc2ad118faa90f812eb615fe9c41e1edb1564812f7bf6a7759a782825757c899082956ba318956bfc745c23eeefe41dcddfa9f605ef76bd12ec264f8b85f38d3
 DIST warden-1.2.7.gem 32256 BLAKE2B 258f8c83792fd5464c2bec957335ded49922fbe75ef3e2f6869a147b38b89be83b4601c8cef7e3008cb1495bdf9a6eb4d798974eff0565f48b05937b9c4fca3a SHA512 f02f695586c26c42b1bbd621e54dad04a42e8bfb4bfacc4f90f67ef2fb0c8593a3c32dc1545ee6483ab0df094cae6e6a5c614718b65a13103f83af13407c5336
-EBUILD warden-1.2.6.ebuild 477 BLAKE2B c034fde9bc0ca74043c6fbab2b113e2f7ea09490159b68003bf2e2df8fa3a61afc72311a0598edba3cf43b073d11d03463312ad77e1e1f39732626e293af7d05 SHA512 aeaf29b2a384b524b50446ce4ef90166add0350f5c0ea2fd0a6ddb8fa257c08221efd5ff3c4b872e36e9d38341e0688c9883a2d79fdbf4255c59be6404d4e807
 EBUILD warden-1.2.7.ebuild 470 BLAKE2B b6b1a6cf1cc103722057be498b4a0ca59e54b2464fb18540b8fc6002364809b59b19d74dbc268e52de072781851b800811381a3ab65151919f6492294e2a003e SHA512 13d5d4d62ad076e15e50bc8897e9c1f66a5f39ae0116470dd3af5440055dc562fb59cdfcef226e69ab6b0c3f9081d4105514d41f9ee3ef118b14f6e2d377c0fe
 MISC metadata.xml 339 BLAKE2B 393d527f8c13840cff0d3f73c38e94964fcfb294074767d395ad1e61048d950cc291737406fb0009ef7e7566f175d18a271b35f783dc70e348325e8c0569f6ea SHA512 60503377aabecc35e11148db41d73be583fec27d3776388f7a2f59eeef85d948f13d071fc245555b8d37148147a5c019d094c9cc7ff044b262dbf44bcb3d40e2
diff --git a/dev-ruby/warden/warden-1.2.6.ebuild b/dev-ruby/warden/warden-1.2.6.ebuild
deleted file mode 100644
index 836d2ce8595f..000000000000
--- a/dev-ruby/warden/warden-1.2.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_EXTRADOC="README.textile History.rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="General Rack Authentication Framework"
-HOMEPAGE="https://github.com/hassox/warden"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/rack:*"
diff --git a/dev-ruby/websocket/Manifest b/dev-ruby/websocket/Manifest
index 7b371b06c61d..ae54a330ed6b 100644
--- a/dev-ruby/websocket/Manifest
+++ b/dev-ruby/websocket/Manifest
@@ -1,7 +1,5 @@
-DIST websocket-1.2.3.gem 26112 BLAKE2B a205cf30321b9f5a198cd661c7a6f001655609d905cef4b83da2daa37117445372ef13615cb8b08ff788f6d9c7b92a585ed8e4dc7147f73b54de6eef5db0e9da SHA512 fb98517bc81463850d10bef95efaf5c3297519e3e106d3fde1b97559434cd19d272c60d5875287e171757936fcda0eda385f05317dab56e48eba833433ccfaec
 DIST websocket-1.2.4.gem 27648 BLAKE2B b90391dfb836cd700f76da83ec85c8a3d9bfac008fbe798f2a78de7c72ae8390b4b193bd2a7302b636f9f84786fc073befc813111af7db819440ee86eb0dc3ab SHA512 dd3a67adadaf45850d666dbb6a152aaeba581e751fe4bfa32a286946b71b7129e0f18d56ab458a489f0665347483c18d73c2fb232de7204ab3434a2574c685c9
 DIST websocket-1.2.5.gem 27648 BLAKE2B baeae7755ae9efb2e6b07196925501c67d3d0a41c1ee882a2a1309a9685830b5a5327a20d8716b27ff2c0d5dee34bbb66e1fa70666b89e4a3423c14465fdc7b4 SHA512 0cf0c2a049416faa66241cfeb40ff8771c6cc12f2653139b0dd8541450e4b705e747e025ec1aab0e3ff57e777b31ff99a2bec1f3a11a2afbfa69ad48d45b77e3
-EBUILD websocket-1.2.3.ebuild 461 BLAKE2B 17b4bf994660cb233e6fe94bf706fcea1f3d6bdb8f8a77564f67508b0bf49b51b5bc61795596735114393ed433fc74cdd45ca84781036e947c71a806fec2e346 SHA512 a3c3de5c2ff7eb9581aa9f368bb0eb10dc805abd62c806e839a0af9a559cf5c9c3ba6dc096cab82116226568b083e3e7f695c9bd55d64334a88f9096ebb64168
 EBUILD websocket-1.2.4.ebuild 461 BLAKE2B 50902cb782b1ef7039ff618bf713f582b8b8f203f3a1ccb811192d8881d6873a6cd1ce138bcb419b5ed51c8805b82acab15283d4e160d544deeec8ae8532405b SHA512 afa34443d2fd7a078e24621122e7400831a1ec900ef468c8343e9e9d185f2c1a860df75a336d34d3b5d1e79b99fe34407a974ccafa72c23c5c1eb26372cc044d
 EBUILD websocket-1.2.5.ebuild 454 BLAKE2B f02f418e480eb75018bb0c86dcde0f65ae258395532cd9eef4256e8f87f1fd0ac4d0bdd54873d61eadb37634fdbcc414c4e4cd8c1c1b1ccd12d6f8f68ac95413 SHA512 13e72ac96273dcef1d0545bb330956dc510c936f133b8ae03d4fe57558d14cfd84eb99491bc883fa93e4d879d95b00907d06c90d8a83f75d2aa8d623fcac9859
 MISC metadata.xml 347 BLAKE2B 8592ff0cdeffa4dbd1206e33f7d4ef8f79effbebd99936a8498f898da908254f10656505e61d6495cece6a91633ef10ca055ff4a6d118c1ce1ec8b8b258352f5 SHA512 2fa469898a71bb5a922605eee46ee6f9a1460492d7098c2ad4f656bd89ab9ab3d4fd9314c0b65f283a2eddd670b40adb54b3be0a2669b5e347a19283a678f1d3
diff --git a/dev-ruby/websocket/websocket-1.2.3.ebuild b/dev-ruby/websocket/websocket-1.2.3.ebuild
deleted file mode 100644
index 3c8680009b50..000000000000
--- a/dev-ruby/websocket/websocket-1.2.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Universal Ruby library to handle WebSocket protocol"
-HOMEPAGE="https://github.com/imanel/websocket-ruby"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
diff --git a/dev-ruby/wirble/Manifest b/dev-ruby/wirble/Manifest
index f2f99fb36acb..945e5b5944f2 100644
--- a/dev-ruby/wirble/Manifest
+++ b/dev-ruby/wirble/Manifest
@@ -1,3 +1,3 @@
 DIST wirble-0.1.3.gem 23552 BLAKE2B efecdea2e23e6ae9c659586d8b58fae279bacfb1470f8985a4df23407a937415d8db0eef6d7edda19452479a11549cd642e318ebb65cf23ac7067d6b2d95274a SHA512 efb3b233ed13fa28f0a9b746311af24c48266b4f80ce42670550687a24b31bd90c5d0799d68aa0e797ffbffd1d3dbebe86ba39cb02e697eb426dfc9f8d606678
-EBUILD wirble-0.1.3-r4.ebuild 715 BLAKE2B 7195c71d6cb91192f812a5bb55c3b08b8793ada227254bdbced3b20bce4cd9777d6f059e346d5806da69c33b54f06142a89ea6d05bf11b88cf36ff400c4963d2 SHA512 4000240a434089b751aa45de7122e45a69357a36d6550787364f35b94e3a5d1a8ff590abc5c7d1368b9e977fe0383a4066d4f1e1bd671983242f9bf217be000c
+EBUILD wirble-0.1.3-r4.ebuild 715 BLAKE2B d1dff0289866156bf943a6030a4cd04e39cae19ecd1e80d73483354ca4c44ab243271f81f3a02457c9fbc7f791f4b340fbbf728bd93aafa67c0ac34c96a31ce1 SHA512 978bec154c14fa539d90f27c9c2ae0c341fea07f656a05a8ec9727daf556d6fb0778e2ad8e28927eab2e38c388593d40eb08a159fa4d2ba5d0ba106e5cec810f
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/wirble/wirble-0.1.3-r4.ebuild b/dev-ruby/wirble/wirble-0.1.3-r4.ebuild
index 6c641ae6d4f4..2918ee31189f 100644
--- a/dev-ruby/wirble/wirble-0.1.3-r4.ebuild
+++ b/dev-ruby/wirble/wirble-0.1.3-r4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README ChangeLog"
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 90c20724ecf9..d6db3e9cad02 100644
Binary files a/dev-scheme/Manifest.gz and b/dev-scheme/Manifest.gz differ
diff --git a/dev-scheme/slib/Manifest b/dev-scheme/slib/Manifest
index 77cf6fcf805a..263c683670fb 100644
--- a/dev-scheme/slib/Manifest
+++ b/dev-scheme/slib/Manifest
@@ -7,5 +7,5 @@ DIST slib-3b2.zip 1067021 BLAKE2B 1b48969ca2d0070efa596cca0a310d5cfce0b6eaa04e4e
 DIST slib-3b5.tar.gz 987735 BLAKE2B ad1e6e43885a16277d01f37582db7de068f21da5e10b23e034f5487ac8748303dcc9c12615884ee047dce7c246203f1d0d1cc375794371eae6854199d720c209 SHA512 e5d1210b70cd882cd5e810b3c4102d6060ec82fb2093f472bf31b597f6273e0a02f4d35a82c4b5c8cdc3f8b2c7b9e498fa3e35c7f265fa864cd9dc50e7a874c8
 EBUILD slib-3.2.1.ebuild 3861 BLAKE2B ca50ee84c84163761c49a02f00a54ca9b6d1e520befcc597ba503563a6041eb502e714ba0f6a371d60a0c5dd33e7383d2ed05eb51d10a5867c19059429d06c0d SHA512 032eddda11b6d5f196f7ebc77f5cd0c3d0c33489470e1bfb9b3a7f1ae744c2dcc3e6229c475efcd45be86e7ff206f80c225e2494430a3ead2fb4702600347462
 EBUILD slib-3.2.2.ebuild 4050 BLAKE2B e7dda94e5f0e8d84eb80fefab2ca6296bf016da2ec50ab575e28c110cf097feb0effa55aaa657c5717b933f25db50759b024f79c04797fb0d4edbf6057d3d69b SHA512 d44ec1a0e70ee5170d79c9e0c403c632cbee43f9d443070bbe45de98ec4cc8c09f3b9027734f9138528b54b1b9710728e87cef5f94951e1e39f69409e2318757
-EBUILD slib-3.2.5-r1.ebuild 2771 BLAKE2B 91e6333ab1f86b856629945c1302da22f19b3f7ac4c0cabdd64a9ff1efc4144b21184fcd61e12b5ff5a4d9d807541c5dcc183283a59ed3b801f788d9dd11fae8 SHA512 e3496009636165d73cd2ccd6b24e7aa21fc57840e4be3ac0e1ea6877369c3d1d0730d86ca31538405c5809402e3e788f86a3f6f7e5e8d99a1668f818d8da3bd6
+EBUILD slib-3.2.5-r1.ebuild 2770 BLAKE2B 19b8bab3fa247e634de7e804b8e129200f5180fde26d2560ef00cfef8b0bad4a9f5faa79dcf4dd9a2db5b2e2c585bcbac735e555fd06a7981e5aae1b798c02ee SHA512 2b712ecb043d7f0ede97a5bf97741f8fb59a78973c78f6b60cde4ab3c99bc81f0f62910fbff8d2b4619f968033328eee5d29f2ecac2c63e1c482e18485eb5c1b
 MISC metadata.xml 580 BLAKE2B 64dcf4957037aed50b50ea0648103f9b9f2cc040736751a1bf584464855fed650efe1d3e437ef122356e3f83f7c9b528ddea493193aebe49dc285a7066281d69 SHA512 5b75cfc410ff0ec6a324590f69001ac38410e963df6490695abb85132168cd37ccf685b9281026eea2fc82e59340fccecde58887aa3b64f88003970b979d5807
diff --git a/dev-scheme/slib/slib-3.2.5-r1.ebuild b/dev-scheme/slib/slib-3.2.5-r1.ebuild
index 13e785598264..9a91dbda1ab9 100644
--- a/dev-scheme/slib/slib-3.2.5-r1.ebuild
+++ b/dev-scheme/slib/slib-3.2.5-r1.ebuild
@@ -17,7 +17,7 @@ RESTRICT="mirror"
 
 LICENSE="public-domain BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="gambit scm"
 
 RDEPEND="
diff --git a/dev-texlive/Manifest.gz b/dev-texlive/Manifest.gz
index 86b1bcc309d4..00a1e8166bb7 100644
Binary files a/dev-texlive/Manifest.gz and b/dev-texlive/Manifest.gz differ
diff --git a/dev-texlive/texlive-basic/Manifest b/dev-texlive/texlive-basic/Manifest
index 6f1d3924eec1..2f7ed812af2c 100644
--- a/dev-texlive/texlive-basic/Manifest
+++ b/dev-texlive/texlive-basic/Manifest
@@ -333,5 +333,5 @@ EBUILD texlive-basic-2013.ebuild 1702 BLAKE2B 71fdfd7880bfa73365ca8bbd97e42492ca
 EBUILD texlive-basic-2014.ebuild 1670 BLAKE2B 8630493349ae85ea661b44e9e211bd12558dd72e1f630de4227dd5bfab590c2e812976970f226df2d5581a56faa7d59c57193752faac9ceae288bbca4af34b5d SHA512 b4887c336269bf826c81466759351057a19ed0047f82ae8b06c9eed1d483c500bd99a0b962bf62fda778d44758ff1f9c8e9fae6771d66b883f5704107a4ca061
 EBUILD texlive-basic-2015.ebuild 1722 BLAKE2B 08620f418a40d45fc413361520df51f35fec6d2eb80d74fbf01acd9678e9948881e7a2c4d5d878f6a29ffe0104ef7f82cf00dee0bf28fac25f29f0c18a50ecaa SHA512 d42b475db6259196281a09eb2e4ab9d058aa49ca1639131e5371388812a0cc839a9ec79cae2ea21b02d08f7097b2a7997925ca56704a6cb5654cec10cf153a09
 EBUILD texlive-basic-2016.ebuild 3224 BLAKE2B 3bceb6a883a0e125c48c49e6471729650fe8dc1c22fdc32cba5a7583a7b2f29796b0881f38484143a8d98afd602e72183763c8edfbf657f68b253532eb56e8e1 SHA512 da7416cbd7f4efd0efbff5315a9e5c91d11ee4d42a817d674b58c320a5c1dfd141700365ff9ef604fd379d302d2eec084e51d76c1eeca599cf6ca31e98c4788c
-EBUILD texlive-basic-2017-r1.ebuild 3225 BLAKE2B 130affda7b5ed74dc0477f21f2b293cc499fe2be9ad69e4f937d9b562a6ba70c86cccca64dad8a08bf97d2f86afd85e8e0da918a8bd98309669f5139a1a496de SHA512 182264ab8c4a69218e6e08c5ebdc0ad4ea6bce07327f5954f98dd2812b5efe600ca8e88fc53380d54878fa3fd927a241c1befe46d25748da6b65fb16aef24ead
+EBUILD texlive-basic-2017-r1.ebuild 3224 BLAKE2B d62c376477dbd263bbd9d8112242bd6498ba0c84c4a76e77058347cd817448d5ce35eaf4d66adfb19820dc3f35c953eb44e02377adccf0500881cbd7a6f99a88 SHA512 6453ac5245b012db021898b4943db0a6a41558a509369ddcf15bccab3388e4bf6edda1b81c30e04ed45ec394a1f43785c8cc85648d1290180d42459d50afc1e9
 MISC metadata.xml 688 BLAKE2B aa7b007f62d5b0a2abbf20faf44b53118960ba7cd36777fcd168ee50b41256a6cb46838e0b3757bb45f0e5c7fc5cb1b9ee3a53bbe9c23f2563cb852a24a810f9 SHA512 59ed72f217730364d768f0240839d7dea3ad2e6f01c9b24658e999f7e3415711ef1783e3260391bcfc9d396528d2fc7eb8d28ef96c7c19731f123574a2c64f69
diff --git a/dev-texlive/texlive-basic/texlive-basic-2017-r1.ebuild b/dev-texlive/texlive-basic/texlive-basic-2017-r1.ebuild
index ce9152f9914e..a39b2273a931 100644
--- a/dev-texlive/texlive-basic/texlive-basic-2017-r1.ebuild
+++ b/dev-texlive/texlive-basic/texlive-basic-2017-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Essential programs and files"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.3 OFL public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND="!<dev-texlive/texlive-latex-2009
 !<dev-texlive/texlive-latexrecommended-2009
diff --git a/dev-texlive/texlive-bibtexextra/Manifest b/dev-texlive/texlive-bibtexextra/Manifest
index a7d72cf7a9d9..440bf7decc38 100644
--- a/dev-texlive/texlive-bibtexextra/Manifest
+++ b/dev-texlive/texlive-bibtexextra/Manifest
@@ -742,5 +742,5 @@ DIST texlive-module-xcite.source-2016.tar.xz 3112 BLAKE2B 7daffdcd5a43e961c42618
 DIST texlive-module-xcite.source-2017.tar.xz 3108 BLAKE2B 805e383e43bb27febc97f160cd4ae34149fa33c55e16db672fcc30877a37e9b5ada8fa2d94a5e87b6d8607bb503cf9c7d4c1ffb357699f772079504f85d6be20 SHA512 f99d309c7939d864be018f8b33833534d15981a84307aa77249ce3ee259c4649d509ab1322be6318a4cbae85b753b37b594694b39beb628f6cbafbd6f688a151
 EBUILD texlive-bibtexextra-2015.ebuild 4240 BLAKE2B 92244bad9860483ab5145e3f40cdb3b4818b5af573a4096c236846f9a59a5a0691448ced86ff9ac9edb82b9be99f8e45b3a0626d0f9a44966b3ad904c6f20932 SHA512 884a45704da1da1485ad6de484e85fccf8e39897ae0ee58c3734a52f3c95f713efe1a18ef337256b261f481b3f168c93b1a4d968d63f82fc813e4c55d4661aba
 EBUILD texlive-bibtexextra-2016.ebuild 4903 BLAKE2B 3398edfbf07efb51fbe639aa681cb31cad95545bb58fc7acbb673c566b022f598005e5e36612a146cac6403c1cf3bf016bc737352c54d1b9bebe8d3d24b97ccc SHA512 2830a1975cbd7c64243bcb789792bf52bafa64b14b580626d803b8c13265f90315a7c304adad4d3a5448d3ad9839712b792ede2dc4f1131d10ba2cca8933d328
-EBUILD texlive-bibtexextra-2017.ebuild 5186 BLAKE2B 333b2c78a9ea976e6cd6d596afdcf9c5aee64cc614fa8f1d5eff24524956b3c62fe2cc320a344d383fe04058f8f222b45a8bef68311612d4cc6e8fb6bfdd8720 SHA512 19b4cfc23edf80258ba88b5c16d2b85d4e7fbe2352b34e90173c06382b98ecfae5fe397d8a1819857de0bb72e1e48461c0e8563ae7f5618ff9d00a4bfa2e0aab
+EBUILD texlive-bibtexextra-2017.ebuild 5185 BLAKE2B ead8240b5fbdd51b012aeab2d1d690a867de8bd98fe61df8f6ea16ec6fb3af04b00a3e3817a9a316705749b45481841a9cccac211ee8b382b46f6e30a12e5f7a SHA512 17371299ab32d6496e3a04e0ace48a66b53accd73e490aaa7d14fcb74e9f3b46cfef498b0d52bd87ccb2d3e453b3fc79cf6af5a26fa2628d1d88a1df9a12ee57
 MISC metadata.xml 495 BLAKE2B eaf4c29c2686caa7d176ca20cb28e092a895c5d1ba17b2023f5f59b7a01383e106582ad1ecd5c2f0fc3d8912a53311db98791b8799a4e52b4eab01c4cda2b003 SHA512 1209d61abc60dcffd50bd8e460b9f6130afd00da9d350d4a53a287ddda6a78140129c7ff036aeca4f008f33d9eedfb0eb3d7fd839196eb14cd4ee46da92d2429
diff --git a/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2017.ebuild b/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2017.ebuild
index 3cd3377caeaa..23f28801be8b 100644
--- a/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2017.ebuild
+++ b/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive BibTeX additional styles"
 
 LICENSE=" Artistic GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2017
 !=dev-texlive/texlive-latexextra-2007*
diff --git a/dev-texlive/texlive-context/Manifest b/dev-texlive/texlive-context/Manifest
index 802fb4ac30f5..3224ae24bc77 100644
--- a/dev-texlive/texlive-context/Manifest
+++ b/dev-texlive/texlive-context/Manifest
@@ -209,5 +209,5 @@ DIST texlive-module-jmn-2016.tar.xz 40024 BLAKE2B 5b4999cbaa4583e37af40b40ee82b7
 DIST texlive-module-jmn-2017.tar.xz 40024 BLAKE2B 5b4999cbaa4583e37af40b40ee82b71e8483ea5689a72c63f1cbcd4962ccd5eb737ebb77b665b56843827809d644bda24574ea1c2de1fa6d52ee159d890afb0b SHA512 cdf252d2e61f53444be69c4b6c9ab1cdafd865365f1d59f0c7d428825858153f213a86a5871e93bb3bb261ac4afa9c5391b2adb21f1c59d81bc6592711aeef38
 EBUILD texlive-context-2015.ebuild 3331 BLAKE2B 0f01efd1cdd744c56214a322de4462f1c0ef03fbf1e73052b1ed5f4e529835257fcfd0bd72f87c641419458a251c3a2a61e70a5a1ead441e8ced52ae48a15787 SHA512 a0e41acd624e8f0c2b2cf0c57a7d171642b6f34c96697c6fba89526f46b6335c43084fb0ffa85f5ed4975f74eeb3a3b55dbb5081eee2fe90ec6ec0117c01853a
 EBUILD texlive-context-2016.ebuild 3390 BLAKE2B 6763b062145c1ff60d8064a199c9b007da5a3348e3d69fd433f2ec462c66e06b381eae77379a4cb9a90b766358a338d6f6b5a7944f2ca39449dbad3a8176ac24 SHA512 29bd33b405090ec461ca6ecb76ad38130838bdc8a3e82529f7de67eda88cd23b0960f84039e54d3db520ffde08616b9fd9262c87b7681adeb289e620fe211369
-EBUILD texlive-context-2017.ebuild 3401 BLAKE2B 641916d3a75011b6fbf75ffd99e1721d56ace318b19c47251a6485bb64d6633af988fbff11c9c2a7f253dc0b6cdb9665f51aca873d7c3ec2b9045973bb3c5458 SHA512 a29c483f6a113e9ada50df4c058ed1c4f8980fad809ad354a2b39053e90a5e38171c9463535c9efd12270545619d70d7de9ef54d32c0aa17eec3e6e4c97d70d9
+EBUILD texlive-context-2017.ebuild 3400 BLAKE2B 08f88a3b42406ebdcd4e519ccc32e47d03ed1d9148e59ea129aa7c102bbdabef4a0aa5bafcbd1c41523618661a45e5ccccf406f6e3df2d6b4d359d78b9ce10be SHA512 6d19edb3f801f87d345240a56d16ab3356073399f556bd79dc583cfd2f35854b52bc3bab0237dbba3863ed6a410a6fb1b577db1bc41a77f6d46c43c0dfb0f520
 MISC metadata.xml 517 BLAKE2B 18bea3fc4db71d01c85ed3d254367f5cc9be257dbbb6d524c2fdaf87215efb617bc2268bd598f3c69bb8bd3b1bb1cf529268db118305fc6394bec447504c72b3 SHA512 6a05b0aa2626563c21edc01c8d842ac54e7533420e86d41d91a2f6730ef1dabcaf96bc2d68088a9ddf89fae4a932b9bee5dff998b75c1824d789cf6937995311
diff --git a/dev-texlive/texlive-context/texlive-context-2017.ebuild b/dev-texlive/texlive-context/texlive-context-2017.ebuild
index 5fd733928b65..a6f4437ffccb 100644
--- a/dev-texlive/texlive-context/texlive-context-2017.ebuild
+++ b/dev-texlive/texlive-context/texlive-context-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive ConTeXt and packages"
 
 LICENSE=" BSD GPL-1 GPL-2 GPL-3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 >=dev-texlive/texlive-latex-2010
diff --git a/dev-texlive/texlive-fontsextra/Manifest b/dev-texlive/texlive-fontsextra/Manifest
index bdbe190d3257..4695fe00befb 100644
--- a/dev-texlive/texlive-fontsextra/Manifest
+++ b/dev-texlive/texlive-fontsextra/Manifest
@@ -1664,5 +1664,5 @@ DIST texlive-module-zlmtt.doc-2016.tar.xz 53496 BLAKE2B 21c8fb0408a61ac64efb5437
 DIST texlive-module-zlmtt.doc-2017.tar.xz 53516 BLAKE2B 58c88b219e36bb4ee1379468b2995713c729edde8f36f18c1f6209b74cf8122997caf27f24d3bc8072ee0ece2ada0542e37816bb56c2de20d658739f0c4ff246 SHA512 834220fc28cda484b15cca0b896124a98f3664686582490c19582644524cdedd111e0ec500cdb4fbd45dd0a4c3ec9d647ee4a5a4de699f6b6ed16a67e7221312
 EBUILD texlive-fontsextra-2015.ebuild 6636 BLAKE2B 3989b0191b27a60d3d21e1f63eae24691491380d8db26e5df29ead531b89b8010dce36a97f58191a67d32ebb8c0c205fc37ab5889b213aac032c707702e54743 SHA512 55f849a5f5404b150a5ab657ee4a8f8fb3a83187b9fc19e7cb8d73897777549be70b556ab105ed35b41802907cbed8ccb52d5bcfaa736b9ded8de96c33ad799c
 EBUILD texlive-fontsextra-2016.ebuild 7447 BLAKE2B b28ea9f6ac33e106121cc6ea9810a269e1a88774cdf3de93accde179373f6a28ee4e0363facf55dd851c3382d61e2022dca9e48debd0c157f4a82325cccce27c SHA512 cf782c23daf034de2537aa5262708b7f8e46e9fc58bcfe30a485e7665273211f6db3cad7c67b57f3bb840dae3c14845256d22ecf019dce5b83a4a7e9f0ab032c
-EBUILD texlive-fontsextra-2017.ebuild 7507 BLAKE2B 80efef84f089cb77fb11b6f188161064ee0f900c5427800fc307df0a87f9c0ad07e431b401eeca1cd94e3af5380765c343d3241f9bb5f442a9dd85d61adcf84e SHA512 d2ebe12249628e65cd8a518cb94b496d9d4278255b7c77d2efa5c0fb5a0e9dca1cf4b059ede14d0b0c61567bae6e66cc7cb53c42e05457c30f665656b3757133
+EBUILD texlive-fontsextra-2017.ebuild 7506 BLAKE2B 1c731ff08fe70555073387efaf235b1866408a1b3d0f591acfbe9be50629b6821e05f5cc7807153825462372cd25389fd8d6bf36c9d5c2b5cd2bb6925078117e SHA512 10d6e578fc0164e8bc6e696a38e6c15afb14647996034568636dc60dfea88c9ddba69c2c302c06950ede2181d2f34ce324fa725cb36de55151ad47726cc8b26c
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-fontsextra/texlive-fontsextra-2017.ebuild b/dev-texlive/texlive-fontsextra/texlive-fontsextra-2017.ebuild
index 244537a4a0e0..c1a094842a11 100644
--- a/dev-texlive/texlive-fontsextra/texlive-fontsextra-2017.ebuild
+++ b/dev-texlive/texlive-fontsextra/texlive-fontsextra-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Additional fonts"
 
 LICENSE=" Apache-2.0 BSD GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 MIT OFL public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !=dev-texlive/texlive-langpolish-2007*
diff --git a/dev-texlive/texlive-fontsrecommended/Manifest b/dev-texlive/texlive-fontsrecommended/Manifest
index caf8067c317b..4de19305b2a0 100644
--- a/dev-texlive/texlive-fontsrecommended/Manifest
+++ b/dev-texlive/texlive-fontsrecommended/Manifest
@@ -191,5 +191,5 @@ DIST texlive-module-zapfding-2016.tar.xz 46960 BLAKE2B 47d0c14c5d540178ee2639a2b
 DIST texlive-module-zapfding-2017.tar.xz 46916 BLAKE2B d9aa25802f203bd2b08dc503c8e163dc0a404dd0629aa5a7a1e28543c85f3b59695d480789eb0b11408490aa72d8e8716ab9fed413641cfdd4106ec7878f99bf SHA512 d7efd293f6e0616d1a633615f9bb79970c829fb99a7d5c1b6c217058ee74f29492fbc303a35951140a135d7742b58609c693df4eeb1ecdc5f63cd9fcdb177d11
 EBUILD texlive-fontsrecommended-2015.ebuild 1390 BLAKE2B 0611474b755f436a3a346da7bb4a06c789e873405713d749599d77a76c875b7aadb2331ce0d19bbe96ebc7e71f0a5e380074b2c7de54d860717b799bb18be97e SHA512 83303017badad9096a7f724c58dec81169d63ced6ac8eafcb36f66b7147b146e51679fea0b6271758558fb76ebc375557bd4e3a5ae05d361c9fdd30f0244c6c4
 EBUILD texlive-fontsrecommended-2016.ebuild 1429 BLAKE2B d1e173c6a3444ba682cccf349829218469bf161f0181da39c19fad0f854f6fb629e7e9e626ad21e3949533ce8ab92ff621fe6220ad1f09fadd236a034087caa3 SHA512 e09f522f15d8b033a149e0bd07dadefb9fa7194a1cff1bf38ecf6fd6bb2fafb64397fe2d1f8a78de61e3799b1bbc211210d910e8a9eac233e008122c27db082d
-EBUILD texlive-fontsrecommended-2017.ebuild 1397 BLAKE2B 7d5ab62f25ddb1477b0ae46eb260beed22c7d4870705f841a1b910eeb7b22c103201f3fd636de5015db0e1d0873a18d6349a41f46374c142bff67a7e73651dd3 SHA512 e7829a6340d119587e5e6788348b439d03da84033094d123f6f618a6871c82da946b7cb640405ded10f77cac7114aa17d6b9b94d6d2c453c1a2921aad06f8f75
+EBUILD texlive-fontsrecommended-2017.ebuild 1396 BLAKE2B 269a0c797a025e5d294e0849bbfe37798a7366e4212214e35642e755cd44049d669098e4126e04fb5ce574b609a0ae59f27f01f46dc7c9a37a5f6cd32c689ee5 SHA512 2442c48c72c340f91a28e5235a25bf120ae297f0dfddffa14f2e0123e29c1b09719a346685518a807a43a94561361f9beac6de3ce33310b3412e14281c1209b9
 MISC metadata.xml 569 BLAKE2B ae2ca0d4582cf74769c8537a954af064ea8e615318b8aa1d23f8ada27e6c8c41dc177654bf60ad9ee99fd29e14472ee79d8859de134bf50100aa384a10a69dba SHA512 0753e724c31d9af811afffb43e2317076a8f83211d5a45eee3f5002d8bcc5e424af95b5582d6b556cd2f42133984f5e0979a399d812f3844def897643344b101
diff --git a/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2017.ebuild b/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2017.ebuild
index 09b73825018f..f1c8fcbaa6bd 100644
--- a/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2017.ebuild
+++ b/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Recommended fonts"
 
 LICENSE=" BSD GPL-1 GPL-2 LPPL-1.3 OFL public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !=dev-texlive/texlive-basic-2007*
diff --git a/dev-texlive/texlive-fontutils/Manifest b/dev-texlive/texlive-fontutils/Manifest
index ad1c7935514c..caca7684423f 100644
--- a/dev-texlive/texlive-fontutils/Manifest
+++ b/dev-texlive/texlive-fontutils/Manifest
@@ -96,5 +96,5 @@ DIST texlive-module-t1utils.doc-2016.tar.xz 95856 BLAKE2B 7eb77e6f98b472001b4d34
 DIST texlive-module-t1utils.doc-2017.tar.xz 95856 BLAKE2B 7eb77e6f98b472001b4d3484840b30002ab079cff6066759e38a6635abff28b490ca6bf4d80f483a6237e195b20e4f00144a184c839ce92c0a070343cbf8c74c SHA512 59f3c52154ad0e443f35b5ed90cdecc201295ccad18dc919e8b41e9c5ac636502332e50a00febc0716702606eb98f2b8ae9438f3f881cb93fb81b91c5150451b
 EBUILD texlive-fontutils-2015.ebuild 1623 BLAKE2B ba8173335c3e0cccfc7e16b7cf15c89a053f70918a184c47a44ba1e98bbed4337891dc087baf19087206e2416c270a1cfbf9bb7d6f2d97aa4b25ab545a2426a0 SHA512 1bf8ed4c31a3e75a208d4fbcf71c5eded16b8c3ae0ad0b60766b92fbc7141533670984728419f26423740e357b98b25d685b30bf5228efa0ac9ecab8f3f9b5fd
 EBUILD texlive-fontutils-2016.ebuild 1641 BLAKE2B 99ecfc5d05050363cd18b273307b7dd79116c58417329751d587e461bb5e2398bc84991f4c08317a2350c26901dc6957af1eca345d71f4ef986534416e3f84b0 SHA512 a7e3f93f0a9cda43669fd347051f4350c6c513bddf1754854b894e8ec71115a23d6f3f2aadb053b4a5d46c8091d30454c3a90738cdd40bce26b9257b414586d5
-EBUILD texlive-fontutils-2017.ebuild 1647 BLAKE2B 9eab3f33664a631515d59bc2bb5b642890e7beb9dd07b3a9ecae1d89f82bef13b5b52852aa11ab1f41f9da167901409b6e967122dbad67ec2512fb8f95f1a49d SHA512 8041160dc99be841767ea32f4a69679509013298c7b2266993726f8450a49e9bfa0738817273129bac18d75d0f5126e99c6b88e9ba452d5e0d135613654d8aba
+EBUILD texlive-fontutils-2017.ebuild 1646 BLAKE2B 28b3fe28dc24c67677d41b76341455d1b2151764b293f987d559a1217ad1633442a81f14f6c25e6d737a02e7fb52f8a146b1f961b71881eaa4dc25a873b029f8 SHA512 51f6b4e2cba4eb93b6a6c668d940565b88d6af46cc071037ef9ada01b7d542989a9573be3c16b338a05f2ed5e55e675481434afec84f17b8418f3f802adf1938
 MISC metadata.xml 638 BLAKE2B 309dd88d7961480feda8e50f7c6c2f63274d24fd2beaf6c751cff8224243fbb25f23c176c92df85f0d09dccc8f6a90c9f63a301bb2c8527827aff6c97df85410 SHA512 c2ae5eb56b99612125ed6063f369979c8888a6b253a3a47bb4f125f45a8923207f13d5eacba69ef6af3717017a50e1603e17701cad95b484270c5715cf2c56ff
diff --git a/dev-texlive/texlive-fontutils/texlive-fontutils-2017.ebuild b/dev-texlive/texlive-fontutils/texlive-fontutils-2017.ebuild
index 206b646449fe..1cd5d6651200 100644
--- a/dev-texlive/texlive-fontutils/texlive-fontutils-2017.ebuild
+++ b/dev-texlive/texlive-fontutils/texlive-fontutils-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Graphics and font utilities"
 
 LICENSE=" Artistic GPL-1 GPL-2 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-psutils
diff --git a/dev-texlive/texlive-formatsextra/Manifest b/dev-texlive/texlive-formatsextra/Manifest
index ede6c8b92584..83954d80b8be 100644
--- a/dev-texlive/texlive-formatsextra/Manifest
+++ b/dev-texlive/texlive-formatsextra/Manifest
@@ -73,5 +73,5 @@ DIST texlive-module-texsis.doc-2017.tar.xz 130016 BLAKE2B c64cf692a8582dcea4ddcf
 DIST texlive-module-xmltexconfig-2017.tar.xz 460 BLAKE2B 48985abdf4e6211a630fc928184d1bf4a93b1400c4fd7b9964e64ee9245e1e9357bff437351bf96abf0c20b8c835def9549f4af47eac50d53dc0d46e300a1957 SHA512 20d6c529e0772be2c31b1f47d353f19981c0c0c1790a7e025290f2715b747fdd189f6cb51f6cb9faaa990461e9a30d829854cdfedefb1b20cd1d362e13323c8b
 EBUILD texlive-formatsextra-2015.ebuild 855 BLAKE2B 4caeb81ac40eff97ac794179c4ab1133b4bc7da411bd0f27ac61cf91769938852ff6e4540f2aafc960f2331e99f1b2dcb1717f59418c84df19a4cd8b3c92a43e SHA512 6609dab2676c3f2d6ad28a96bfeecb8a97a40ac45678eefebe46163589ba8c5c3b7349df45a28bae4080fd67932fffe3273285317e345a7d825eda4bb39d49f7
 EBUILD texlive-formatsextra-2016.ebuild 866 BLAKE2B 52fbfe70db78a94d37f3438aa5e6090cd6f92145ae1881972736b0e2e0e3167bc2c4be23cef35eb832bd173884cebd6c6eb575574a256cc0690b09ef42e359d9 SHA512 307a695dfc9c40a722b2f7bda478c888d0f4777c85c0531c5c34b102c3203f8f65f1cdc44d8a258139599370091129664c194b5d7961c6b07a3b49409b7b5bc1
-EBUILD texlive-formatsextra-2017.ebuild 1218 BLAKE2B b404a31169956bd7f476dd9058f8b95f5355cdf5be7757865d11409de53fa85b0920fdfa356de543ff3022e9b3307501f7b21f5bae18e5b714f01934a07415a9 SHA512 3264fe0863873809a3b4f35e579d91fc2350c4e8b72cb18c864a3612cacc0981b2e9088545d03bd762ab37a67e7de6e6d0c9b8d726282966878f8ef7e8b2ec78
+EBUILD texlive-formatsextra-2017.ebuild 1217 BLAKE2B d7d6c2da621b78e87b1b6eae0ed2c62db1bba45a9f9c7b820db5eec82d69aadfd08ede5a94e756a166fe3b3eb32995424365b8ad79d1965fef8f82e0ab61d2ab SHA512 bc896e4a55a06d9e2cffe5f618c7e3d912bb6333e522f953abbe9b2aaf2b671bed5260ff154aa01bc82c5f49daba23dac084e6aca713913a85a9c2da0c40b139
 MISC metadata.xml 683 BLAKE2B d76a08b76354e21ad30a29835dc19c8c280313b330106276ff74f9221265472565ae8dc5582cab4963450482513f48a281af0adf7e2ebaa9adc7de2a14274975 SHA512 044d70fc0c48a776f9d169e0c5abd41c29ffc2508f05c175f301833cbc64f39f841effa2dab8a3b8c7ca94d487c25f3412593d3b173914c826874236e66db556
diff --git a/dev-texlive/texlive-formatsextra/texlive-formatsextra-2017.ebuild b/dev-texlive/texlive-formatsextra/texlive-formatsextra-2017.ebuild
index 022213fc1d0c..13b0322a0bce 100644
--- a/dev-texlive/texlive-formatsextra/texlive-formatsextra-2017.ebuild
+++ b/dev-texlive/texlive-formatsextra/texlive-formatsextra-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Additional formats"
 
 LICENSE=" GPL-1 GPL-2 GPL-3 LPPL-1.3 public-domain TeX "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 >=dev-texlive/texlive-latex-2017
diff --git a/dev-texlive/texlive-games/Manifest b/dev-texlive/texlive-games/Manifest
index 2dfe44b23ee5..c078250c424b 100644
--- a/dev-texlive/texlive-games/Manifest
+++ b/dev-texlive/texlive-games/Manifest
@@ -228,5 +228,5 @@ DIST texlive-module-xskak.source-2016.tar.xz 14252 BLAKE2B fe640843de6ee3a74bde1
 DIST texlive-module-xskak.source-2017.tar.xz 14244 BLAKE2B ef03e62fd8031626ba3678f8812b13eaa416252ac287233bd696679d31abd661b5a2ed88b8b4624fac0ba9b7ccabee9cb9e32c38dd7c7bd1f1e4f2787cb04169 SHA512 91f482e0ac3d798507583729fde18a1a014c6f5e71507fb10f4c893613661488953529f78496bac476a6dab9d3d896d0b6eb902eb166b77b78c90148afad0375
 EBUILD texlive-games-2015.ebuild 1641 BLAKE2B c6df36330b7f4c8197a61399b75a2e44c55b69f63863ef4ee9f77ecf3713d002b25a18cff01ac2f41bb40bae0c581828ffc184575605e0a24baf073dde9fa7e2 SHA512 a2f2c66788974f68e16d0e6886a491628811c5e27598ec3ca1c7859079fe93190ec883f47fac696b4e228a7753b0e4480b76aff5ae0c1c011b4904a69e746b99
 EBUILD texlive-games-2016.ebuild 1679 BLAKE2B de35db32c8b09cfa753c54a8486487dcd3a58a5b738033ff96e4fe062c6762978ab06d0d90b4d4a2761da3f4fd248e1b3cb6c9428de503602aa0a57190b3481a SHA512 40edce778f8ac4e22b05258667c42be1fd6422b99f4334b1e3beefbf62dd5bf0d8f683f44a0dabbb5f4a3d0c67d0010a0c3af5558f0c76d8b0a5a3cbd451d1d5
-EBUILD texlive-games-2017.ebuild 1691 BLAKE2B f4cb2edf028c54150566bf478c0adb23620fe283e8e4e64859b2c7dcdc189ba6f60f0f76941a1ed6c278b51fbf7a8931f17de64d5fc8a9c278c0369c6d3b28d1 SHA512 6f51de7f35de90331fef73e868a1baee45df20636aec24f38b742fc93d056817f9f7dbbe4be8a0616d3d787b76d1e19dacc7be3e0910d02bb910c889c713a692
+EBUILD texlive-games-2017.ebuild 1690 BLAKE2B ae44441cf9bfd7f0ffab0733ed5a64cf1b65242932253abc97685097f8eccf008916c068849735413404db5840f9e068b39a8b655c971c209452e1e3cc6937d7 SHA512 53645954ba45c865b54fbc0b875a1cba9e9e646e8a65495de85fbe97b8bda16d791e331153868eae32613e8bd48c84a66a9e4ad007954c789d0906217a735869
 MISC metadata.xml 465 BLAKE2B 3de0cdbc6aa2d82d9014a125adea187b4c28e22ce8da0eae7b50d4a7507beb618869f282d8a5a7258edacb43e26038f9704da1d61a86ccf86baabfeccc3f3d99 SHA512 026164fc27101f4b41d1a2b5a979762d3f75f1b0f13d74b7d3aa617ebe24d92708c3f68c7d4d12887c821b3f799cc0528f38f0a20507f5ceb1e427f300d094c2
diff --git a/dev-texlive/texlive-games/texlive-games-2017.ebuild b/dev-texlive/texlive-games/texlive-games-2017.ebuild
index 45e54cc5a61a..6df3087a5f32 100644
--- a/dev-texlive/texlive-games/texlive-games-2017.ebuild
+++ b/dev-texlive/texlive-games/texlive-games-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Games typesetting"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2017
 !<dev-texlive/texlive-latexextra-2009
diff --git a/dev-texlive/texlive-humanities/Manifest b/dev-texlive/texlive-humanities/Manifest
index 7f32390a9505..a3b69af8dbf1 100644
--- a/dev-texlive/texlive-humanities/Manifest
+++ b/dev-texlive/texlive-humanities/Manifest
@@ -375,5 +375,5 @@ DIST texlive-module-xyling.doc-2016.tar.xz 148336 BLAKE2B c5713dfb4cfcbb53358573
 DIST texlive-module-xyling.doc-2017.tar.xz 148336 BLAKE2B c5713dfb4cfcbb533585738d9f84ebf906f3b86b207cf846261ad89e279ededaf9ecd418a8f2af882ad26a1af11a5a9264f4b497a4c2096262e78e0c666ffa51 SHA512 66da3f3cd34f67c078102731dbbe218fb000e96727a244c70cab046836e85af89fbb3987ec2696bac85885ed277a6e33ac955214924265be639ff228382a8ee9
 EBUILD texlive-humanities-2015.ebuild 1984 BLAKE2B 678d593214418f3e09d8edcc52525594de0d621ac11369535f724bb380213456fe9cc76a4d925fcb92893943c5d81e0da2a117949b3d4085498d202f1c4eaeaf SHA512 90194819949102591cb8f378da050701ed766865e1cb167fa724d38822b07c45141d20bbc4fc90ef8a5fc6683229c30397c6ddcae1ccb691ca10f24ae9a412bd
 EBUILD texlive-humanities-2016.ebuild 2168 BLAKE2B 1b08839cccc0590ee88549bf1fc5ff14450a86996ee6483e85227e62bac219880bf0b9067f65365112873adbad1be55043d0bdd47fd039a5794c3dcb3771c850 SHA512 33cfe4d2f7ea9d94a198a69b2cf23b77d90da98b03309f1727d86dd25be315c90062235529b2fabae3e48dcdd142a6817d23effd050c2a00af3b0924f4b33ce0
-EBUILD texlive-humanities-2017.ebuild 2180 BLAKE2B 952b3bf700d30b3970b2c1b7472f028dd40d5ea55efdf57795c0b946816379df22a3bf2a02b76f6baeacdb8cec93517255daa3fd1bf5dc4194144b17a45f9c76 SHA512 8af62ace9f190caa52bdb883beb263d6c1420a7e8671f7bf1c257a16c1b4471e1586acf8b0899a913cfb679d3e3327a6fbdd3bba24e94f4ec51c0a1d62fb2931
+EBUILD texlive-humanities-2017.ebuild 2179 BLAKE2B 00dc392fdce6660bba6416d0b752098699c15727b578c835026427915a1f56b97dbd1f5fdf04df0f90a43b207b0d2c79457ffa11b6bb1a88159dea3c83031619 SHA512 9d6342b4158260762011c7dac44129ad5fd5cf9e347025d3c496229286fe18fbb092454f385884c8573d8b2836e2b690c3112157e962045cbc285f3be509945f
 MISC metadata.xml 475 BLAKE2B 2142cba5684575516bfc39a7ce98a7f5a496cb309e7d21d6f90f13d5d9999291e29cc3d85f4b4242acacedcee02f0d224e27d6ace55e69c7a0e0fae38360b278 SHA512 32785127247aaffa27bc13a63d6d39b50084b437895ae3eab812e9a047efbda0e59ff3bb8281654148f6c3d4fccbd2223c984b92b7a38825efdb19083296567c
diff --git a/dev-texlive/texlive-humanities/texlive-humanities-2017.ebuild b/dev-texlive/texlive-humanities/texlive-humanities-2017.ebuild
index 13e50dc6fe1e..c5ae0d275a82 100644
--- a/dev-texlive/texlive-humanities/texlive-humanities-2017.ebuild
+++ b/dev-texlive/texlive-humanities/texlive-humanities-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Humanities packages"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2017
 !dev-tex/lineno
diff --git a/dev-texlive/texlive-langarabic/Manifest b/dev-texlive/texlive-langarabic/Manifest
index 37cb618120f3..56b547b6b874 100644
--- a/dev-texlive/texlive-langarabic/Manifest
+++ b/dev-texlive/texlive-langarabic/Manifest
@@ -102,5 +102,5 @@ DIST texlive-module-xepersian.source-2016.tar.xz 71732 BLAKE2B ae89d5f706af05451
 DIST texlive-module-xepersian.source-2017.tar.xz 70908 BLAKE2B f2e1a6422ff0faa994c0b38a391786cac7b4c416dfd66c3586a15e61de62cc84f3165f93871a1cc4c61485b2870d1d76fd9058c344b168e079ab121ea19a274a SHA512 be7fb30ad51937d2c500ddc48bff37bd8b8d109b08c7118f913e6ed145d8c7a1fd327b0f1af98b039f0587c455d1d70bc9d27f3527ae8b2709e87fab3008e3f3
 EBUILD texlive-langarabic-2015.ebuild 1061 BLAKE2B 7420181b852bc970b4f0b1da994063bd3680b34b70568114227a71e7911f094487517947b546f0618597839f2639c1b00e8b9659934defdcea030ce02a2baafc SHA512 3866788553d62879b1c639ea0ec2ec2692bb208dbaade1b64e184501f1ac1b2c545ea334e40e5533c29609a3a866201efc9d1db119e7b88bbc989ed3563ee7d8
 EBUILD texlive-langarabic-2016.ebuild 1204 BLAKE2B 5c7bd475b696ef312b9dc3dc35acdc5bd07efc4191de4c90d42c0a55f24ba36573d99bb94ce03b5e5519f8b98ded1505dada515b2519ab2802c5d49c0ce08cf4 SHA512 827155b4be0245106d23b678404d6a179905fd90b3c95aa1af3752e8018c20e03709d4ae500906d949915d678523c21a7140e1c588f640919d8547c0815ea02d
-EBUILD texlive-langarabic-2017.ebuild 1233 BLAKE2B cba285698463ad781441eba5ba63ff875af09fbc1d6ebce44afebb118043108aeed4787ff08f162463230201b17b40eec81950de2eea778717aad22814579cec SHA512 a8da008306167e1ab6cd02ec597309be850a0e70479b7d48d26cb3058e285682ed3c0c4f25690ffe8f067ff8e5bdbd6b87808ea38a18ab9ad841a6fba8316a91
+EBUILD texlive-langarabic-2017.ebuild 1232 BLAKE2B ad8337f9d135985bd6ff9b4abb39595a33d20f31546ae2e2bee4ee46a676889a38a6cf9547a22f00f457f451466651395681ba4690851f37cec397aae04b4de5 SHA512 c65cd953a91d533cd7c0a6bcc80302529c1bfbe2c4c1750b78652e4a42b3ca5434fdb6fc2018347453414908cf2cf33ef1befd7321d3d6821bcd6da623ed8d83
 MISC metadata.xml 442 BLAKE2B 736ea2f06e692dd1cb0b4438d8387f401012d78d427da16aa300d9e875fe9f531ab1cf7837d07e131f93a40868af960925fbc300de440b3b0c870d7f444edc19 SHA512 152893abd014e6d0faade3d41cc1664b3a875f0bfcfc5788e52ede435a7b6aaf7a1f7b717dbe52347c515740071353f160187961d5dc80e58773870d42115b9d
diff --git a/dev-texlive/texlive-langarabic/texlive-langarabic-2017.ebuild b/dev-texlive/texlive-langarabic/texlive-langarabic-2017.ebuild
index 3832c65066a7..00af3d80f57e 100644
--- a/dev-texlive/texlive-langarabic/texlive-langarabic-2017.ebuild
+++ b/dev-texlive/texlive-langarabic/texlive-langarabic-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Arabic"
 
 LICENSE=" CC-BY-SA-4.0 GPL-2 GPL-3+ LPPL-1.3 LPPL-1.3c OFL public-domain "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-langarab
diff --git a/dev-texlive/texlive-langchinese/Manifest b/dev-texlive/texlive-langchinese/Manifest
index cc384202ffd4..f5b40720030d 100644
--- a/dev-texlive/texlive-langchinese/Manifest
+++ b/dev-texlive/texlive-langchinese/Manifest
@@ -126,5 +126,5 @@ DIST texlive-module-zhspacing.doc-2016.tar.xz 169376 BLAKE2B 45808ff96133386df78
 DIST texlive-module-zhspacing.doc-2017.tar.xz 169380 BLAKE2B 2576e25d7f1d1fbe8d6c79267296473396bde0e88fa5072f0a0e47c6ad43da60170f44c9ae0c2ef4016abdaa915fcc52768051af0e97378a60f356b5f5218508 SHA512 0232956c6b105b02dcc036be0fb5bf761dd99119ed9a339db2c882bdff9ddc5ed17b351cdb0dd297c76760b298306db268794f73567873c62d7eb361a60e0fd7
 EBUILD texlive-langchinese-2015.ebuild 1330 BLAKE2B 041767732d0432a9f2e3e94812112cf4edc87e2636405bfbc4637dd462c556461ec01d336dc2e3049efef08c7c8b59326964b58c738b0f0958c1f9597c9d331e SHA512 ff6c43158d33da0115af1dcdbbec5fbb72a101e95ef61387d42e9ccc81368427d949a50c8e09e770a04dd2b45a62aee7e83a427e87fef7acc12ee70ed31d1a15
 EBUILD texlive-langchinese-2016.ebuild 1472 BLAKE2B 0b97940fae8153ca85373518010b8f173ad73b3df297604b4e5f1fef990453b055da6069092801beab766172d2b24e5057f7ba80c444feba819304879a7010ae SHA512 7bbd67fd50f2392f41cf9113fcb9ffcf7bc3f40a1d664ac92802ed63bb55a9b38e942d1620cebcceeb0307f8271612c595d50a90b9a9bda677f9bd37fa8673de
-EBUILD texlive-langchinese-2017.ebuild 1477 BLAKE2B 81c11c690adffb2e9d6151e87d266b0550cafbf1d1862e44993cdbaa1c79e128c2522289cdef9e1fc46ff97e55494e97ed7b8b979ee64d996fe0c36ec44e3f13 SHA512 85911837ec2af8c0bf3996bb1f32c0f603f3bcb1a603d1b3566a0cf9ba38c47c3f6eee2ab6fc7cc51204cf8ad8cf67f933f4dc749911af4a04a4c594aac14344
+EBUILD texlive-langchinese-2017.ebuild 1476 BLAKE2B b2b374d49621ade2f2ad5cbe06596c974ca62182e4f0536738c8147256fc05e872ba62c2ec8ec145f6695cdacde075536b814a6244dc4cfe2de7179c94cac0bc SHA512 39d09faa9a53ccef684eb360ed6b1fa33c8b0b1dd8d502f723214aff6aa3369dd6fe6d536cffae0ceaf8f9699bab95c05bb7f87348a38c390a2c17d3fb884c7f
 MISC metadata.xml 474 BLAKE2B 747a030b403eeaf6d99ce9fdf27b18216b5d4f22d07d93360e4055a25e7aa0927d4d2ee9df26afdf67838027cd2bf4033a9bbb2efa2a8cfce5c9894bfa6eadc4 SHA512 4916435018bf6a3a3a4ed6e2b140c6970bcdb9a97dd0fc55e1572436a1d58ce0063c0d48de606fb266fccd470882d7643ead61a37e4cce6cf5d326ea39526aae
diff --git a/dev-texlive/texlive-langchinese/texlive-langchinese-2017.ebuild b/dev-texlive/texlive-langchinese/texlive-langchinese-2017.ebuild
index 8ccd957461b6..5aab9a646a11 100644
--- a/dev-texlive/texlive-langchinese/texlive-langchinese-2017.ebuild
+++ b/dev-texlive/texlive-langchinese/texlive-langchinese-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Chinese"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 LGPL-2 LPPL-1.3 TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-langcjk-2017
 !<dev-texlive/texlive-langcjk-2014
diff --git a/dev-texlive/texlive-langcjk/Manifest b/dev-texlive/texlive-langcjk/Manifest
index 7d14d65c8f6b..94e10dd27035 100644
--- a/dev-texlive/texlive-langcjk/Manifest
+++ b/dev-texlive/texlive-langcjk/Manifest
@@ -62,5 +62,5 @@ DIST texlive-module-zxjafont.doc-2016.tar.xz 135392 BLAKE2B 45ed0bc4943682318cc4
 DIST texlive-module-zxjafont.doc-2017.tar.xz 135392 BLAKE2B 45ed0bc4943682318cc489f1c9a08097f9b5c7c8cf53320eba6a379b5238b2f0319becb98f1482c98b59b5103595703b25a06f32671edb02f8283518d0864dbe SHA512 27cd14f91f64ebfb2e4076895bf04a31f5d0b21acf4a9fee8e3c816c847bb45e894e0dc5ed5cb06c8fe425e75352d975b800511afe38af6f952b37ed1b0c30a8
 EBUILD texlive-langcjk-2015.ebuild 1169 BLAKE2B 9d4411e779b0806846f0a7118ed6d063bb8c8f934c3450b185058ccdf006439e27a98a4c12afe96126e4e3f7d17acea1dacf0d37668bf5068c6d510f157da246 SHA512 02e83ce9e4d97d3888de92d08167765b6df8eab5fed0aa71cdbee7c7ab612699acf2e84526422e67beaecbfc325148dbb3463b424f25539927e0744b12eb800c
 EBUILD texlive-langcjk-2016.ebuild 1210 BLAKE2B 857fd3f3becf0f3c0235b0fd8a962048ada09f95da91b95e42527bace6ef97eafb5035ef37725d64e6bbbb0a68e562263b87f30a02637d2331fbee0cb986bb06 SHA512 ef2415142050f91c49d4bedc445ff7aba975aeaac0ee4963bb3b71bc8a978613953c42f27a5290c138e44ccea81c365a7abd18834a165c21a675b671af5b6353
-EBUILD texlive-langcjk-2017.ebuild 1258 BLAKE2B 89e8af306c1e6440789c107e091d487d2894d6e2eba77e1469b79c3b5cc8932aed312366865dac6bbf69a82f1c3cfc4576061eb37cf5290241e5f1d0752abb75 SHA512 d0e8e8e4eac939bf7f2a6e111c4685108d5a57f491bb8f372a20013404857f3987a63c9141dd90ff41b2971359846fdc726ba228d4a64a4175cdaf4fe7bae0dd
+EBUILD texlive-langcjk-2017.ebuild 1257 BLAKE2B d7cdc528287adbafdeb38de1ef97c357a3175f4106d95295ded8d08f1be75009004c31034f2b35f85b7b0fe54c388a493dfac81725197c54e478d2bde9992aae SHA512 495bc5185f12862afaec85e60a551b50c8b2548d05a3f041ce220f268ac23c078c51e392d2c3a91b2fe54d425480558d69a5d0be77180e1195fed6b19e6b2ab3
 MISC metadata.xml 723 BLAKE2B 9cb444063df06e44b6058fd7a4696a54ce0da42446175bad1b1ae17874efc1481f68d667358c5b649905b7a8ec8bdb2b631711e39c110d002bc56bd1ffbcb888 SHA512 d8503e8724dc8600e133fe921e1f2ee8d62a30dd7af0cb50657ece7d50a2cf07178f84252014535c6a7d4cb4664f7492396a924060781599540a8e88f80d9de1
diff --git a/dev-texlive/texlive-langcjk/texlive-langcjk-2017.ebuild b/dev-texlive/texlive-langcjk/texlive-langcjk-2017.ebuild
index 59d9e21a65f8..e3cf185ed4be 100644
--- a/dev-texlive/texlive-langcjk/texlive-langcjk-2017.ebuild
+++ b/dev-texlive/texlive-langcjk/texlive-langcjk-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Chinese/Japanese/Korean (base)"
 
 LICENSE=" BSD GPL-2 GPL-3 LPPL-1.3 MIT TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 >=app-text/texlive-core-2010[cjk]
diff --git a/dev-texlive/texlive-langcyrillic/Manifest b/dev-texlive/texlive-langcyrillic/Manifest
index ab598c29c595..1892bb2848d6 100644
--- a/dev-texlive/texlive-langcyrillic/Manifest
+++ b/dev-texlive/texlive-langcyrillic/Manifest
@@ -270,5 +270,5 @@ DIST texlive-module-ukrhyph.doc-2016.tar.xz 160948 BLAKE2B 7844b1c9d0efcaedbd77f
 DIST texlive-module-ukrhyph.doc-2017.tar.xz 160948 BLAKE2B 7cb5ecffd21eb994dec06bd9666138913a429895d5acb5a643e1e388c0b94eeafcc57868816acd8432fd198e92e54b23455336424207f799c8f5934f4e749207 SHA512 6e426ed9bdfd97145613330d613d7c43c15c40e2c7524938f569004e2ba67adc8622a5ae3b58f51e868d74b83618651d107e7f5e52f4077c21e66e0468497a8c
 EBUILD texlive-langcyrillic-2015.ebuild 2281 BLAKE2B e3b4467b62f304f6a62c782576aee7311d8fd223d62bf447b4d4d7e79392b84ba20dae72463760894fc8e5d7d92bce334e5788014c412efab1342ca155408cd0 SHA512 dfaf50fbf9cb0a2e68f7b5520a188ffed47bb2e645fa12995b1e5b8022975488facd2fe00e8d188b2b5d30e897176fea20de7d66ad19eb6fd2d1cee1d755e5c9
 EBUILD texlive-langcyrillic-2016.ebuild 2479 BLAKE2B 8b51434a007652fcacb0bf389dc65beddf872a33804a931f6e527db8eda61302f43fbcfcec99c0906bc104a59a6e7f18c402c54731f5f7f1e7bbb216a3b29749 SHA512 03307bef68df6061ff2d815d3683e5dbdfe148d91a045a24c46c0351a0cca97843681242bb5239e0480b093fbcf0ef7488a2a1b74d4c8611db505674a9ae72e9
-EBUILD texlive-langcyrillic-2017.ebuild 2502 BLAKE2B 5097ddade4c0a6c2f27d061d5ede795f40cef476f35616a5bdd8ed2f0e3cb1169fb14005ec0b4c4787c4208faac0b77d76f07a66a46ce2e018a8ee381a7ce04b SHA512 85257139228d08b720143bb2cf3d2af7148c4dcadb3da96f7a8ee9f06125bdd5e4784da5298898310acaf06d0fc833bfcd31a5a58d0bed79d1e93d4c24a80c70
+EBUILD texlive-langcyrillic-2017.ebuild 2501 BLAKE2B 033ddea99a036cddff9792400591880d72e5a765a5d6aaf24bd12b83892c7e9c5e035b0558104b64cab2b1a7c9cd3a11bee490720f373c883b91b334a6daeaa4 SHA512 8ad12338389568ddff765d01196578ed4bf31a2a6c4f0f7f432245be5a47262e0beb98815c25f8a205d03440a14abcec6b1bbdd55cc324c79f696256dfa3671a
 MISC metadata.xml 525 BLAKE2B c1d2a5c32b236c45931436789390fbb09eb05a21874a13c607ebeae2b722fcf4d317a5df44fe243aed230089354fe17ff7f8681e3b75fe03ec48ff0df6886113 SHA512 3ce96ce9895df4195578f5e0859a103fb64332cc6716bf5321751fdbfdf30ab19d32ca82aafd2d9942c2a410a17cf35a970f3ec15743a5b097b42706e4ef5fe3
diff --git a/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2017.ebuild b/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2017.ebuild
index 8930229e4029..fb84c5ff76b1 100644
--- a/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2017.ebuild
+++ b/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Cyrillic"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.3 MIT public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 >=dev-texlive/texlive-latex-2017
diff --git a/dev-texlive/texlive-langczechslovak/Manifest b/dev-texlive/texlive-langczechslovak/Manifest
index 368a388c8c0a..25469c0e992a 100644
--- a/dev-texlive/texlive-langczechslovak/Manifest
+++ b/dev-texlive/texlive-langczechslovak/Manifest
@@ -75,5 +75,5 @@ DIST texlive-module-texlive-cz.doc-2016.tar.xz 1029148 BLAKE2B c941abdc2dac11b68
 DIST texlive-module-texlive-cz.doc-2017.tar.xz 918152 BLAKE2B e258fec9292ed957e9603e7fe525427e894b6f1c5b9da47143a99e96c8c46f39eb3db1e16315e4e80834da5c611efeb97bd4e6ad3bb27b228cf80729256d2341 SHA512 914b96890fe0d136ebe7939e3659b9b93faa0f226ecef2a6bc06d058680a1ad48318ef09e6093eeb48073dfb32b65d141b80f36f631acaa9858d6ac72279e1bf
 EBUILD texlive-langczechslovak-2015-r1.ebuild 1026 BLAKE2B 68dbdd932989d2b1496ebdfc2611b1296c5a70e4c5cacd68832b998e0ed22032a312b68e86aff273cf9b14423707ad9bf33b3a7d256d8d8d98fa59f566a1f4ad SHA512 425b4f393c60bf59cd7610596f1693298ce274b8debd37a51b7d4523304819f63328698e3f2ad0475f5631cdca28a1d30d348731f7f6eac8b48838e4f2db9a44
 EBUILD texlive-langczechslovak-2016.ebuild 1111 BLAKE2B 9f4ef99e1e0cda3ad5701c27e48c03c03420bbd8e91848b4b90abf8fe15f4800bca7e79d55ef0f409ee5d782785a109a38414cd7f173ad5ea3478f777c7fadd2 SHA512 dfa07cf40853f59a8c85388ce0f66d34f730f34df0efc68a90260fa8db5965833305e165669565cc33415a8e5e67ef7b9997af35aa437be5d56333e2de4c9c96
-EBUILD texlive-langczechslovak-2017.ebuild 1116 BLAKE2B f6e419ece6d3522ea19bac1652292e6542c421cd2b76c58edcf63296fe350def49629d89d8dc437e7097614b7f5da72c9ced9ae3b9adaa65d7693ecfd14eebc0 SHA512 c50d8599a54a717f193d160e2a6d14262801edaaa7c947ee9a2eec03224d9d877da2f4f514c62df54fae6f54bf39a24bc87d9935db6ba5effef8c2392b5e0a6a
+EBUILD texlive-langczechslovak-2017.ebuild 1115 BLAKE2B 8181e78ec670b5186c421758b979e424fb7710377e8108e4f7006663f1263f26a61df60b35a9f834d69e5949cec9690158dac71185cd33e7885e7c0dd2b2cc39 SHA512 d237d649d7b7592a85bc0ce629e7e1a00a8eabc6cb505b763d8b900d47c9ffc4d2f44e17505c97dd9d5086556ee4e1dec2b150c6f4b0e30117d321446f3ac587
 MISC metadata.xml 436 BLAKE2B 3c6031ea7696419b6d259418d4093bb41cc1562bb07e35cba24485550c806a1ba2b741530ea2c7a1168d3844baa2a7fbb55be69a69911cda4fb0e955209e7983 SHA512 6db7969532a5e09e517223fe972926798a8221d2921d5d11d3f2fba86dd6283e62e782f8273151c7fa05f9eb3dbf43e8f53179e049a16f975052b22993f494b2
diff --git a/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2017.ebuild b/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2017.ebuild
index 1423cef9d6ec..32f6d65453d2 100644
--- a/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2017.ebuild
+++ b/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Czech/Slovak"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.3 TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 >=dev-texlive/texlive-latex-2017
diff --git a/dev-texlive/texlive-langenglish/Manifest b/dev-texlive/texlive-langenglish/Manifest
index 007cbedcef7f..445b6d228e4d 100644
--- a/dev-texlive/texlive-langenglish/Manifest
+++ b/dev-texlive/texlive-langenglish/Manifest
@@ -358,5 +358,5 @@ DIST texlive-module-xetexref.doc-2016.tar.xz 174672 BLAKE2B b014ac92ef2ce4994c58
 DIST texlive-module-xetexref.doc-2017.tar.xz 174648 BLAKE2B bf126a0056264985fa1e3b54d94e577c81c7e278b578fc45e13dda76eefcee37bfeb4a773c73b7022ea43ff62eb8d3d985b66bfa613188055b6bd08a1f33a29b SHA512 f5db9bde0d0370f56164c5054f1dadc983f84a26f16d3d35d76b738e542db3a63a737a529c250cb282f6389284a9ab10c564b25ccbf09f64fe96559e0752351e
 EBUILD texlive-langenglish-2015.ebuild 2470 BLAKE2B b3de439067bc9662dbddc9f44fc834e716b5da5ab857bb1531877962b72fdc8d95af479b4311f1ef69e9660c616a9703b4fb258e1db8f5a331840260294fe030 SHA512 ef60a5aff5246aa8132c3d80a33496d3dea69a69d1e725b7fca2a8dbb2dbccde23609856abe16c1986f9a1a23e4ceebe9f9b19a984a42b3020727cefdf383887
 EBUILD texlive-langenglish-2016.ebuild 2542 BLAKE2B 2e4b55602cb7fe4f3b9db9ee50647046f792d51547987d6d95cb4c76d93cdc8098c27397e7856bb8d770add63804f806f164195f4d6394f7e3a5b37e06b8fd46 SHA512 b0947fff8c0aaf724850516524a4445af1c539137278419048f4a438716f7b6898f41db66019709489b28d15309d0ff5bc4f4e27f352c0dfda02afb94bb7bbbe
-EBUILD texlive-langenglish-2017.ebuild 2619 BLAKE2B c440c65b31c1683f7af9c2dbfe8664603444cf8ed08675b6884d95f53a2d9edee0abf82de63b9afa808015454ddf13fb3e3e2a377685a1e53aed814183deacbf SHA512 8d6f538f3e27d9f677983a25f33ce087bc48439240e38a61a3bb19ab63405dc462dadfae70980298b60e5a26bda6e40c106f8970b1bee6f0b9633fe4f6da831a
+EBUILD texlive-langenglish-2017.ebuild 2618 BLAKE2B 4227ff7517d30c49c4a816a72d793e88020e200ab979701c8a83f636c7044b695ac0082f5a85ff3cdcdf0fbd6c4a9ae12441086c93d49bec6af3ea40abbbf8d4 SHA512 d46a2dbbb8748b7c05064f20b0cbda30e31482e8a1f2b5a878149be64b8b8d8421958a7e53b9263733edf681b9fac93e0c9ee9c893abcfcca1edd8ffc54719e4
 MISC metadata.xml 454 BLAKE2B c93dc6411985a25b9a32ad10276380a60dbb427b3b5da91bf09800425ffb32caf65a2fe1e512755d69001c4ba6143fb1df7ebbb259045bdf4cc689a494e67f70 SHA512 31c04097cb5cf947fcb4332ef246526cbe9c0ba0086d12e8ebcd1b7c3e298b063ce8e13d88b29ad7b397ef8338ed38c3f05cfbd1ad3c99fac79c59eeb8b28b5b
diff --git a/dev-texlive/texlive-langenglish/texlive-langenglish-2017.ebuild b/dev-texlive/texlive-langenglish/texlive-langenglish-2017.ebuild
index 3fd97341d9d0..f0616982ca91 100644
--- a/dev-texlive/texlive-langenglish/texlive-langenglish-2017.ebuild
+++ b/dev-texlive/texlive-langenglish/texlive-langenglish-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive US and UK English"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-documentation-english
diff --git a/dev-texlive/texlive-langeuropean/Manifest b/dev-texlive/texlive-langeuropean/Manifest
index 8407d5cc037e..861554205247 100644
--- a/dev-texlive/texlive-langeuropean/Manifest
+++ b/dev-texlive/texlive-langeuropean/Manifest
@@ -622,5 +622,5 @@ EBUILD texlive-langeuropean-2013.ebuild 2840 BLAKE2B 48f3e173ba64c39818c0d4085d1
 EBUILD texlive-langeuropean-2014.ebuild 2909 BLAKE2B d9f5bbc02ec05adafdeda554edf184b9aa870a2844ab0ed2a7fba65dc92025c5b35611b7637fabaf5589a384a5314aee7e124934f80b42cc10ca4777ca3f9dd1 SHA512 1165a468fc864784fdbe11f7e89e25eb2fcd57d2e754af2a865130bbe814b6c327ad920c0a8d878e4179946562861a18a74f3f24121167860c9a562f04fb64eb
 EBUILD texlive-langeuropean-2015.ebuild 3058 BLAKE2B d98a6872ee8dc59ea66645a56c4e318ed457eb8aff33e52644d9c7f5d8e090900abb7094126ce97fc26c28b91f395a1e9ec8c2fa79012c468fa8eb0e9878e89a SHA512 a59af9f2e82083e2a3929955a1863edacf957164aa30ee955a0a525a98d4b26034c82f377a23aa47a6b02f9c437ff3f143f70511b916698b9d8130943edac140
 EBUILD texlive-langeuropean-2016.ebuild 3409 BLAKE2B a78de8adf4e4255c2f882b45cef5e34aa1b3c1d2942a59738772ef205bfcdaa9add592c4a8cf31bcaf6a2021226650840def54dfc1e800e67781a3a384e9d63d SHA512 ceecf93b9bb7b35fc43f84f1941d3e5a9466df8e43f58c2752c0efe7feddded1044a6f4e6a66bf209fc8e94d6f8e8f3372ede7ebbfdf26d7d37f43bcc5a96cd4
-EBUILD texlive-langeuropean-2017.ebuild 3390 BLAKE2B 35576abb1724aeafc4cc8a8085c2c8a18187dcc51d1095e062cb309937a1e6f02c9bbfd197df566dee2ea1d6e6ad2273b1ce9e0c609c861084f90a731a688ffd SHA512 b4da00319bb8a49de04adfff3510f4dd760c0dc0d0c21f04da699a3394db47677435bc64ddf82b7b161d8239f83540cc99ae121a9e610cb70362256f69b12d16
+EBUILD texlive-langeuropean-2017.ebuild 3389 BLAKE2B 45eafdd8b4c2be7a4016344ecf30f35a6f6e592c25abfe9d59b6b3ed4fc104a88b002bf2712b9fbb3677fe6099ca5653fb51ff1739ace23119e2409db76eb53b SHA512 2e018095b32a67bafceb35198ab0a806aa26d67be9bf842f1b4519b8e10160f42a40ab2bb86c861436a96069046161d46afdbc6d197a8cb505f2092f65ca246c
 MISC metadata.xml 567 BLAKE2B 1529aa51facc0942b5c0c6e8463aef9b45946bac106e2e5a73357ccb738d724eb0bbdabb382d2d86e27b581f7f573f4544e8e4193efb763039a6109a326aeb00 SHA512 34c78d457f3560fbf5693c5e601a908605082a182c0933b0c00aff363f966e0251b06e5e4751741e0ab9359f3dc92b5ec2bf8fbe72fc0a09ae7a0eadeb100727
diff --git a/dev-texlive/texlive-langeuropean/texlive-langeuropean-2017.ebuild b/dev-texlive/texlive-langeuropean/texlive-langeuropean-2017.ebuild
index 99a26d2a7f5d..b473e55f6efa 100644
--- a/dev-texlive/texlive-langeuropean/texlive-langeuropean-2017.ebuild
+++ b/dev-texlive/texlive-langeuropean/texlive-langeuropean-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Other European languages"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-langarmenian
diff --git a/dev-texlive/texlive-langfrench/Manifest b/dev-texlive/texlive-langfrench/Manifest
index 990566baf1a1..3ebd8dbbbc69 100644
--- a/dev-texlive/texlive-langfrench/Manifest
+++ b/dev-texlive/texlive-langfrench/Manifest
@@ -214,5 +214,5 @@ DIST texlive-module-visualtikz.doc-2016.tar.xz 5653552 BLAKE2B 3d7ff5529a25b0a45
 DIST texlive-module-visualtikz.doc-2017.tar.xz 3723460 BLAKE2B 4cbc3efaf7e628128b1ca6e9a67888e2bc654d32e460c7493b5f75ff9cbe9309dbfe2e03292bcd942643119c9b1fd6f7f7b66b4e223e8b16396a9431f7b1b7d6 SHA512 22729727d95cbceed8baa9d850bc218005d6b5ebabf5add3cf604fcd501f2b07529ef8203c69544e37952f5147f9b4926ba148527c76669a7fcf408c1d94ba62
 EBUILD texlive-langfrench-2015.ebuild 1640 BLAKE2B bb63c7bf5a41ab3bc68d95c5468ac6dc600a4502dd76e9b8a8a914e8532796db8365d8c79f59bc41ef0b01a2bfde5162854e492fe222e37c82dcfe574f92cba4 SHA512 1a57a22528fae6beb713aba8ff09f78a9cc964dc54e29ecb19683d25036b38ac0c671ad17255dc2f44cb8cc8f03172988d0f1bab6cfcaf5b9e72bd74e3c13b67
 EBUILD texlive-langfrench-2016.ebuild 1859 BLAKE2B fe0893111b6c9d090872431116d9dc903633030bd6f86eb9f260938bdc357ba16185785b2eaea06a84750ac15409f18fcb3c551142fea7bd881a1153dfc86dcf SHA512 2f72551f33dcf53097727824d84fb42cddc672e3274750fd75cace1782eecaf02a4824fcb3590d3d7632261bb3dcc5f6f48e4e4e6d8218c7e9189e80a4009432
-EBUILD texlive-langfrench-2017.ebuild 1872 BLAKE2B 6eb20f3f7aec996d96990d1483ffb548735d5a6d591194df53323b169f521b12e17bb47d516cfb9260411ae4618141593269db9963c2341bd416665e942fbe8a SHA512 5e61f0ae6c241de83bbb5c263eabab27cbcfa0e518217610c014f302c0c4322f506be78cfa3d5a235fac81cd8cdf4b75f124828b1b87cbc504934c6c79d3530b
+EBUILD texlive-langfrench-2017.ebuild 1871 BLAKE2B 2cd0028616ad78d0da25ca94a970606817fc819e65673e963f390b7e1915403693ef99031a8d9bce90cc9465c90874a303c632f9f77eef9eab4f43997247f821 SHA512 334c1bac3ff65d5ce4d5dee6ccf2159f0fb8f75e62ccf422733ad06b0c0c098c26b830683c0ec1fd7c09fa4c2e1a3379fd2a6e1c45c678adc4033f752913e62b
 MISC metadata.xml 441 BLAKE2B 6a36c72a1efc71db9ff852bf890e5303b85c080aba256e055f8dcd97000025ea3351d5293f186fee14497706a8644d67ef7b5fdf783b4c9764f88266fc776c74 SHA512 613ea7ab10d9808c61e8a0b62bf7a1a59c10ac796afb1c8067e8e0ca681530650348af075bc0d02e38f2af4c9131c43343c0c6d9431d8d91d756098f84a5aea2
diff --git a/dev-texlive/texlive-langfrench/texlive-langfrench-2017.ebuild b/dev-texlive/texlive-langfrench/texlive-langfrench-2017.ebuild
index ddcc1b50a4e3..bf4e8cd953f5 100644
--- a/dev-texlive/texlive-langfrench/texlive-langfrench-2017.ebuild
+++ b/dev-texlive/texlive-langfrench/texlive-langfrench-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive French"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-documentation-french
diff --git a/dev-texlive/texlive-langgerman/Manifest b/dev-texlive/texlive-langgerman/Manifest
index 1877e61daaaf..3d7793bc860d 100644
--- a/dev-texlive/texlive-langgerman/Manifest
+++ b/dev-texlive/texlive-langgerman/Manifest
@@ -301,5 +301,5 @@ DIST texlive-module-voss-mathcol.doc-2016.tar.xz 230652 BLAKE2B 241c60d9b5384986
 DIST texlive-module-voss-mathcol.doc-2017.tar.xz 230640 BLAKE2B 8e71203fa3dc3958fffa93fe9bb2c36d2e2a520dfedf7a62b18d646e6879f8ae6eaa5374f04321de6561599e5c4b9d8bbf583926d89f7f5823ec53a93a9c867f SHA512 f2add19457add6311f59b8a8ecde14e53d0aabfa26698aa109cef1a3c63eb83eeeac32c16818d2ec3483373b9e42bc873a93cd899626b46a363772ff07466894
 EBUILD texlive-langgerman-2015.ebuild 2234 BLAKE2B 60d764b026e67183cdf963aa8286836a18ba4e67626e722d9272425be976f8540257a7a12f12c525a9b8054f96448cc65feddbc8a545c180cb11a938ac48e0fa SHA512 9de673f7ea085be19ea58b8521784d2e865d939b0830d5fd15af5815ec286663ad730d3de2151335affb462e9d566c5cd09adb4bf35eebcf1f572af9f71f2eb2
 EBUILD texlive-langgerman-2016.ebuild 2378 BLAKE2B 3110ae2ed3d58c25f1acf6812b16fc2ab6210c2aab161c7c08b2100000ec5ad04cad688ddd7e8bfc9399c2f53311abac8b218d593046d75b5799f9d822787535 SHA512 f8bf4fdcfada8dfc960c2ef7f3107e485523682e13b5d46a717c05d4f51616c710141aaa052b5c121eec5ebc2eb8222d5f609aaf89941c73e51c81ec7be76013
-EBUILD texlive-langgerman-2017.ebuild 2387 BLAKE2B fb737327c983e7c8f1efdf6135629527a0d95e5b5d973a4d67dab5fd4f42274391831ef3d51b7dac489f8270eb998c4bc48d75bf210f9068bd39ffa1ba3959ee SHA512 c9653f411210a4239e5a70a0f3e53ebe4e2ff0af40771b25395b630b1395e70340e8c612cd873c6d3bfa4f403735a8e1b4a7e01784e8730e86fb8216ffeb4f79
+EBUILD texlive-langgerman-2017.ebuild 2386 BLAKE2B 6ed9b5d2ccde72127274de4db7c6fb85c016e12bcb4cb315151db7e89b679859890ee55cb8dae337fb4212251ba537bb656b3796bf21a38cb52561630738c270 SHA512 b8aba67d64b46a5804215a77a032e457b50febe63cbc568749f9f084a68d8d61372e5fb95f7077a8574ccc16932a8d3ef548735383a16abc4a26d417b8f72c16
 MISC metadata.xml 430 BLAKE2B 41e8c9acd74fe643e9c5dbeac94931be157c58d415956f514e80e9b4756ea3652fb7852058966e0754b48516f6554304eee95f2561aeb4d94ece0b77dbc459b9 SHA512 94807ed6a052b681bb2c080ff42a333ed33229f5b14047d8c669eb34351158cdf40448ae8d57eae7ed25aa74fbeaed05fe0d393944072cd21d4ac9986344530d
diff --git a/dev-texlive/texlive-langgerman/texlive-langgerman-2017.ebuild b/dev-texlive/texlive-langgerman/texlive-langgerman-2017.ebuild
index 77568a74a146..ed5ec8e95258 100644
--- a/dev-texlive/texlive-langgerman/texlive-langgerman-2017.ebuild
+++ b/dev-texlive/texlive-langgerman/texlive-langgerman-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive German"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 LPPL-1.3 MIT OPL TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !<dev-texlive/texlive-latexextra-2009
diff --git a/dev-texlive/texlive-langgreek/Manifest b/dev-texlive/texlive-langgreek/Manifest
index 3e5637e40ab9..0b8fe8f8a576 100644
--- a/dev-texlive/texlive-langgreek/Manifest
+++ b/dev-texlive/texlive-langgreek/Manifest
@@ -163,5 +163,5 @@ DIST texlive-module-yannisgr.doc-2016.tar.xz 28912 BLAKE2B 70c3fa5093ebb4ca06dbc
 DIST texlive-module-yannisgr.doc-2017.tar.xz 28908 BLAKE2B 162c85ea48dd27040d7f964d34c23d9e81210a27bcb6294d49d1a093f4c077dea08d9cbdb5ef65447e190887a184ff6665ab9e71ed36805c023273300a7375ac SHA512 174fdf12c5fa80bde25b5d519115a275d1fa41990b4167549cd7b5c1417af86cb5b342ea29d6dbf912d7b3ef50d008ed646094e41a1c0c68208e897279c5fb3b
 EBUILD texlive-langgreek-2015.ebuild 1345 BLAKE2B 5edae562bcfe19b95ad2c371e3d113a5796a1c9991fb6ef0f32fdf4953a3d11746964f7a684df45426a6e03910d544a86fe63a22b24e8f00beef7e11da9afed5 SHA512 950d2c080f22645444d7e4265019d036d5ef6b5bfae22e82f4ccc1411e25e81e936cb635f882a3dff0e2166ceaff4f4f992ae2d9ea4adee67bce8d0ae5395f75
 EBUILD texlive-langgreek-2016.ebuild 1430 BLAKE2B b29f77dc8dee13041428cf812365b0255e419d495077e962a9b8e250ba12f0cf62635babeb138177fd34407b9d351a0c9e1eca8deff459b2b6ea17cf4d5aab3b SHA512 ef1f871250d34e9eac1382bf81257843e55c1fdc1dfd5342ff2489cb5efcb375b2bebce0ec50ad3b109b214c3a422528309e446e70fb0bb717beb440ac4f7983
-EBUILD texlive-langgreek-2017.ebuild 1435 BLAKE2B 904d10431114ca377474b828ca6fbe1a8486c00dc35ab5f1b480edda373662610a12cfbf0b54748d65641b4d26ff9d74c3c1a7033cbeef135ac92fcff1bef385 SHA512 63e981c2d6e6364545662e9203449a62439911c649b0f07298953d02acc5ef11e626d1629e52b72d1f17d3c6d8552d58fb8d6ac8c1035c30ccab29aaa5ed6bb9
+EBUILD texlive-langgreek-2017.ebuild 1434 BLAKE2B 5128465c4d965644846c182ce0d853a8199ce8f460fb4b171230c2e7ae898714ed35351ae5e3dd2963513f76d65b34d7362aced5b50198493d7e8315417538b6 SHA512 e48f9bca9cb7237e8c07d7e53319342782bf7742de54c4aa7ee72db3c87c363f9810cc7188f8f74e0e0ff2527749e4264e29776f85d47d8e6dafcdb11ee0d27c
 MISC metadata.xml 429 BLAKE2B 01e67263a2df3a5c42fc95f234933748d2e6fd741d2ef909646f39aae12a0bbf10611248f6c62ca71bf9a9bc71a30ec6ffc10fbb1b8e649a6aa732649a98900c SHA512 0bf25c8f6d55b298c60dee53a09d63e1d8b659b4b2585b35f8b3f0081a5e68073627f7ab4ea27b5cc135939845f0ad609373edb4265183ae4affec6cf0c700f3
diff --git a/dev-texlive/texlive-langgreek/texlive-langgreek-2017.ebuild b/dev-texlive/texlive-langgreek/texlive-langgreek-2017.ebuild
index 19128d339385..9e3ac5b17c19 100644
--- a/dev-texlive/texlive-langgreek/texlive-langgreek-2017.ebuild
+++ b/dev-texlive/texlive-langgreek/texlive-langgreek-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Greek"
 
 LICENSE=" GPL-1 GPL-2 LGPL-3 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !<dev-texlive/texlive-basic-2016
diff --git a/dev-texlive/texlive-langitalian/Manifest b/dev-texlive/texlive-langitalian/Manifest
index 76473c45fb82..86731597816a 100644
--- a/dev-texlive/texlive-langitalian/Manifest
+++ b/dev-texlive/texlive-langitalian/Manifest
@@ -114,5 +114,5 @@ DIST texlive-module-texlive-it.doc-2016.tar.xz 1026220 BLAKE2B 62008baebedecde0b
 DIST texlive-module-texlive-it.doc-2017.tar.xz 896808 BLAKE2B e9414135232cac146bb7dff72b6dce1e50c9789ea39f15908cd6927943577edd0f6c0136a9247a67ec52bad99c5e06017c92638bd38c140743b08e9bfd8e6148 SHA512 4f50a36da762c4ee000e93df770232d97726f7846c6d3dcdb9333849479371334f12c7acb454441f5985c44c0aeefcf1146136eae3ce69c4daf9c8e2af89fb9a
 EBUILD texlive-langitalian-2015.ebuild 1226 BLAKE2B 2377cec38bcb2fe414dcc007efa11f526d0180522cdbf5f383194d03b0ff0e098e50c534943b1203d79b134d4fb1fe39883fea0473e2fcc5c1d0917275d5e893 SHA512 1e265212d5f7ae230020279c83e452eb72106249ce512cbfb152b86e3c8f39ea868744824193fb7d6b561ca3d2cd8ae5eb5f4a1a5fe930c5e65f99468a5f2a5b
 EBUILD texlive-langitalian-2016.ebuild 1278 BLAKE2B 35292e791eddee046ba56b5c11312f9a2b67ab0d42feef2ad7d753e9663a68296b42895d69103124c9c4c18298311811a88a96967c8e9c58a3e5d9e88b2edec2 SHA512 44afe9a2fcd7edde0902c2c2e759e9817c1fb691a6807fed5d799214a176d64d9391a1b388b9e06853e0a158f0f2227c601a866a6fee241a42bc1fd08ca27c29
-EBUILD texlive-langitalian-2017.ebuild 1290 BLAKE2B 092c84dd01e596e9949ac5634e54633722169f7e1ff009e6f8a17f3b69c3585dabd737570f38df206beeefdc878858331155e86f6f764b92e3c569ed9383c111 SHA512 984957abce2136ebb5438a75d13f7cc50af907fb035e160196810fde390614469cd024a4e62b8e1fa8d66700e2b6ab1cf988b7924432cab1484a3b10adad73c7
+EBUILD texlive-langitalian-2017.ebuild 1289 BLAKE2B a82950e05e5ca6eb043a4c7d21c87ff0a2cd53dfd68992ec3f4e8080e12f843cb1bbffc8c47d9a1d6f9667ee59bf8ea942e5e571e7945351612dbe8bddd83673 SHA512 5b36c42f8be0cd70cfe8de9ca6537821d9a07b1883ed5c40077ebc29f63c9798673df6fe13d67650b3b45838b31ce69ac0cf8501a0148f2d99e8036fab34b42e
 MISC metadata.xml 431 BLAKE2B 27fe61311c21a334ee4479de2505b23adc057f3b3307d19e4399b739a2c3a569ebba3918cfb1aa1ee19796615d1a0f52c474f2fa793ec8d7eb4c9cb64836326c SHA512 de7474642ce4d561760aa2302808ecf5d6d845f99fc6817543f60ba14f51e31ce809b08ee5b71f99e9efd43ef29b79827d73ba6888a8ed98e57551aff7664f92
diff --git a/dev-texlive/texlive-langitalian/texlive-langitalian-2017.ebuild b/dev-texlive/texlive-langitalian/texlive-langitalian-2017.ebuild
index bcbbb130f89d..f2972bb7bfc6 100644
--- a/dev-texlive/texlive-langitalian/texlive-langitalian-2017.ebuild
+++ b/dev-texlive/texlive-langitalian/texlive-langitalian-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Italian"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 LGPL-2 LPPL-1.3 TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-documentation-italian
diff --git a/dev-texlive/texlive-langjapanese/Manifest b/dev-texlive/texlive-langjapanese/Manifest
index 5b62f567a187..6e6c1e88ef9c 100644
--- a/dev-texlive/texlive-langjapanese/Manifest
+++ b/dev-texlive/texlive-langjapanese/Manifest
@@ -223,5 +223,5 @@ DIST texlive-module-zxjatype.doc-2016.tar.xz 136636 BLAKE2B 099e45c8286afb60e6fd
 DIST texlive-module-zxjatype.doc-2017.tar.xz 136620 BLAKE2B 5db914ed47ae8bcf0630916db81962632124f24af585759440d97522820109ae72bb797700065740c24902ea9d3fb17efe2bc7fee29fe2d51115209488890de0 SHA512 215c9c6809b33dcb830a0aa477beb474f42d1eac162ef933a9ab36967a2c7d956e078aaf1944682c755d454ec74fae504cd2001435ad5f9eeffde92cb2d9bc9d
 EBUILD texlive-langjapanese-2015.ebuild 1639 BLAKE2B 1c4efe39d051b075f212b560a623ec663ebb0b01926fe546ffcd3e6e0c95180f7f305c0d2ba35dc8cabf83b653f728f67f8ab1cc564b24711715c606591dc0ef SHA512 dfda3d2131066bcb53690b809c562d10c85fde14d37d1bc86ed0b10388aa959d0b567f66abbcee8f06e22152c8b263e51c8701bc29403541b9f01d24a5d3ee77
 EBUILD texlive-langjapanese-2016.ebuild 2003 BLAKE2B f1672f7593df2ec5f071ea817534406df533d775b9a7cf0773e2219550bef45974743ec740b128004fed8bedd9233b75a9c7852ea0948b22c928f31714537817 SHA512 f0c78617091aa54247837538f1467b7f8ef72fdf25a9fd4258d0be842455738c3abbf373e2daa75f23e9f50ebe21a2ca5f58592a01a3a6fb6f2d89564dfae71f
-EBUILD texlive-langjapanese-2017.ebuild 2188 BLAKE2B 318db0d207e0c3ae05cddd8d6be74de64005e6f6ca12c856e75eaae2c9dd48f8de5c0283f005f3de7778d5eaa794b07c5d46a9c8d6f50876a083f231de152d7e SHA512 9ca1721071dfccdf69b5af8bb17e4ca3c272bde6e889c57a0b919b9c724bcd11602e20c7d31dd378a106575b30f7dbda1e96c340788ac1a71d7a4c4ba049feae
+EBUILD texlive-langjapanese-2017.ebuild 2187 BLAKE2B 00da9c4f6702cf638c6f958704b3329655ef29d22bc6691c5ebff07ebf3cecf367a9a9fe6b7f955d24a396936fb853ae0d5ca63c1ca265ca2d81fea9a6dff375 SHA512 dcd55aa15ad602ba81ee4e0ccc1ac2a3d35f450966f1311d019a85e138e3ca1ba5ca2b6c5707a4a672f092a90dd34f723342dc16793a27a239eb620238792531
 MISC metadata.xml 475 BLAKE2B ba6de588ea300f8ea1d0b7829c5281ee2b8db04e6a64984c3826950756cb7c3d78cbcb9ff7b751202c699c2c41601a30641410a21673a30f81524e8a0e7cd016 SHA512 3baa1973144345a57ce6b43971c69af9c529f1d62f8e128ff5b0558a98d52a6c07cb142ae27d5b76c0a579b2dd305c4b87a4136b974dda8bd5a6eed8b6c9ada7
diff --git a/dev-texlive/texlive-langjapanese/texlive-langjapanese-2017.ebuild b/dev-texlive/texlive-langjapanese/texlive-langjapanese-2017.ebuild
index c03b2df35ba0..18dcbd207c5f 100644
--- a/dev-texlive/texlive-langjapanese/texlive-langjapanese-2017.ebuild
+++ b/dev-texlive/texlive-langjapanese/texlive-langjapanese-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Japanese"
 
 LICENSE=" BSD BSD-2 GPL-1 GPL-2 GPL-3 LPPL-1.3 MIT public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-langcjk-2017
 !<dev-texlive/texlive-langcjk-2014
diff --git a/dev-texlive/texlive-langkorean/Manifest b/dev-texlive/texlive-langkorean/Manifest
index 8f3f4ea29048..d6ec9f8ea2c4 100644
--- a/dev-texlive/texlive-langkorean/Manifest
+++ b/dev-texlive/texlive-langkorean/Manifest
@@ -63,5 +63,5 @@ DIST texlive-module-unfonts-extra.doc-2016.tar.xz 8064 BLAKE2B 7c3f53612c4ab16c0
 DIST texlive-module-unfonts-extra.doc-2017.tar.xz 8068 BLAKE2B 759d77ce36409524db5834237bdcdd85c525a9a01b440dff13e06be414910b847ede522c44b6da6d118c0f5e87bb2df053307aa8ba932e7ab5f9ec62b5a1e52f SHA512 1581e671688c88457227f54f9b35a37f4b3eb066528d4ee85c39d8330144a40d9cb5d0e967098be389bbbe1fee2d53f4437fa1c56d1735f53b49ce7699b2b845
 EBUILD texlive-langkorean-2015.ebuild 1008 BLAKE2B 0a8ef6c6c75d3db0436ba443e8d732ca6a602c4afdacb0d8b85c297e140475a39348b1492b2c0475bb57a9ac41317546a7c0c08a33490d2e3b55611423473b7a SHA512 a0e697d716ed50cc7d0436a1a8efc8b0a4c620e9b5370f88fbfcf1f5f8e1fa2345b5c8abe0a73cbc698228fe14da2a156325d51b588bc7b3e4c4186a6309a462
 EBUILD texlive-langkorean-2016.ebuild 1142 BLAKE2B 8a0ae6cca00845abc98fa59cd2a84759d2d7a266a85c49608136bd9da45899362c746d5092d925d13d94c838f9740a49ddc28ef94b1093f8fda24aa47cea9409 SHA512 c3c0a02cf3dd6b4787d5cbe4f79eb01d439987528a4e3e1c1dc8d6f469f576888ce94991e9e0438420f3fcb7cbbefc76bb2ec0e6c5fd37355c82be6934f15a6d
-EBUILD texlive-langkorean-2017.ebuild 1147 BLAKE2B 221962cbd53751ce1876edce15a7186a1f406511ec0e465c2257e13d09b1d776e7b730686550b91da3405541d1e13d1d3c5471b79712bf94f0c50bac9dd94d40 SHA512 193cd711baf19fb90fe8b5a9e79b65d76fb674021fb5ad7986d2b41812c8d1464a95e98adea20725d1da9beaf38974f1d1c60410c2cf04f93a42d1b0f1baeaf8
+EBUILD texlive-langkorean-2017.ebuild 1146 BLAKE2B ec429872c430fcf092ee3990f2853195deecb0a7878e9c811134b50f53ff4116686758d92120d59b4f5d55f1073e992de69dad9a86e3e9206896d98cd61b40c0 SHA512 321711e18fce194c0c51c6bca2fd25f6a2acb54681cab02cb09b76a034e2e655879ac21aca315557309828f6651c294420bd12423efaf6e9e4594ba7f8c0b218
 MISC metadata.xml 473 BLAKE2B 3f98501738312fa8703259ad9c06be5c22e8e13cbeb3c073eb06409589fa54255cc721748f9b44670c2cf889b5d9884a9c84ca0f67595cc5e5eff66422bfec79 SHA512 74e1c1d392ea2aef8b16938b7d77867236548014132035d592e629755e4e2fd9aab59eaaf1384e493fc2d66b1655d0775a92d61020cbd5c01cc85bed041b6a66
diff --git a/dev-texlive/texlive-langkorean/texlive-langkorean-2017.ebuild b/dev-texlive/texlive-langkorean/texlive-langkorean-2017.ebuild
index 600f59188e42..7b24634c1ed2 100644
--- a/dev-texlive/texlive-langkorean/texlive-langkorean-2017.ebuild
+++ b/dev-texlive/texlive-langkorean/texlive-langkorean-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Korean"
 
 LICENSE=" FDL-1.1 GPL-2 LPPL-1.3 OFL TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-langcjk-2017
 !<dev-texlive/texlive-langcjk-2014
diff --git a/dev-texlive/texlive-langother/Manifest b/dev-texlive/texlive-langother/Manifest
index 19cacd5ceaba..e5c6d7b71359 100644
--- a/dev-texlive/texlive-langother/Manifest
+++ b/dev-texlive/texlive-langother/Manifest
@@ -212,5 +212,5 @@ DIST texlive-module-xetex-devanagari-2017.tar.xz 12444 BLAKE2B f884d677eb3f303d6
 DIST texlive-module-xetex-devanagari.doc-2017.tar.xz 988 BLAKE2B 7590cedc25e6b10b7b50623373b0f4f643b23455fd3a97c2197f4336b0303796a8f1d665750baa732446f4aba63fab13daced7eed26af36285b6e3cb08b5ed73 SHA512 deb051cb19d44f438ac1f3b7716fb66fc6538ca1ce33c1b84976d6904715d17ef65e4a2fd015f168d908b6905d0a2de5621d8b03150e45b7f5dcfb68f2eeecc5
 EBUILD texlive-langother-2015.ebuild 1703 BLAKE2B a776e72562722025e3f4e3c7a2baf6d61e2573c20c965273224e3f74710da8cc52ce37d922f137fdb424548a00de885239a887b0f291c945e14cab1898f45293 SHA512 aebc6f82f9d2a1de983d652f0e1863d0cb7336180247ddd49f9a4439bac07682f334fd8eb627f00d769b6dfc9e0df739a18b88a2248ed6695b2f92e58b353ca1
 EBUILD texlive-langother-2016.ebuild 1820 BLAKE2B eae19257187024e8f659a47d7d8945cd3f5e080c889ea04a13f6204c476a4ed43f7c39ceacdcdeb76037b0a6bfd7d881557fff01f16e703e84764abab6833650 SHA512 e29a7f00c6c1cd796d1233c8f50c4d05104dcb74217ae27bc0855e61854c903bc618324e3a992bbceb0c9774e110069bb4fc36043ce8ec2ceb3c34732519c12d
-EBUILD texlive-langother-2017.ebuild 2667 BLAKE2B 2144ea1de54371b4d7d20a6eb93d53b9f682ac9053f12f1b8cd449ea7a3ea9c951a982f6f89c00305fc65e307e580d7dca5ae20763e27f1e33531b702ec6dbf8 SHA512 483b79dcbceb668c5fd3f2a82ef1e042a3e4626fd65533bec446ae90cd19f167420a76a704468f00a82d4b0c00e3082ba5c76a4906b47eadf58ab194dcdc7fd9
+EBUILD texlive-langother-2017.ebuild 2666 BLAKE2B eee3b6aeda2c133d9cf09ae44917a779f74be4318aecbf0e17d82569acf14ab96ed95227f8ee9f063673c909f2b3644200e05e322b29e86290ebc3a3e37589ab SHA512 ceeeb95d41117fdf6f80ec4eb390e355fdb4a5bf25ce77356406c20eb95820d2d15a7a7af158a9ee47cc14fc948b3847e8ecf65d5ff8cfa60cfd506bba1365d7
 MISC metadata.xml 692 BLAKE2B fa87041bafc6f25a3ee065fa21c064cb2109470b9833a4d20c5d3d8e9488ee91fff4364cb078287f481402219a77d1c0fd655b90951ae7d7226011e5352af5f6 SHA512 6c9fbac4fe09b5d24c5ce682f68801725f66857ec30418a8fcd2614319750936af116b30357ab03b2dc4ef761dd397a8786e81374f7f230a4d77660df67c083b
diff --git a/dev-texlive/texlive-langother/texlive-langother-2017.ebuild b/dev-texlive/texlive-langother/texlive-langother-2017.ebuild
index 7d32163de398..cb2022bf92f5 100644
--- a/dev-texlive/texlive-langother/texlive-langother-2017.ebuild
+++ b/dev-texlive/texlive-langother/texlive-langother-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Other languages"
 
 LICENSE=" GPL-1 GPL-2 LGPL-2 LPPL-1.3 OFL public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !<dev-texlive/texlive-basic-2009
diff --git a/dev-texlive/texlive-langpolish/Manifest b/dev-texlive/texlive-langpolish/Manifest
index 5292af4e92b5..08bf23441c42 100644
--- a/dev-texlive/texlive-langpolish/Manifest
+++ b/dev-texlive/texlive-langpolish/Manifest
@@ -110,5 +110,5 @@ DIST texlive-module-utf8mex.doc-2016.tar.xz 7496 BLAKE2B d32ef2bd413f0daa010a453
 DIST texlive-module-utf8mex.doc-2017.tar.xz 7496 BLAKE2B cd63a21dd1699b7ab117a9cf7c3ccc5c8c9368dbdf8f6a87f25d0e50bf0d19381f517085a64356571465edd2a3b2fa671b64ab8b398cdac6acad8ccf9650f5fe SHA512 3ae93491cd484e39552273cec22d7b295a7a8b12259b67bd803bdab60d2919678c72b4ee46d4a0e41425bdb2cb29fd53b5c880690141dffea8c9417561af4939
 EBUILD texlive-langpolish-2015.ebuild 1100 BLAKE2B 62e87d127307f315be93ae65bc1f8079e9233587f27bb67f654195901755fdbda4574acd3c34e21b28ce760679c7f441c283310046f3c4dac777601793d31598 SHA512 7c3e0f346cc9ca9fb75706cd87f843db18ab3267dbab01520e293054130ca63a77548c67a6b7c36c53a032542a2de320ccc8fb2141bbb50cbca18c34481b35e4
 EBUILD texlive-langpolish-2016.ebuild 1152 BLAKE2B c2bc2e33e5ecca1fe7cef3ff12310d7f00c542dc6d646f4762b83be22f888cd94a97f85fa13ed149720a2b87ea31be5afb45c2b6233a047c05654238b72dbe3e SHA512 08a03ac8d2113fcb46e677a0ecc59d749dd925e59900391302a3d34190a2c85a376d36214f023b323fb35ad2d64aafd3234c146ecd4f28ca454d063c731a3866
-EBUILD texlive-langpolish-2017.ebuild 1180 BLAKE2B 779ceebc130f30b7ef54f2eed0f10be78c15ecbc9a9133f4357e375dcaebe390a2e687d712570b8439db02767dd98ce4513380e078aad74cdceeb313230e46f8 SHA512 8bea9b51a505b28ee3246cb8e0eb62ca9b2739ba5cde33ad1d478c6cf50448abe7fbfff051d59361d832591395a0a78e2299d49e4c21ffe4f3930d8ce0163ddf
+EBUILD texlive-langpolish-2017.ebuild 1179 BLAKE2B 4b659ed5dc496352eebe62ff18124db6eaa0db47f64287a44fb2ad6e1b2d27d2b85f2fb19a1f6d9da502ce40eed966031b790a7a1b41858e7defc5c9c47a5b32 SHA512 c5fb8b2ed9aaa8272ca2bc583457d253be024515a8282c19bcb1573810dab0c41b610441ee5a55a134b5757fa21e6708ec700bb94da5e047532147fa68dbfdf5
 MISC metadata.xml 430 BLAKE2B e3f3794885f68e64219d24a8a9d38f2fde0fffd413f3233196641a3ea95035329fcd9d632a3fc9bfd9f34540402f4bdb0b2bae0c0613aceb660baa7e64d6ecbf SHA512 4fd41829665f79f87a77ebb3cedce3ecea4bcc767ed49cf40d7e424eb0a1836817a001852e67ead3f61f189a71eb022bc6ef415e616176c33c1d129b105732e8
diff --git a/dev-texlive/texlive-langpolish/texlive-langpolish-2017.ebuild b/dev-texlive/texlive-langpolish/texlive-langpolish-2017.ebuild
index fb7d2fbfaa46..5a32dcf85bce 100644
--- a/dev-texlive/texlive-langpolish/texlive-langpolish-2017.ebuild
+++ b/dev-texlive/texlive-langpolish/texlive-langpolish-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Polish"
 
 LICENSE=" GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2017
 >=dev-texlive/texlive-basic-2017
diff --git a/dev-texlive/texlive-langportuguese/Manifest b/dev-texlive/texlive-langportuguese/Manifest
index 058853d8dfb9..b7ce843dde4e 100644
--- a/dev-texlive/texlive-langportuguese/Manifest
+++ b/dev-texlive/texlive-langportuguese/Manifest
@@ -60,5 +60,5 @@ DIST texlive-module-xypic-tut-pt.doc-2016.tar.xz 225212 BLAKE2B 5439ab246f1df32e
 DIST texlive-module-xypic-tut-pt.doc-2017.tar.xz 225224 BLAKE2B 8b0095cdd853c248e968896248335f58165c3e4abe7d93fd0d4ee9242c73b6f8a5c8693211820b066a07cbbe7554b0d26c92eed4382d1b7c5be22edc45b9b8a0 SHA512 24bb3acdb66190e34bc56cb5696ea17be0a14fd25cf0a519e44b676bdf8b1bccf7987da307bf0d1f0288918dd15e589c05ecc0eeb351f7aeb2a870396a9d55fd
 EBUILD texlive-langportuguese-2015.ebuild 956 BLAKE2B 541f2e489aa22777dc81d1c69a2c14b2b1843ad707c11201714fc75e6981d1e9681a04ec159fa140bb647e60dd6d4495d8a6239fedf310233c4189b2f74e3a8e SHA512 25453a658f94ee1468e0517aa645473ca1f5d9d2ea9ba93f439556fd9ac09a7df09f92c2c79381f95691f8156a950a7bb6f6c9c7b1de4a970e60208f3ef79d2e
 EBUILD texlive-langportuguese-2016.ebuild 1008 BLAKE2B 08ae382e1bab87629d2125266f788ba61fa15f3d51d454d094233de33bdb2f0c6ecd5c383a4e47c2ab0275a3d61b9164e2d1c223dd4a372faf00493cdf9650c3 SHA512 5fe479bf4e4289e57f3cd7426453fd9ec5934aef7d407ade3841f63954006443720e24fc341c356e1b5ed69e5996e0adac6e9285beda7a4da76701f0cf3fe636
-EBUILD texlive-langportuguese-2017.ebuild 1013 BLAKE2B 3d0fc93293f8aba3c8c7e74c7c4f0dcba43a3c7b9fe6940420e8a7f14a501ed00a7d34c3ef4d7214b9f67679b5e2a630837bc6d30567abf0bde375cb0c46d180 SHA512 d1822dc6d47e663769b45b6eb3f6a1da67d5038e97ba24d0e4e9e3cfe1edc1b061d1811734fa8882f330220421567e1654c0882017ae8312baf238d3103435f1
+EBUILD texlive-langportuguese-2017.ebuild 1012 BLAKE2B bccb03d97e58e9a0752e7c5952640184e5b25fa383c53f24687e7c013c0e8ee08f46ca292a116f9fa27d87c090c9d682588bdc3ef20827f81fd59f4154b410d6 SHA512 8deeb1178420ed042cf563840d87ae49ff75af5ed3fea226a35fd406ecc384678232ca392193c2db683ee46a120e771e80bebaa90432adedfd5678aaad4218f8
 MISC metadata.xml 434 BLAKE2B dcf4b081dc6c914dd2e249828f1512711394ee46c6100dbaccace8faaf713b3fd2988c14330fea99b123f5ab2c84a0c843aaf4642a32c060be94ddde18d332da SHA512 3a73611ae49dcc118cd89773bb2bb73a3bd4535a77379c44946f08fe84ffb846cfd1a8a68ad3daead16f2590803976b2b9b44b63c9bc21da43193f0c2979ad4d
diff --git a/dev-texlive/texlive-langportuguese/texlive-langportuguese-2017.ebuild b/dev-texlive/texlive-langportuguese/texlive-langportuguese-2017.ebuild
index 77dd34917a6c..c3d73860e817 100644
--- a/dev-texlive/texlive-langportuguese/texlive-langportuguese-2017.ebuild
+++ b/dev-texlive/texlive-langportuguese/texlive-langportuguese-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Portuguese"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.3 public-domain "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-documentation-portuguese
diff --git a/dev-texlive/texlive-langspanish/Manifest b/dev-texlive/texlive-langspanish/Manifest
index e1104441bf81..d5e37933ac16 100644
--- a/dev-texlive/texlive-langspanish/Manifest
+++ b/dev-texlive/texlive-langspanish/Manifest
@@ -91,5 +91,5 @@ DIST texlive-module-texlive-es.doc-2016.tar.xz 1026792 BLAKE2B d46a6cc74b57c07eb
 DIST texlive-module-texlive-es.doc-2017.tar.xz 1026792 BLAKE2B d46a6cc74b57c07ebbc873939bee1d8aeb26daea5641bdee56ec7071f2b841481cb179ab58f47354b32f520ecdb7e90177741c891a6f41b39ec2fa7d1a449e68 SHA512 d2a5c3f7626ffa447565a6c850e6edd736faaa87d460b961842a5ca3bb3d13766ee3ee25057644184af2c5a1306c75c89250fbb44a1c2920cd17fff7b6024e5b
 EBUILD texlive-langspanish-2015.ebuild 1109 BLAKE2B c45e2f789dce6409d7e8e957a4598b977324e4bbf40ccb2f7430a8c18f18b8073878ad557c087f266fc266b022e47231bab9a6776635ff1a884f44079b7f1d6d SHA512 4ae7db7978bb010a2eb6ab13537d8de2ba97182f691c4011904532a051e64056c2abb8196da3c352f282f7a6316fcdec27da2a62511c4918cc0bae5b2e0fa012
 EBUILD texlive-langspanish-2016.ebuild 1251 BLAKE2B e2f87cdf269ace40bc1298d72400eee0824fa68777497ce2521b49cf5c45afe7d4b8066fb4681f5af219fadcce21e4e8b593a3e22421082adf2ff2ca65b4d810 SHA512 5cc99ee9922382813deb3bf0f8ee5941563c93473f25c54feb50159907ec04f539b38ba69cf695dda250899540211a8a6ea39432500cc2946c8f8abd10c66bf1
-EBUILD texlive-langspanish-2017.ebuild 1256 BLAKE2B 377174ce3c490f5c7b7ed447589f3e5fb013346ebc82722ae787a60a78a2fde03aed47a3b71637c460cc5ada51ff624ddefca97ea1c5be34c7eac71bd0208fd4 SHA512 cc079a5ff53bc91b663e47c0223019d4055f3cca0e8aa537ce866154d589dc636b0f790c1b21debca2d3d9852da9da8fdde7b3a22b2ea123b72077e2a74e7f75
+EBUILD texlive-langspanish-2017.ebuild 1255 BLAKE2B 15d78357da56ede6c4b802cd1c2bb5932bd99e4d8f2bffc9568d9cc581ca5c7d56cb9c7ac7a38f96580e76ede5574f9aba7da824c7e07f35db4f8c9046045003 SHA512 2196368919e6be484ab40e9e01d388199de7727295501e64bab617fe8404c4da25281219e76084717686525be2d985c46d5f4c63e693a5e97efce5e73f4ea0d5
 MISC metadata.xml 431 BLAKE2B 5b913256eb54147f95ff3804ef4e8975fed09563218bfcafbc6d664199b647f289e14e59e61d1cda1714c0295d3d7d4b03af7029ea3a642ff85db17a942eed33 SHA512 e7af474fa040a433df88f7d07f7ef410f4d5cc8086f8cbf397b08f40c03f2ce47a884ee7c994c7a6a75098f508ad73cc9aeaf74b84307b6aaedb9f16ff5873d2
diff --git a/dev-texlive/texlive-langspanish/texlive-langspanish-2017.ebuild b/dev-texlive/texlive-langspanish/texlive-langspanish-2017.ebuild
index c6f9f280b6a0..4f6ee5bb6c25 100644
--- a/dev-texlive/texlive-langspanish/texlive-langspanish-2017.ebuild
+++ b/dev-texlive/texlive-langspanish/texlive-langspanish-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Spanish"
 
 LICENSE=" GPL-2 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-documentation-spanish
diff --git a/dev-texlive/texlive-latex/Manifest b/dev-texlive/texlive-latex/Manifest
index 49f980bacfa2..86b009c70a5b 100644
--- a/dev-texlive/texlive-latex/Manifest
+++ b/dev-texlive/texlive-latex/Manifest
@@ -218,5 +218,5 @@ DIST texlive-module-url.doc-2016.tar.xz 266856 BLAKE2B b20dab7bdddd79e71440befcb
 DIST texlive-module-url.doc-2017.tar.xz 266852 BLAKE2B 159ca5b010b9a66768c0b37760d39f93356e1ef81be55da03f360b2c9fef8f345af38cf7cb9432b038485d212d427b6db564fc773b7ad3d15638054b84112a1f SHA512 ec678563ea26b5e013d631b9ced49c870f95556bf9f29259b9f35e2ba1a25150e613cf7fd7cf03e12fdc2323e2124dc617b3cc3bb164a9e7df2365b252d75858
 EBUILD texlive-latex-2015.ebuild 1664 BLAKE2B ca23fa646440a7af7c4f447914bf67100c8cf2101bb715e01da310b3f7e220399e06bc373ba03ff9080b51b1612835bd931aba8b4775d19a8b9cc95fb614c76a SHA512 55ac48caaa06f6b065706ebaad54a16f4800b0f545184ece83257939435c14d39e1bba72e375b685c8e73edab3cb670de3e854c3cd2c4eb4c900a60bb0024571
 EBUILD texlive-latex-2016.ebuild 1749 BLAKE2B dbed9fe284e1737a13d9e8e6cd134754419c14489ed63a939b25602eb58a77fdfdf5ffc35dedaf9a051b8365d93e64444a2d1fd61a652a0ec5c878bf99f25599 SHA512 11fec719d43909cb6931af816f6526738a9f8de7ddaab3bcb6af95e0c08beb69783e48ed374b57cbe39114c87c26a79b18205abc9ec61a2d89ea845e824556db
-EBUILD texlive-latex-2017.ebuild 1755 BLAKE2B 586fe3f7dfb0fd88505c6ce929ec858da265081320cb0b8352b830d5d8fa501b7b9ac0a981b0a32f44b3c259c73430349a878bdc8ae8cee630e28a5b21c4b15a SHA512 95fcd68efb2a8b11db29d7038648df9500da187100bb021f97d9d3fb22a5dd2b961db7a4c8e00b4c285b8df2299c2a8ecc150fc5ab3f49f4945202addf99580f
+EBUILD texlive-latex-2017.ebuild 1754 BLAKE2B 47e76b6705c6a569157dd6c04faf91112c318398a75fba3f6ee7e6dd498fafc9dbc8002106aa27d9a6b57f68380bc268248aec06b43b69e370ec1534ec4b9f80 SHA512 762ee2dee3c1a7536355ae157989f4e52f8ed5104148b824804d7ea834119a56fbf06583fa988ac2421bca4b0189b6c3f8a0f54e68a0c5fc5af9065f741ac23e
 MISC metadata.xml 529 BLAKE2B 59fc302f07f83452a60415a6ef75ae13bc314b3e2e0c3e8c58aedef8e2079e7184879908ec6d978a43a09a4429b3c1b79a3cc786a9695238b2a021916895269d SHA512 394556cea6402e78e83bb5ecb801bc9c6d4f0e85f368437953ccd1ce563954a3be99badee441c26d7791c965e13b17acd003ec325cc11b87a6fc605ffa2dd350
diff --git a/dev-texlive/texlive-latex/texlive-latex-2017.ebuild b/dev-texlive/texlive-latex/texlive-latex-2017.ebuild
index bd444944e29a..ac53d599614b 100644
--- a/dev-texlive/texlive-latex/texlive-latex-2017.ebuild
+++ b/dev-texlive/texlive-latex/texlive-latex-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LaTeX fundamental packages"
 
 LICENSE=" GPL-2 LPPL-1.3 public-domain "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !!<dev-texlive/texlive-latex-2016
diff --git a/dev-texlive/texlive-latexextra/Manifest b/dev-texlive/texlive-latexextra/Manifest
index 4197f1c12bd6..51453d239710 100644
--- a/dev-texlive/texlive-latexextra/Manifest
+++ b/dev-texlive/texlive-latexextra/Manifest
@@ -8557,5 +8557,5 @@ DIST texlive-module-zwpagelayout.doc-2016.tar.xz 591560 BLAKE2B b82dc9fa2ee968c3
 DIST texlive-module-zwpagelayout.doc-2017.tar.xz 591516 BLAKE2B 2c7a6199ffd8262858bdda2697b6f9aabde0c1d4cbcacaef223683be09fa1fc2db87be5a7542fc68de96a62ccab7f45468a41d1ba0303ddbbfd2a1947791864c SHA512 0a31ba65d49cbc111d6a5ca3ff1b2f9aa91614a23d6606aad1d5b9d37cd40f0f72c95bdfd56e56cb5f408279870e867282d862d0267d8e829fde608a49c079de
 EBUILD texlive-latexextra-2015-r1.ebuild 35701 BLAKE2B 46fdc6ce25f678528baa046d968c460f64c85ce8ab62663d5dd04405dc1d93c99f1ce10e361a2e9f6f034756a3e689326e43aeb8ef11acd3366ff7fdd5a93435 SHA512 8eafc43db3fca70cc31be8d4b3283cbb51e096c41bb45b6d930ed17fa32a4e899be8afaf25807cef3d4a0cf7c7e39eac06027cf642c02a8c6ad5fc1549c2d54b
 EBUILD texlive-latexextra-2016.ebuild 38864 BLAKE2B fb33ec8142e6175f326d62f259906592e0c379268f50ed472c171a54cd23826ac7a42ab35c9e71c88fd58cb6f4fc8a478bfb4f9927165415ab6326334874be73 SHA512 25639da7c812a1c920068252eeebe967ea498302e75e094345af966cd2aa0adaa0038d28300eca134f70edbdd471bdff54aa2c8e4f2202674da4aec05bf42d1c
-EBUILD texlive-latexextra-2017.ebuild 39388 BLAKE2B 4ab9c924f48c371a9ba4aa38fe29c450cbefba7ee1b144f7dd61da8098f0b571a5ace6c5456b789dd8ffbe9ad0fe918fb8ac0153998e9a119e64fadb9173c9ee SHA512 b2bcb37ede411412aed67394ff14c67e2b0c8519e7cf0ef9a705a92c06e2bc72bff2f5b5572ddd20fd963920ca1dab8656a69f6ddb514ebaa80a8e690778d475
+EBUILD texlive-latexextra-2017.ebuild 39387 BLAKE2B 983efb495b6647b651616a84e56d5104dc47fbf50411137f40df9b2b29c8d8eb9accc0d58c9d9a5f3cb4e1ca40695d9522da8ef9dabd9006dca255dd7c238303 SHA512 6bf98d62de9c480f5e61c00ec9e3feb6dd56f875d8e3cd75d5e0db4dcff8917f55d516d079024105962cbfe9538235ac78297e7a10b6bf3a69a459d8d1e1f60a
 MISC metadata.xml 464 BLAKE2B f44661c9ab79ec9d3ca261cea4af7b64fbef81b0d63218137c940e804a8254b7a8638564d51b4f843e4ec59fc15711bbebd09f4b1fefd5a070ce0819345ce778 SHA512 f2f516eb45d8d405e29e91886fd2ffeb54e6126028d2ac218eb0bf43e009ab225f0a0661ce99436dda82b5f63b47e5930ab047e2bf16a2e306da510453fbe6a0
diff --git a/dev-texlive/texlive-latexextra/texlive-latexextra-2017.ebuild b/dev-texlive/texlive-latexextra/texlive-latexextra-2017.ebuild
index 029df83310bd..a351c0cdf9dc 100644
--- a/dev-texlive/texlive-latexextra/texlive-latexextra-2017.ebuild
+++ b/dev-texlive/texlive-latexextra/texlive-latexextra-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LaTeX additional packages"
 
 LICENSE=" Apache-2.0 Artistic BSD GPL-1 GPL-2 GPL-3 GPL-3+ LGPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latexrecommended-2017
 >=dev-texlive/texlive-pictures-2017
diff --git a/dev-texlive/texlive-latexrecommended/Manifest b/dev-texlive/texlive-latexrecommended/Manifest
index 69c4ed11afc3..db921a68f241 100644
--- a/dev-texlive/texlive-latexrecommended/Manifest
+++ b/dev-texlive/texlive-latexrecommended/Manifest
@@ -433,5 +433,5 @@ DIST texlive-module-xunicode.doc-2016.tar.xz 588 BLAKE2B 323414d6b59493065bd9c03
 DIST texlive-module-xunicode.doc-2017.tar.xz 588 BLAKE2B d26d3f9960cc982a16cfdb2435d59d187b16370034e473a7f72439d4e41f24365df03bb8cc56dfa55d736a53b41baa43eb9ad9ef7790874265f4e8702dd9e6b3 SHA512 29ef434a1832f9c21b327856d074fff3db3d9e6094ac251b9e00cb224fff058806b7a491e9c166570b41ebbc2d1db084b90fac68a26f45e70196623b6754f9fc
 EBUILD texlive-latexrecommended-2015-r1.ebuild 2523 BLAKE2B 871965a20dc0d8485e86a7f21a6c9ed464bb2f34a7933aa835c60029bac591ceb31f20847cb81baa4ab14355732e441118d45800cb315c90ce2fc77458cbf09a SHA512 d554eac751c4d856768baf916f676302fa4ff47de94f92084ce3ce24ec773e6c6a297723d56b37c1a708a129250ba50c5cc8194b8810afb35197d53c97ce44ff
 EBUILD texlive-latexrecommended-2016.ebuild 2669 BLAKE2B aefccbfc5396277a5e45b271de1e083fe7698578a9da7e4a0f0a31e45901fa89b45f9c097749cc314103977211f96e5b5a6cb0a77bd6865d806462f5a94793b7 SHA512 d8a307c712528487358343fa9f0803283375ad3d66f60b7b546f3c818b3fae9f7f8d21381d6a293cc28870180e6907bd759f6f9e68beafe07badc40a079517ef
-EBUILD texlive-latexrecommended-2017.ebuild 2827 BLAKE2B 7c339e33e129cfbce4c7d92d1ef7fd4a54405d418f139815118c0b3d2f2930621f1a8a0f06c248e547c07bdc977f8c8428e82b35a1d7b676ba8ad43c04ca98fc SHA512 6bafec96e84fc859efa3a6322eff2b8b2a2afe792a373ecc6595e4578d8859ebfc0593a57184aad5ee239642fed5da18969541c618b479371809fc884e92d60a
+EBUILD texlive-latexrecommended-2017.ebuild 2826 BLAKE2B faa63f81bf3b382e5e1765ec078de2ca292c11bbdfeb6fc86fedbe3b7095f3c7c769efb6ea5f7528ce1ca97fcebdb7a271f5c7d5f8e2b83ce16dd6f97872848f SHA512 aa6636a62ca42861d2acebcb5a1a269e12bd0676efc4db97f8ca0c071dbd2224fc8d493023fdb40add47d3460d2dfec7d288da86f3570acb360c7addb3fd60f8
 MISC metadata.xml 493 BLAKE2B 2863d00d1b302441682fdc631273218535ce353c050c295b9f9f0fd133cd687a281e4cb634eeb58c89421dc9cecb3bf32e7816dfa2745e139a90f5760e7d0927 SHA512 815d4e8c1dee309cee3f6f0fc553903a7129a3fb9be6dd413e3c0b81f8924c82e8377b11eddeae17192b2451209ecc25d15dc19a925a58ec979c10f2342a6869
diff --git a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2017.ebuild b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2017.ebuild
index 7b646ee5806d..109befe20a90 100644
--- a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2017.ebuild
+++ b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LaTeX recommended packages"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2017
 !dev-tex/xkeyval
diff --git a/dev-texlive/texlive-luatex/Manifest b/dev-texlive/texlive-luatex/Manifest
index 7f986a41dafd..197f1bfd9e22 100644
--- a/dev-texlive/texlive-luatex/Manifest
+++ b/dev-texlive/texlive-luatex/Manifest
@@ -266,5 +266,5 @@ DIST texlive-module-ucharcat.source-2016.tar.xz 2324 BLAKE2B 32a496c2f876e38e6e0
 DIST texlive-module-ucharcat.source-2017.tar.xz 2316 BLAKE2B bf8293199b8b1f8207b13bea33e526db234b76080a85815a5c8ba1ef2b90cd0e6f41f607c179c06fca2d7e784400822965b0cf7099a9b22a22a28f687f9c6f4e SHA512 558e2895a44364217155323d0c7592fcd9c6730ae35d998e2135f95bd420ad8c8724627b0616cb649ed12cdb20fe75a02fcf545180d081537fe148a44cd1bc2c
 EBUILD texlive-luatex-2015.ebuild 1933 BLAKE2B 151dadac8277032b699389ff0076b09de2b797f4aa9aa0b80bb6af1a2087aa75bac4785fa58df761681f9a7169005309afa60f3a3b48dc579e5496b14234aec6 SHA512 3784c4eccd2b2c458d77050f3b2ee05c1b4e4856f1fe6751d787c3e342a1a06151a34e1eecb9fb61ad53b8a71f773bf6b52f15f804fb04ee5c305124f4b0ad88
 EBUILD texlive-luatex-2016.ebuild 2130 BLAKE2B f19caa4317b9fd487eea19b65c126f0e107331d5b187bc7a455c5d390ede3af9e02c6ba29c7614804c20175b2419a97c13a0ba48978ff86655579cfc2ba0b1f5 SHA512 03e91853717d21fa034638402c976762e59ac66a781e129ed71ac877333bf2a4d4dc726bbdc37732e1bb4b3eeab68c3aff194b90a109995d93c010fbf3a76ccd
-EBUILD texlive-luatex-2017.ebuild 2156 BLAKE2B 4e53428950d243afd8126137c38cf144b119de841a311c938d5afa6b8db834eb3331e911dabc0eaef088115d9e892a126cd4e293e607d4a2104b7bb6a8471a9b SHA512 b1eaf035f70083c9c09df59373ff74c400519219dfacb1784905e870a8422797144b2feefdf99dbb7a5fbc2274596813d0b94b142f88608927d4ddf7830cb194
+EBUILD texlive-luatex-2017.ebuild 2155 BLAKE2B eca9b482483178e35fc562f1b80cbc6d7311df0ceaa9809cd6c851a10b12ca96f090f2c8192f9da5ec15ceea7b4ce49253ddd54d0a3d37f485b74e2619e8d6e8 SHA512 7a87e71ce799e27bf234c098470c8cd1662a225fcf314a3fe531f4801712523da56845fe3d05076fdf0821dce6445ff964569d11e33c765539eee2d08deeafb8
 MISC metadata.xml 548 BLAKE2B 12926c8cbe1c42799921e43f05ea4b2ed0e314855e01131d271d97f1b72914ee3eeee039e959a81d27e6c39469a42f68443245420a50b7177815858f3a92924d SHA512 9952f37d3ba08676efe90c13476b43140d0039a6b698ac91dc028c26fb7704dbf9da880d5f38123b219f0af0c6a029bd463625a6af5527ebb94f2d56b1b1b166
diff --git a/dev-texlive/texlive-luatex/texlive-luatex-2017.ebuild b/dev-texlive/texlive-luatex/texlive-luatex-2017.ebuild
index 1d92cbcaa173..0678e5b46d8e 100644
--- a/dev-texlive/texlive-luatex/texlive-luatex-2017.ebuild
+++ b/dev-texlive/texlive-luatex/texlive-luatex-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LuaTeX packages"
 
 LICENSE=" BSD FDL-1.1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 "
diff --git a/dev-texlive/texlive-mathscience/Manifest b/dev-texlive/texlive-mathscience/Manifest
index a1370efc247a..55866f2f0bb8 100644
--- a/dev-texlive/texlive-mathscience/Manifest
+++ b/dev-texlive/texlive-mathscience/Manifest
@@ -760,5 +760,5 @@ DIST texlive-module-ytableau.doc-2017.tar.xz 360816 BLAKE2B 0acb1fbf39ef9de43869
 DIST texlive-module-ytableau.source-2016.tar.xz 15896 BLAKE2B 4e5573ebce1e66772b5486c79586d4cf33fd36f8b05dd302ecb20da33edbc84fdc6899b9dab6c52e066462c3958cca6f5fc8a6213865f53817addb214ce1b9f5 SHA512 76ec8e726ab8878e9ec7a1ce674da3a8d6dbd5c971d95cb6ddb68475493fc179ff3904a7f9b45da1c36ebd10f6d1d95678c0176b11ca48c4b598188713d94da0
 DIST texlive-module-ytableau.source-2017.tar.xz 15884 BLAKE2B 5474eb45ab176e7e03352eef9f87604052099bd385e804fb98795b9b68cc5c15c125fe8f5307a10ed6b7e282c3fca1ffa913cf9b0c4c128134e0113d95f92c79 SHA512 646fa552fadca33406c195ac17b2d20504439f39dd8f62d85fe4f66b6a476424cce08599e69571ac7d05a28252f406fb0c092f55bdbf00524d1967a231a9dc04
 EBUILD texlive-mathscience-2016.ebuild 5518 BLAKE2B 358d034a7ad2114c2097eb5758168f95b3be25e6f2df6c44e722fb0e053a16163925303a6656678b83f18c4b98d364ee1835323f09bb9af43eed6edaa8cb8255 SHA512 b38dfd37ca9ec6553ec0391ab0c7c9bb5648aa6ea9fa5234b18b0932e1305487ac4f5b83705c8c331ec9fd42100e6645b23f8b54ba216aa86d0c552618b15520
-EBUILD texlive-mathscience-2017.ebuild 5817 BLAKE2B e384c050d0baf17f8b46f90d17a89971090aa64c1801787e9136977dcb3315acfe06168da4337758158f0d66d64e26f45274c577f995f9bc47ff37c533ea35e6 SHA512 421c37cd80241214b65663c6da83a97000254ee329d812ce463cb0b965dfcd41de2fe0475fdb760da8cb5cbe2c0647e6e23f11d6c69ae5bcaeb758e371ecbecd
+EBUILD texlive-mathscience-2017.ebuild 5816 BLAKE2B 7a1dc977fdc9d230f2f67c7d209cd59a08d26f3793ddcbc0e77723e3536eda95321bfecb046fc01c248cd275e2bd257c1aa43d7894496305d14843d1810ba07c SHA512 c909159663b31b807c435826023e2bfdddfa23bfecf83b9b1f58ed84a78f4d7a6ff2be2734a3d95cf5f0e70fdde2ea4b1c3ed946d46f7f2c4e97aad3156a34be
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-mathscience/texlive-mathscience-2017.ebuild b/dev-texlive/texlive-mathscience/texlive-mathscience-2017.ebuild
index 015a62c29d97..60a72a193c98 100644
--- a/dev-texlive/texlive-mathscience/texlive-mathscience-2017.ebuild
+++ b/dev-texlive/texlive-mathscience/texlive-mathscience-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Mathematics and science packages"
 
 LICENSE=" BSD BSD-2 GPL-1 GPL-2 GPL-3 LGPL-2 LPPL-1.2 LPPL-1.3 MIT public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-fontsrecommended-2017
 >=dev-texlive/texlive-latex-2017
diff --git a/dev-texlive/texlive-metapost/Manifest b/dev-texlive/texlive-metapost/Manifest
index c525cd43fa1a..d4d491f76062 100644
--- a/dev-texlive/texlive-metapost/Manifest
+++ b/dev-texlive/texlive-metapost/Manifest
@@ -270,5 +270,5 @@ DIST texlive-module-threeddice.doc-2016.tar.xz 119012 BLAKE2B c27db6786bec940763
 DIST texlive-module-threeddice.doc-2017.tar.xz 119008 BLAKE2B e364557138a3dabc1eff4bef7ce2042a1f6522eb3b6ce84e1e3778c49707546271948e25c3650d3fdff3d07ee176f3071e3f7ba4778eff2ffda75b5d851bc0ee SHA512 976acf5671cdfab523ce1af8a3851a99bb154ae19e601d2cb6ee26f5f78d69b975fe8e73a6930c6dbbf086c5e574d83a279efac3d6fe3f376eaaaef7f05665b6
 EBUILD texlive-metapost-2015.ebuild 2087 BLAKE2B d1761344d2fd274f1e4f3cb111a187386e2ab2e4b29beb249340ea0ceeea52de4990d354518a7db5ae5a4d0f9ea4bb9303cc4ed454ec37853d6b2a12d42c0588 SHA512 a68c555617d120ff2c5b9799a0734dc5345e3da878d6db8fc49ab8273b8b2561ef1ca75fbe8d0cb755ccc84ebdb7bbbb113604702fc9067b580567e7b3ddc9a3
 EBUILD texlive-metapost-2016.ebuild 2194 BLAKE2B 2f93e3d25d7c77ddd8b392fe3c5349d8b3ec0ddbd462986f1200f73afb21d644ba2c8193b27af36ca4f8bd45ebf5c73e7fae967d2448800aeda2cb8405b3a514 SHA512 f586b069af46b2e854375c26dc035959682aa212056a7ab52f2a8f3af0d1e06bbaea4eccaefc03c1f2c0b69af74ba8a2088f301ffa8dc56e557334221869a012
-EBUILD texlive-metapost-2017.ebuild 2226 BLAKE2B 5bbabd6eced79147e24ce82de91e2157118135f4184b198b968032f21198231ceafe8e3452fbf252dcdb1bf60b013f2c7dc4c128b598e09a1ff61736a66cdd19 SHA512 3964959c496773e5432475ec5efb11e72d86e1d322e31cffb2f6ad069a93da772f63e251b8c795a78d45cb432ec52c47faff8cd28f3071622f75024d7a301fc6
+EBUILD texlive-metapost-2017.ebuild 2225 BLAKE2B db754757041f0f5d450dfe85f3585a2f6a94da60c6ee3289cda06a4c46513fef0bca240bdef929b0fdbfb1c2c73286d097e7c29587fd91596a4f70a09811b38f SHA512 3ac43871a213dc12430cbefe77b18449a3465ca6b70a0706318bbffe0d3dc795795fa9a73771072f515c229037d6e37c624ff193da18bbf90a916383dd791d68
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-metapost/texlive-metapost-2017.ebuild b/dev-texlive/texlive-metapost/texlive-metapost-2017.ebuild
index 8c1ec249015f..eae361b34881 100644
--- a/dev-texlive/texlive-metapost/texlive-metapost-2017.ebuild
+++ b/dev-texlive/texlive-metapost/texlive-metapost-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive MetaPost and Metafont packages"
 
 LICENSE=" BSD GPL-1 GPL-2 LGPL-2 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 "
diff --git a/dev-texlive/texlive-music/Manifest b/dev-texlive/texlive-music/Manifest
index 0157bd54dde7..f369def6ab52 100644
--- a/dev-texlive/texlive-music/Manifest
+++ b/dev-texlive/texlive-music/Manifest
@@ -158,5 +158,5 @@ DIST texlive-module-xpiano.source-2016.tar.xz 6324 BLAKE2B c3cf3e0a74df7994f2585
 DIST texlive-module-xpiano.source-2017.tar.xz 6324 BLAKE2B c3cf3e0a74df7994f25853fe895773f8b23733e71831060a4ba761fa1603ba4201e9e913e4c6008184c7159d1c331a6bd2c34d37b865d883b0e1b52f2d1b2687 SHA512 2566a4cd4070ae021ea0808b3c9ccf1d6a7add4f9e0a504c42f6c42ce659ddb6e9de7f7b8cd61f02a84c8bbb9163ac11aabb09c1b7efa4aa8a6e067ae3c129a6
 EBUILD texlive-music-2015.ebuild 1639 BLAKE2B ef6fcb260aca80084d8b6914808ca11194e5707589fd40ef348073fb592c82bef2abeaec1ae2affe3e1310d315776aad2416f137ac95df6fe0a3dd192e03507c SHA512 5984a2c6fa3e0fa3355ed7817496ab529efd02cfcec845058a284aace05ca459dda8da9ac317948f1e60e221b0bbfd65f0793799968539f41103afd83184879d
 EBUILD texlive-music-2016.ebuild 1707 BLAKE2B 13639fb9102b4b15c837183ec8a3ff8b97ba9acbcda5fc2e96950def41ecaea5988c009a738e81e1f940dfff5b5de9df1425d85eb548abaa06a743069e675044 SHA512 231669bffd8ff89c2afec839bab68363284e0384305eeb368030e1d699b55f16118777e759b9cf2a233200050e477dbf4a7fcf66adcdce8dda25be7c03cdda4f
-EBUILD texlive-music-2017.ebuild 1683 BLAKE2B 2c3eca234416ac41e50d98d1a22a0ff7cf34a1cf0bc36ae2088ccd814c8102d60e868f31a147cf172b4029f92d8472d26340ac54b3b81866c58423f2733ee1bc SHA512 5f1217339b20598b61e47117399eb3aed746abd715b71fd23567d9b67857afbba378f7a4190fab838208a4eabc1ddafca6b2ebd7a6dca2e38f349efa2a900c4e
+EBUILD texlive-music-2017.ebuild 1682 BLAKE2B 2692702156eaf9b694608478a5390764a44d812a6683fe308d65a7f834bc642257c5f506db6ac15a2d6a9b3d901a4eef3e27761e55c7b8f5f85dfd6da4ee7044 SHA512 4fba4457f7d32f93faf78d13f2584ba46d6045eef6d26de60412596ce1e42d317fbb24cf0dfa591cc1383cc42216f84de9ab6e38fb74db34b288324f07bc96b1
 MISC metadata.xml 444 BLAKE2B bcaf0689cbedb3dc02a63060d40765ba836651697d152028439119abff46f55cedd497220880d05ea00d5ac98dc61df77bd918c88e3d6fa783a356552be2b8b9 SHA512 2f4196a50ed70a2fe7a7f3d51ee5f3299682a7dcd06f0791ba128503d0bae27caf127eaa61e847644c06d40d3bc107977fe5546040e3eb14cae1705c570d6c7a
diff --git a/dev-texlive/texlive-music/texlive-music-2017.ebuild b/dev-texlive/texlive-music/texlive-music-2017.ebuild
index 1079101ebf78..b6a1d2d7cff5 100644
--- a/dev-texlive/texlive-music/texlive-music-2017.ebuild
+++ b/dev-texlive/texlive-music/texlive-music-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Music packages"
 
 LICENSE=" GPL-1 GPL-2 GPL-3 LGPL-2.1 LPPL-1.2 LPPL-1.3 MIT "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2017
 !<app-text/texlive-core-2011
diff --git a/dev-texlive/texlive-pictures/Manifest b/dev-texlive/texlive-pictures/Manifest
index bc473df0a608..40879d66f868 100644
--- a/dev-texlive/texlive-pictures/Manifest
+++ b/dev-texlive/texlive-pictures/Manifest
@@ -1011,5 +1011,5 @@ DIST texlive-module-xypic.doc-2016.tar.xz 3923200 BLAKE2B 3c0da6c849d411338568c1
 DIST texlive-module-xypic.doc-2017.tar.xz 3923164 BLAKE2B 05428b38455175d31fb3f6cd492a7209ad90370c15467637894e387836d7c25d669263c16382b24d1ed060b3e7d50282a06197cc79e5fd5731b9c92f1097baed SHA512 9f2ca1f120378e4ce52d96d7622a7f22a301c02ceaa2a19ce14d775073961aef01d1fb65202bce2ce1d8b88801749e2d642a0b2d52518d7c70317e8c62d9d2bc
 EBUILD texlive-pictures-2015-r2.ebuild 4702 BLAKE2B 0f3de68fba8f5c5ab1d7da53cf684a74327decca7dce8bb9d9319c3fec4602abf8bd40be33338de28146690abcee14b24b5c07e1e340d2a4ca06fd0837bab411 SHA512 9d139b8e5ae9b39ca353f3542ecded6f474f1146c8d3076ab96f1e1c229baffb298af4a63f721b7bc604be67c4113f69e8d5bb97a82bad587cc7b5cbf29e7d00
 EBUILD texlive-pictures-2016.ebuild 5350 BLAKE2B 236fa6ce487c989244bbf50ba5a20f0b045ea069e9e399458d5efec652c09c2f38a89146d1b76f575083ae8019296e5d85524b576b2a8b4e2a569cd5a8be4ae6 SHA512 154546a58d9e46cc4ee55aae6af764294d9705b54499608a7916580b56414248f181831581ffaafad94061a513b8a90b466e7ba7d5f9afcd9b23f9839e8c1758
-EBUILD texlive-pictures-2017.ebuild 5546 BLAKE2B 85368b9bd11a7e5138e9570d0da690c15a9505e19981ff4ffa3ab05090213f9a92153bca977ebfeee950da70ddca29660bbf2772efe1b8a146570a94ec25b821 SHA512 3768164ebb96f261180ea0586370b97c4f1c87e8efe787a89ec1988de00e882a0bfbfba63b241ad261804940e62e26dcb7d7ecb6d3f56b5ba1919266f2677d43
+EBUILD texlive-pictures-2017.ebuild 5545 BLAKE2B 64ad8e4fe4f13b9be6061a78f5f2e20503ffc76f6873c4cc7b3f5f2b29952dc0512378435716d78c3656e037bbc4a5106f25046e0885b52b661e25d373d88cc5 SHA512 fd9fd9f04421fba9eaf2eb0f0a8a5b631eb7f4b616b97831873850fa5ff4567ba78f11fedd645a8898b040c9a52f35f572aaa4c02125ad862f52e7dbe21ebcdb
 MISC metadata.xml 478 BLAKE2B e113025fb506c77cc1f2a8099b1182d3ce057e8067145dfe921af4289f22f3894e4a20eb6f941f4bdcad739df93975766490d62ce253a0710ff428dcc045ec11 SHA512 547880e196d638109a84a159cf694f201dc6e01ae15d26e252fc7da697cc2c466da0a3403c149d5847049da06e682557293cda020b77a05b0684611b4562f957
diff --git a/dev-texlive/texlive-pictures/texlive-pictures-2017.ebuild b/dev-texlive/texlive-pictures/texlive-pictures-2017.ebuild
index f99082439df4..0b3731a72661 100644
--- a/dev-texlive/texlive-pictures/texlive-pictures-2017.ebuild
+++ b/dev-texlive/texlive-pictures/texlive-pictures-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Graphics, pictures, diagrams"
 
 LICENSE=" Apache-2.0 BSD-2 GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !<dev-texlive/texlive-latexextra-2009
diff --git a/dev-texlive/texlive-plaingeneric/Manifest b/dev-texlive/texlive-plaingeneric/Manifest
index bf00cdd7420d..f893ecdcca0d 100644
--- a/dev-texlive/texlive-plaingeneric/Manifest
+++ b/dev-texlive/texlive-plaingeneric/Manifest
@@ -181,5 +181,5 @@ DIST texlive-module-xlop.doc-2017.tar.xz 537924 BLAKE2B 99ca47024e0a88404dc3dcbf
 DIST texlive-module-xlop.source-2017.tar.xz 916 BLAKE2B 13e151cd8bb0bf1b2912b7e9962a2da70e52f24b6f8ced1aa582ec974e20c680befc949f677dcfa54c4f8f0a6266b14611022a28f1118d6b8e85a4e5c3495fcd SHA512 246d2ff227d6ab8ff9367f0ab26458e408f4919f84edba84a06c97c057ad4c217fdac5efe8dbae56bea66f4ec0133e9e94ce444cbac4a3c70e3d88b413b7de08
 DIST texlive-module-yax-2017.tar.xz 5952 BLAKE2B 41a9fdfa93d7f50c7977ed2270ba0c62b80f329a9ddc9b86ac909217ea6614884c0a58904a94109d2347fb7e5ad627dde5464718fdfff364d9c402b59645b359 SHA512 2602ad4d5487fc3ff982b9921c0f16b19b658d0d225cc4b40be98be4b7d6ac86666475955644d04d8ec0fabca8c566b1fd219797d2dbbec8b6d9becfeeb6d0f3
 DIST texlive-module-yax.doc-2017.tar.xz 123708 BLAKE2B 7a64cdbd2a8e88238f331fc2dd9f4350e02ff4cc9cbe32741debbd7a47ea4bd934cb751eb9faad159e594f6fbaf86ecca86d497795c7e2985e5134ceb879def2 SHA512 ead74dc1ee40a1b28cda1665969e3e21f1c1f153d6af1b74e1c1473c0edd79225e74a054416f0d04c432721c7ad80540d28566735e570234371d290033c9afd1
-EBUILD texlive-plaingeneric-2017.ebuild 2908 BLAKE2B fc7b639cc7708511535507e38cc335d6e6d87a1e63e976c63e0c0fed1557032e151a60eb7caf28af0725bce8dcfbfcf73b589a0934c43d38ea2d294996a25919 SHA512 6d4418e992421653ab5a9c3727f6fbcd880037f5fb6292207ca6db287bb2ee6c9ca06b3ea001cc221ba9b22d8b6241bb9b0383e2f9bdae85111825af81ef49ab
+EBUILD texlive-plaingeneric-2017.ebuild 2907 BLAKE2B ec022eff5edc104e7785b60ff2ec316fe5d5e7e2b5e001de47526deee64ef5cf0a6dc4092c9fb7b59da48de942c9c294f03378d1a30d548ba5c898bbbd249825 SHA512 cdfba2025acf444e0491fd6922dece969b2aee04c4077f54c7ca2af82ba005412579a4f87cce59e93346b7a65bfbd6774910b534cbb088fc6a8e93428d3945b4
 MISC metadata.xml 510 BLAKE2B 499e22771e566c734ad5e8c6a239863e8ba931da1b0784f3320e07d4741afd647cc893a2f0646bb2ddc6b17cb340303efdeb5c8c6d866caa9abe7c97a133a620 SHA512 651f52d36fa1f4c9b767e600554cff9a6a38b702727ca17db398eba1ec732e60351cabb4521bff8a3234230f645fbb9e24af342df28e857fa6d1c6f5ceb3f9c8
diff --git a/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2017.ebuild b/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2017.ebuild
index c4734401855f..469aeb2bffeb 100644
--- a/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2017.ebuild
+++ b/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Plain (La)TeX packages"
 
 LICENSE=" GPL-1 GPL-2 GPL-3 LPPL-1.3 LPPL-1.3c public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !<dev-texlive/texlive-langvietnamese-2009
diff --git a/dev-texlive/texlive-pstricks/Manifest b/dev-texlive/texlive-pstricks/Manifest
index b17d5de135fb..a8d5da300ede 100644
--- a/dev-texlive/texlive-pstricks/Manifest
+++ b/dev-texlive/texlive-pstricks/Manifest
@@ -692,5 +692,5 @@ DIST texlive-module-vocaltract.doc-2016.tar.xz 15928 BLAKE2B 35c277d8ab65745bd41
 DIST texlive-module-vocaltract.doc-2017.tar.xz 15928 BLAKE2B 35c277d8ab65745bd415507cb2c3e056783327aab71d6918434675bb41febddd8b237abdbb5398e18d7ee959c3ab20597824a4ece759572f55871437e4cfc7d5 SHA512 38931f205f6a284a8e1397d74ea4987ed99317582f10fc5a28d3dcb06489cb6031d97edbc3a5a0c0bff25cb4a8c1b223da3491573bfaf26b6c76c5569617b037
 EBUILD texlive-pstricks-2015.ebuild 3837 BLAKE2B 988ad479cf87d9fcf47284366d8ff4c17a7dd863a4ab312d98bb7d1faca3910f99ac9cf11dcea7c2687a68d850dc1275933616d57c43f9dbb05dcda544eb0358 SHA512 7984d95ed298cc8bdf142b8d7d5826793cb0d0c0692625926fae792ac26ed8f634d91308c7a5916d2b0749e5895369078625ed64e8f7a01104100228f94a1dcc
 EBUILD texlive-pstricks-2016.ebuild 3906 BLAKE2B 48c1faa217c65c19a0b0dfc7f974c5e669b40dc2d6987cce7b3cf5fccc607e6a7a0469c447c020f3b185094cf48983a8cea2d79f9668398442d179cacbf92d2f SHA512 eab6117beb0d638c0c993a8a10a557a1002d96cb05f822231b3a89137b505fe2dfeaeb9ae3a4a49efbe4c9ce51612ae95327127b1062d13548c555660167b5ed
-EBUILD texlive-pstricks-2017.ebuild 3886 BLAKE2B e7ffad7f3342ee4b5683c1d10b87f1847617e247dba3b7e6159a86455448290d9328b6ccd42e8e75c07aff53e5fff71e09204fe1fa68d0c570a0bc1c1d7f8ab7 SHA512 13d35845e5967821c1b117d44823641f056b8afe4a6aa16f47ccadb59f11fd9b0b55dc21e7ea8c7545168bfd594684f3783c8e4a602936366f15f7bb813a4ada
+EBUILD texlive-pstricks-2017.ebuild 3885 BLAKE2B e5bd7018e1cd58a491e66df395550352dcbd4771276a79b0057bdddf1e5c1b28d17d128bc6201809ffc700fe88d986518eb946be5b4061049c81e0bb2937c406 SHA512 74c02b15679e5e3f3ef3378eb9ae4d837c24e3bdf845f28a6899cacb50bcf79c8854f7803b3fc37500b8d3244a77f56af20bce68a8535942fac003891c97b2ac
 MISC metadata.xml 449 BLAKE2B 524269780e1b502624f7ca03581ecaa6dc078802561231346bebefc0d9110aa0c8080b52e4ca3efa80c9ed5cd9a680d23a6228cbb693cd40c7d787ea24c7c06a SHA512 a3df336b00fc7b9c13cb71b5bbc2917fd5eabc00fe2cb341ecb845167a3f2d342025d4d81d22f421c79b2cd6fb14782cc1c5fcc54fe720b2e14d5e75f56eb58f
diff --git a/dev-texlive/texlive-pstricks/texlive-pstricks-2017.ebuild b/dev-texlive/texlive-pstricks/texlive-pstricks-2017.ebuild
index ecfd3f48955e..31297ecfc592 100644
--- a/dev-texlive/texlive-pstricks/texlive-pstricks-2017.ebuild
+++ b/dev-texlive/texlive-pstricks/texlive-pstricks-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive PSTricks"
 
 LICENSE=" GPL-1 GPL-2 LGPL-2 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 >=dev-texlive/texlive-plaingeneric-2017
diff --git a/dev-texlive/texlive-publishers/Manifest b/dev-texlive/texlive-publishers/Manifest
index 10b0e8e2d9f0..1882cba4cb6e 100644
--- a/dev-texlive/texlive-publishers/Manifest
+++ b/dev-texlive/texlive-publishers/Manifest
@@ -1221,5 +1221,5 @@ DIST texlive-module-york-thesis.source-2016.tar.xz 12584 BLAKE2B 62d8fbc2d8e7195
 DIST texlive-module-york-thesis.source-2017.tar.xz 12580 BLAKE2B 1bae520b3031c8bdebef74a8391f9f89d40e9a0d0cd71a46285e0939f1c0fca4be0ef7edfc491f6f5eb4a48a61404a0026514fbf307ec6a3bc383fe95eb87ec9 SHA512 088375bfb5eb7d55150761e9e322f93e8282735740a30176c3c8e03e720692b3212ddbda85410429e477d95841f396b43a3998d6d03a55b8d3edde0ff592b1ca
 EBUILD texlive-publishers-2015.ebuild 5206 BLAKE2B 89eac7c490c9a707ab43b7c31b741b0af929fbaee896fe9f4cd3d002bf7379088f6ad89128a4ad4b97c7d6df882f5565bb44a4145cd1947794135e0480085763 SHA512 8b19b119e459b980432f71e41b89ed55887c79647facbe967821a282b7d4de691acc10da19634c6697240cdcf5e7d0970d6f11dbbb2afab200996d844f0b73b8
 EBUILD texlive-publishers-2016.ebuild 6003 BLAKE2B 51629da13cdd24d5e6992253133d21ff3cdb5fee110c7a349f59352def289b042aab1c1ed644604c06ff1480025451be33eb6d911cb811fe2363eacd5f6c2c65 SHA512 1698659d1889afd405fc2e94c2f4daab7ec18f0efb0c12267d2673a60e104e82711f1ef40fbca3d6cd6c34572dd991bfecf5fd1b1d78eea10ffa054a10d0a0d7
-EBUILD texlive-publishers-2017.ebuild 6174 BLAKE2B 87a74b8a2fe879fce3ff656fbdaeb944850b59c459094d195c7736cf1bd39b3c89f55585c4bcfeb4260a7777be87cf6feb19dffd53f0dcaba04b2d0395fb5c0e SHA512 5d373491c9b89e6c364655f3c0c3190fbd666422772186ba1a8ea5900059c703fd4283c1d4f2ec1134d25d9ab4cbaa736bf83799900e0375387ead9d3d51d7d2
+EBUILD texlive-publishers-2017.ebuild 6173 BLAKE2B d1de80aa779340e688d9950fe7710701ae4b42cc1131462a5c24be1a8e6c76063f1e0fef1399475883c2e1d9e6ade6cfd6197cc7c247af9de241fa517231d0a5 SHA512 14b059e16656092ffd87ad4a6f38d759e86dab9eb73bf6edc6a8790da2788236f0983fefd71b6d3ea49b9db55894432fb02437e5e9ada91d55883f8b70ee40eb
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-publishers/texlive-publishers-2017.ebuild b/dev-texlive/texlive-publishers/texlive-publishers-2017.ebuild
index 019ec75902e6..713f8a7df371 100644
--- a/dev-texlive/texlive-publishers/texlive-publishers-2017.ebuild
+++ b/dev-texlive/texlive-publishers/texlive-publishers-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Publisher styles, theses, etc."
 
 LICENSE=" Apache-2.0 BSD GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 LPPL-1.3c OFL public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2017
 !<dev-texlive/texlive-latexextra-2014
diff --git a/dev-texlive/texlive-xetex/Manifest b/dev-texlive/texlive-xetex/Manifest
index c5c0cc643459..f0a569dc3ed3 100644
--- a/dev-texlive/texlive-xetex/Manifest
+++ b/dev-texlive/texlive-xetex/Manifest
@@ -236,5 +236,5 @@ DIST texlive-module-xunicode-2015.tar.xz 25752 BLAKE2B cf329be8b01de223cec927cba
 DIST texlive-module-xunicode.doc-2015.tar.xz 588 BLAKE2B 6fd1bd78870423aac5f246596b46f120020199d00818701fa6a45e77d7dc3ebc547d352ee264c7b93b22b84586adb242f4e1aafbaf8a33259f8b2dda832069cf SHA512 25cb6d481074888a2a033950fce4779399b311b0fb0072abc41ad30e943e15b1321ebaaa2c34e0b90941ff3df1a2779aa1ef8c336ac93ddf1359bad674502baa
 EBUILD texlive-xetex-2015.ebuild 2137 BLAKE2B 718243970bedd524c327019733d9a32b15f9ef3163927113d783deb3721be873538c8fa6b0e092a6615ff3303784d3db56b7c8f8d95032b6fd5810403f2689a3 SHA512 1fa5f3642c6423469523e90670fed9fe21d45a8caf3abddf71219df821f7f956c89aa55370b899ea571bbe4dbf9aa8b7c6df38b58022da727350bb0946d502ff
 EBUILD texlive-xetex-2016.ebuild 2095 BLAKE2B 60f9f421b0a8e2eed9d21718422e93d0f97a50a6de7f5d9dfd128beb0eba742497ce87da878c16e651679d86b319fbf70135cd258b7c69b1cae0bf5c1a3de2b7 SHA512 1e14458de84ba0dfdc2d32594cb074981251b6915b7408cfe417d696c3d9e9af51de28c1135ae542fe0ec24710099da7198615c1da48e4cbe080c99a0bf01a67
-EBUILD texlive-xetex-2017.ebuild 2187 BLAKE2B 9cc4ccb1b8868b3d23947d40d364542a5bb95d27117af0476d51e3437a6c6b2ae920fd5419a54af45afbde607b0cb3d90a471a8aef379a2f7b73f086db65bc6a SHA512 9898f5e2999519454f87badfa1e69770fcea88c2e05c6f5b0599cfd25c71c6768e1109a9d53afddd6613d8dcab5f6cea0b0cc1d7a0300d4a13f739ab9d9cb352
+EBUILD texlive-xetex-2017.ebuild 2186 BLAKE2B dc1cfeb8f985f4def32cc8129fc04fa82f2932cc55042c2289232e8885698cb5d8c1dd2f36bf0b8058c5ba5456393a0c8823b89dba3e0ab8610430d242230d92 SHA512 e2428a85b7d1165071b859218065d09c031521f580f16c2cb082830bfe8abc6fab19232ef450146c1b62a5363f2a79a49ece679e7dd4317ea624b10e0b688965
 MISC metadata.xml 504 BLAKE2B a78657320760b67ad93c4a3c8742b007639499446359800bc66c332b20dcdeec00835b9c17b576a45398efb5b15275427a74dfc1a474c513f8fb4eb0fc58d68a SHA512 c93e85dfe7e3cd8b815b3ceaa52f9fc91899eafa788904ccd10fea03bfbf40f5699e90f059899ed721a23f34b368885e38aa8e22e11f5950d3cae1bbe2626e96
diff --git a/dev-texlive/texlive-xetex/texlive-xetex-2017.ebuild b/dev-texlive/texlive-xetex/texlive-xetex-2017.ebuild
index fc7b054d3431..9dec0891ddae 100644
--- a/dev-texlive/texlive-xetex/texlive-xetex-2017.ebuild
+++ b/dev-texlive/texlive-xetex/texlive-xetex-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive XeTeX and packages"
 
 LICENSE=" Apache-2.0 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c OFL public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !=app-text/texlive-core-2007*
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index e43f01cfe6d0..a3459566b444 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/cmdtest/Manifest b/dev-util/cmdtest/Manifest
index ac4734befb1d..95fcc69775dc 100644
--- a/dev-util/cmdtest/Manifest
+++ b/dev-util/cmdtest/Manifest
@@ -5,5 +5,5 @@ DIST cmdtest_0.30.orig.tar.xz 38508 BLAKE2B 7a27ed4930decdfbc49e922af9724ddba2da
 EBUILD cmdtest-0.16.ebuild 565 BLAKE2B 995a4abe2db0272e6f806937b4990fb89843ed2fcf825140e6ce963bf4beb14223aee7b50cbbd9f68a7e80249ef11f2f5253f34b889e821f8c7804e3261809d3 SHA512 35a3ab987715ec0af7dc3665c766a9c1b4d35005d7799eadb7478c0125add44761a61b17f8e2d8b80cf79421c0b0a3b7ca6f886153934728a5e2809f291fabe3
 EBUILD cmdtest-0.18.ebuild 601 BLAKE2B 77c1b49917bf33964f7f2075ccd9e2b2f068a5d50d7d3744b388db2d69870605813486e6ac6858a19fce0c2bfedcda576af3a09b2b1386afb95e8e5dad4207e3 SHA512 432135a76f50e12791623ceab1e1866dfdce2b038f0a82bc6c884f85f2aa50ba6371c6ba0bd1a9e1ac5d155dd6467e012b566ec22c1512a5e19553a6bc39970b
 EBUILD cmdtest-0.27.ebuild 641 BLAKE2B 0719f9ee8398d9651210172815b72314c5ce0a4f4aca2b676c54144a182e12de4a1b33670584401e3080cea867f02a74f14989aa9578394f0cad5759cf3d7094 SHA512 47d71f682e2f37c913593a768097bc1c04ccbcb393057428e89de3ea7ce214160fc25b785b7689327d73ed8fedd4c0e6b3269b51cd2ec33463cea4aeb26091d3
-EBUILD cmdtest-0.30.ebuild 732 BLAKE2B 185fe485f333b5ce7071013f8cb0e176118cd3cfcfbc29102bbec449d4e056876a24e2145c57e1a84123784bd3e2393ea1177c27313320f3a70d99b407c4f777 SHA512 9245f1e52d2a01e0c2128525ab740cc1d75b2a5b5151954217b9afde08663d55bb7a25c0ffda610d7c6198e62fbfc7dfdd253b2790275d5c4b71d02147f82623
+EBUILD cmdtest-0.30.ebuild 730 BLAKE2B a98e0a73accf28c069d7d3c8bcbd4d441f262ec3d72376f5be5e1e08d0273fe7eab68c225603143c76b728c90c2c1d3cde630d8ecbc86b066217f9ee11979ea7 SHA512 bacb9c1eb198951f0f4bcfa1c7ce74ea82cb65db007d166d2d68a34e2ac8dfb0023e1a9b0a0a4fcfbe7c4f0248018168410fc09db9dca24bbeff03f9da00e8ce
 MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
diff --git a/dev-util/cmdtest/cmdtest-0.30.ebuild b/dev-util/cmdtest/cmdtest-0.30.ebuild
index e13a7c16c494..fa1e19245eaf 100644
--- a/dev-util/cmdtest/cmdtest-0.30.ebuild
+++ b/dev-util/cmdtest/cmdtest-0.30.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://code.liw.fi/debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
 
 RDEPEND="
 	dev-python/cliapp[${PYTHON_USEDEP}]
diff --git a/dev-util/cppunit/Manifest b/dev-util/cppunit/Manifest
index 070b75a42dc2..dcb20c42077d 100644
--- a/dev-util/cppunit/Manifest
+++ b/dev-util/cppunit/Manifest
@@ -3,6 +3,6 @@ DIST cppunit-1.13.2.tar.gz 953596 BLAKE2B 205a631dde2cdd2b543be3e39c66331499f7f7
 DIST cppunit-1.14.0.tar.gz 959716 BLAKE2B 581e3b73d6d152c249005ddf267100443e6c9cba12c52c43e9d6f81096b9cd13c3686fa2f73ebaf28c31193e41dbfd5d919dfb0143b190881345da65a5b7f86d SHA512 4ea1da423c6f7ab37e4144689f593396829ce74d43872d6b10709c1ad5fbda4ee945842f7e9803592520ef81ac713e95a3fe130295bf048cd32a605d1959882e
 EBUILD cppunit-1.13.1.ebuild 1519 BLAKE2B b947d09d79ae72338dcd884cea61ebfd4540f2cb8cdba41b116b6d73f4c28982b29676ac8904628ff75da8a4b1c9aff5d4e58190c4da05d90087e81040b03005 SHA512 828a553548f581e0de5c161e1c113943a87b4ce7a53389e6d0bdee808ac4acf75acef2c393a41cf142aaeccef1732f618a99500a91dc400a9c00f43f2b1362b5
 EBUILD cppunit-1.13.2-r2.ebuild 1727 BLAKE2B 9b1ae6e1f7c4390c8af78bd81fb59f0356453785613075f58c7ca707a0013e6878c74374b6525645c449e077603810164e4991627c4c8a628d5a69de483b1032 SHA512 1bff7dfb467e8cbd8b3ab440cfd0755cc7ca99824acfc729f579a3eb528947acb9cffcd7d9429853e3b8974cc5c9614da9edb5f7dd7826c7b8f09769d2036780
-EBUILD cppunit-1.14.0.ebuild 1728 BLAKE2B f5d58f6af81383be090f36be4bd8ba0238f79199a8daaf03351c273a8074ce7e87a472f025003af7b3895dc7b8a68481e95580e9c05a8744332510be6b253c68 SHA512 7f63953dd598ccfbb678a66b5bf452b52ea89f2d7e91f5de58108db0f869f3fccbd58e4eac11987ba6f0380b551c70e1df5350b8fa7cdeae124b2d8e27d06960
+EBUILD cppunit-1.14.0.ebuild 1726 BLAKE2B 3dd80a2efe5f5085fa6ef22b77967654389d767c01ade5a17b9c512afab779f35bdf323ae50393f1730bde8e7239c99e059a171a0866d17f098b8b661bf19c10 SHA512 c03a4a41c4faa5ad5337c97c24f3f268707250b847c7c9565ba1451bd2f84d2707708581e16fd92dbcc3a74f3c84c653656d3c37c3e59b9a5925353a3350fc6a
 EBUILD cppunit-9999.ebuild 1736 BLAKE2B 5bde8ba9a2298f612f2396f3f3de5893ebf5ae7868eb74e1ab78bfe9e8d739560d97f9d3d10c8abc4a216f768360ad307490ac008566161037a231e99089818a SHA512 38b35d01aa20d7e1c28832403a002b174ba44b656b5ba0f400972907b10bef5e94cc88292dd442aa2c59881e46fb0b8c98bad5d8cbaec93b29a3b7b38cfd6afb
 MISC metadata.xml 245 BLAKE2B 61823ae735b381c891f5cae47974d3b1ea6136d6f5f5d449a26dfcdf26472282d760b4ee8a605b8a7b75b9c97443cbc0db309ada118ce186030f276ed7c88963 SHA512 b098db4fb4d9ea116f6246bc6caf0f49e80e236d2fad78d287b638dbd5add7bfaf7feb1ca081ca557b23dde9227ce42fa808f3f6fd8eaba6a7e9cae93342f9c6
diff --git a/dev-util/cppunit/cppunit-1.14.0.ebuild b/dev-util/cppunit/cppunit-1.14.0.ebuild
index 147300b392ba..7d7191bbb95f 100644
--- a/dev-util/cppunit/cppunit-1.14.0.ebuild
+++ b/dev-util/cppunit/cppunit-1.14.0.ebuild
@@ -15,7 +15,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
 [[ ${PV} = 9999 ]] || \
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples static-libs"
 
 RDEPEND=""
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 9aa0787657da..4ac7f12d3647 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -3,5 +3,5 @@ AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a154
 DIST glib-2.50.3.tar.xz 7589284 BLAKE2B 8648e5d9e8f4c943ca3ec5a5ec01f380f55f76555bf4ec731e211b33d0e23c29ea2a9323e2e839f35f89f292863df76d4e8c622fc44c0e5905eb904576618dbd SHA512 ef35806c15170b6608445f255136c0bebd2d433adf903c2af2865f6a57b4f2fcfc1e4a7cea1a0dac48ff5fe26248fbf7886dba4a8d209506f0a94160df8fb7af
 DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017
 EBUILD gdbus-codegen-2.50.3.ebuild 1305 BLAKE2B 5aecff45e4829b32d3404c81f664620a54a2127bf066ef3af51e9be9ec3b70d4f5b18c674bec23d1b061f32af4d4346bef508ec0cf9111c94ebb7f2c7b01cd0d SHA512 cb018c694e4639888ff696c72b9df895de46946a0849668b3ccce9d6dcdae8193bc84cbf7ff2a0ccdd75108c8b4358d76cfe547dc8849cfa22c69ee42f8d3223
-EBUILD gdbus-codegen-2.52.3.ebuild 1317 BLAKE2B 975946902047aae38c34bebc8815c8f7c5e4db76d64547ce2b2fa2b7728232d65e74d1fe5a967a71d7d78812c915b1c38cf1f174f73a1e8b5b58858bd9c4b2d1 SHA512 469af0a5642a7f9f4e704add003d48004b42adc4d1dc780e8e2a30b72d96a4d46fae0cb4f7583e4b7067a35dc2bd57cb9eed7667d5a19482d4c5d9aa7151efab
+EBUILD gdbus-codegen-2.52.3.ebuild 1316 BLAKE2B 610efa050ee6d0377ea59d43d8ddbded045e40a96eaf7204d8e82ce8b67d51a7d811c56fdcc09ae14dc2534f9e8cb22110d562bf7987179855c7d921f32d1600 SHA512 abff2fe60c77cf9fdde1dbc521de5f286638e8089325dc7644d0a933028e8463072d599a670a56c22c597a180f91780c82e27caef0e77a79ee7f617fead3abe7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild
index 190af0d24fe4..4bee4383c729 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index ed4731489807..c1be159048a9 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -1,7 +1,7 @@
 DIST geany-plugins-1.30.tar.gz 4469990 BLAKE2B 3cb8434765667814dc95227a82bdf204b2f918c951de8d5d9b56549c3fc343e1fe1c3e225d9f907da6b3227440dbdad09d0318d2738c213640a4629e9f7b42fe SHA512 11dc44215aaa369831c249ef84b5dd0ee7eecdfbbf4707fc6165d78201e9e755447463c171ac6c8b2bc70df28a97b23762073ab9b31f7c33285d4728089da807
-DIST geany-plugins-1.31.tar.gz 4547472 BLAKE2B e570ccd2ab469fb251d17cd9a43bc4766189bcafa83a516e5960259a961378792bed061ea4b6d0a9748a5db5f8e8c60e9091a8e221c67d83afe8f51192c5a61b SHA512 73d48b276c93211c6ebc726b24726e7669184d8951d5d29662cb8144c04a239ef8fb621f91b7798720bbdf319a09e35efcaee1535125697838552bd0b1e47bc7
 DIST geany-plugins-1.32.tar.gz 4655759 BLAKE2B afef1fd304b36daf4da5bd2a753c3de2c3c94d4274716fe726afc4164d98645f3f2436b306b894bb4245d86ee0782058b0181655d42764421b2d24c3e9e4c79d SHA512 0284aa28820361f419a4ca000a8781bc044e112732ea6be7e511841c18d075eceef4abcabc1153ba9ff8229e529d3e44f6aacdc668927323f2d78bb2f8897a06
+DIST geany-plugins-1.33.tar.gz 4671123 BLAKE2B 33471215480597b34e2733b7dc292e94ff12985b645fda76b2e25492573bb866766a3ea5a4598c4f643e9528f8062ffb9bf6ccabbb9be04aecbf23650d9c776d SHA512 d046eb0b7bd3c704b62c84b05564b973203ddabf6c09b94bf3008955735d672077bff1a7cda27d4eba97824231483f3e64b3b0f0234a97a1a2727d535fb28718
 EBUILD geany-plugins-1.30.ebuild 3438 BLAKE2B a0cf586e95195375680bbde21c7de798fabd3ad944c9a7934ace91285a267436938b8bf158af9a6da5d55caa3b5c258218c0f5f3c44170a0c7384bc447cec0be SHA512 ab7193e7c89b6824c33d489e8bf0b6098b814c9bff52987af9c4ca5eb059902102f94e659b90e4ba1748f9242d7fbb3a3564bd88d0826c36f4b4a3807083eb99
-EBUILD geany-plugins-1.31.ebuild 3519 BLAKE2B c919ee924c681b067e7340f3b276a6531f44a23167533d04dcd231659663b8da9982e5e4dfef9fd123101acbbdf4d3906d1623b960a60fddc1c341f33170d017 SHA512 1c806fe9dfd3d54552836c35a98ac78e36cbf6eeff671def0e0a42d60e3007f8c6741150f09ecb1540a6637944c4763d827753475e09768556249132bba6a7c6
 EBUILD geany-plugins-1.32.ebuild 3182 BLAKE2B 5003867dc35ec00ff63552dbfc57680c0014a8af897da13ab286ed57fba913968c54fb27a2f9758744db1f3d01ebba4118d84dc325b3dc43668d4b00c85d7da1 SHA512 2779d14f320a8dfbbdec5ab9862a5fc6eb2230d09774c018ccb6bbc248b0291ebde97de7b03bff998dd41f1b2d83717531948865c7c2936a500a5a2f18c1957f
-MISC metadata.xml 1593 BLAKE2B a3cdef722d40a7c3eeec7075667a9b5d496b2e73ec7b67f8d47bf992959f08b099e0f124999903fb4151e8eba686830f93a8cbedd4fee2870d6fa96171726c55 SHA512 5fc32297ae864f48fbb764c9c4ba8380232255bb3279ecd5276a006468c71ea363343c222ccab729168f5ef010e8710fb4d3168356156adee7eec9c67544607b
+EBUILD geany-plugins-1.33.ebuild 3166 BLAKE2B 3e6beb940b81bd921424b6d1310c2fe402675a86815c6743483d7d9b5c05b4f4cdd1818bf92086430a03bc44b3a5c4bdaf58fb7e71af5da286dcfe2d71ee11a2 SHA512 7d3ac36a212e1deeeff6256aaf6593a65c0ade96e6da40fafe28a3672d46c4b3960c9c5b68c026acfe8c1bd8bed930a5aab9707168f3e7c4fbfdc9dbcb405d93
+MISC metadata.xml 1533 BLAKE2B 33a794171fd9b6a50ea6669c4bc782f40144d7efcf3145c742f4b427c1a2389d9370085ba2661498800324c17b3bfd5608b70c7e1f24892134e338108ae08354 SHA512 7c469c01a2afc24631d1260ca010c59031d61c63c903ce13ccc5147d960f0299c5cad02f4a839df8bef1f5566a49ef443bfdd0b40eea0a4401c8fa6625f532da
diff --git a/dev-util/geany-plugins/geany-plugins-1.31.ebuild b/dev-util/geany-plugins/geany-plugins-1.33.ebuild
similarity index 68%
rename from dev-util/geany-plugins/geany-plugins-1.31.ebuild
rename to dev-util/geany-plugins/geany-plugins-1.33.ebuild
index 1241ce470d88..4115b2f8d7be 100644
--- a/dev-util/geany-plugins/geany-plugins-1.31.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.33.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils python-single-r1 vala
+inherit python-single-r1 vala
 
 DESCRIPTION="A collection of different plugins for Geany"
 HOMEPAGE="https://plugins.geany.org"
@@ -14,25 +14,19 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="gtk3 +autoclose +automark +commander ctags debugger +defineformat enchant git gpg gtkspell keyrecord lua multiterm nls +overview python scope soup"
+IUSE="gtk3 ctags debugger enchant git gpg gtkspell lua multiterm nls pretty-printer python scope soup"
 REQUIRED_USE="
 	gtk3? ( !debugger !multiterm !python !scope )
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 
-GTK_COMMON_DEPEND="
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-"
 COMMON_DEPEND="
-	>=dev-util/geany-1.26[gtk3=]
+	>=dev-util/geany-1.32[gtk3=]
 	dev-libs/glib:2
-	dev-libs/libxml2:2
-	autoclose? ( ${GTK_COMMON_DEPEND} )
-	commander? ( ${GTK_COMMON_DEPEND} )
+	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( x11-libs/gtk+:2 )
 	ctags? ( dev-util/ctags )
 	debugger? ( x11-libs/vte:0 )
-	defineformat? ( ${GTK_COMMON_DEPEND} )
 	enchant? ( app-text/enchant )
 	git? ( dev-libs/libgit2:= )
 	gpg? ( app-crypt/gpgme:1= )
@@ -40,13 +34,12 @@ COMMON_DEPEND="
 		gtk3? ( app-text/gtkspell:3= )
 		!gtk3? ( app-text/gtkspell:2 )
 		)
-	keyrecord? ( ${GTK_COMMON_DEPEND} )
 	lua? ( dev-lang/lua:0= )
 	multiterm? (
 		$(vala_depend)
-		x11-libs/gtk+:2
 		>=x11-libs/vte-0.28:0
 		)
+	pretty-printer? ( dev-libs/libxml2:2 )
 	python? (
 		dev-python/pygtk[${PYTHON_USEDEP}]
 		${PYTHON_DEPS}
@@ -67,10 +60,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# bundled lib buster
-	rm markdown/peg-markdown/markdown_lib.c || die
-	# devhelp plugin bundles devhelp
-
 	default
 
 	use multiterm && vala_src_prepare
@@ -80,54 +69,55 @@ src_configure() {
 	local myeconfargs=(
 		--disable-cppcheck
 		--disable-extra-c-warnings
-		$(use_enable !gtk3 geanydoc)
-		# GeanyGenDoc requires ctpl which isn’t yet in portage
-		--disable-geanygendoc
-		# peg-markdown is bundled, use app-text/discount instead
-		--disable-peg-markdown
+		$(use_enable nls)
+		--enable-utilslib
+		# Plugins
 		--enable-addons
+		--enable-autoclose
+		--enable-automark
 		--enable-codenav
+		--enable-commander
+		--enable-defineformat
 		--enable-geanyextrasel
 		--enable-geanyinsertnum
-		--enable-geanylatex
 		--enable-geanymacro
+		--enable-geanyminiscript
 		--enable-geanynumberedbookmarks
 		--enable-geanyprj
-		--enable-geanyvc
+		--enable-geanyvc $(use_enable gtkspell)
+		--enable-keyrecord
+		--enable-latex
 		--enable-lineoperations
 		--enable-lipsum
+		--enable-overview
 		--enable-pairtaghighlighter
 		--enable-pohelper
-		--enable-pretty-printer
 		--enable-projectorganizer
 		--enable-sendmail
 		--enable-shiftcolumn
 		--enable-tableconvert
 		--enable-treebrowser
+		--enable-workbench
 		--enable-xmlsnippets
-		$(use_enable autoclose)
-		$(use_enable automark)
-		$(use_enable commander)
-		$(use_enable ctags geanyctags)
 		$(use_enable debugger)
-		$(use_enable defineformat)
-		$(use_enable enchant spellcheck)
-		$(use_enable git gitchangebar)
-		$(use_enable gpg geanypg)
-		$(use_enable gtkspell)
-		$(use_enable keyrecord)
-		$(use_enable multiterm)
+		$(use_enable ctags geanyctags)
+		$(use_enable !gtk3 geanydoc)
 		$(use_enable lua geanylua)
-		$(use_enable nls)
-		$(use_enable overview)
+		$(use_enable gpg geanypg)
 		$(use_enable python geanypy)
+		$(use_enable soup geniuspaste)
+		$(use_enable git gitchangebar)
+		$(use_enable multiterm)
+		$(use_enable pretty-printer)
 		$(use_enable scope)
+		$(use_enable enchant spellcheck)
 		# Having updatechecker… when you’re using a package manager?
 		$(use_enable soup updatechecker)
-		$(use_enable soup geniuspaste)
-		# Relies on obsolete and vulnerable webkit-gtk versions
+		# GeanyGenDoc requires ctpl which isn’t yet in portage
+		--disable-geanygendoc
+		# Require obsolete and vulnerable webkit-gtk versions
 		--disable-devhelp
-		--disable-markdown
+		--disable-markdown --disable-peg-markdown
 		--disable-webhelper
 	)
 
@@ -137,10 +127,10 @@ src_configure() {
 src_install() {
 	default
 
-	prune_libtool_files --modules
+	find "${D}" -name '*.la' -delete || die
 
 	# make installs all translations if LINGUAS is empty
-	if [[ -n "${LINGUAS+x}" && -z "$LINGUAS" ]]; then
-		rm -r "${D}/usr/share/locale/" || die
+	if [[ -z "${LINGUAS-x}" ]]; then
+		rm -r "${ED%/}/usr/share/locale/" || die
 	fi
 }
diff --git a/dev-util/geany-plugins/metadata.xml b/dev-util/geany-plugins/metadata.xml
index e97496ef202a..ba173350cebd 100644
--- a/dev-util/geany-plugins/metadata.xml
+++ b/dev-util/geany-plugins/metadata.xml
@@ -20,7 +20,6 @@
 		<flag name="enchant">Enable spell checking using enchant</flag>
 		<flag name="gpg">Enable geanypg plugin which integrates GPG using <pkg>app-crypt/gpgme</pkg></flag>
 		<flag name="gtkspell">Use gtkspell for dictionary support in GeanyVC</flag>
-		<flag name="keyrecord">Enable the keyrecord plugin</flag>
 		<flag name="multiterm">Enable the multiterm plugin</flag>
 		<flag name="overview">Enable overview plugin</flag>
 		<flag name="pretty-printer">Enable pretty-printer plugin</flag>
diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
index e318d0285ba9..78687291df69 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -1,8 +1,8 @@
 DIST geany-1.30.1.tar.bz2 4352154 BLAKE2B 6efceb21e07aba3b0698196543746e926d6a73ef5d5f560467eee18a7b9ade4ce0ce37808176922b3399ea8a72b2f281af313a9f57aa325e1a9cb964f0f1c34e SHA512 55fb446b0c517ccee4d2f3023334b96a336788422a4dc41207a4f290c5d4b88df1eefa4b7f6fddf0567224f890ae7bea396306a935512f17e01682034f7200e3
-DIST geany-1.31.tar.bz2 4355879 BLAKE2B 5bd71d41ae4513f280e7e3e61f98cfd125cc7f5b6ab4c0b80f339cc4f8b1c40a6bbe36716dcf689f1d0ee0ec71ba23b00d092f3dd4fffdbba158ca4a049bf64b SHA512 6b5b07928173ef2673867ce2ab9cef1d74dfa97a5ca3515bfb85c0c4d239d7964d5f8d912dce3d97cad06a92c7a967abd454a5e4dc91e481d47de7773d8f6503
 DIST geany-1.32.tar.bz2 4341296 BLAKE2B c12b5608929d308cd9ff66c04a395a48d7ae05e773f201ebce64b883a8b5da73d6e84b1799cfea35ae2c12b02177cc0d43328924daaf8f485a83305d0d8e763a SHA512 a5ec73f690368d735e20ba90db90ab9a10e504545374a0d82c82af1f2df2f1382edb966e442257a271602b9322e3229af6a07f9c883d5d2d32236dd8f7791b5d
+DIST geany-1.33.tar.bz2 4106409 BLAKE2B f0f16053eb1894ea98c8e79cd1cc5cb12adde4755358db42afe7c50a940168eeb6d7c5b7778765f28c6f6b029b5e17ac8433580e30c456b1b56fbea07ac16c6a SHA512 7fd53bd61cfe2dc05af69b5739ba2841cada822ea6dd76c6b2eb2707e69210f47cf19308842e3a989772c18a7e4386bf7a2b053085063605d196e8e630ab2b33
 EBUILD geany-1.30.1.ebuild 1570 BLAKE2B a50ba6cc4c43000bed7ce4b1f8bbe1c0a9ecdf0729be7377dc16c976debf848d63a3aeb147558d005e2759df60752ba4061a8844aca239a2dbbe76076c3407a8 SHA512 c8d077fa9cfb0a7911f8ecb4fa343f359da2f48ab252928ba594e66e33ecf694e28239f5ab0185cf0d36b2e0421e053daaf9d12ef5fce48a8b458a47d319fe2e
-EBUILD geany-1.31.ebuild 1578 BLAKE2B b8d24b3a80cf74be805e0a77130a110e4c02a4d571cacf2c6593fcee85e36d6bb40609b70357667f0a764d5ea779dca19b74aa284e50aab9ba9f929129865979 SHA512 2901aeef60de657cead6a8014f454fde320ea444ac0971e8d9575b22a26fc28c5291873cf2aa04a630159c7385c8089cc9a4fe86d4df346a828a065095df023f
 EBUILD geany-1.32.ebuild 1569 BLAKE2B a451545a2dbcf970013939a50f67af077d1ff82eabfc3e0167731abd5ea3c3cd284d928d47d766ce9c070369192c8dbad0d366e14b3ccf1424b105d99011dd8d SHA512 092512d94cd461d2ba5822a1a7c6fb8151170bbadbebf037f2da41351e7be56780344c29734bc48d88f369fb20f2d9a617d1a9600f35909fd0b449d764373182
-EBUILD geany-9999.ebuild 1716 BLAKE2B d8f333bf0ccfebf13f85c724d550b0654a44e8ac8d662b2e6819016860f6a3145e1ae4c05671f056b8af75f5a30ab2770c76760918194a7415e116ea0d52623f SHA512 f6d65dc0cfcdeff91f8be76a8f9a55e167624a717610596dadfea0eebf71055073a074c792864573b386fa26956010d9c9ef01fc3e77ffc1537678e92e8679b7
+EBUILD geany-1.33.ebuild 1708 BLAKE2B be73a09dc4eada889b0af8f8f963d6635e0f0e60632df56cced5ce0a4daefbdd2eac3a132d2a6b27a50df44444e611a73054779521c47f49c1d6d8892d39e119 SHA512 4847dec91a041abb532bef42d41555754517fd8598628f36df09f8ee06a23af0b9d60b05f6ebb230c9871c75a2baaf70e33105d2682fbe05aa6bdfee9f619dfb
+EBUILD geany-9999.ebuild 1708 BLAKE2B be73a09dc4eada889b0af8f8f963d6635e0f0e60632df56cced5ce0a4daefbdd2eac3a132d2a6b27a50df44444e611a73054779521c47f49c1d6d8892d39e119 SHA512 4847dec91a041abb532bef42d41555754517fd8598628f36df09f8ee06a23af0b9d60b05f6ebb230c9871c75a2baaf70e33105d2682fbe05aa6bdfee9f619dfb
 MISC metadata.xml 1978 BLAKE2B 04d6567b9c02f927e912c8d35bdea73c8015dcc4a6c7f47d91b50086c619e2e25a472170f46a4d1053cb942a33d66f85da1e837bc7f4397678534702cef964fd SHA512 f070310d9266a11c4b91c4f644534f3ff9d7538c2d97e6daa009d403cb2c8aae2856ed51646315906a51399b6e51a1f32fbd12f5ab616b597c4fc7c97c5f5152
diff --git a/dev-util/geany/geany-1.31.ebuild b/dev-util/geany/geany-1.33.ebuild
similarity index 61%
rename from dev-util/geany/geany-1.31.ebuild
rename to dev-util/geany/geany-1.33.ebuild
index 2dbe5634afac..4975465aee2a 100644
--- a/dev-util/geany/geany-1.31.ebuild
+++ b/dev-util/geany/geany-1.33.ebuild
@@ -1,19 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils fdo-mime gnome2-utils
+
+inherit gnome2-utils xdg-utils
 
 LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
 NOSHORTLANGS="en_GB zh_CN zh_TW"
 
 DESCRIPTION="GTK+ based fast and lightweight IDE"
 HOMEPAGE="http://www.geany.org"
-SRC_URI="http://download.geany.org/${P}.tar.bz2"
-
+if [[ "${PV}" = 9999* ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/geany/geany.git"
+else
+	SRC_URI="http://download.geany.org/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
 LICENSE="GPL-2+ HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
 IUSE="gtk3 +vte"
 
 RDEPEND=">=dev-libs/glib-2.32:2
@@ -40,30 +46,36 @@ src_prepare() {
 	# Syntax highlighting for Portage
 	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
 		data/filetype_extensions.conf || die
+
+	if [[ ${PV} = *_pre* ]] || [[ ${PV} = 9999* ]] ; then
+		eautoreconf
+	fi
 }
 
 src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable gtk3) \
+	local myeconfargs=(
+		--disable-html-docs
+		--disable-dependency-tracking
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		$(use_enable gtk3)
 		$(use_enable vte)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" DOCDIR="${ED}/usr/share/doc/${PF}" install
-	rm -f "${ED}"/usr/share/doc/${PF}/{COPYING,GPL-2,ScintillaLicense.txt}
+	emake DESTDIR="${D}" install
 	prune_libtool_files --all
 }
 
 pkg_preinst() { gnome2_icon_savelist; }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
diff --git a/dev-util/geany/geany-9999.ebuild b/dev-util/geany/geany-9999.ebuild
index dc57933d71f2..4975465aee2a 100644
--- a/dev-util/geany/geany-9999.ebuild
+++ b/dev-util/geany/geany-9999.ebuild
@@ -71,7 +71,7 @@ src_install() {
 pkg_preinst() { gnome2_icon_savelist; }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
 	xdg_desktop_database_update
 }
 
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 6b5b08c7af05..253f2866a5fc 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -2,5 +2,5 @@ AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c5
 DIST glade-3.20.0.tar.xz 3492928 BLAKE2B bab8682ec83a98f7f405a667e9fc9ad4b0fa334e0f1f3b1ba5bd8e17af1c61c65031ebe2fe56b8321df142f5a4d8dec348793bba0fc3c195c6722d635d52a291 SHA512 58c8da3522c75470f5b42492bddd83f61d828fa2a3fb8a78d15813f6d1f1df22bd808f25ae7228bf2e821bacdcc5665b889bac3ea8364c4dac288f95e817e98a
 DIST glade-3.20.2.tar.xz 3535064 BLAKE2B 33e5e9477556ac5f645cf13658ff1eebdaf046c1bbbcf5ac528c00f9b5f76943ede8140cc6a3b73dc27ed96c363208700031306f19478ba0e9e2fbae8319f500 SHA512 45f850ed4d409aaf11153da45398e7974d7b85235bf5d5043bc11755c3e4d1201f59ed854786162a7414f0521c818982560d4e226f93625b9253dc598793118a
 EBUILD glade-3.20.0.ebuild 2390 BLAKE2B 22cd5f2417192d963cbb2ff1376d9fa4b5eb44aba78f53c233dc5fd159fb93fa2c03096d71a35cd89321dd2d1f28092a503a4fd0f5cc8883da76854d9a470292 SHA512 98673ca19010e2a63c5c7c9c79dbfdb65939324004c7be6d8b846684411af444ef1fc499234296bfff24d5f8e03842781378d6099356af8b6dc236e757bdf047
-EBUILD glade-3.20.2.ebuild 2394 BLAKE2B c91560f04379072a2f56196d638ad8c85af639a1fc3e5d6c510dba765a734411e6087b554d133e5c15be5401d6676e606025b18c9d3d74c639b697a377a95a4f SHA512 e861f128dc6d30597ba120db61bac3fae5e77de1b8ae5514680401776c9baff90fb8f12fb1644b3735790be7c2ff35e7827212ede6a5468c47795abf410e4069
+EBUILD glade-3.20.2.ebuild 2393 BLAKE2B 358410a94c2b9231da43a23861e288b2435c5746744eb8e9b8520e71d00fa28a6396b894bec691935b31eba01fdc2b124ab01e48c0f5452f267a723b20d69954 SHA512 01c2cd6e6c614b73b9cae77df24c893344895b06f83b042bd6f48250f8677eda638a64559be488edc718b38cc7e6231ac856bbae874b52a7efbe0fe80c3a8bcf
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/glade/glade-3.20.2.ebuild b/dev-util/glade/glade-3.20.2.ebuild
index 11d5534f3d09..fa4a734fc8ce 100644
--- a/dev-util/glade/glade-3.20.2.ebuild
+++ b/dev-util/glade/glade-3.20.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://glade.gnome.org/"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
-KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 IUSE="debug +introspection python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 6a3e1c3eab2f..ecacb5ceb64c 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -9,6 +9,6 @@ EBUILD meson-0.42.0.ebuild 805 BLAKE2B 7e3a4ca5a0da7e3898575fbbc5d8c6b452b73b7ec
 EBUILD meson-0.42.1.ebuild 805 BLAKE2B 7e3a4ca5a0da7e3898575fbbc5d8c6b452b73b7ecd2d3aa8ae59f442d09b64e9eecdef07bb5fffc3fdc372b44a9bd816bcec3c7c0b4e005939943e40e8191122 SHA512 ccfb7dacbb5cb935f51709917060a9c7849d861d8396f3dcb3d39e4f2fd4706232dbff88055d2d61845f21a4f0c5b0726baf943e3b1b12507a1f4d7fbb292c88
 EBUILD meson-0.43.0.ebuild 796 BLAKE2B e3766616714b2355642c3c428dda7f0cb7036082d2885eaff9c48c069407c390fe1da43f6a376edd288eeaa09a2eee98a2088f8e1bc8b15ceec1d94baa22ae61 SHA512 d7378ebf05ad2b4b63ebf2e81668ba28a24758541c8c000ef11fcb6275b2e7cbda0aca69ef485bd2e2816b904bcbbc4eb1c9752a2bdce78e032435e121a60c08
 EBUILD meson-0.44.0.ebuild 906 BLAKE2B 4a34d43ed4a38c711f1e6b108878ef5f4d8def23446a61525660f1953421b3638b9e7079209417487412a0da5b104342fa2f26fd6710519d3fcc2f9714de452b SHA512 c2adf5e99f0be337f66b0cfafcbd55fed056518144651589211b4653b510006dcc1f7d8169407ef79a3fcf52141fc16099428525eda86175729d5d2f2cfd344c
-EBUILD meson-0.44.1.ebuild 914 BLAKE2B 6ced2f33a5097ee384a85cf3cf35f49b6d3dbcc5f0b5c968b8c5d2e30fad6eeb2cbb12ca4c1804262a8d232b391437acd0db8fe142f3cf6ff316837d3cb1a109 SHA512 7a7887812ab9bcb12211ad574c4e73c5be03d660793e54a90b8d848be7d231dcea27aa5c1ffcf04a3eebf108fb871640e696f56347e9e26b3801357113efc99a
+EBUILD meson-0.44.1.ebuild 926 BLAKE2B b3d5ca88c61e70eaada584ffcfcbf06528bf20bcf00a589085e22511b21e3ce401cb09271029a5be7bb297a145480b3fecd7fd6936cc375e1023591cc054e821 SHA512 36c4098010ba1a116e0016356b9ce6708c717396a7e2b2a9188625ac2a6559d741ff3e28ef5320ad5bc79ac913d4874581e53f3dc154fad1f2d9a4b9a7c7fe13
 EBUILD meson-9999.ebuild 821 BLAKE2B d772ef53915acc1e19cf6487208bf5a82b99fa11cc2e174051e72fc7c8ecae19b351ba838a122fb46140e643851e7754bb2df4c0eaa0034f85b0836e968a7a96 SHA512 0836e241d5a0ce99f923fd5c58ea404d58474f5beff48dd6b130f7be13106d285baa82c0ed0c812ffc967bc743b413b6c7b02ae73f2de8fb10c5d7450c4ec355
 MISC metadata.xml 443 BLAKE2B df3275dde920dd96d5a078c34d08793d7e377a64910b30b6620a4365a61005d63ba2dfd630191765c47b52e9b309d95dad18d86a10276308f4253c5faca078cf SHA512 acc217d18494f1f968d25b52e58fa268d6a1931c5ecd03350e84ed8094ce5d0a708ba536688dfdd267ca6bfad103a2bffcfece5bb5bd9a34f4853b5f1f655826
diff --git a/dev-util/meson/meson-0.44.1.ebuild b/dev-util/meson/meson-0.44.1.ebuild
index f7d05928a187..22780b0bf0cc 100644
--- a/dev-util/meson/meson-0.44.1.ebuild
+++ b/dev-util/meson/meson-0.44.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
+	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x64-solaris"
 fi
 
 inherit distutils-r1
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 509d70653edf..56a380f69f9b 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -2,6 +2,6 @@ AUX ninja-uclibc.patch 526 BLAKE2B 732fb8dc79b326a1a4d453ef7d7210dedaca436f19ed2
 DIST ninja-1.7.2.tar.gz 180611 BLAKE2B 9e0b5faaed9dd0c01b3cb22e5927668e985f897c4a448871b3147d4383d562b91f4e4fe304cb61a31d5ee096b58f0c4e4a7c1907ed9637658faa1eafb31cdd72 SHA512 29900d07364d87ad8b9614b82bc1b0afda5ca6522563ab73fb228f206ed6b29b70cf034a3caf5a9b2c0b105d1e076c6b425d93b5d14aa3ca3730d75611212a64
 DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2
 EBUILD ninja-1.7.2.ebuild 2654 BLAKE2B 6d06ebc1142aa72cc51f6ef11c42b9798adf36c98c778ea660ec88595c6b558458f3b2d4b988cea5c27b9daa717c78334da132eb40fd18ef50b6a70d0050e123 SHA512 715d1473f7515354f0c3f3d8c7017abbf45509c477b1d66f6c4e7cd3d2dac0d85fe68a35feed89c77be4d1d10540039a9966abe35c453d3bb6965709686e0cd3
-EBUILD ninja-1.8.2.ebuild 2610 BLAKE2B 96dcba452cd3f358a75a73d1ef3422055833aef0f08497cf48bcf20a4e2e8b9d2e871b272202f9d0814d56e0be009962c428e0561600469d91818e8bc6a49bdd SHA512 b82f91e3faf70dd5b345725b1a5e9de68f1929ed3aaccaf4cbce909cbf00bbe068862604fca732f81a6e94ac46e8cd3420470ade28c24196928c664e8f578742
+EBUILD ninja-1.8.2.ebuild 2623 BLAKE2B 3cbcc388e4dc71f6d4b2674f8dc360a78e649afb4fff00317214b7511d5ee973602e165a39284b59cebc52f4e974f0755dbd5b6c5825b0fd7d52fe74aaf7e518 SHA512 74c00f7e068a3c5c1ab7936ea2095983de574f206d4e066dd20380cc23b00bbd43e76ddbe4fd39634e0fdd83c4b6e885edf62c31fc6ee3ca6472db9837c28e39
 EBUILD ninja-9999.ebuild 2617 BLAKE2B b39d201c06de2faed1e66931a03a5e3aa7a09e12a12cd2d618b7cb3537054205cc9e137fdc811f6fae3f0cbae1ec75a4a0c69dd880ba1cd9dcf15d27bec790f2 SHA512 510034c91bc8be87f2e267e3d38ef86f0fe27dc8d2ca634e302b47a1752cd7caa379055f91c493d248693ae5c472ca4987870f0f126b41be0507dd0872ebcce8
 MISC metadata.xml 340 BLAKE2B 7cf71b1a09f74328ea74362db4250bf038c0455dcd5f65676ceb5d80a61b5c2923696ecfeccf9d6cd264633e7dc00daa80bf960cc67e5b889d18d487d8e89b97 SHA512 4b78365b98eb9b8a1ef27115261dbf426942cccb7be03c8264e2728e60dedfec8fa51ee3f43488043be5af21b28a74c1c81f4767bcc58574873c2223172447b2
diff --git a/dev-util/ninja/ninja-1.8.2.ebuild b/dev-util/ninja/ninja-1.8.2.ebuild
index f956707544f1..c143bfab4212 100644
--- a/dev-util/ninja/ninja-1.8.2.ebuild
+++ b/dev-util/ninja/ninja-1.8.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
 else
 	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	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"
+	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 ~x64-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index 2f33c04558b1..4191f0f3f13c 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -7,5 +7,5 @@ EBUILD re2c-0.13.5-r1.ebuild 712 BLAKE2B 7dccc9fa372c83c421eb1ee12ceeac59765c37d
 EBUILD re2c-0.16.ebuild 755 BLAKE2B 7c7cacf4824b4a9d880298bbb2d1c40810500ea9203db157830652b7b598a68ae4c5bc685899bbbc9937f9ee8bc550d07c93755ff2064927f8475dbc4d14dee5 SHA512 8bd63d72cb9bd092ce626def2946ee5167d98c91ced9497f8fa895115c868fb199b2afe4173fd0f5fa14f0aacd763170f72817e4cf2444a2bebbccf307a45653
 EBUILD re2c-1.0.1.ebuild 763 BLAKE2B 590b767074a8478ef7f3bd01f2c050ce868ff2b4795f2ff3762b917d45d6976ff29ebbd7da914d76e6ba56cb3e70e352f53b48ef4374743e8ec482fdba24b786 SHA512 ded3ef724bc5624a00994a80739483e7a21278bb45f7d54001e060b71d591c44cca59e7202e1af5f36ec84b39003c97f7f9161d735a8ba67925d29bdb65253a7
 EBUILD re2c-1.0.2.ebuild 769 BLAKE2B 90d97ac18d6faf57040988b9aa1f5fd50c726359012a1d3f6f16155cb29c2ea3202aad01ad7f9fdd5c0e97b9d956ef998549f1e86ce84636993825b22b48593d SHA512 2845c30b034de806ec2339ad15e9a966349006db475d614c0399988cc1f6fee866f37e6d5c671d73414c11a14c28b7e56645b8cdebf1f785f47c15c5ca225d86
-EBUILD re2c-1.0.3.ebuild 769 BLAKE2B 90d97ac18d6faf57040988b9aa1f5fd50c726359012a1d3f6f16155cb29c2ea3202aad01ad7f9fdd5c0e97b9d956ef998549f1e86ce84636993825b22b48593d SHA512 2845c30b034de806ec2339ad15e9a966349006db475d614c0399988cc1f6fee866f37e6d5c671d73414c11a14c28b7e56645b8cdebf1f785f47c15c5ca225d86
+EBUILD re2c-1.0.3.ebuild 782 BLAKE2B b20b14e780a6bdf3f9a09d7b21f67b9d797d403d176b5b25bab866600614a7e0bccc5ce043acee34ca3db5a32f32f47240750c3c91d8c0ea1b00ef48a67affd7 SHA512 829c3ff138da03fd1867869509533a24b964add4594c6115b2df2a042825ac164a3117afff3f2b03f34fa6c10df0e4db42d07ceca52e6489598f2a009dc61bc3
 MISC metadata.xml 423 BLAKE2B 69ad12e8bd8cd2356e36736ab276efa0aadc2755f784fa4e7fe23ae4d4e7a27a06c8fcd4ee727f87847a7fdaf136d12e811a20345183d261d2b649724818f9f3 SHA512 997590e1de3136f7f87181746d9dccfd8c34a12e570d15a29a8abd4b4163bfa98405d928e932255c962d4af79e9913de563453891155590bff309d764c2b5bd9
diff --git a/dev-util/re2c/re2c-1.0.3.ebuild b/dev-util/re2c/re2c-1.0.3.ebuild
index bce28d1d0814..bd4ecbe5865e 100644
--- a/dev-util/re2c/re2c-1.0.3.ebuild
+++ b/dev-util/re2c/re2c-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="public-domain"
 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 ~x86-solaris"
+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 ~x64-solaris ~x86-solaris"
 
 src_prepare() {
 	default
diff --git a/dev-util/sasm/Manifest b/dev-util/sasm/Manifest
index 57f388d08a10..c7f8761c5c31 100644
--- a/dev-util/sasm/Manifest
+++ b/dev-util/sasm/Manifest
@@ -1,4 +1,4 @@
 DIST sasm-2.2.tar.gz 9117410 BLAKE2B f85d120469f11fd8cdb7ae9dcdc87464d8bc64db4f99cb2787c4f2adb6294288a7fd1dc071b53badb8153e8c8220a77964b102a234ad9ebc3b6a64d505c828dd SHA512 42d4af775d37d47bcf63fb70b9142e387e33cef5589002ff3e3cee926b5fca7e1508d640d1d5a175d48fc9fd041eb1f03304cad5ddc3c22a09ff29198650b513
-EBUILD sasm-2.2.ebuild 640 BLAKE2B d4a254916286246bcef2146f292db325a290a4cd9e91f67362d6b65d92a502b2d60996d136fbc3c6bdebf4b27d2e3c35a0d689c01c266317d0fb2a061efef36c SHA512 4a7059cdec57cbbd3f010368d1b0752ff2946b0d0a1c8818a6ec909cf9bef832e8426adba3b2938528647d6b9a690fcb3d9076c5132a10c95445a1527d517cbd
-EBUILD sasm-9999.ebuild 640 BLAKE2B d4a254916286246bcef2146f292db325a290a4cd9e91f67362d6b65d92a502b2d60996d136fbc3c6bdebf4b27d2e3c35a0d689c01c266317d0fb2a061efef36c SHA512 4a7059cdec57cbbd3f010368d1b0752ff2946b0d0a1c8818a6ec909cf9bef832e8426adba3b2938528647d6b9a690fcb3d9076c5132a10c95445a1527d517cbd
+EBUILD sasm-2.2-r1.ebuild 749 BLAKE2B 336ff1f57eaf6fa9beef03f49b9b6082d45072e1e89927117e9d464a56edb6717e3cda8e72a02fbe9ebce398952c650ea7adca8afc9cbf29e718e2f3e688fd4c SHA512 7e049807b11fd7acbef12900decc451979818b413718e2935e6c28ec68ac7b0a70bfbe8316c407651bb66f336308157ba75ed77db0313b3ad45dbd81fcc6fddc
+EBUILD sasm-9999.ebuild 770 BLAKE2B c78133844ee317fbc57b7650359d56cf86ca102056b8241ced281450a8d755d9ab72b32aa2edf4901375bc634bac347041ecfa825fddec6e5b280fce4c26f10c SHA512 0dba9e85f0c9a638f82ef99f1a6deb4854c84f40ac2d8845f0d0dc155d22a84363af58a07e1ed4e32b9c797b1c4f4bb8ac0e35c77bbcccfc9c0718d62af59e27
 MISC metadata.xml 325 BLAKE2B 7fad0a2d1d4ab4f67758d702f18de025b6bf553e5f99ab43b6657ee9dbfcb858892ae5c4d6e37094b744b85fd70f1dd7f1b1e8e7ff142d86f9bf83190aa045c2 SHA512 8cb446410e74845234244cb121cf966f18ea1ce69796f6dc5c6c1d434952811e61c8b02aaeba24905578f8e8463e29269538b50768b30524af859419769b5a92
diff --git a/dev-util/sasm/sasm-2.2.ebuild b/dev-util/sasm/sasm-2.2-r1.ebuild
similarity index 72%
rename from dev-util/sasm/sasm-2.2.ebuild
rename to dev-util/sasm/sasm-2.2-r1.ebuild
index 023b24aab05d..7c9c73aab793 100644
--- a/dev-util/sasm/sasm-2.2.ebuild
+++ b/dev-util/sasm/sasm-2.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit qt4-r2
+inherit qmake-utils
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/Dman95/SASM.git"
@@ -24,10 +24,19 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
 "
 REPEND="${DEPEND}
 	dev-lang/nasm
 	sys-devel/gdb
 "
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+}
diff --git a/dev-util/sasm/sasm-9999.ebuild b/dev-util/sasm/sasm-9999.ebuild
index 023b24aab05d..61a911989dd0 100644
--- a/dev-util/sasm/sasm-9999.ebuild
+++ b/dev-util/sasm/sasm-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit qt4-r2
+inherit qmake-utils
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/Dman95/SASM.git"
@@ -15,7 +15,7 @@ else
 fi
 
 DESCRIPTION="Simple crossplatform IDE for NASM assembly language"
-HOMEPAGE="http://dman95.github.io/SASM/"
+HOMEPAGE="https://dman95.github.io/SASM/"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -24,10 +24,20 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
 "
 REPEND="${DEPEND}
 	dev-lang/nasm
 	sys-devel/gdb
 "
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 4993bfb2dfd6..36e04117f4c1 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/bzr/Manifest b/dev-vcs/bzr/Manifest
index efe62bd06ec4..5d46e5a773f2 100644
--- a/dev-vcs/bzr/Manifest
+++ b/dev-vcs/bzr/Manifest
@@ -6,6 +6,6 @@ DIST bzr-2.7.0.tar.gz 11586410 BLAKE2B 9d61d5efa1c02667fdb93d66fc4290f279c74bff2
 DIST bzr-2.7.1_pre.tar.gz 10964137 BLAKE2B d126730d782f232d6c486e31ab465a1a295de456eb59fc1db4d215529ec38e78826da1bedbe6a80af0e874188635c83742c5ae5b07c42dd968f1d0d88596a35e SHA512 b65c63dff33f1646e6db84d9307b870140c2c7b3b16cef69eb4bfb5a5a94cb1721ed74c26e6ad78232fffb4b5055cb4096d9835197db9b97f91c16e8a79658b3
 EBUILD bzr-2.5.1-r1.ebuild 2470 BLAKE2B b3754ea550a6c170983d6b06a4dda66996e20c1a7608b950d3b41a697990a2ad7ff36da43aa34abf4f5f1e9d4116a83ce92c767bab5eae4838eb7c3b9b7eb4c9 SHA512 5e7cca64bd3a9db51c0ed5356512dff59e42826bca40c0dac474d18f70297d68acee3b418ba645d500b68e7ecf5188d60b4b67d91d4f6ffb55d8cdef9598f578
 EBUILD bzr-2.6.0.ebuild 2631 BLAKE2B 807b7646d46612b14b25daa1a69ed9028c2951c1e5571b09877e52e86a029786ba615421af2f03b325ee9f4e7e5d7dfc6652662f60052c453a7934877a8f3699 SHA512 14f83b1bea6fe57900da6477f4b424868175a87fd52d821e59b92bd51fd8254b7afac26f8777a943592433d7249d98c7f44d20c733ba6bc6dfb58d1ff7b16deb
-EBUILD bzr-2.7.0.ebuild 2626 BLAKE2B dfa178451522bffcf0cc6ac19dae0938cbd5f57e648e7167494dd10cfb44a12264578576110823ceb9040ccbccc516b0e435e8a9a3eca6dc8a5efbf4367a1c34 SHA512 01b44b2740dd4667a690b67a8537f5a0af8edc3c258f022cbc01393539b558779649f877df866dfdeea97ab4f33b7bf71166ee621347f4825399e77c0af71383
+EBUILD bzr-2.7.0.ebuild 2625 BLAKE2B aa7873c2df71d5b8a1a62a6f4f4e1824449315a751abf60ca951367c502e7c78c0f33f8708f00dd8cf29d45f57e94893651c394e8806eeb67a6f833a43581dfc SHA512 e693ddce65578205660dbc931072f15bc85d865bd84b78ca8294d889d6d143fd3042cbe0071a07977bdf37b76ded2046345f83d47fd03c271ac48ee15a48f52a
 EBUILD bzr-2.7.1_pre.ebuild 2607 BLAKE2B a42a111d51b1dddda9bf2a40c8f618efe08c9696ed342684d4434719ae6c7a75047c45ea94292cdbccb9ea776fb6305ed6a61fe670f2903fe55a5e1b42e2bcb1 SHA512 e9a62929e213075dd564dee6a399b480da1f422998cfee2ef37057575b8014f5ec0839728c37f97f604aa693040584713d09981f376148855c33131cfd791e1a
 MISC metadata.xml 772 BLAKE2B 8f1d371a225b5b6702748efc93dde757d88a39c0a8124abc898eff891a4867c92dbc19a356b4c0726682e5304b80be333e12a981d04b0ae89e480cb2f6b6c3a3 SHA512 cc63dba9888058f60521da2fdc43697f1fc8bde194782346279560b50ceaa555b464599d28641350cd25f67aebe2f449cbe306dd651620bc891271acf8aaddac
diff --git a/dev-vcs/bzr/bzr-2.7.0.ebuild b/dev-vcs/bzr/bzr-2.7.0.ebuild
index b8b71ef26731..81ba12bffe6c 100644
--- a/dev-vcs/bzr/bzr-2.7.0.ebuild
+++ b/dev-vcs/bzr/bzr-2.7.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://bazaar-vcs.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 IUSE="curl doc +sftp test"
 PLOCALES="ar ast bs ca cs de el en_AU en_GB es fa fo fr gl he id it ja ko ms my nb nl oc pl pt_BR ro ru sco si sk sr sv tr ug uk vi zh_CN"
 
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index f3ee72de793f..c0d2bc4add95 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -33,7 +33,7 @@ EBUILD git-2.13.6.ebuild 18874 BLAKE2B bcafbe72ca9e7b0d1f8c6c43461ef1d225ca2ee18
 EBUILD git-2.14.3.ebuild 19352 BLAKE2B 375c5540c22cbe94fb89f81b099f3d29a92f4f6ef5757792ba80d2b839451988bb9bdec65720b8be7e47dc2ffcea47eeb92531da930705d1c4d40094c435fd56 SHA512 9fee218882dbccd73ea9f0014311630a50194dc090a7a4eddf5970c6c7e675a7a98e2849a9ff8867894f1d84d5ade79ac3edb6a9784005b5d1a6f5c6deebe4ac
 EBUILD git-2.15.1.ebuild 19355 BLAKE2B b286bb11c1b50affce296a56465bea7874e56b70343c43c8d7cc8fba872ad92f463800652517434039fe91d2268ea1e469113d09391602ca18a42f0b3b52e2bd SHA512 040fdda804318cd6d42882f98588d7ad5a105af11cbd879532d45c8438e3854f4be8f58ec8bc2a05393edc526950e135f22f547b4efd212e3bedce1cbb9b70fd
 EBUILD git-2.16.0.ebuild 19355 BLAKE2B b286bb11c1b50affce296a56465bea7874e56b70343c43c8d7cc8fba872ad92f463800652517434039fe91d2268ea1e469113d09391602ca18a42f0b3b52e2bd SHA512 040fdda804318cd6d42882f98588d7ad5a105af11cbd879532d45c8438e3854f4be8f58ec8bc2a05393edc526950e135f22f547b4efd212e3bedce1cbb9b70fd
-EBUILD git-2.16.1.ebuild 19262 BLAKE2B f60b422e549ef3c70744acdd541a20f31a7c001889ace0cb588c1dca6b3f9055454c66545e6454e5f718bf62c424c2e8015a54510b28883eec0887c4fc169af9 SHA512 fa468a047a1cea0219b65d380278a21f83429aad3c2de64cad86a5b203e80402014cfc64e8ff62e77ac4020ef257b850c7a4c1cd4c1fd1bbe3f3db060e9bf87b
+EBUILD git-2.16.1.ebuild 19261 BLAKE2B 8c72e5e83a8ae6602142791935704f393bbd5f25084627233348c380d7ce1b1d82d7e8b1a3a91a0ea4bff3d11c85122a30fb8bd50678352a16de76f9d71cf35a SHA512 c127406dd3fe22df44f72adf5a8d7371b5e29c35f4e7c5e6fff71b9f8fe6f79053a270510fdd329a80bec4f47f1a63c06f2ce2d195f5585d82b77c4d834c0dbd
 EBUILD git-2.16.2.ebuild 19268 BLAKE2B c5d980343d17117b4a61bd5ea470b507fdc9061ca760b0140f3591a16f8cc5eeb4756db1bf8c1ff8c984bcd85e5b04e4ce251122b26a55282c0381420ee0dfef SHA512 e3fc8dbf927ac71d8e9fc1caa49f5359f2f6fd8999637d30a674793c16a4be0fef5b9249e87273f0b2289e1583efc724ef3d6fd3bc28d8088dab92617dbf6245
 EBUILD git-9999-r1.ebuild 19268 BLAKE2B c5d980343d17117b4a61bd5ea470b507fdc9061ca760b0140f3591a16f8cc5eeb4756db1bf8c1ff8c984bcd85e5b04e4ce251122b26a55282c0381420ee0dfef SHA512 e3fc8dbf927ac71d8e9fc1caa49f5359f2f6fd8999637d30a674793c16a4be0fef5b9249e87273f0b2289e1583efc724ef3d6fd3bc28d8088dab92617dbf6245
 EBUILD git-9999-r2.ebuild 19268 BLAKE2B c5d980343d17117b4a61bd5ea470b507fdc9061ca760b0140f3591a16f8cc5eeb4756db1bf8c1ff8c984bcd85e5b04e4ce251122b26a55282c0381420ee0dfef SHA512 e3fc8dbf927ac71d8e9fc1caa49f5359f2f6fd8999637d30a674793c16a4be0fef5b9249e87273f0b2289e1583efc724ef3d6fd3bc28d8088dab92617dbf6245
diff --git a/dev-vcs/git/git-2.16.1.ebuild b/dev-vcs/git/git-2.16.1.ebuild
index 11833ac40d80..c031dcbda500 100644
--- a/dev-vcs/git/git-2.16.1.ebuild
+++ b/dev-vcs/git/git-2.16.1.ebuild
@@ -45,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 17f68b6edc43..16436339c56b 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -10,6 +10,6 @@ DIST subversion-1.8.18.tar.bz2 6884906 BLAKE2B 77c0f2e43cd6d69fb360adfea78b42e38
 DIST subversion-1.9.7.tar.bz2 7881909 BLAKE2B 004a180780e00f5af80e14586dee799bae07dccde7f240a51594590b1a084f3054b5b4d917d5e47e0b6ffb11097ecfb97fff490f6d31c0532f2aae8cd9d10031 SHA512 a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b
 EBUILD subversion-1.10.0_rc1.ebuild 15473 BLAKE2B d68c60e33126a967c5ba1d91eb0e5ca360e22cb19483eb6db7cb8e91c493139bc77ae9078c4409892d42d40114ecaa356261b5365d47cad01417cbf53d5ba846 SHA512 2dc1184923614f2d0b51273fba4ecebc3c4f02913d8b00d24910e485989a41c88e6275bb2cec52b54edffeb017be280161ab13ce89b2603330e62305fe85f8be
 EBUILD subversion-1.8.18.ebuild 15810 BLAKE2B 78d6d45a448b6c70b1d6813f23f607ecf79ec936959b8179ff793ea521550433555f4b498b5ea9f1bf4acded0302728dd561c24a4b7e715d0b29c28cdabc2753 SHA512 e50f0c552ac0b3e9654f70f89508ad4eb29e924430d156e18c3a2c88920a1317189be4d02f1b52f7693fc515c981b87e87dffdc20a9a1e5c7959d7289b51b7aa
-EBUILD subversion-1.9.7-r1.ebuild 15820 BLAKE2B 04fe6669cdc7beb8f0e2e87e96b99d50c36d49b6ac49b2153ea6ea47b65f668e2493795b57691c8614591f38727186a26b4d96739e9332a610b6d2768ad5fd23 SHA512 728fe37d92124fb8e82b18a98b75b4ab1d5804fb86151e00b4358697ae0a9503a4823816c3ce70997344c305dd8338ed1f35243959dbae6f180f0ad9f68ee775
+EBUILD subversion-1.9.7-r1.ebuild 15819 BLAKE2B 6e6bcf8b85ba7d530142cf7bf5ee34e766c2ab1fa8ac885977710350307cce88a474472bbe440828e4ab04ef8b3ef5b7d2463b13127924da34ec9b7e7fcc7b8b SHA512 2295b6431becba501d001ecc139e140a1e2d354d4da086c31c6afe711beb332b3cebd3cec6cef604dda8136fc6248ae31f1ed14d2a8f55e74b1fca572046dfd3
 EBUILD subversion-1.9.7.ebuild 15687 BLAKE2B 60f9339a3829dd420f15d87a2b3a8673b5bf800b02a33fe70bc5a1c1d01bc79d97a7c8b0102f004288cd8a78ea83c05839a3c6397e3e9283f7bd9acbd0e702b9 SHA512 949dd71c2f252b82f505fd2a1146cc6b89d22865c49c4155e37aab286111f41a07c9b2caa1f1fe042d87abcfcd3bcd1a77528b16379bdc67c62eb604f044a3c9
 MISC metadata.xml 659 BLAKE2B 645c4601d97faa216c2b75f48c2202f011ba17611ae68f3d572584b4608e1d5b7ef2db5cfdb78d0aafffce51519f65a4945979e3da9c57b03a2c3f08552e74c8 SHA512 2a2f10c5500540ae1bdd49d80d9689c14a79772d93b689db01e0cd1d63a729b86a7b28974492ee08d6433495c61d5a493590c4c60d843afc881c54d574369313
diff --git a/dev-vcs/subversion/subversion-1.9.7-r1.ebuild b/dev-vcs/subversion/subversion-1.9.7-r1.ebuild
index 413b4e8c0a24..fce20acdbc03 100644
--- a/dev-vcs/subversion/subversion-1.9.7-r1.ebuild
+++ b/dev-vcs/subversion/subversion-1.9.7-r1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Subversion GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax"
 
 COMMON_DEPEND="
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index 33f49011d5c3..a7234f64f817 100644
Binary files a/games-util/Manifest.gz and b/games-util/Manifest.gz differ
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index 84abd332d366..3f9ffc31ff7a 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -4,7 +4,9 @@ AUX pyfa-1.33.1-staticdata.patch 1571 BLAKE2B ffa07ba329d3cbb5f198755fe814f43114
 AUX pyfa.desktop 155 BLAKE2B bccfc81c4bc7dd9099ac4bd11fdb0d5f8d72b53b5dc8a700147e7e5996b14aac9e4b46e2884a473ecc8d8b1f49305e66c46cbc7e6c5e43e93e5a3fa71c5efa08 SHA512 d62a44e4e724057581a360cc1eb10aa4c7a0c50cb1d95137e58ba14db17644c852da2582be8d508c50b7359e7f99dc893d78d15cb11c46967a9b7896ff667781
 DIST pyfa-1.34.0.tar.gz 8629709 BLAKE2B 5b16296b675383a446bb21133c9e83726a92beb221babbf8fbe4b19f0f7e95bb19fd6050a5c2e3d5e602df4bbb83debfeefd6ec7efdbff35a47934ef9b29979f SHA512 4642efd4de5be4add3c3f994d7be9dbeeb231fe86229f7944d52f265527c7a79698d3da5ccac3018e02c6000b0da888ad0e64382e12f74b7dd7b3398e7bb2d48
 DIST pyfa-1.35.0.tar.gz 8743938 BLAKE2B 623a70ea8d28c41f94b5c54c3b8b57ddc6b6604f0eccaa1d9716f8b47295bfca12e2db068d3283448b2a6719a3ef73c74d42a98550a1b062e93e6d1091a45797 SHA512 28b3294e8c1d611402d4123d184d6ddf57886a51264fc25529ca3e0cd8af6d41dbe28b15c4714e591f940427651249761db8d2353006b169d358974bc691f121
+DIST pyfa-1.35.1.tar.gz 8746324 BLAKE2B f224f78c97f15d37e2276512541985bfd2ae80c031233261837cd142eddc16a853688a4f1f1f8684736f757d60fd57c41fb14987f336274b2284bd1de26239b3 SHA512 6da5e2d3351157f35c32c7b210d8bfb86a9dc2ea3a3df02449950c498ffabecff3a48fe38086dce75ec5a2cc2549dd28b474015edc0ea01c56a2ff58d1ba3f69
 EBUILD pyfa-1.34.0.ebuild 2697 BLAKE2B 71befdff7b877943da1c58af9905f9318539956c703f0d6fccf195138842b9e4fc7a57f04dd3de1d6be01d2bd2efc28cfb659612b723a3bf422ca72e51224358 SHA512 5184f4207c8c0d02c52b5265fff0f393f6f871c2b8b1ba0d29835a252d57305bdcf5957053e705b49b2e2a6ec5db8c7f953f3b884ff848ef5a7643d10c3ddb28
 EBUILD pyfa-1.35.0.ebuild 2693 BLAKE2B cfad57e838b2f6fb1f5071a750bba9a6eca9da1d7c8a5306017d1f9486c14948ba6a84cc2be706d360e134da7ac81b51f914d4342769043d884dce4c5b091985 SHA512 46d5c45fc04385cca35eea00c12d6ac0356ebf2e4bb721334b89c21a556f9d45c37fa29d61546062055beca041a6af63431fbee3fa701a18d722d50a5db2bce6
+EBUILD pyfa-1.35.1.ebuild 2693 BLAKE2B cfad57e838b2f6fb1f5071a750bba9a6eca9da1d7c8a5306017d1f9486c14948ba6a84cc2be706d360e134da7ac81b51f914d4342769043d884dce4c5b091985 SHA512 46d5c45fc04385cca35eea00c12d6ac0356ebf2e4bb721334b89c21a556f9d45c37fa29d61546062055beca041a6af63431fbee3fa701a18d722d50a5db2bce6
 EBUILD pyfa-9999.ebuild 2690 BLAKE2B 75617e4742feba8338064811a6ce993df0e1fdf1f1dde52777c7417ec9b7f349af8c6f70223522a285737a06e869aa241bae43781f34339ddaa8013b9f592f29 SHA512 5e9ca6acc8a7b53f327c7190ef98473a377f030dc33497117479a93cda83b2ea9e6bf3ff5bed3cf1e2ca7097059365b91a868aaf72dcd1835884575cdef9bde3
 MISC metadata.xml 817 BLAKE2B 3756e4c4cd95064bfdfb74ffccbc1162b457e620cd4b99f1c4c04943443a83cec1a5642056f219dfc090c37a230dfadc07dacd0e6f2d7a9380804e951c1d8c86 SHA512 3323fe99b3a0768fddc07ae1ca23e099e8097717c382ec9a9cd2f63b293f6caf8d9164140548f2a4b2754e925d1e1302ba1a56c0320eb343f5a7ff0206d88811
diff --git a/games-util/pyfa/pyfa-1.35.1.ebuild b/games-util/pyfa/pyfa-1.35.1.ebuild
new file mode 100644
index 000000000000..566b23ecc2d1
--- /dev/null
+++ b/games-util/pyfa/pyfa-1.35.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,threads"
+
+inherit eutils gnome2-utils python-r1
+
+DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
+HOMEPAGE="https://github.com/pyfa-org/Pyfa"
+
+LICENSE="GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm"
+SLOT="0"
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git"
+	inherit git-r3
+	KEYWORDS="x86"
+else
+	SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> pyfa-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+IUSE="+graph"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.0.5[${PYTHON_USEDEP}]
+	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
+	>=dev-python/logbook-1.0.0[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	graph? (
+		dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}] )
+	${PYTHON_DEPS}"
+DEPEND="app-arch/zip"
+
+[[ ${PV} = 9999 ]] || S=${WORKDIR}/Pyfa-${PV}
+
+src_prepare() {
+	# get rid of CRLF line endings introduced in 1.1.10 so patches work
+	edos2unix config.py pyfa.py gui/bitmapLoader.py service/settings.py
+
+	# load gameDB and images from separate staticdata directory
+	eapply "${FILESDIR}/${PN}-1.33.1-staticdata.patch"
+
+	# fix import path in the main script for systemwide installation
+	eapply "${FILESDIR}/${PN}-1.33.1-import-pyfa.patch"
+
+	eapply_user
+
+	touch __init__.py
+
+	pyfa_make_configforced() {
+		mkdir -p "${BUILD_DIR}" || die
+		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
+			-e "s:%%EPREFIX%%:${EPREFIX}:" \
+			"${FILESDIR}/configforced-1.15.1.py" > "${BUILD_DIR}/configforced.py"
+		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
+			pyfa.py > "${BUILD_DIR}/pyfa"
+	}
+	python_foreach_impl pyfa_make_configforced
+}
+
+src_install() {
+	pyfa_py_install() {
+		local packagedir=$(python_get_sitedir)/${PN}
+		insinto "${packagedir}"
+		doins -r eos gui service utils config*.py __init__.py
+		[[ -e info.py ]] && doins info.py # only in zip releases
+		doins "${BUILD_DIR}/configforced.py"
+		python_doscript "${BUILD_DIR}/pyfa"
+		python_optimize
+	}
+	python_foreach_impl pyfa_py_install
+
+	insinto /usr/share/${PN}
+	doins eve.db
+
+	einfo "Compressing images ..."
+	pushd imgs > /dev/null || die
+	zip -r imgs.zip * || die "zip failed"
+	doins imgs.zip
+	popd > /dev/null || die
+
+	dodoc README.md
+	doicon -s 32 imgs/gui/pyfa.png
+	newicon -s 64 imgs/gui/pyfa64.png pyfa.png
+	domenu "${FILESDIR}/${PN}.desktop"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index dce186e9bfc9..4f52a498bd69 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 17309bd4334d..417249fa5bee 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -4,5 +4,5 @@ AUX gnome-shell-3.22.0-gir-build-fix.patch 882 BLAKE2B 62a816accf06abd182d138132
 DIST gnome-shell-3.22.3.tar.xz 1952576 BLAKE2B 26d974bc45b93342db3d23f9a999734b571c6819c1fdddc20e019e282bcfbdf6d9f40850667756046187e0e3a52a57ba60962cc49b7b4b49909ec5f992e518e6 SHA512 47d67910b321a182d3ecd41f20cd923ec433cc93ab04b0b31351ca0229505ecbf343b1307585e557ee757845dc09b2371b0c2197717ed532b71878c186337ee9
 DIST gnome-shell-3.24.3.tar.xz 1982088 BLAKE2B 608b3e73d546dea543a23c31a64b03c32f35d118cd79fd0371a9e392377b4dd03bc16413443d643ed604a2fa81c2838939d92ef4c89a54469a8bd83dc9661f8f SHA512 369ed80b975369b79d4ac9b3f1fbd469fdde331e9079d09eeac6398a9b3c349b09f7570dfce1ed6e1cdfaf514b4b40c6038f34b6c3c7928470b2cd65b702ff15
 EBUILD gnome-shell-3.22.3.ebuild 6847 BLAKE2B edb25faf602ece895a316042dd62896d84755f17f26f51a217c748b653e3ca729aae959c8a2fb39d51da654ee9f961855f69f43d15ad9777d1b6b0d22c10b212 SHA512 b0cb683473ec3a3dcffb1dd9fee56a6b9ec4dfe6f311a523c3920cbb690a69d5e4e73643bde1c6eb3faf4f4a6bb8337640d42ce92b2b8fd08b26e39666449ad3
-EBUILD gnome-shell-3.24.3.ebuild 6568 BLAKE2B 6ecdb9b049a67d41d9051bfc606e480419e48e9eb84742901c7e022d7aadfc7ab9d83e82c3a00e49c17a3b4c52efd4f61180717035eb6819d2df1924443f0b84 SHA512 b7fa60c65c9c642d4da55803ad0d730ce5be3e5934cca34c83e076f4517e5b252f959b9bf40757ca8eaba434d48ed2bde7460bc72b7a1f250bdafc62706bc4ab
+EBUILD gnome-shell-3.24.3.ebuild 6605 BLAKE2B 9cce522a52e154685227cb288a5b84ce217b36d6a8db7aa4ea359fcec6f5af600c4dca1f40f76ac6621260691129e0a091c9a872b575217cf7777089e51d3b2d SHA512 2d7ba6030280d0ee9f73e0e78f0f334d3507d29989592726cb8de2bca433fa00ffeb41f30b64cdd9197ecf515a8049f8c6ba8ac8dec08638173b91f59198908b
 MISC metadata.xml 738 BLAKE2B f379ab17d70d0241fffcef221940031cf797d3393c903fcc75c847e4bd985242c124b598e61ae50bce7e58ababe8595533bf3fb52fea47d75712eaa2af291492 SHA512 02db87e2ac6c43ed104ae911de8caf78632b861c4efd3bbf5b0cf7dfab1d4d79e023b724b140ca86e72961c06454479f4d814ad1ae5dfd481bfbc7a45af0c18b
diff --git a/gnome-base/gnome-shell/gnome-shell-3.24.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.24.3.ebuild
index 03418b19a10c..6f8c36950540 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.24.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.24.3.ebuild
@@ -83,6 +83,7 @@ RDEPEND="${COMMON_DEPEND}
 	>=sys-apps/accountsservice-0.6.14[introspection]
 	>=sys-power/upower-0.99:=[introspection]
 	x11-libs/pango[introspection]
+	gnome-base/librsvg:2[introspection]
 
 	>=gnome-base/gnome-session-2.91.91
 	>=gnome-base/gnome-settings-daemon-3.8.3
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index 6fca38238ce7..087097a55788 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -1,5 +1,5 @@
 DIST gsettings-desktop-schemas-3.22.0.tar.xz 598412 BLAKE2B 0249dfbdc7d574824ad6c34cdbafc7859eba4d78494c80d42b9b5a739cfaa8bb6d43e13093148253dedd0ae2762261750f791d809ba8058a78098fc7f8dad510 SHA512 653198f78f8108222e84c0e94b6b914e03597234a627f1c205fc58a7bf54fdde073ff98cfdce1dccec7da1d8a7cbf648004cd392382d4ff617245cc3e581dfd1
 DIST gsettings-desktop-schemas-3.24.1.tar.xz 638780 BLAKE2B c1857636e18c69658458aa9dfd65a7c3983791000f16eba08f706c243a0b804ed20dfde58f9cbe879f41348dc8257ecab86d5111c89bc1aacca1d8b62f2c0332 SHA512 c3970d61cc1c29bf97a39c439b3e0ba5c5d5c0f811e17b8884f106f095b159dd0c43cb90e02561edcc26e15b2b887e960d38de1c0e7498413db0c63102f15833
 EBUILD gsettings-desktop-schemas-3.22.0.ebuild 762 BLAKE2B e0502aa9126fc0808e90ecf18ec028d00edbaf9a813db4d4230f5c4572dadf4b5dc26afda75cb76902022341a4b3a55e541f14a84b1a52da0ed0ba57821f48f6 SHA512 66a5ff681cec7c66941ce08292117c26d2314499f55daea0f87c95d3f4d73ae4c3e0ac166717bc793c9d4f9a03593c317b5c0ddbd065146b35992334a1c8e209
-EBUILD gsettings-desktop-schemas-3.24.1.ebuild 767 BLAKE2B 3f32d4dc235865d0a65399e0756702b8f7de34fe7b983b6250fd1e9e9975b17892df2fa26c052f67178ed31b087ecafe9a9871650d38f840f26c6cadb9999106 SHA512 824302cbc325b80890ff0eec9967cb0b72804efba96ad96ec02c01ed3b78fddffb28fad91c7e392fdfe5865798cad691dd1bd9d2b5db0cdae2dbf3075a130683
+EBUILD gsettings-desktop-schemas-3.24.1.ebuild 766 BLAKE2B 7fb798a1f13f292c30d0ff13359a226686ad02db5308acba25eefe3e9be09abdce4b8943b0c51cd75ee82031bced81ea0ff8d8a851d85772491f4f8959b25893 SHA512 00a160053e14d11e1634f39d318f3351f127c69fb23e1aaf4332422ab5d096b6b0101b3cc6105ab1d0dec2c184d2aced899653e50427aaad29658e2c99957961
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild
index f0d63226b945..105c2fe7ded0 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+introspection"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.31:2
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 17929cedbace..82cee5e92bb0 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -3,5 +3,5 @@ DIST gvfs-1.30.4.tar.xz 1895304 BLAKE2B 7e7dbcde464ac3afc982d6d04916ecbee4b0cfae
 DIST gvfs-1.32.1-patches.tar.xz 53288 BLAKE2B 2394f0931927069b4aeab69769df74c823ebffca2e7e73245b3597e085f2fff5c98999e6eccd052fa3564339b75d764f2124592c0977fddd2eb4afeca819b965 SHA512 c3e9de02e013aaf707878f8ffab96c42ac558412020f8462f928d2c7bd8b9756aa980e6b8db50e6f0ff0ad91f250ef1a26358d80b5d1cdaa9234475ec3a3db4f
 DIST gvfs-1.32.1.tar.xz 1813212 BLAKE2B 4b349e968eaab75d75ac9e7b66087298754ad81668e415812c4db74e2e393ac2cddea1b55771656dcd67ffdca23e4cf1642afef101498d309c643519fcefcca3 SHA512 7bd4d137437c1704faf6a9c2712bddcc327284e752c552c2cc18c64beb5e6d291af321e92d02d4f09b619762121129cee82c13ec2a4ca39d045196ebeeb28dd8
 EBUILD gvfs-1.30.4.ebuild 3682 BLAKE2B 2d3d1ef263069a971b730ca70ca5719a67279b393381e14ea385fc677be382d7e81d68a81e89a1a8cfd288e56fb2cf52577cc55568a666aba89b64e247cc47d1 SHA512 e5698ae16fad71377b69a981ab420754be4303f36b8b18bd1687b2377469a215ae2a6eb75df5682c80dca4b682a7e9f48840247616d431b1b11a2b56048110ad
-EBUILD gvfs-1.32.1-r1.ebuild 3830 BLAKE2B 1f55047d3da8fbad8dc383364767aee15fb8cb36ca58bd16c70d391352965a19560bbd9979ee46c763aa2ecd1ec9fce333c47bed9125d61fcd193c65b0ba4117 SHA512 623b3803bbc478dc67a75bfedb8bed8ac2de7cc847e1a308a145fcccaf1314f94802f7575247a9bf389ecca6b9470f3b85486f0611eddef88aad33e4340acbdf
+EBUILD gvfs-1.32.1-r1.ebuild 3829 BLAKE2B 24161e79fb30c9f00cb8407d76d10b8055ee93ceda88d6277c3736b3fe49037cef8be434a7c51714450920e741853105eb91598490eabb5cb570cb045bf82378 SHA512 20fca7141a0351d852cbb1acf2cf66ffe61ba0fa582ced8496e058219dc74ba1bf89aa59bc84a957ed144d243ca65f7fcd606f0b77fc69fd6a443f4c662948ba
 MISC metadata.xml 1625 BLAKE2B 931da927a3cef58e8d768454cdda485acf3b8b42a87d9d4be0faa495e7b49b16e780815a0a959b91b116b078cb333c69873374e0f95e8aadb074ce836df3149d SHA512 4a3815b41763def19356793e36bafbd8a87359c9501f526465a6d8b62394c1605909b70ba4b8679b2dca89bb2660ea573a0e97611facf2d23c878fcdf51e7bfc
diff --git a/gnome-base/gvfs/gvfs-1.32.1-r1.ebuild b/gnome-base/gvfs/gvfs-1.32.1-r1.ebuild
index e4314c65e985..14b7f16f0c1e 100644
--- a/gnome-base/gvfs/gvfs-1.32.1-r1.ebuild
+++ b/gnome-base/gvfs/gvfs-1.32.1-r1.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
 	udisks? ( udev )
 	systemd? ( !elogind udisks )
 "
-KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	app-crypt/gcr:=
diff --git a/gnome-base/libgtop/Manifest b/gnome-base/libgtop/Manifest
index 655c6736f397..66746b10f442 100644
--- a/gnome-base/libgtop/Manifest
+++ b/gnome-base/libgtop/Manifest
@@ -1,5 +1,5 @@
 DIST libgtop-2.34.2.tar.xz 725720 BLAKE2B fc69a6d64f86e16490f417748937b196c090de7afb68052a42258c06b7b65b686edb41abbf69ad42065a44b5811def0776969c2caa01009c2087355e9b1b2e9f SHA512 22ae4792236c47fda265f1b16f66f8685122f84a76e14adf2fd9e5e669c1f9776a58a2ec00564e37add98084d7e3cea621b38b8ad09b15e348f9c74f5345f19a
 DIST libgtop-2.36.0.tar.xz 727072 BLAKE2B 46f24573bde0bcfeb2210ea08446f6e6590fadc5697745178133ce5f3aec2e464cbce8446d2dbddb9f05d4a16eb7daf110c4554778a28573116b2b59edcf556f SHA512 2768c628fa3e872a940246042b2c78ad4618612ecb2cf2b95fb70343a4f1a01bb558d0ce9e5b3468f395349f338ca33d460e1d91f2c123ad39243cd0ff20d5e5
 EBUILD libgtop-2.34.2.ebuild 695 BLAKE2B 721a1692bcc264ba0b3c70a283b522f15e02a24d03c8b96086e51729c0c19932259c0f90542c0ed05b7225bb4f0a1733492535c6d33e78a246c475c4b7205ae6 SHA512 748d1283986bc38c5ab86e5d91996c1149e02f31339898cc39c8eab2b72c056e8569854a751487bd1d8c54d4f7fe8c03b6ed8fbe3cbb63a1a6d95dd1ded42e77
-EBUILD libgtop-2.36.0.ebuild 773 BLAKE2B ca5f524a8f500f1c0997253e902fe61ecc5d578b7b799758eb3bea589ca9616294ba43a7cc8662a6ba5fda892880aeb820b9dbb1018fcd0a12098f7e02be6c1d SHA512 5138c4ea38464dd2281f589757e7c72d19c32befb0167966fab696b32b67b2dc65ce4000d8ef0e2f2a369bfd7d0b12b935d48241021835790d369e97d075046c
+EBUILD libgtop-2.36.0.ebuild 772 BLAKE2B 5210d323417380894b6c97eb154b2cbf81d1f1acdc3f2a3dea3b0d76a790c40c0600a282ee29ddde7b8691ef603b80bb523cf1972b4611e030eb9a16d846c913 SHA512 ac77245d69b7d3b9852bfd8840cd710f47c8dba96b802f92b664919a07274356f1680a4d8c57902427710f60809aa99de9b45622a89e6061fbed30af0ba201ec
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgtop/libgtop-2.36.0.ebuild b/gnome-base/libgtop/libgtop-2.36.0.ebuild
index 4ba971352444..2994af5f7341 100644
--- a/gnome-base/libgtop/libgtop-2.36.0.ebuild
+++ b/gnome-base/libgtop/libgtop-2.36.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgtop"
 
 LICENSE="GPL-2"
 SLOT="2/10" # libgtop soname version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/licenses/CC-BY-NC-4.0 b/licenses/CC-BY-NC-4.0
index dddb063deee3..1fe4148c9331 100644
--- a/licenses/CC-BY-NC-4.0
+++ b/licenses/CC-BY-NC-4.0
@@ -49,7 +49,7 @@ exhaustive, and do not form part of our licenses.
      such as asking that all changes be marked or described.
      Although not required by our licenses, you are encouraged to
      respect those requests where reasonable. More_considerations
-     for the public: 
+     for the public:
 	wiki.creativecommons.org/Considerations_for_licensees
 
 =======================================================================
@@ -405,4 +405,3 @@ the avoidance of doubt, this paragraph does not form part of the
 public licenses.
 
 Creative Commons may be contacted at creativecommons.org.
-
diff --git a/licenses/Canon-IJ b/licenses/Canon-IJ
old mode 100755
new mode 100644
index c31bb8b1a040..b303ffe70322
--- a/licenses/Canon-IJ
+++ b/licenses/Canon-IJ
@@ -1,55 +1,119 @@
-AGREEMENT FOR THE SOFTWARE MODULES
+AGREEMENT FOR THE SOFTWARE MODULES
 PROPRIETARY TO CANON OR ITS LICENSOR
 
 
 IMPORTANT
 
 
-SOFTWARE LICENSE AGREEMENT 
+SOFTWARE LICENSE AGREEMENT
 
-This is a legal agreement (the "Agreement") between you and Canon Inc. ("Canon") governing your use of Canon's or its licensors' software modules listed in Appendix 1 attached hereto which are incorporated in Canon's software program "Canon Bubble Jet Print Filter Ver.2.50 for Linux", "Canon Inkjet Print Filter Ver.2.60 for Linux" and "IJ Printer Driver Ver.2.70 for Linux (or later)" (the "Software").
+This is a legal agreement (the "Agreement") between you and Canon Inc.
+("Canon") governing your use of Canon's or its licensors' software
+modules listed in Appendix 1 attached hereto which are incorporated in
+Canon's software program "Canon Bubble Jet Print Filter Ver.2.50 for
+Linux", "Canon Inkjet Print Filter Ver.2.60 for Linux" and "IJ Printer
+Driver Ver.2.70 for Linux (or later)" (the "Software").
 
-READ CAREFULLY AND UNDERSTAND ALL OF THE RIGHTS AND RESTRICTIONS DESCRIBED IN THIS AGREEMENT BEFORE USING THE SOFTWARE.
+READ CAREFULLY AND UNDERSTAND ALL OF THE RIGHTS AND RESTRICTIONS
+DESCRIBED IN THIS AGREEMENT BEFORE USING THE SOFTWARE.
 
-BY USING THE SOFTWARE AS DESCRIBED IN SECTION 1 BELOW, YOU AGREE TO BE BOUND BY THE TERMS AND CONDITIONS OF THIS AGREEMENT.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT, DO NOT USE THE SOFTWARE AND PROMPTLY RETURN THE SAME TO THE PLACE WHERE YOU OBTAINED IT.
+BY USING THE SOFTWARE AS DESCRIBED IN SECTION 1 BELOW, YOU AGREE TO BE
+BOUND BY THE TERMS AND CONDITIONS OF THIS AGREEMENT.  IF YOU DO NOT
+AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT, DO NOT USE THE
+SOFTWARE AND PROMPTLY RETURN THE SAME TO THE PLACE WHERE YOU OBTAINED
+IT.
 
 1.	GRANT OF LICENSE
-Canon grants you a personal, limited and non-exclusive license to use ("use" as used herein shall mean storing, loading, installing, accessing, executing or displaying), have used, copy, have copied, distribute and permit third parties to use and copy the Software solely for use with Canon's Inkjet printer products and Inkjet MFP products.  You may modify the Software only for your own use and reverse engineer the same for debugging such modifications.  You shall distribute the Software to any third party under the same terms and conditions as contained herein.
+Canon grants you a personal, limited and non-exclusive license to use
+("use" as used herein shall mean storing, loading, installing,
+accessing, executing or displaying), have used, copy, have copied,
+distribute and permit third parties to use and copy the Software solely
+for use with Canon's Inkjet printer products and Inkjet MFP products.
+You may modify the Software only for your own use and reverse engineer
+the same for debugging such modifications.  You shall distribute the
+Software to any third party under the same terms and conditions as
+contained herein.
 
 2.	RESTRICTIONS
-Except as expressly granted or permitted herein, you shall not use, assign, sublicense, sell, rent, lease, loan, convey or transfer to any third party the Software.
+Except as expressly granted or permitted herein, you shall not use,
+assign, sublicense, sell, rent, lease, loan, convey or transfer to any
+third party the Software.
 
 3.	COPYRIGHT NOTICE
-You shall not modify, remove or delete any copyright notice of Canon or its licensors contained in the Software, including any copy thereof.
+You shall not modify, remove or delete any copyright notice of Canon or
+its licensors contained in the Software, including any copy thereof.
 
 4.	OWNERSHIP
-Canon and its licensors retain in all respects the title, ownership and intellectual property rights in and to the Software.  Except as expressly provided herein, no license or right, express or implied, is hereby conveyed or granted by Canon to you for any intellectual property of Canon and its licensors.
+Canon and its licensors retain in all respects the title, ownership and
+intellectual property rights in and to the Software.  Except as
+expressly provided herein, no license or right, express or implied, is
+hereby conveyed or granted by Canon to you for any intellectual
+property of Canon and its licensors.
 
 5.	EXPORT RESTRICTION
-You agree to comply with all export laws and restrictions and regulations of the country involved, and not to export or re-export, directly or indirectly, the Software in violation of any such laws, restrictions and regulations, or without all necessary approvals.
+You agree to comply with all export laws and restrictions and
+regulations of the country involved, and not to export or re-export,
+directly or indirectly, the Software in violation of any such laws,
+restrictions and regulations, or without all necessary approvals.
 
 6.	NO WARRANTY AND DISCLAIMER OF INDEMNITY
-THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY, FUNCTION AND PERFORMANCE OF THE SOFTWARE IS WITH YOU.  SHOULD THE SOFTWARE PROVE DEFECTIVE, YOU ASSUME THE ENTIRE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL EITHER CANON, CANON'S SUBSIDIARIES OR AFFILIATES, THEIR DISTRIBUTORS, DEALERS OR CANON'S LICENSORS BE LIABLE FOR ANY DAMAGES WHATSOEVER (INCLUDING WITHOUT LIMITATION, LOSS OF BUSINESS PROFITS, LOSS OF BUSINESS INFORMATION, BUSINESS INTERRUPTION OR OTHER COMPENSATORY, INCIDENTAL OR CONSEQUENTIAL DAMAGES) ARISING OUT OF THE SOFTWARE, USE THEREOF OR INABILITY TO USE THE SOFTWARE EVEN IF EITHER CANON, CANON'S SUBSIDIARIES OR AFFILIATES, THEIR DISTRIBUTORS, DEALERS OR CANON'S LICENSORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, YOU HEREBY RELEASE CANON, CANON'S SUBSIDIARIES AND AFFILIATES, THEIR DISTRIBUTORS, DEALERS AND CANON'S LICENSORS FROM ANY AND ALL LIABILITY ARISING FROM OR RELATED TO ALL CLAIMS CONCERNING THE SOFTWARE OR ITS USE.
+THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+THE ENTIRE RISK AS TO THE QUALITY, FUNCTION AND PERFORMANCE OF THE
+SOFTWARE IS WITH YOU.  SHOULD THE SOFTWARE PROVE DEFECTIVE, YOU ASSUME
+THE ENTIRE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL
+EITHER CANON, CANON'S SUBSIDIARIES OR AFFILIATES, THEIR DISTRIBUTORS,
+DEALERS OR CANON'S LICENSORS BE LIABLE FOR ANY DAMAGES WHATSOEVER
+(INCLUDING WITHOUT LIMITATION, LOSS OF BUSINESS PROFITS, LOSS OF
+BUSINESS INFORMATION, BUSINESS INTERRUPTION OR OTHER COMPENSATORY,
+INCIDENTAL OR CONSEQUENTIAL DAMAGES) ARISING OUT OF THE SOFTWARE, USE
+THEREOF OR INABILITY TO USE THE SOFTWARE EVEN IF EITHER CANON, CANON'S
+SUBSIDIARIES OR AFFILIATES, THEIR DISTRIBUTORS, DEALERS OR CANON'S
+LICENSORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, YOU HEREBY RELEASE
+CANON, CANON'S SUBSIDIARIES AND AFFILIATES, THEIR DISTRIBUTORS, DEALERS
+AND CANON'S LICENSORS FROM ANY AND ALL LIABILITY ARISING FROM OR
+RELATED TO ALL CLAIMS CONCERNING THE SOFTWARE OR ITS USE.
 
 7.	TERM
-This Agreement is effective upon your acceptance hereof by using the Software and remains in effect until terminated.  You may terminate this Agreement by destroying the Software.  
+This Agreement is effective upon your acceptance hereof by using the
+Software and remains in effect until terminated.  You may terminate
+this Agreement by destroying the Software.
 
-Canon may terminate this Agreement if you fail to comply with any terms hereof.  Upon such termination of this Agreement, in addition to Canon enforcing its respective legal rights, you must then promptly destroy the Software.  
+Canon may terminate this Agreement if you fail to comply with any terms
+hereof.  Upon such termination of this Agreement, in addition to Canon
+enforcing its respective legal rights, you must then promptly destroy
+the Software.
 
-Notwithstanding the foregoing, Sections 4, and 6 through 10 shall survive any termination of this Agreement.
+Notwithstanding the foregoing, Sections 4, and 6 through 10 shall
+survive any termination of this Agreement.
 
 8.	U.S. GOVERNMENT RESTRICTED RIGHTS NOTICE
-The Software is "commercial items," as that term is defined at 48 C.F.R. 2.101 (October 1995), consisting of "commercial computer software" as such terms are used in 48 C.F.R. 12.212 (September 1995).  Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users shall acquire the Software with only those rights set forth herein.  Manufacturer is Canon Inc./30-2, Shimomaruko 3-chome, Ohta-ku, Tokyo 146-8501, Japan.
+The Software is "commercial items," as that term is defined at 48
+C.F.R. 2.101 (October 1995), consisting of "commercial computer
+software" as such terms are used in 48 C.F.R. 12.212 (September 1995).
+Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through
+227.7202-4 (June 1995), all U.S. Government End Users shall acquire the
+Software with only those rights set forth herein.  Manufacturer is
+Canon Inc./30-2, Shimomaruko 3-chome, Ohta-ku, Tokyo 146-8501, Japan.
 
 9.	SEVERABILITY
-In the event that any section hereof is declared or found to be illegal by any court or tribunal of competent jurisdiction, such section shall be null and void with respect to the jurisdiction of that court or tribunal and all the remaining provisions hereof shall remain in full force and effect.
+In the event that any section hereof is declared or found to be illegal
+by any court or tribunal of competent jurisdiction, such section shall
+be null and void with respect to the jurisdiction of that court or
+tribunal and all the remaining provisions hereof shall remain in full
+force and effect.
 
 10.	ACKNOWLEDGEMENT
-YOU AGREE THAT THIS AGREEMENT IS THE COMPLETE AND EXCLUSIVE STATEMENT OF AGREEMENT BETWEEN YOU AND CANON CONCERNING THE SUBJECT MATTER HEREOF AND SUPERSEDES ALL PROPOSALS OR PRIOR AGREEMENTS, VERBAL OR WRITTEN, AND ANY OTHER COMMUNICATIONS BETWEEN YOU AND CANON RELATING TO THE SUBJECT MATTER HEREOF.
+YOU AGREE THAT THIS AGREEMENT IS THE COMPLETE AND EXCLUSIVE STATEMENT
+OF AGREEMENT BETWEEN YOU AND CANON CONCERNING THE SUBJECT MATTER HEREOF
+AND SUPERSEDES ALL PROPOSALS OR PRIOR AGREEMENTS, VERBAL OR WRITTEN,
+AND ANY OTHER COMMUNICATIONS BETWEEN YOU AND CANON RELATING TO THE
+SUBJECT MATTER HEREOF.
 
 
 
@@ -60,19 +124,46 @@ UNDER THE GNU GENERAL PUBLIC LICENSE AND A SPECIAL EXEMPTION
 IMPORTANT
 
 
-Canon's software program "Canon Bubble Jet Print Filter Ver.2.50 for Linux", "Canon Inkjet Print Filter Ver.2.60 for Linux" and "IJ Printer Driver Ver. 2.70 for Linux (or later)" contain the software modules listed in Appendix 2 and Appendix 3 attached hereto.
+Canon's software program "Canon Bubble Jet Print Filter Ver.2.50 for
+Linux", "Canon Inkjet Print Filter Ver.2.60 for Linux" and "IJ Printer
+Driver Ver. 2.70 for Linux (or later)" contain the software modules
+listed in Appendix 2 and Appendix 3 attached hereto.
 
-Such software modules are free software and you can redistribute them and/or modify them under the terms of GNU General Public License Version 2 published by the Free Software Foundation ("GPL").
+Such software modules are free software and you can redistribute them
+and/or modify them under the terms of GNU General Public License
+Version 2 published by the Free Software Foundation ("GPL").
 
-Such modules are distributed in the hope that they will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  You can find full text of the GPL later within this notice and see it for more details.  
+Such modules are distributed in the hope that they will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  You can find full
+text of the GPL later within this notice and see it for more details.
 
-In addition, as a special exception, Canon gives permission that if you link the modules listed in Appendix 3 attached hereto with other files to produce an executable, this does not by itself cause the resulting executable to be covered by the GPL.  Your use of that executable is in no way restricted on account of linking the modules listed in Appendix 3 attached hereto into it.
+In addition, as a special exception, Canon gives permission that if you
+link the modules listed in Appendix 3 attached hereto with other files
+to produce an executable, this does not by itself cause the resulting
+executable to be covered by the GPL.  Your use of that executable is in
+no way restricted on account of linking the modules listed in Appendix
+3 attached hereto into it.
 
-This exception does not however invalidate any other reasons why the executable file might be covered by the GPL.  This exception applies only to the modules listed in Appendix 3 attached hereto.
+This exception does not however invalidate any other reasons why the
+executable file might be covered by the GPL.  This exception applies
+only to the modules listed in Appendix 3 attached hereto.
 
-If you copy the modules listed in Appendix 2 attached hereto or code provided under the GPL into a copy of the modules listed in Appendix 3 attached hereto, as the GPL permits, this exception does not apply to the code that you add in this way.  To avoid misleading anyone as to the status of such modified files, you must delete this exception notice from them, and then you must not link such modified files with the modules listed in Appendix 1 attached hereto to produce an executable.
+If you copy the modules listed in Appendix 2 attached hereto or code
+provided under the GPL into a copy of the modules listed in Appendix 3
+attached hereto, as the GPL permits, this exception does not apply to
+the code that you add in this way.  To avoid misleading anyone as to
+the status of such modified files, you must delete this exception
+notice from them, and then you must not link such modified files with
+the modules listed in Appendix 1 attached hereto to produce an
+executable.
 
-If you write modifications of you own for the modules listed in Appendix 3 attached hereto, it is your choice whether to permit this exception to apply to your modifications.  If you do not wish that, delete this exception notice, and then you must not link such modifications with the modules listed in Appendix 1 attached hereto to produce an executable.
+If you write modifications of you own for the modules listed in
+Appendix 3 attached hereto, it is your choice whether to permit this
+exception to apply to your modifications.  If you do not wish that,
+delete this exception notice, and then you must not link such
+modifications with the modules listed in Appendix 1 attached hereto to
+produce an executable.
 
 
 
@@ -80,126 +171,344 @@ If you write modifications of you own for the modules listed in Appendix 3 attac
 GNU GENERAL PUBLIC LICENSE
 Version 2, June 1991
 
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.  59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
-Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.  59 Temple
+Place, Suite 330, Boston, MA  02111-1307, USA
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
 
 Preamble
 
-The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too. 
-
-When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. 
-
-To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. 
-
-For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. 
-
-We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. 
-
-Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
- 
-Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. 
-
-The precise terms and conditions for copying, distribution and modification follow. 
+The licenses for most software are designed to take away your freedom
+to share and change it. By contrast, the GNU General Public License is
+intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+When we speak of free software, we are referring to freedom, not price.
+Our General Public Licenses are designed to make sure that you have the
+freedom to distribute copies of free software (and charge for this
+service if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone
+to deny you these rights or to ask you to surrender the rights. These
+restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis
+or for a fee, you must give the recipients all the rights that you
+have. You must make sure that they, too, receive or can get the source
+code. And you must show them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+Finally, any free program is threatened constantly by software patents.
+We wish to avoid the danger that redistributors of a free program will
+individually obtain patent licenses, in effect making the program
+proprietary. To prevent this, we have made it clear that any patent
+must be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
 
 TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". 
-
-Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 
-
-1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. 
-
-You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 
-
-2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: 
-
-a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. 
-
-b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. 
-
-c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) 
-
-These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. 
-
-Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. 
-
-In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 
-
-3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: 
-
-a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, 
-
-b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, 
-
-c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) 
-
-The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. 
-
-If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. 
-
-4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 
-
-5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. 
-
-6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. 
-
-7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. 
-
-If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. 
-
-It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. 
-
-This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 
-
-8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 
-
-9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. 
-
-Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. 
-
-10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. 
+0. This License applies to any program or other work which contains a
+notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of running
+the Program is not restricted, and the output from the Program is
+covered only if its contents constitute a work based on the Program
+(independent of having been made by running the Program). Whether that
+is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source
+code as you receive it, in any medium, provided that you conspicuously
+and appropriately publish on each copy an appropriate copyright notice
+and disclaimer of warranty; keep intact all the notices that refer to
+this License and to the absence of any warranty; and give any other
+recipients of the Program a copy of this License along with the
+Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of
+it, thus forming a work based on the Program, and copy and distribute
+such modifications or work under the terms of Section 1 above, provided
+that you also meet all of these conditions:
+
+a) You must cause the modified files to carry prominent notices stating
+that you changed the files and the date of any change.
+
+b) You must cause any work that you distribute or publish, that in
+whole or in part contains or is derived from the Program or any part
+thereof, to be licensed as a whole at no charge to all third parties
+under the terms of this License.
+
+c) If the modified program normally reads commands interactively when
+run, you must cause it, when started running for such interactive use
+in the most ordinary way, to print or display an announcement including
+an appropriate copyright notice and a notice that there is no warranty
+(or else, saying that you provide a warranty) and that users may
+redistribute the program under these conditions, and telling the user
+how to view a copy of this License. (Exception: if the Program itself
+is interactive but does not normally print such an announcement, your
+work based on the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of a
+storage or distribution medium does not bring the other work under the
+scope of this License.
+
+3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+a) Accompany it with the complete corresponding machine-readable source
+code, which must be distributed under the terms of Sections 1 and 2
+above on a medium customarily used for software interchange; or,
+
+b) Accompany it with a written offer, valid for at least three years,
+to give any third party, for a charge no more than your cost of
+physically performing source distribution, a complete machine-readable
+copy of the corresponding source code, to be distributed under the
+terms of Sections 1 and 2 above on a medium customarily used for
+software interchange; or,
+
+c) Accompany it with the information you received as to the offer to
+distribute corresponding source code. (This alternative is allowed only
+for noncommercial distribution and only if you received the program in
+object code or executable form with such an offer, in accord with
+Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to control
+compilation and installation of the executable. However, as a special
+exception, the source code distributed need not include anything that
+is normally distributed (in either source or binary form) with the
+major components (compiler, kernel, and so on) of the operating system
+on which the executable runs, unless that component itself accompanies
+the executable.
+
+If distribution of executable or object code is made by offering access
+to copy from a designated place, then offering equivalent access to
+copy the source code from the same place counts as distribution of the
+source code, even though third parties are not compelled to copy the
+source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt otherwise
+to copy, modify, sublicense or distribute the Program is void, and will
+automatically terminate your rights under this License. However,
+parties who have received copies, or rights, from you under this
+License will not have their licenses terminated so long as such parties
+remain in full compliance.
+
+5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying the
+Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further restrictions
+on the recipients' exercise of the rights granted herein. You are not
+responsible for enforcing compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent license
+would not permit royalty-free redistribution of the Program by all
+those who receive copies directly or indirectly through you, then the
+only way you could satisfy both it and this License would be to refrain
+entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made generous
+contributions to the wide range of software distributed through that
+system in reliance on consistent application of that system; it is up
+to the author/donor to decide if he or she is willing to distribute
+software through any other system and a licensee cannot impose that
+choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License may
+add an explicit geographical distribution limitation excluding those
+countries, so that distribution is permitted only in or among countries
+not thus excluded. In such case, this License incorporates the
+limitation as if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail
+to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Program does not specify a version
+number of this License, you may choose any version ever published by
+the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the
+author to ask for permission. For software which is copyrighted by the
+Free Software Foundation, write to the Free Software Foundation; we
+sometimes make exceptions for this. Our decision will be guided by the
+two goals of preserving the free status of all derivatives of our free
+software and of promoting the sharing and reuse of software generally.
 
 NO WARRANTY
 
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 
-
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND,
+EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE
+ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH
+YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
+NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
 
 END OF TERMS AND CONDITIONS
 
 How to Apply These Terms to Your New Programs
 
-If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. 
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.
 
-To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. 
+To do so, attach the following notices to the program. It is safest to
+attach them to the start of each source file to most effectively convey
+the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
 
 one line to give the program's name and an idea of what it does.
 Copyright (C) yyyy  name of author
 
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2 of the License, or (at your
+option) any later version.
 
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 
-Also add information on how to contact you by electronic and paper mail. 
+Also add information on how to contact you by electronic and paper
+mail.
 
-If the program is interactive, make it output a short notice like this when it starts in an interactive mode: 
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
 
 Gnomovision version 69, Copyright (C) year name of author
-Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.  This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.
+Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show
+w'.  This is free software, and you are welcome to redistribute it
+under certain conditions; type `show c' for details.
 
-The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program. 
+The hypothetical commands `show w' and `show c' should show the
+appropriate parts of the General Public License. Of course, the
+commands you use may be called something other than `show w' and `show
+c'; they could even be mouse-clicks or menu items--whatever suits your
+program.
 
-You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: 
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
 
 Yoyodyne, Inc., hereby disclaims all copyright
-interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker.
+interest in the program `Gnomovision' (which makes passes at compilers)
+written by James Hacker.
 
 signature of Ty Coon, 1 April 1989
 Ty Coon, President of Vice
 
-This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License. 
+This General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications
+with the library. If this is what you want to do, use the GNU Library
+General Public License instead of this License.
 
 
 
@@ -210,7 +519,8 @@ Appendix
 Appendix 1
 
 
-(the modules incorporated in "Canon Bubble Jet Print Filter Ver.2.50 for Linux")
+(the modules incorporated in "Canon Bubble Jet Print Filter Ver.2.50
+for Linux")
 
 libcnbpcmcm*.so.?.?.?
 libcnbpcnclapi*.so. ?.?.?
@@ -229,7 +539,8 @@ printui.res
 *_raw
 
 
-(the modules incorporated in "Canon Inkjet Print Filter Ver.2.60 for Linux" and "IJ Printer Driver Ver.2.70 for Linux (or later)")
+(the modules incorporated in "Canon Inkjet Print Filter Ver.2.60 for
+Linux" and "IJ Printer Driver Ver.2.70 for Linux (or later)")
 
 libcnbpcmcm*.so.?.?.?
 libcnbpcnclapi*.so. ?.?.?
@@ -263,7 +574,8 @@ cnijlgmon2.res
 Appendix 2
 
 
-(the modules incorporated in "Canon Bubble Jet Print Filter Ver.2.50 for Linux")
+(the modules incorporated in "Canon Bubble Jet Print Filter Ver.2.50
+for Linux")
 
 bjcups
 pstocanonbj
@@ -281,7 +593,8 @@ bjcmd*
 stsmon*.mo
 
 
-(the modules incorporated in "Canon Inkjet Print Filter Ver.2.60 for Linux" and "IJ Printer Driver Ver.2.70 for Linux (or later)")
+(the modules incorporated in "Canon Inkjet Print Filter Ver.2.60 for
+Linux" and "IJ Printer Driver Ver.2.70 for Linux (or later)")
 
 cngpij
 pstocanonij
@@ -316,13 +629,15 @@ tocnpwg
 Appendix 3
 
 
-(the modules incorporated in "Canon Bubble Jet Print Filter Ver.2.50 for Linux")
+(the modules incorporated in "Canon Bubble Jet Print Filter Ver.2.50
+for Linux")
 
 printui*
 bjfilter*
 
 
-(the modules incorporated in "Canon Inkjet Print Filter Ver.2.60 for Linux" and "IJ Printer Driver Ver.2.70 for Linux (or later)")
+(the modules incorporated in "Canon Inkjet Print Filter Ver.2.60 for
+Linux" and "IJ Printer Driver Ver.2.70 for Linux (or later)")
 
 printui*
 cif*
@@ -333,4 +648,4 @@ maintenance*
 cnijlgmon2
 cnijlgmon3
 cmdtocanonij2
-tocanonij
\ No newline at end of file
+tocanonij
diff --git a/licenses/EPL-2.0 b/licenses/EPL-2.0
index e23ece2c8524..e48e0963459b 100644
--- a/licenses/EPL-2.0
+++ b/licenses/EPL-2.0
@@ -261,8 +261,8 @@ No third-party beneficiary rights are created under this Agreement.
 
 Exhibit A - Form of Secondary Licenses Notice
 
-"This Source Code may also be made available under the following 
-Secondary Licenses when the conditions for such availability set forth 
+"This Source Code may also be made available under the following
+Secondary Licenses when the conditions for such availability set forth
 in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
 version(s), and exceptions or additional permissions here}."
 
@@ -274,4 +274,4 @@ version(s), and exceptions or additional permissions here}."
   file in a relevant directory) where a recipient would be likely to
   look for such a notice.
 
-  You may add additional accurate notices of copyright ownership.
\ No newline at end of file
+  You may add additional accurate notices of copyright ownership.
diff --git a/licenses/JPRS b/licenses/JPRS
old mode 100755
new mode 100644
diff --git a/licenses/Manifest.gz b/licenses/Manifest.gz
index 4e67dbf79da9..773ccfadbaf6 100644
Binary files a/licenses/Manifest.gz and b/licenses/Manifest.gz differ
diff --git a/licenses/PyGUI b/licenses/PyGUI
deleted file mode 100644
index 1725e37a9424..000000000000
--- a/licenses/PyGUI
+++ /dev/null
@@ -1 +0,0 @@
-This is free software. You are welcome to use it however you want.
diff --git a/licenses/dotnet-eula b/licenses/dotnet-eula
deleted file mode 100644
index d7a4344ed428..000000000000
--- a/licenses/dotnet-eula
+++ /dev/null
@@ -1,128 +0,0 @@
-MICROSOFT SOFTWARE LICENSE TERMS
-MICROSOFT .NET PORTABLE CLASS LIBRARY REFERENCE ASSEMBLIES – 4.6
-These license terms are an agreement between Microsoft Corporation (or
-based on where you live, one of its affiliates) and you. Please read
-them. They apply to the software named above. The terms also apply to
-any Microsoft
-•   updates,
-•   supplements,
-•   Internet-based services, and
-•   support services
-for this software, unless other terms accompany those items. If so,
-those terms apply.
-BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT
-THEM, DO NOT USE THE SOFTWARE.
-IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS
-BELOW.
-1.   INSTALLATION AND USE RIGHTS. You may install and use any number of
-copies of the software to design, develop and test your programs.
-2.   ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.
-a.   Distributable Code. You may distribute the software in developer
-tool programs you develop, to enable customers of your programs to
-develop portable libraries for use with any device or operating system,
-if you comply with the terms below.
-i.   Right to Use and Distribute. The software is “Distributable Code.”
-•   Distributable Code. You may copy and distribute the object code form
-of the software.
-•   Third Party Distribution. You may permit distributors of your
-programs to copy and distribute the Distributable Code as part of those
-programs.
-ii.   Distribution Requirements. For any Distributable Code you
-distribute, you must
-•   add significant primary functionality to it in your programs;
-•   require distributors and your customers to agree to terms that
-protect it at least as much as this agreement;
-•   display your valid copyright notice on your programs; and
-•   indemnify, defend, and hold harmless Microsoft from any claims,
-including attorneys’ fees, related to the distribution or use of your
-programs.
-iii.   Distribution Restrictions. You may not
-•   alter any copyright, trademark or patent notice in the Distributable
-Code;
-•   use Microsoft’s trademarks in your programs’ names or in a way that
-suggests your programs come from or are endorsed by Microsoft;
-•   include Distributable Code in malicious, deceptive or unlawful
-programs; or
-•   modify or distribute the Distributable Code so that any part of it
-becomes subject to an Excluded License. An Excluded License is one that
-requires, as a condition of use, modification or distribution, that
-•   the code be disclosed or distributed in source code form; or
-•   others have the right to modify it.
-3.   SCOPE OF LICENSE. The software is licensed, not sold. This
-agreement only gives you some rights to use the software. Microsoft
-reserves all other rights. Unless applicable law gives you more rights
-despite this limitation, you may use the software only as expressly
-permitted in this agreement. In doing so, you must comply with any
-technical limitations in the software that only allow you to use it in
-certain ways. You may not
-•   work around any technical limitations in the software;
-•   reverse engineer, decompile or disassemble the software, except and
-only to the extent that applicable law expressly permits, despite this
-limitation;
-•   publish the software for others to copy; or
-•   rent, lease or lend the software.
-4.   FEEDBACK. You may provide feedback about the software. If you give
-feedback about the software to Microsoft, you give to Microsoft, without
-charge, the right to use, share and commercialize your feedback in any
-way and for any purpose. You also give to third parties, without charge,
-any patent rights needed for their products, technologies and services
-to use or interface with any specific parts of a Microsoft software or
-service that includes the feedback. You will not give feedback that is
-subject to a license that requires Microsoft to license its software or
-documentation to third parties because we include your feedback in
-them. These rights survive this agreement.
-5.   TRANSFER TO A THIRD PARTY. The first user of the software may
-transfer it, and this agreement, directly to a third party. Before the
-transfer, that party must agree that this agreement applies to the
-transfer and use of the software. The first user must uninstall the
-software before transferring it separately from the device. The first
-user may not retain any copies.
-6.   EXPORT RESTRICTIONS. The software is subject to United States
-export laws and regulations. You must comply with all domestic and
-international export laws and regulations that apply to the software.
-These laws include restrictions on destinations, end users and end use.
-For additional information, see www.microsoft.com/exporting.
-7.   SUPPORT SERVICES. Because this software is “as is,” we may not
-provide support services for it.
-8.   ENTIRE AGREEMENT. This agreement, and the terms for supplements,
-updates, Internet-based services and support services that you use, are
-the entire agreement for the software and any support services we
-provide.
-9.   APPLICABLE LAW.
-a.   United States. If you acquired the software in the United States,
-Washington state law governs the interpretation of this agreement and
-applies to claims for breach of it, regardless of conflict of laws
-principles. The laws of the state where you live govern all other
-claims, including claims under state consumer protection laws, unfair
-competition laws, and in tort.
-b.   Outside the United States. If you acquired the software in any
-other country, the laws of that country apply.
-10.   LEGAL EFFECT. This agreement describes certain legal rights. You
-may have other rights under the laws of your country. You may also have
-rights with respect to the party from whom you acquired the software.
-This agreement does not change your rights under the laws of your
-country if the laws of your country do not permit it to do so.
-11.   DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED “AS-IS.” YOU BEAR
-THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES
-OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY
-GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE.
-TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE
-IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
-AND NON-INFRINGEMENT.
-FOR AUSTRALIA – YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN
-CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE
-RIGHTS.
-12.   LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN
-RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S.
-$5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL,
-LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.
-This limitation applies to
-•   anything related to the software, services, content (including code)
-on third party Internet sites, or third party programs; and
-•   claims for breach of contract, breach of warranty, guarantee or
-condition, strict liability, negligence, or other tort to the extent
-permitted by applicable law.
-It also applies even if Microsoft knew or should have known about the
-possibility of the damages. The above limitation or exclusion may not
-apply to you because your country may not allow the exclusion or
-limitation of incidental, consequential or other damages.
diff --git a/licenses/dvibook b/licenses/dvibook
deleted file mode 100644
index 455c5f05a8b9..000000000000
--- a/licenses/dvibook
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- * Copyright (c) 1987, 1989 University of Maryland
- * Department of Computer Science.  All rights reserved.
- * Permission to copy for any purpose is hereby granted
- * so long as this copyright notice remains intact.
- */
diff --git a/lxde-base/Manifest.gz b/lxde-base/Manifest.gz
index e257cfd871c9..4b9ed45b2ccc 100644
Binary files a/lxde-base/Manifest.gz and b/lxde-base/Manifest.gz differ
diff --git a/lxde-base/lxterminal/Manifest b/lxde-base/lxterminal/Manifest
index a7218c03132d..c8cf28f72301 100644
--- a/lxde-base/lxterminal/Manifest
+++ b/lxde-base/lxterminal/Manifest
@@ -1,5 +1,7 @@
 DIST lxterminal-0.1.11.tar.gz 304025 BLAKE2B 88e0172bcfa5e310f9ac726fc2cb03d6300eed8876203f641721d3b3b81b05af143e6184abb45748b02ae100ab6e16494e7d42facdd1f28d8b45c6ace59676aa SHA512 4f929e9177775c78dcf4c440e1cff4f4824f56ff5bd165cb76ab42208db350feeb08d22449a482b3979160873b0120a78ace43069d910b5aeeec0736aa550139
 DIST lxterminal-0.2.0.tar.gz 248698 BLAKE2B ca65e08baf22410a4e93d18ecc05e27329b9aaa555a945d81dd4f0e74a88205ff3345c34524304ab216a81fe21cc266fee1dc74381d1b6c3d315f3e50efce2a2 SHA512 5bec0e16fa4d929203e4c206fb59fb0c88e02f29adbf527c31fa2a0007d3dddbdf12f2219e204360b5dd95a68a89410fcf937325f3a7eb1229b568c9c10c0e78
+DIST lxterminal-0.3.1.tar.xz 197628 BLAKE2B 9448855b6d1bfc3fc272ec40f7e5b4fde1dfcb861254db3ed35b73611fd2dc5ca5d760542251f297289a051913e6eb6d669b2c04b194e01862ff7e79305c2e14 SHA512 3063eb7bc7426293d35dc1d9c32d5841e4c3f0b417f3cfa3e5a7bf4d9b71df9c9d375d53d6dd6694b318085ba07167bd8403b2caea9c6e9197aef4b7802877fc
 EBUILD lxterminal-0.1.11.ebuild 603 BLAKE2B edb2eff40e44f3ca6603cbc6003c6dd61d6aadb346e8645923fc43a002510cb1f5e2cd5d01af25378447a6da270289346b84436281d52d1e2b7d5cfa7190893c SHA512 3987739c16c86f08e1ae7df3177934f2e290e215bf0044271af26a559944fb6c59ea935efb84b710d5e2af7d2cfd4c9fe71e84e2a552dcab993f1b6c411f83a5
 EBUILD lxterminal-0.2.0-r1.ebuild 658 BLAKE2B 17d722e0344c2bfbeb134ffbbefeaa18b7fa6b75f923229f962bfe53c0bd00da0d3bcc55f9eaca9d551a92f49b376ddbee3b10640c11a96a7427d05eb6b37f7f SHA512 d84e773bec3f05d8f07b3799cd76623d30cc4202bcaf3a61e840044a687acc5fff1bef795407ad8821c381e66bec6da17de1b93bb5cbe94d67c0cf6c635af8a8
+EBUILD lxterminal-0.3.1.ebuild 1192 BLAKE2B 927945918dbd0db4900ce74d512317ac80560476ca0150bc881253648af47440fcbf62fad5f8d2bb3bfdf031c2e6f73ab07ffca4bf216b74932bd658e6270546 SHA512 19e41554a48eef86f943a98553faf800f1397b5624f056f7e3c7f56ff0f8a515e528b9d07e0e885ed5709fa508a6746e59edfa12bbf3a08512bee0c05f32d134
 MISC metadata.xml 408 BLAKE2B 46853cfafd4a24907018aa2f99cf01f261d2ba37bdadd119e70493a6632e14b8dfec1dd0359c2192940c0c272d38e7c482a83590c7e775a06587b0bf4059e57b SHA512 2542f3365bcca18cfbb25bbe5a58b569bc7480ab42df1d86238e7dc1b52968387440f588394421b7b9ddcebb3c26709630a92ad3670684fa6b510d1cabc58907
diff --git a/lxde-base/lxterminal/lxterminal-0.3.1.ebuild b/lxde-base/lxterminal/lxterminal-0.3.1.ebuild
new file mode 100644
index 000000000000..c6b5993d83cd
--- /dev/null
+++ b/lxde-base/lxterminal/lxterminal-0.3.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="af ar be bg bn bn_IN ca cs da de el en_GB eo es et eu fa fi fo fr frp gl
+he hr hu id is it ja kk ko lg lt ml ms nb nl nn pa pl ps pt pt_BR ro ru sk sl sr
+sr@latin sv te th tr tt_RU ug uk ur ur_PK vi zh_CN zh_TW"
+PLOCALE_BACKUP="en_GB"
+
+inherit autotools l10n
+
+DESCRIPTION="Lightweight vte-based tabbed terminal emulator for LXDE"
+HOMEPAGE="https://wiki.lxde.org/en/LXTerminal"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/lxde/${PN}"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="gtk3"
+
+RDEPEND="dev-libs/glib:2
+	!gtk3? ( x11-libs/gtk+:2 x11-libs/vte:0 )
+	gtk3?  ( x11-libs/gtk+:3 x11-libs/vte:2.91 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext
+	>=dev-util/intltool-0.40.0"
+
+src_prepare() {
+	default
+	eautoreconf
+
+	export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}"
+	l10n_get_locales > po/LINGUAS || die
+}
+
+src_configure() {
+	econf --enable-man $(use_enable gtk3)
+}
diff --git a/lxde-base/menu-cache/Manifest b/lxde-base/menu-cache/Manifest
index ca1ca9566659..b4bd81305e55 100644
--- a/lxde-base/menu-cache/Manifest
+++ b/lxde-base/menu-cache/Manifest
@@ -1,11 +1,15 @@
+AUX menu-cache-1.0.2-CVE-2017-8933.patch 4631 BLAKE2B 86c7a0b99ed3e85f3793e7eabca1c56fd0dad8719d4384218e746913a94359c4f16e1c239cf64622e8583a860c457d3b50f9f2f5182cefb4f2ad08ebe71a3813 SHA512 54dcc28b9c2188e921096d22be9729c8bcc366bc78b8a2dae0146aecdf88e6ee3455d2ddeaafd760e6ba0e22e48fba3c6c11edf8e5edd40fd4650ca671baf6a2
 DIST menu-cache-0.3.3.tar.gz 392291 BLAKE2B baf9eb9013a1a208ca69d388cdf902ccb8303a3c44fd92ba475acd6ebf36a1fd802b50e74889c618ea37074f4834ce4167e497ff3fcfab6ffffe146f3d8a3e6e SHA512 1966b94989cdae0a1a3a48f19d337471a28acadecf7f03dac8c27d515324b8eb4d15102e2aa293c251e020f521f6e586aa13c8eca7ae7909b9ce5e67ef3ebafe
 DIST menu-cache-0.5.1.tar.gz 406329 BLAKE2B 14851fb55b15d2e5262e8ca6de55a4fb14bdc56741ad00979dcb5f8b4e57d9db71543700658ab8aeecd0a40d4eef91f18c9a854352c7c10816ec35cd0d34f9bb SHA512 44d55a01f5452804e77518c4a2ba400a5b65edbf4061e346a6c02356195867eaa0bb9eaa057fbf603ddf79759acb16632bf3b7ae543eebc1544e28517cd23066
 DIST menu-cache-1.0.0.tar.xz 261988 BLAKE2B 126aca354efff42ea51336b4cb0c8cb42240b1c95ba3de0862fb2a2ee31da04c85c5b4c0b442bf00c7a96311b8b6c5cf45a6299bad4c638559b8d8e69ac53a48 SHA512 b336cddb9c3d993aa605e6adf9ac3c40fe631eccfa06d1835897f6cb5ae82bed93bc323c12b7dff44b8785dfb646058d77cb697f3c275998a5483b2582926e22
 DIST menu-cache-1.0.1.tar.xz 262508 BLAKE2B 82019f7a6b596cb0f4da641cdd70c5b96fd75d2e63192391b556c6f1d40fdfb90047a7febef44f10fe9357c0682d8c0fa931b0ff45462ba1b6578e5c9c44656f SHA512 5de4bf99ab5a511da6781d54b03349cc0232b379a73f9f9c328fb9aed6ec03558a9adda85be1fbbe53d94669d07a5196929ab67cd3291de7aae59f587afda3a3
 DIST menu-cache-1.0.2.tar.xz 264540 BLAKE2B 500dd761cf2c5771a89fd0f1ed58f5f736be816a75af5209041dcabab0fe5d3cd04b14749ff1cde88bf0a536a6c13f3a32ecf1a55663c52ab379c65951dce3e1 SHA512 4a74d464778160052ca7c2abda8c899ce4a3bdf8ddf5fe9ca4cd7297a62340ad1b065162fc5ecb55c0af206175e50dacd4ad0c01a8ffac5690012e534dc3b4b7
+DIST menu-cache-1.1.0.tar.xz 265524 BLAKE2B af7caea53a30be53836ccb7d75b0817aef610815009f22dc56fb6d412508ce27a6a5625c25f92faaafe8123dd73ddb2b3f83484e48c1b5deb635c9d630cc868c SHA512 e4c6619ade7b9a1b97c1366bb94dffb9975be5664b193cf0c69cf9470ef7ae19bda3390d04d98ee9a5b1658ec48aa5c83508c26c347af689161ee67c076b3c9e
 EBUILD menu-cache-0.3.3.ebuild 478 BLAKE2B 6cc6cab53da51047e81d04e58a740a43c0517c428607a9994967301aec89f30ec74e0c7cd3d826845a54512fc01c135b3e6ac6d80d4250bc47fc4c0dbeae3107 SHA512 7dc179652dd996b711d5a8d1b893214861332b9877125e8319506a3f7cf8c9901e826de9a4d58ac39b933c117d40bad11eb0cb5213c533b04418c03e48d41693
 EBUILD menu-cache-0.5.1.ebuild 522 BLAKE2B 02da03184da61002d1e4fe4464a80d465419f825bd6605c6302f1d2cf923a19ec2805f1b20f53b3b3e812539db3e87deb03dec070c29101ad2c62cea3a8d6a93 SHA512 6f16123ff84c97f8efedde35611d4d6606672f722952189aa55c73bb0de06a6707c249de76a089664e32d33754e3de73082fb9f10c2ef35faf9f182704067972
 EBUILD menu-cache-1.0.0-r1.ebuild 544 BLAKE2B e39886c3cec6f5bc6e684dcb0976c5504062f7369ab60288463202256ad367eb30003aa5b120410c64f39cd46db593b204f864c261b0b6e6d73a95dffdd7eb88 SHA512 695a5c00b7641cbc0e4fc4276ed6d0e245c0a2e1ef396cf90429984100cd651bf7ff72757ae3802dba46f32eaa2f6e8c4a116f0815b92a286fc74240a5796606
 EBUILD menu-cache-1.0.1.ebuild 542 BLAKE2B 4db007b54508279e1cf8bed97a226d45b0ebee3e51d594798107b15d7b7a8e6143b6120a8819e79efddc415664db3341e5fef0385922866b940c2975c0ee08d2 SHA512 1811f33ea471c5a48b3db71a16900d56746e232654fc349280190ea767ecd5f2249c205287157fb15ced4ca9e2ec69182ba265ed0d165a3c877a8ee1aac5709f
+EBUILD menu-cache-1.0.2-r1.ebuild 609 BLAKE2B 172c61fb66b0782b1f567549b85beec1299a96cfa0c34bfc1ac460420428db698d0dee02ea7ffd50c6e3a81d1adcbceb682ace432f64403f362a5fb38cee587b SHA512 6f4b81e829b66f9b66e3a4e8038ea7f7b560b322ea4b941fd85fe04d1abb4eaf2efff09ea9dc62716505b9980d8c9c35350ef41bb7c6f6a517d2537c2cfeacc5
 EBUILD menu-cache-1.0.2.ebuild 542 BLAKE2B 62a7f01f87e8f1c6ef5742253ee1759e2669e0beab3639a77d89ff3ecde534492d4ad2b6c8334ad1731a58ae2bd449f2a13da9dd73056dddbc02ac4e0fe6bc51 SHA512 10902ab7ae5f3c133ba3f8383751e888751aeda4d0d2342ef25959c8031db146f7c80c668ae9457c46212612ddd49786c7547c8d0dd16198349def69905f3346
+EBUILD menu-cache-1.1.0.ebuild 597 BLAKE2B 2ba1294bdb1bbc301ff66a9c401269d7d9b69a25235d85199c284c1c3ba1efbcb84b20008f6e0c3e8b84aced15e03a6dcc19971fa6dce86e49b5c7a0e61cc589 SHA512 932f67b3f0f44d8e56746bc356b023da9050671ac420c68d7341bc86e22a70a4c34a866dfc2577493d41e9a0f8706a5a8942e487ae6ae46da01a631a940f06e3
 MISC metadata.xml 438 BLAKE2B 22ac961e4ca76cf28e725a25d16767e5ec9c8d56cde16f3e613f5c1f56bce4eee38583f524796cb868301d2400cc3242fb466061edc140e28043a132bbb26b9d SHA512 406a5d2489fe96131ecbdcdb8570daa229a4360f393037b76b2d3bd4a7eaccb5dfae9b0d4c6915d0a09d2ef04d879c01b16bdf5c7af648eed87c53a09aa82bfc
diff --git a/lxde-base/menu-cache/files/menu-cache-1.0.2-CVE-2017-8933.patch b/lxde-base/menu-cache/files/menu-cache-1.0.2-CVE-2017-8933.patch
new file mode 100644
index 000000000000..89ce5c501b0b
--- /dev/null
+++ b/lxde-base/menu-cache/files/menu-cache-1.0.2-CVE-2017-8933.patch
@@ -0,0 +1,122 @@
+diff --git a/NEWS b/NEWS
+index dcc572a..6177e9d 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,3 +1,12 @@
++* Fixed crash with invalid <Name> tag in a menu.
++
++* Added new API menu_cache_app_get_generic_name() to get generic
++    name for application.
++
++* Fixed potential access violation, use runtime user dir instead of tmp dir.
++    It limits libmenu-cache compatibility to menu-cached >= 0.7.0.
++
++
+ Changes in 1.0.2 since 1.0.1:
+ 
+ * Fixed crash in menu-cached if cache regeneration fails.
+diff --git a/libmenu-cache/menu-cache.c b/libmenu-cache/menu-cache.c
+index 3bc9cfc..d914127 100644
+--- a/libmenu-cache/menu-cache.c
++++ b/libmenu-cache/menu-cache.c
+@@ -3,7 +3,7 @@
+  *
+  *      Copyright 2008 PCMan <pcman.tw@gmail.com>
+  *      Copyright 2009 Jürgen Hötzel <juergen@archlinux.org>
+- *      Copyright 2012-2015 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua>
++ *      Copyright 2012-2017 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua>
+  *
+  *      This library is free software; you can redistribute it and/or
+  *      modify it under the terms of the GNU Lesser General Public
+@@ -1234,6 +1234,22 @@ gboolean menu_cache_dir_is_visible(MenuCacheDir *dir)
+ }
+ 
+ /**
++ * menu_cache_app_get_generic_name
++ * @app: a menu cache item
++ *
++ * Retrieves generic name for @app. Returned data are owned by menu
++ * cache and should not be freed by caller.
++ *
++ * Returns: (transfer none): app's generic name or %NULL.
++ *
++ * Since: 1.0.3
++ */
++const char* menu_cache_app_get_generic_name( MenuCacheApp* app )
++{
++	return app->generic_name;
++}
++
++/**
+  * menu_cache_app_get_exec
+  * @app: a menu cache item
+  *
+@@ -1522,8 +1538,13 @@ static void get_socket_name( char* buf, int len )
+         if(*p)
+             *p = '\0';
+     }
++#if GLIB_CHECK_VERSION(2, 28, 0)
++    g_snprintf( buf, len, "%s/menu-cached-%s", g_get_user_runtime_dir(),
++                dpy ? dpy : ":0" );
++#else
+     g_snprintf( buf, len, "%s/.menu-cached-%s-%s", g_get_tmp_dir(),
+                 dpy ? dpy : ":0", g_get_user_name() );
++#endif
+     g_free(dpy);
+ }
+ 
+diff --git a/libmenu-cache/menu-cache.h.in b/libmenu-cache/menu-cache.h.in
+index 76ea7b4..cded59d 100644
+--- a/libmenu-cache/menu-cache.h.in
++++ b/libmenu-cache/menu-cache.h.in
+@@ -151,6 +151,7 @@ MenuCacheItem *menu_cache_find_child_by_name(MenuCacheDir *dir, const char *name
+ 
+ char* menu_cache_dir_make_path( MenuCacheDir* dir );
+ 
++const char* menu_cache_app_get_generic_name( MenuCacheApp* app );
+ const char* menu_cache_app_get_exec( MenuCacheApp* app );
+ const char* menu_cache_app_get_working_dir( MenuCacheApp* app );
+ const char* const *menu_cache_app_get_categories(MenuCacheApp* app);
+diff --git a/menu-cache-daemon/menu-cached.c b/menu-cache-daemon/menu-cached.c
+index a6895ee..c100484 100644
+--- a/menu-cache-daemon/menu-cached.c
++++ b/menu-cache-daemon/menu-cached.c
+@@ -473,6 +473,9 @@ static void get_socket_name( char* buf, int len )
+         if(*p)
+             *p = '\0';
+     }
++    /* NOTE: this socket name is incompatible with versions > 1.0.2,
++            although this function is never used since 0.7.0 but
++            libmenu-cache always requests exact socket name instead */
+     g_snprintf( buf, len, "%s/.menu-cached-%s-%s", g_get_tmp_dir(),
+                 dpy ? dpy : ":0", g_get_user_name() );
+     g_free(dpy);
+diff --git a/menu-cache-gen/menu-merge.c b/menu-cache-gen/menu-merge.c
+index 816cf96..31f05b0 100644
+--- a/menu-cache-gen/menu-merge.c
++++ b/menu-cache-gen/menu-merge.c
+@@ -1,7 +1,7 @@
+ /*
+  *      menu-file.c : parses <name>.menu file and merges all XML tags.
+  *
+- *      Copyright 2013-2016 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua>
++ *      Copyright 2013-2017 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua>
+  *
+  *      This file is a part of libmenu-cache package and created program
+  *      should be not used without the library.
+@@ -138,11 +138,13 @@ static gboolean _menu_xml_handler_Name(FmXmlFileItem *item, GList *children,
+                                        guint n_attributes, gint line, gint pos,
+                                        GError **error, gpointer user_data)
+ {
++    FmXmlFileItem *name_item;
+     const char *name;
+ 
+     RETURN_IF_IN_LAYOUT(item, error);
+-    item = fm_xml_file_item_find_child(item, FM_XML_FILE_TEXT);
+-    if (item == NULL || (name = fm_xml_file_item_get_data(item, NULL)) == NULL ||
++    name_item = fm_xml_file_item_find_child(item, FM_XML_FILE_TEXT);
++    if (name_item == NULL ||
++        (name = fm_xml_file_item_get_data(name_item, NULL)) == NULL ||
+         strchr(name, '/') != NULL) /* empty or invalid tag */
+     {
+         RETURN_TRUE_AND_DESTROY_IF_QUIET(item);
diff --git a/lxde-base/menu-cache/menu-cache-1.0.2-r1.ebuild b/lxde-base/menu-cache/menu-cache-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..736a786ebeac
--- /dev/null
+++ b/lxde-base/menu-cache/menu-cache-1.0.2-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Library to create and utilize caches to speed up freedesktop application menus"
+HOMEPAGE="http://lxde.sourceforge.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+# ABI is v2. See Makefile.am
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.2-CVE-2017-8933.patch )
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/libfm-extra"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
diff --git a/lxde-base/menu-cache/menu-cache-1.1.0.ebuild b/lxde-base/menu-cache/menu-cache-1.1.0.ebuild
new file mode 100644
index 000000000000..5592bfbcbd34
--- /dev/null
+++ b/lxde-base/menu-cache/menu-cache-1.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Library to create and utilize caches to speed up freedesktop application menus"
+HOMEPAGE="http://lxde.sourceforge.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+# ABI is v2. See Makefile.am
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/libfm-extra"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	econf "--disable-static"
+}
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 97467bb332c7..f7b2d5049549 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/sylpheed/Manifest b/mail-client/sylpheed/Manifest
index cc19b6fc76af..ccf29d8bab69 100644
--- a/mail-client/sylpheed/Manifest
+++ b/mail-client/sylpheed/Manifest
@@ -2,6 +2,6 @@ DIST sylpheed-3.5.1.tar.bz2 3561816 BLAKE2B 811d433a2930d32dd6d2a5aa3010c4cfe54e
 DIST sylpheed-3.6.0.tar.bz2 3568998 BLAKE2B 283ea6c956eb67332b9f1ba34cecb2be853a079d398b5165e925b9adfe33b75d5eab559b91a707b5c76d9253f35acbf4177afcbb90e86fb48b45bcd9aa517768 SHA512 84c59e327690ed7e637e9ce60e630da6cdad771ccc278e31e490ed643da55c295fb47e999ad421fc59dbbcfed990882022b96cf478bd47253692d2e86279c591
 DIST sylpheed-3.7.0.tar.bz2 3612328 BLAKE2B bd8182db8a46b956e12b3da4b15d3ee8184a612e2fb216aca20fd4a022610b17416f994d36b390a5a92835915e95f08bd59bf71154a86962c9564162be891f21 SHA512 490837528bf7ba9d26994cd5fff00b6e5390a127419b9d0efd9fc25c38be1291d55c5b8daebdf5ca9d9159a51c938449e76212328f3eae40cc039db88cb5caa4
 EBUILD sylpheed-3.5.1.ebuild 1562 BLAKE2B de18e090c09ad9df8e8ff26fdd2af1499e7f7c273891cd6b74f2852209f42b8713ce320b20fc6f0a4dc4fd0f684de720215b2cf0c06b946aa765d566bcce87bf SHA512 d7660a0451164cea86d5c52a19ec3823a1ee6dec6a9aeb67155c447efc9db47735b0eddd2e4703d39bb15c71168933b75701ab0a138d17cc8a4852f8909b72ca
-EBUILD sylpheed-3.6.0.ebuild 1618 BLAKE2B 1b6d8c71d800912ee1e11e4177b402279d70d2128fe005603fd3d8663a9380e9d3e3272197ed8ce9a29dd04cb9467e3641dd75ce98506f0f7fb575acbb79ce3d SHA512 5bc8ef39de7ef23643ecea5d21cb080316c1f04c9e1c0146895ba4d45b9bbb4c7efbf265070a550fe2fe0ecdb2f77d63d32e070328c76b29fbd4362c2d9d5918
+EBUILD sylpheed-3.6.0.ebuild 1617 BLAKE2B e3e6bb60400bc6b3cda4d2faea44897f8acc17dfeec65c37e33416ce61d956db81b7bbd2b082545484413176f05f5b562b080455ee9f55f6113b01f3bfc28ce3 SHA512 65d4c1d6bdbf6638d1b23bfa5cdb28ef198037ac2d2d81a75d7e7d8ad13ef863363fee6f5bdf6ba3028914354910dd58db80be3b20da0f5b0f71496fe7a99be1
 EBUILD sylpheed-3.7.0.ebuild 1623 BLAKE2B 8f6bcfdb9684cb2091803a3125eaccacb3b980e21a324a60f5becae76a360582ecd8a63b64200774f26731a46995beb0184327e2463321690cde42df0d77ed86 SHA512 9ca225e89923b4eeda0439377c362519a06eac6696cbfe72a262390103e77ebeb17f9b40e85e9ad1b3a2070111fb8a5edde371863e71beca28e954b5ebad342d
 MISC metadata.xml 440 BLAKE2B efcb9ca3d9130ca42ba924b3466975f87869800e50cd286d892331a0bf97b21dfacd3fdf02704091341a391e60052ee2b3322f2e90dfe66b076ff4f1db51fb31 SHA512 69ac2f825b9dd04550e139906f492e50eceb5e8922a95b2a44196c664215095dbc0809f9677d403dcb7deb5093dc0c8723b56ad840b3a93ea9101b55ac38de84
diff --git a/mail-client/sylpheed/sylpheed-3.6.0.ebuild b/mail-client/sylpheed/sylpheed-3.6.0.ebuild
index 36b66531cccd..98b90da34967 100644
--- a/mail-client/sylpheed/sylpheed-3.6.0.ebuild
+++ b/mail-client/sylpheed/sylpheed-3.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.sraoss.jp/${PN}/v${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd"
 IUSE="crypt ipv6 ldap libressl nls oniguruma pda spell ssl xface"
 
 CDEPEND="net-libs/liblockfile
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 298433462d37..1ede0cdce6a6 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/dcc/Manifest b/mail-filter/dcc/Manifest
index 18898fa9dea9..baebdd3a7754 100644
--- a/mail-filter/dcc/Manifest
+++ b/mail-filter/dcc/Manifest
@@ -9,5 +9,5 @@ DIST dcc-1.3.154.tar.Z 1711292 BLAKE2B 3e53488e718b13a1c36c1531f552ee811f42b274f
 DIST dcc-1.3.158.tar.Z 1714175 BLAKE2B 19e11e9e78268e76bf97f16ad6f03f0bb114ec9fbc9b1f8bb6ca7ce72fa419b1e50a6d35ee32ed5352b13da96002d313c00a07395317d33082eb69c9ae60008e SHA512 24fba5ea713e8df1468644508c323d64b3868685716b7cc02263933476940a807cfc4593432a9195371308c83d4ea93653e89634681d95dcb32f5d65c7274599
 EBUILD dcc-1.3.140-r1.ebuild 4450 BLAKE2B a7e8d531230170fa40cc7782929e53d01b1d29aabe750ab9d6b920416d5f09047e65eae84cb9d7417e8a51f16acb4609acaaf52b551c0aa027f5eb652f608747 SHA512 6a7dbf51021db45042ffabf96f4082af7cf16541607b5d6780f4bd66c4bd9b860316a84ca69a885a6de2aa05e48f12e2f47080a88c85c0471bb1ca7a8875f804
 EBUILD dcc-1.3.154.ebuild 4358 BLAKE2B 0e3b69bf36dc2a6f8f58eac9638c76648b825a2d9deee643e1a4ae174b34ce150a885fc115284aad0dc817743355f07bb450a75e62b5942172fc6d812c943c37 SHA512 d22050cdf0e5ab84a524c62e3752faa5a2bd986a57ee3ac643f56bf8ff5c7501b396d9a81f3788652e4f0c3229ae9c5bb7a45646bc903fac7b636670a0748508
-EBUILD dcc-1.3.158.ebuild 4363 BLAKE2B a8dd859abe259a047b79424dcd44206b1f98cfb54558b46d4c1cccb15ce358e4e0f2395b5853bd8dc451bb001f41a922b2b01d95aaf3059233d14b0f1c1a7e3d SHA512 f0df44965502018e118a69a4fae4d2226dbee91c974797b125be4db37ad14da93d43d9a6faaa56c614f9f6c09d7348a8961f105072c8214606797b1d2cc876d1
+EBUILD dcc-1.3.158.ebuild 4362 BLAKE2B ee485c0437a592c33ffb664a8c46ae699dc4258304d74c2bc0e22b70e0804ef7d54aff726026f635c6cc89d71c78594b6781c47ce36dc0a2bd272a4bec29fae1 SHA512 50d075c30e1a1c3db2eb1f2ebb389e0a2431c168f29b0ef6b5316d5a3124b7c1ce528c2387c5a7da5711c68e7c1c4d0eb9874176e2c60a9ae0efb250e81e2d1b
 MISC metadata.xml 417 BLAKE2B b1228d8060b3a3ce26e0a301089873d253bdee3e4e5fa785db1aef00528dbf3b786d3f2acd0d810b707fca436384cf26e67b5cfad63c912d3e6ae5cc374562e8 SHA512 8a17fc0c9502d8e21389a520cba60b482593a89064fb913a87b1c4fc73d20f0652948f848c803f22923a0873ed213025db2663effa584c800a9fe6b3a29f9339
diff --git a/mail-filter/dcc/dcc-1.3.158.ebuild b/mail-filter/dcc/dcc-1.3.158.ebuild
index eb41bfe7d6ee..de62003ecc00 100644
--- a/mail-filter/dcc/dcc-1.3.158.ebuild
+++ b/mail-filter/dcc/dcc-1.3.158.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.rhyolite.com/anti-spam/dcc/source/old/${P}.tar.Z"
 
 LICENSE="DCC GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" # ~amd64-fbsd
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" # ~amd64-fbsd
 IUSE="cgi ipv6 rrdtool milter"
 
 RDEPEND="dev-lang/perl
diff --git a/mail-filter/mailfilter/Manifest b/mail-filter/mailfilter/Manifest
index 3232802391ea..be4fc7073a4c 100644
--- a/mail-filter/mailfilter/Manifest
+++ b/mail-filter/mailfilter/Manifest
@@ -1,10 +1,11 @@
 AUX 0.8.2-gcc44.patch 709 BLAKE2B 277ee8bd914fa34714a54c37c8f49e8f197234e14df4a57d5c27fe5225b70f9faeb9497549c71b82ad7e46c120dcf76bcdb4a87977dd4ba363d4886f8985f635 SHA512 fa205c8aed42a41adaf7f034f3ebb99e0e0fe10a6b1135cff8c8f8fcf678ababbf5fb7b65ee8f2865404d9b717420f1f23b13c2794f038813d91b3ef7b6c1da9
 AUX 0.8.2-gcc46.patch 530 BLAKE2B f9b35c7aff37be269f54859a9a9adebb9b37710cd1f4b941b38ebc466a6c6c1f42634e65921b962c4227fc97c04c080475cf0f1e7e5ecb7a023fe9de7a73eed6 SHA512 f468f02aa73b6e7262dfbdf52aeb4fb9f14af8198d73b116a9d44d173373e3fc54aa567f0d8c9c38e3a13991a2e0e1fda286e853424cea2388c983773b5671cc
 AUX 0.8.2-openssl-1.patch 297 BLAKE2B 6f025728a77bed4fb5bd7cefb84b61600a152cd115bd1a53f7bf2b3140f76c56e4c4b73d7543499ce42f9266c8b3fecb7f01f636def4356c56be5dfee5e8df09 SHA512 bc3c76861044a50912d26458d026684b21476a94d5b851a587b998bc5cec0a0f89b63f02e2e4ee3fe830e50340ae5eedf8b6b3d719e2555d1f11813417e0fd44
+AUX 0.8.4-fix-parallel-build.patch 4549 BLAKE2B ed49f301046c489538d9e4e5544cf8d61c6f859ea66b9300fcb1f889d687d773f368750b87fdaa3e097bc1c66110cbc198534a720f57fc55f47d0b34d600b7bf SHA512 f947dfc76c7bc1213492d1b17574cb6bab56b5210a184c9a8137189402c607d0145ef85041f65d07dd83729913144d7729b11f8ff9d0939159cb419ca0a70aff
 AUX rcfile.example1 4010 BLAKE2B 83f425417e6c270ace4198bd6f4d4b5ecd1993a5926fa73cc2233986c5a3cfc55946114f535a09ebcd9bb6289ee8db22af2a9b3bf71c35ef71d6764275862b85 SHA512 875d926b525610c129dcbbba0cdaa177b4ea1a004eab853fc1f5f507e7e853923e7dfca58147b65cd403b561b85e3a9acf0da9101b344718f3ae732fae91038f
 AUX rcfile.example2 4554 BLAKE2B f5ea7e21821042e37506c6b43bb8aa0a8e3aa5872c6b24d14ce3e9b920a614590a290614e70e63983dc3438523d3ced08cdcb0820da1e9c047c621d8a1db669a SHA512 d58be80921e3372c9be79d1774a27106a113e710e4d1ee20a60f9ac2d6e8db86dd360df59801ba1c27c46069a341625069fcb36559f9d4c9847656f395f61f21
 DIST mailfilter-0.8.2.tar.gz 382966 BLAKE2B 83051f2b692dfe91865e2c5975a491882f8d167cd038a86e9481ff149be82616fd8be69ed171e8393fc0fff7f602802b0dddd0462a00c0b8cd7c0a3c91ffc2e7 SHA512 fc988fe8e36204e4041ce10d6a87f06c8fd48c311aee0d838c2eec08c0d26c13c082fb44a63e7d9c0610d8be52dbf69e340247241f3c76a209319391969ec387
 DIST mailfilter-0.8.4.tar.gz 424789 BLAKE2B 3ffee855a52b6d85ca7241ab55fd31093ff7dad218b37d2caeaf61dbe0a6ce14a283a60f6bee33409363e516902d8024ec4e5008041ddc28b48d7fc1313d5de3 SHA512 d6cd3399240f60020bf17f460376bfa73132e0714adf1e9b34e2993367440eba28d3cb8ef20b997b1ecf02419f69b761f704598641222d32b3aefdb8a96930e7
 EBUILD mailfilter-0.8.2.ebuild 755 BLAKE2B 6dbed812f71083d23b5cb6dd6e9bc97fbb1220ebf686b19e992d4d44956163d0e6c1e5e3be4d5efe25579d3742824501ff78b52112226fe2432f4d9a688f630a SHA512 ad758e9c232779001819bf6939b78bb689f4c243aa2a9bbeedefa3dc9ef78bf58de3565489be2c704a97a2830bf478158cc10cec5dd786311c5e0b34fe6232e4
-EBUILD mailfilter-0.8.4.ebuild 572 BLAKE2B 32158441de0a19f6f9d81ae7350fddea1d668009fecbe74562f09d970a67f6308588b965aedcc133008794392c89cda81156b7aba99d37ab406079468d91d331 SHA512 718e6a6907367777322fc763817a528795752492e26af1dcf2b1527ef51cc088182e7a43d75757e8e3603215aa1464f42ee0892bd8debc1762b8d67489ccee41
+EBUILD mailfilter-0.8.4.ebuild 629 BLAKE2B d9318138b20971b7f5348cbd66c305b384e96be7a24ea21552c78c43c771d53f99f3be629dcf7c5132203ebf80cdf3199468b6bd56603d7525d06a36e82d34fa SHA512 c4427adf3e225014489e353c04c47e9dc4fb118573a14dd0a65e61fe71dcc1d6f1abc473b07c7a463c6e7faef99bc1d49b2a0323b6d957e2047cefb97390f783
 MISC metadata.xml 324 BLAKE2B 53d152511faa79f82e7644c5c191b702f516275c592c6e632577b208c0afab09b1965d2ced2a59a94855990615fa84362ecc8006f1a047fdb2040f3fb3358200 SHA512 3a74aa24b93ab3fc97e9f721991170234e3b04646f1c44fc417083da656473af97bbe13d0fc8a80742a08aba0b798e1666141952cf4fe2d00e43de1a9788dbab
diff --git a/mail-filter/mailfilter/files/0.8.4-fix-parallel-build.patch b/mail-filter/mailfilter/files/0.8.4-fix-parallel-build.patch
new file mode 100644
index 000000000000..f697f94e4502
--- /dev/null
+++ b/mail-filter/mailfilter/files/0.8.4-fix-parallel-build.patch
@@ -0,0 +1,113 @@
+https://github.com/nondeterministic/mailfilter/commit/4b3991b1334d83d5f209723ab3ec58d168baff2d
+
+https://bugs.gentoo.org/649514
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -31,15 +31,11 @@ bin_PROGRAMS = mailfilter
+ rcfile.cc: rcfile.ll rcparser.hh
+ 	   $(LEX) $(AM_LFLAGS) -Prc -o$@ $<
+ 
+-# The final `touch' is necessary to be able to invoke flex/bison more
+-# than once and to not confuse the ../ylwrap script.
+-rcparser.hh: y.tab.c
+-y.tab.c: rcfile.yy
+-	   $(YACC) -p rc $(YFLAGS) -o$@ $<;   \
+-	   mv -f y.tab.c rcparser.cc;         \
+-	   mv -f y.tab.h rcparser.hh;         \
+-	   $(CXXCOMPILE) -c rcparser.cc;      \
+-	   touch y.tab.c
++rcparser.hh: rcparser.cc
++rcparser.cc: rcfile.yy
++		   $(YACC) $(YFLAGS) -b rc -p rc $<;  \
++		   mv rc.tab.c rcparser.cc; \
++		   mv rc.tab.h rcparser.hh
+ 
+ # Almost the same as above, but this time for the RFC 822 parser:
+ rfc822.cc: rfc822.ll rfc822parser.hh
+@@ -47,58 +43,41 @@ rfc822.cc: rfc822.ll rfc822parser.hh
+ 
+ rfc822parser.hh: rfc822parser.cc
+ rfc822parser.cc: rfc822.yy
+-		   $(YACC) $(YFLAGS) -p rfc -o$@ $<;  \
+-		   $(CXXCOMPILE) -c rfc822parser.cc;  \
+-		   touch y.tab.c
++		   $(YACC) $(YFLAGS) -b rfc -p rfc $<;  \
++		   mv rfc.tab.c rfc822parser.cc; \
++		   mv rfc.tab.h rfc822parser.hh
+ 
+-# This thing is a workaround to avoid compile errors.
+-# We always re-generate the source from the flex/bison input, so it
+-# always matches the installed versions and does not lead to errors.
+-CLEANFILES = rcfile.cc rcparser.hh rcparser.cc y.tab.c ylwrap    \
+-             rfc822parser.output rfc822parser.cc rfc822parser.hh \
+-	     rfc822.cc y.output
+-
+-nodist_mailfilter_SOURCES = rcfile.cc rcparser.hh y.tab.c rfc822.cc
+-
+-nodist_mailfilter_OBJECTS = y.tab.$(OBJEXT)
+-
+-# Looks like automake still wants to distribute rcfile.cc, even if it
+-# is in nodist_*_sources.
+-dist-hook:
+-	rm -f $(distdir)/rcfile.cc                              \
+-	      $(distdir)/rfc822parser.cc                        \
+-	      $(distdir)/rfcparser.cc
++CLEANFILES = *.output
+ 
+ # If this gets updated, remember to update the doxygen.in config file!
+-mailfilter_SOURCES =	md5c.c md5.h                            \
+-			defines.hh                              \
+-			rcfile.ll rcfile.hh                     \
+-			rfc822.ll                               \
+-			mailfilter.hh mailfilter.cc             \
+-			header.hh header.cc                     \
+-			weeder.hh weeder.cc                     \
+-			preferences.hh preferences.cc           \
+-			feedback.hh feedback.cc                 \
+-			filter.hh filter.cc                     \
+-			score.hh score.cc                       \
+-			account.hh account.cc                   \
+-			protocol.hh protocol.cc                 \
+-			connection.hh                           \
+-			socket.hh socket.cc                     \
+-			pop3.hh pop3.cc                         \
+-			apop.hh apop.cc                         \
++mailfilter_SOURCES =	md5c.c md5.h                              \
++			defines.hh                                \
++			rcfile.ll rcfile.hh                       \
++			rcparser.hh rcparser.cc                   \
++			rfc822.ll rfc822parser.hh rfc822parser.cc \
++			mailfilter.hh mailfilter.cc               \
++			header.hh header.cc                       \
++			weeder.hh weeder.cc                       \
++			preferences.hh preferences.cc             \
++			feedback.hh feedback.cc                   \
++			filter.hh filter.cc                       \
++			score.hh score.cc                         \
++			account.hh account.cc                     \
++			protocol.hh protocol.cc                   \
++			connection.hh                             \
++			socket.hh socket.cc                       \
++			pop3.hh pop3.cc                           \
++			apop.hh apop.cc                           \
+ 			imap.hh imap.cc
+ 
+ if !GETOPT
+ mailfilter_SOURCES += getopt.c getopt1.c getopt.h
+ endif
+ 
+-mailfilter_LDADD = rcparser.o rfc822parser.o
+-
+-INCLUDES = -I$(includedir)                                      \
+-	-I$(srcdir) -I$(top_srcdir)/include -I$(top_srcdir)     \
+-	-DLOCALEDIR=\"$(datadir)/locale\"                       \
+-	-I$(top_srcdir)/intl                                    \
+-	-I$(top_builddir) -I$(top_builddir)/include -I.
++AM_CPPFLAGS = -I$(includedir)                                     \
++	      -I$(srcdir) -I$(top_srcdir)/include -I$(top_srcdir) \
++	      -DLOCALEDIR=\"$(datadir)/locale\"                   \
++	      -I$(top_srcdir)/intl                                \
++	      -I$(top_builddir) -I$(top_builddir)/include -I.
+ 
+ LIBS = @LEXLIB@ @LIBS@
diff --git a/mail-filter/mailfilter/mailfilter-0.8.4.ebuild b/mail-filter/mailfilter/mailfilter-0.8.4.ebuild
index 734c41d0b394..e6e9d6dd89e2 100644
--- a/mail-filter/mailfilter/mailfilter-0.8.4.ebuild
+++ b/mail-filter/mailfilter/mailfilter-0.8.4.ebuild
@@ -9,13 +9,15 @@ SRC_URI="mirror://sourceforge/mailfilter/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc sparc x86 ~x86-fbsd"
 IUSE="+ssl"
 
 DEPEND="sys-devel/flex
 	ssl? ( dev-libs/openssl:* )"
 RDEPEND=""
 
+PATCHES=( "${FILESDIR}"/0.8.4-fix-parallel-build.patch )
+
 src_configure() {
 	econf $(use_with ssl openssl)
 }
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 88263f556d05..d30a600e90e0 100644
Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 33165f123035..22ef9d7115e1 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -18,7 +18,7 @@ EBUILD postfix-2.10.9.ebuild 8736 BLAKE2B 2e95575a37c0f4587c9ecde36a9a1d622e2fb5
 EBUILD postfix-3.1.6.ebuild 8661 BLAKE2B 707f1822c7e8359adc8f0884237069cd2092385eb4a55c378d2918ed097b596755a533cdf297895a3651572996b5dce8603e3dce8bea172acee60471cfce32c9 SHA512 6174266e057ca6110d39c76f6bd6d11fa24f40641599a90c143aa9396822d1cc2b3e72b7de94e849c913c5d34bf3dd081f29feedb41b2bfc349a6e567381550d
 EBUILD postfix-3.2.2.ebuild 8669 BLAKE2B bec764e9e0d8a93270bc0b3b2f6bdaedbf5e9be6cbb55b506464eecb7f620317b8d55a577a9b65d19a7ab1c40b83fb059233fb56edc4f9aba01e19b8effae6c1 SHA512 094bd11212903bfcbf678698765da8f72ed3b34562aca398d47e90d3a2ae7ef252bc29eead3bb92eebe46a7dc2aa4e615dc3b85ec192c6d6872c2370fe99a11a
 EBUILD postfix-3.2.3.ebuild 8669 BLAKE2B bec764e9e0d8a93270bc0b3b2f6bdaedbf5e9be6cbb55b506464eecb7f620317b8d55a577a9b65d19a7ab1c40b83fb059233fb56edc4f9aba01e19b8effae6c1 SHA512 094bd11212903bfcbf678698765da8f72ed3b34562aca398d47e90d3a2ae7ef252bc29eead3bb92eebe46a7dc2aa4e615dc3b85ec192c6d6872c2370fe99a11a
-EBUILD postfix-3.2.4.ebuild 8662 BLAKE2B 4b495da67bd4bb41d999e20c92a5802d051eeea44391def3212ad911788eb8f9e9e96f71acf44d8562ac90913856ace4c59164e0d5ce15c2c21af7742e2b9e5a SHA512 7682c0c4402cc2c37781dbe680995d0f2154ddf58ee6f9e8dfdfbb12dbcd199d308dbeaaa7fd1924bde2fb29b040b7eb9390312f2c4ecf2919b7f470a4060588
+EBUILD postfix-3.2.4.ebuild 8661 BLAKE2B 521ed7d063f4597e3feae3a828689d64b82791c601e1b1a36dff6344c3cdbf2a37b13dc3772abf121d5f5ab36064ea01107107c5f966fee29feeff673485e05a SHA512 df561550667e14e7a8466f03fcba62d8b8d6378dcb94cbc93e58bba5805359590cbf5fde88f904cb1d2e5444e4bde6bef6e0ea64faf3af5c62fe3bf0e7f5807d
 EBUILD postfix-3.2.5-r1.ebuild 8419 BLAKE2B 04e7ab0301098ace3c2195b9197acd6776e5d97be9a5f667149880b0719d2c30093aac3b99535eb9877bd5d6c6b12bc6d9bfdb34dc330b0fbc1bba7de4225b07 SHA512 a398489f03f32b84701ca93848035cef21e4c74e982135acb6662d9ee6985eced46fdeffb7648d448b4e02863bba47e8b4dc5f96e8d9482bfb102af03fcef7d6
 EBUILD postfix-3.2.5.ebuild 8429 BLAKE2B a434f2413f1278ef9f5744ba2f3a8643a0f927eda405d8c0ff6fb3bdb9d8ae7f25a488e06b5b47bff23967257ae39c86f52e56a06554a4f1cb003a0c2a0e47ab SHA512 0039eba87197569aac558b730a109ed99d1e385a837fa6ca607a97aa6b2b8317d8d0637efdf7fb79e3fc05fd62cd46195c62fc359c3c0c48e6f42655eac4ea99
 EBUILD postfix-3.3.0.ebuild 8420 BLAKE2B f1804677a9b38594181abb821bbfd67f3e93f90071c8f95c5022388bd7409c9b78ba47293a9856b3dba7973e47acbebd5f73c8bd578b59a309eb5d63d45b08d6 SHA512 abe6283043f741c204a976c487550bf8366041e8e9e481016754d26b1210b1eebd730ee1f2b46b45dcd89de05f7ba4dc981d4071cc88a10a458d836505d53ea4
diff --git a/mail-mta/postfix/postfix-3.2.4.ebuild b/mail-mta/postfix/postfix-3.2.4.ebuild
index e93adaf6e0a3..9fa389ae6192 100644
--- a/mail-mta/postfix/postfix-3.2.4.ebuild
+++ b/mail-mta/postfix/postfix-3.2.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
 
 LICENSE="IBM"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
 
 DEPEND=">=dev-libs/libpcre-3.4
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 8fbd0b557abb..7a95ee3757fa 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/sane-frontends/Manifest b/media-gfx/sane-frontends/Manifest
index 1add97a4f00f..5ccaed2f6f99 100644
--- a/media-gfx/sane-frontends/Manifest
+++ b/media-gfx/sane-frontends/Manifest
@@ -1,5 +1,5 @@
 AUX MissingCapsFlag.patch 417 BLAKE2B 5382644f1c8af41fb383bf9889528f279bbac0a18ee2e38f080769b653f24fc02dec53f88f364441d8ceb6d401ad70137215627a181434f6cfcf8245a1d6c37c SHA512 39790a52414a7edcfc4dd9379bd8f35ce91e932209ba9c2ab3f1cb9e5dd140b37f3bfed1e642050a142da43ae435329ab60e201f2934be76648380615a3f37ef
 DIST sane-frontends-1.0.14.tar.gz 231892 BLAKE2B 3d3af2ded774fa90ba4b9545a00df1f036fc72edb71a69f803dde84ca1e9d37b4d20ac91d046ce702c31eb7353d2d85b91cbf8bd53b84adea7f2e58f8be1a062 SHA512 51b24a9bd6889e99419c1d6abb30cb14d8f89b6196c5147044697bdb1b39ee029bdc0d7c6e1f1e800491988aa26f658bc974b25040c49d008ca8977673c78710
-EBUILD sane-frontends-1.0.14-r2.ebuild 1285 BLAKE2B 0ea769df54555a7e8de7b2c61a6fd3b09c7265b1c6eb92045cf39c809c96b0686bbd5b0da12266384d49d5c5e62b259368321213360f20f40f40701f6d43343a SHA512 bc126ba5c86db0a2fdb5c00e0971f1b4e276262a6157101ed2da84bd2b20873b5696a795f3cfba68b478a057ca398732f7ae3df190377054d651a959ed0caa04
+EBUILD sane-frontends-1.0.14-r3.ebuild 1384 BLAKE2B 72e77d42ae9df9ca8f6d8208ff9fdfe144abbdf7af05fdbbc9bc8f5c884597a103bcf934d6eabf72b52f89649de82a8469db6e355e0c83de936b17850f79b6eb SHA512 2f3f8efb7ae76979b53116071095c74a339463b2bc00d77256d3420e518e91ca28268eeb538f489e8eeeffbb60d4c81ec08e6b20c9c7dce6d553679dc388a5a0
 EBUILD sane-frontends-1.0.14.ebuild 1430 BLAKE2B 9f579d1cc997961f304479a4070f2630fb0e34cfb128b64671ad4278b1fe4fd52ab227cbdb51941a04eb10051a19b1dc9ece6233e452b62f19e177afe4d79ec7 SHA512 0f433d8f9915d2ba644b3d76e04e9b3bd208a8c9f3c62067203e0e5b571deab87f2577114f846143d3ca860ecfca9b383a8a3d0f470047009754ae0853ca4e30
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 377 BLAKE2B 83b01e823ed6ad91413a2e23899b9fa78b3b3c6d84d52b0ee122976d1a2de2a21c5089ca0460aceb7a9d28f0cc854d3fc358e97c6f02f4116cc5b75a3ca802fd SHA512 57b14e3a91c20de45448332c24a3e681a48498a27244ac1a05e313a87081cb116f12f3fab170a18dca2b3fc55aca7785fc0713bccdad192ba7683982d83fda22
diff --git a/media-gfx/sane-frontends/metadata.xml b/media-gfx/sane-frontends/metadata.xml
index 6f49eba8f496..8b40ef0464f3 100644
--- a/media-gfx/sane-frontends/metadata.xml
+++ b/media-gfx/sane-frontends/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>herb@hlmjr.com</email>
+		<name>Herb Miller Jr. (herbmillerjr)</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/sane-frontends/sane-frontends-1.0.14-r2.ebuild b/media-gfx/sane-frontends/sane-frontends-1.0.14-r3.ebuild
similarity index 83%
rename from media-gfx/sane-frontends/sane-frontends-1.0.14-r2.ebuild
rename to media-gfx/sane-frontends/sane-frontends-1.0.14-r3.ebuild
index 30d53deebbe2..1521775203a2 100644
--- a/media-gfx/sane-frontends/sane-frontends-1.0.14-r2.ebuild
+++ b/media-gfx/sane-frontends/sane-frontends-1.0.14-r3.ebuild
@@ -10,17 +10,20 @@ SRC_URI="ftp://ftp.sane-project.org/pub/sane/${P}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 sparc x86"
-IUSE="gimp"
+KEYWORDS="alpha amd64 ~ppc ~ppc64 sparc x86"
+IUSE="gimp gtk"
 
 RDEPEND="
-	dev-libs/glib:2
-	x11-libs/gtk+:2
-"
-DEPEND="${RDEPEND}
 	media-gfx/sane-backends
 	gimp? ( media-gfx/gimp:2 )
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gtk+:2
+	)
 "
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="gimp? ( gtk )"
 
 DOCS=( AUTHORS Changelog NEWS PROBLEMS README )
 
@@ -29,7 +32,9 @@ PATCHES=( "${FILESDIR}/MissingCapsFlag.patch" )
 src_configure() {
 	econf \
 		--datadir=/usr/share/misc \
-		$(use_enable gimp)
+		$(use_enable gimp) \
+		$(use_enable gtk gtk2) \
+		$(use_enable gtk guis)
 }
 
 src_install() {
diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest
index 14898f5b604d..b54c54994f06 100644
--- a/media-gfx/ufraw/Manifest
+++ b/media-gfx/ufraw/Manifest
@@ -6,6 +6,6 @@ AUX ufraw-0.22-jasper-automagic.patch 613 BLAKE2B 100e6b31540030a20c8cff8e99329a
 AUX ufraw-0.22-jpeg9.patch 1076 BLAKE2B 84448c537706d7b29f54d4735a75bf9501eac7927529c6d8e43d6cd746763ab753715d54cf943bb8bb5ddd8a29891f7522a680426acd2eb52af450492656ae3e SHA512 520e9351d7b8aa84f79a7c2841c2f56eaca849e67e448dc9503d248e31c1aa9fecaa64a332c0a155b6ba1ab7debec8734f3f2ef710bcb534a5fca34e9b5c8f7c
 DIST ufraw-0.22.tar.gz 1103554 BLAKE2B 5ffa4c660602553853221d7b31bfb78b02644bfeb4461cf752186d83ed8087b7905e414c7d741916ca9460c05849ab679b2f3098c99e5246f54a49b6a915268f SHA512 a42eff5052c18afec90245cf97ceeade78e3f288186cf697ac4abf2e8290d4081db8ac4de3ae47b3774f30a6cb4cbda392099e6fd2125fe751abb40d9b065ad2
 EBUILD ufraw-0.22-r1.ebuild 1942 BLAKE2B d9e275268bacb9820d75e04386f3b5152e93f72e6d06bc9a0cb1dd98ae6b8364d28167ac83cac70994f0b318bd6cfe36fa57dd1ace6f6a287a9fca5b13067ae3 SHA512 1b10bb5090511f5bed94145e7372b7a0b2828170bfceb02ca9cddf979e7327b4dc8bff85b91b9c40f09a36b3c7fbb20d5a9d894d7b323b1010d6ac5f00e97b8d
-EBUILD ufraw-0.22-r2.ebuild 1967 BLAKE2B 0e0cee545f218071f7249d7f5a8956980a872efcf90ef28d7ec331accad52bee5462a6566d2b3588059bc7e1cc12ed59a35799f2dc8d0ca02985cf9e704d02c0 SHA512 f0a86007745587e62f03755477042aa793e560a964db0092c06f43a9d51ad3af637baff90e91884ddbe03885fb51a702867c57d20697a27bc87b14114fbb3035
+EBUILD ufraw-0.22-r2.ebuild 1966 BLAKE2B 38655fd320f0c68bc6ff12e3268dc990da7751e2297dc0f3b9ab198063bf8f12cab50576120e1d743a427ffbc5c556f5d9c13a686d6299cce4742afa8a1abad6 SHA512 b43c718a8b18e6430aaa50cbb407e4cb38ecac609ce9c3d0bfbcb4cda346f1ea9716c3cc85d893eabfbad414bad68c783e77f440b77ba8a48604663e935ae053
 EBUILD ufraw-0.22.ebuild 1684 BLAKE2B 8af30a9b68373d19ae65485f0c424a73f72fa560030fd2ffcb8bdbc618e8bc8b315316c9afb3040e872bbe2109298a8f62c647e85b5e13da702967cb5fe92e32 SHA512 5c9374c8eaf5ac4cbd5aeedcc72de973b9160fbe0b7022ad86a690407b013c613dba97b2116dd1a54830ecec92b5793d6f21525fb75e62c060ae6be0729ef414
 MISC metadata.xml 588 BLAKE2B 3e6ec0c8b11a3c30d1b20b5df4303fc1bc10b4e6459a24358ac50bcfaa414b307efe6d392d23fd7ce1443917865deae0dfa89cc7a068567f227cdc387f99d1cb SHA512 3d161ddfe0da5620312603d66acbc24244317da4dcb905558eddda9d54bf96024881ffbdcaa49f9daf73d779d5e7dbb47a523e05cc6c614756b468f14ef66ab9
diff --git a/media-gfx/ufraw/ufraw-0.22-r2.ebuild b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
index e9712874cb76..39d7c57421d8 100644
--- a/media-gfx/ufraw/ufraw-0.22-r2.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="contrast fits gimp gnome gtk jpeg2k openmp timezone"
 
 REQUIRED_USE="gimp? ( gtk )"
diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest
index c2404551c37a..92e822d9b9a3 100644
--- a/media-gfx/valentina/Manifest
+++ b/media-gfx/valentina/Manifest
@@ -2,6 +2,6 @@ DIST valentina-0.5.0.zip 37175844 BLAKE2B 73cfb434c87e7d59efa76c303f4cc13dd9df08
 DIST valentina-4798.patch 25302 BLAKE2B 153cc2ccc603703a520b5181e5192bac86410ab51eec305effe43463ce081dbbf3bb48eedb93e8ea5928f3f71351526a175c61a23a7005fda5bf4e14cc57403e SHA512 c3adbd2caa4cfb73960de850b29bee881fc408c9e4032e1fa2f29ba80b91abaa194738ff1cfb607657343990a166ad310387a66ceca546ffae0543d774bc53b4
 DIST valentina-4802.patch 6733 BLAKE2B b7e30b77aab75b45e7bfd06165586f8356cfa438e0f5f5fb708d818f04fe9be7fdd025b8098cb5ca1f45cceef0671abf7014c112ab11da8e6c9c1a640e412ab8 SHA512 5628599c1dd208ba9ea8ea5e518bf6aed5ef11aa750670335478e5af49d6e9f235901c79d6483b1897f8288259fd06b463462eddcd062c4920ff251430998ff4
 DIST valentina-5406.patch 596 BLAKE2B 34c5cf515555e455416500795c2afd96176b3ca3c2c3e278dbb6311e7cfb38bba6556126beef23d8b98ace76f0156250974d95310a6af046c0884580aa1d19d9 SHA512 f504ca766969703a20fc7c16652d4615722afda9156eb07c43845d1a6e9c7d08a2e8f07be7c71b4379326757f95e95e85858add2b1d13b0e4e5e8b1974ce18ae
-EBUILD valentina-0.5.0-r2.ebuild 2564 BLAKE2B 2d91c1cf47ec82cb0040cff641689c91d8e2daf868cd344ba03c4d8cec3ccdebb704d652f5f1dae954bebfab5f38d22304a590620e37fc02e25b0486947c668d SHA512 b41f00a7f2368a4e4ca806d76259ce062fc4310c48eb4c131968b4f6a01b8e2b2c3bec6963f7d7767e7e495be4bda27be64f3aa8d9bf706bb7475060df279856
-EBUILD valentina-9999.ebuild 2013 BLAKE2B e16d40f731acab6ef308b85440654a5c9c7f210d76211b395da68620018a1c9fa4feb6a7f8f557a766c8f5147b1b50d09739d72416330380c57288bd28a4ff99 SHA512 8ba73f6f9ddd1a193ef34a11f6bbae68c462ce89964358ef1af6d708f5fbb65fc4cf6a5c71257d408f326dddaedce4dea9c46aee63bb7d1da006de739df7f616
+EBUILD valentina-0.5.0-r2.ebuild 2569 BLAKE2B f372de37045b9a7ef8e582ed2e15c4f9519bf9b438e8a27b755e9cd33a9fc7caa2cbba8d1d5bf73c99539ce43dc97318154aea9a7a0410fc5607db45d640e17a SHA512 b52157b044ace4638a3610e5e5e5e6dc1ba50b6d9e6ab4183752d97fb0fd9970cc5fe80decaec688dad871343c22e8fb7293cbfe4b9f206f7493bb65d394be30
+EBUILD valentina-9999.ebuild 2018 BLAKE2B fb2b00149fd5dd061a876913024c9ce5605ce7e31afdf84224ce262682146f5768316ee5e9dbf178b58b7dd291b6790a9aeef74bf2e6e2f283cec1b2049fd26c SHA512 753a8e38d86231e63c5653e761eefacd495fb06d741a4c241224d128b15f4a16764addc6184c94d3f7e8637eac7ab85c5402161011d372b56a151a76f9427f6f
 MISC metadata.xml 334 BLAKE2B 7f146a505a30d4461165308b40383e2b78998411874c8af6113c3040142003868f397872ecd22b9b8f3ec6193c532fa934c8646ee04e8c49157464b58035de09 SHA512 d1264aa0d26ba75466c5572c37ca6fd384d4e6db392aca0e47d4b1d0bd3ef7e035fed51c460af1bb258c500d1cc9211ec2e85db3e3aa158d378fb1389a3ebf03
diff --git a/media-gfx/valentina/valentina-0.5.0-r2.ebuild b/media-gfx/valentina/valentina-0.5.0-r2.ebuild
index d7a61d28cedf..4dcf9c98e9b2 100644
--- a/media-gfx/valentina/valentina-0.5.0-r2.ebuild
+++ b/media-gfx/valentina/valentina-0.5.0-r2.ebuild
@@ -27,7 +27,7 @@ CDEPEND="
 	app-text/poppler
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
+	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtprintsupport:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
diff --git a/media-gfx/valentina/valentina-9999.ebuild b/media-gfx/valentina/valentina-9999.ebuild
index 7e393108cc1a..a08d13776641 100644
--- a/media-gfx/valentina/valentina-9999.ebuild
+++ b/media-gfx/valentina/valentina-9999.ebuild
@@ -25,7 +25,7 @@ CDEPEND="
 	app-text/poppler
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
+	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtprintsupport:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest
index b5dc46c4aefa..a8f62c093ab6 100644
--- a/media-gfx/xfig/Manifest
+++ b/media-gfx/xfig/Manifest
@@ -17,5 +17,5 @@ DIST xfig-full-3.2.6a.tar.xz 5502944 BLAKE2B 3a83feeb5647ffa9586b9ce40116e9854a4
 DIST xfig.3.2.5c.full.tar.gz 6078933 BLAKE2B 44ccad26fa3d7a57b0e8798d6ebfe6682baf15046d9e360d7a7569cac54c403c0068671e27a5289dbb4f70dafd12c1653a61709749a8298874bc49528783973b SHA512 763bd6fd43bff9b44f934dd6e16b0aa5142041f895e74564d28e7252e012f1c7728bbee40e3970357c7d3fd15aa109dbfcbc1d0a2203fa1a2ed770aabacd9525
 EBUILD xfig-3.2.5c.ebuild 3303 BLAKE2B ca99f5134de4c15df3ae3f656684b3f6bea7f6e7a20e2bae0899e684025475f46bfa2c41792b507db3982637c985e67522261abaa78fda4f399e4ae134cd9139 SHA512 538cee1a1626c417a967f4c4810a0b8924169f61c153b67e8479243dab39041d05cda40e98e5bbc8c2fe5e571fb85acbe0425072c56906d08c53e4bce8be8c1b
 EBUILD xfig-3.2.6a-r1.ebuild 1195 BLAKE2B 417a2288dc0c2ffef4e410ef928c263c16ce2bbc007223cb63056482a81db14dbc20e2ef83db1b41afe155efa39d3c1bf87f43846a0f4a905d78f2ec6b40a580 SHA512 3ac4318244774a3a73fcf1ccb958a7bef931c0165927e293d8557f181554c6aff41e4e2e7365750d5d9bdd7fee5c08c892d80720d001f1f3894bfed294ccecc1
-EBUILD xfig-3.2.6a.ebuild 1206 BLAKE2B 2475a4329ed9f9a46bba67a4803bc3075b31749fc7507de7f7514973d05dd5a6984704991d077f7918e600c1f6132727414f82f4507d3e723b080b16763eac3b SHA512 fab2d9c30819af021979054997dfdfee54873466354363e139dc542801a3800aee217875a653a6c79791b73132512f20ba7a801620c364388d708f58b478258a
+EBUILD xfig-3.2.6a.ebuild 1205 BLAKE2B 9ad9fb464ceb7819bd0eb81860b742b9071ff31b248643bba4859f53384d330948b4061231bda20c4e33589aae71b51a7c2a011ab110a2cb0b6b70b697ceed8b SHA512 883f0e7fb6a90f3d5f288e340fce9ab25b09a9209edafb44dffef945cd96f04619dabcff06d8526114017ab926a5d091aefbd97d7e1fbc423949c9a0fc9ea1c5
 MISC metadata.xml 212 BLAKE2B 71dabc83d0433b968a559d72c4d8a18ff9477e154e5b7e72ca22b859a0fec0ae23b0fdad7233686c6c1e20178142f5c60bf93f58db30c5109106e4d86b9f1cef SHA512 05c3af7b4c872998a64d3d6dce356ad1bfeb67f4ec845e82e022a89c96945ba5fe8848df48b8736feb39bd4d9a7d6714f0895a9c824e3c67d903ea3da1ca0f22
diff --git a/media-gfx/xfig/xfig-3.2.6a.ebuild b/media-gfx/xfig/xfig-3.2.6a.ebuild
index ab5e17ea5e1e..a65925ef8b06 100644
--- a/media-gfx/xfig/xfig-3.2.6a.ebuild
+++ b/media-gfx/xfig/xfig-3.2.6a.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mcj/${PN}-full-${PV}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="jpeg nls postscript"
 
 RDEPEND="
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 7cc6cec98c6c..76564e37445f 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index aa795a3035d1..d45082a1e9f5 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -9,6 +9,6 @@ DIST fontconfig-2.12.6.tar.bz2 1624683 BLAKE2B 48432f3d3cc90240ec19dffb6714e7f78
 DIST fontconfig-2.12.93.tar.bz2 1693157 BLAKE2B 6e2e301690a8ab46024b2e629ac8be99c4af90c535541d6114f217b2ed966e9262d02b5fdb46480443f32be0941e2ab1c398c156c9875374bfb39e7ba959decf SHA512 f7e83707a9f2f134b3d33b43c2b8b274a16cee3c9705a5acf2883355e1c575e50422cf2bd2bd60cb481708f8ed72cc57e80ca616af0f19a9db3f35c30f7ea8f5
 EBUILD fontconfig-2.11.1-r2.ebuild 4770 BLAKE2B f1cc240f9fd3631a484c33cc078c505d4b4af5e8c60baa63b9bb1112bf355e82774372ee26e85b13863c043d64e583d1c26af75fd0948f24b9f8eb6fb88a79ef SHA512 597cbd513b3407a49c40bca4ab879777f761d1ac3bf3091efdf504ce854dfc672d1721e16acc9bf8fce557ffe7f911105ae1dedcbf2ab082848b331e60ccef81
 EBUILD fontconfig-2.12.4.ebuild 4930 BLAKE2B 40ea1f8710e43736d7da02b1a30df092818cc5ac8d513ec2f09958d0ed6cad7a1446b143279779643229e473b1fadc206387820c8b31755974b5f1d76594ed95 SHA512 46110903d927e176a8346527503431ca66b4a1b08aa3a441e0621ea9c7eec5429b21191c18156c8782013cc0e8dfe7a0ba55acd1d6c9dd92ddee23fe3562d11d
-EBUILD fontconfig-2.12.6.ebuild 5003 BLAKE2B b5781919665c909aad7859660271ecf38bfbf33cc73828474e98774632c6fc77ee7a91453436dc98c3f2200c2c17c92db7dcedab4ca4d5bc72e905a95f078204 SHA512 1bb04d83c3d9e9a922d8c9703c385855b1b470600efb5ef7f795a206fbfef2091b6ae2ee46e2744219f93b059f0e27054f102bd30861e40b4578bbff62832d28
+EBUILD fontconfig-2.12.6.ebuild 5002 BLAKE2B 60c64fdb26ae3109651959d666457705e03a6e169c3ba4653a23f25b6f0e2ab3b5efad0326c33ca0a0718235725add92c2de5fd992fffdf830de9792edf4b1e4 SHA512 d266d72f4ecf70a9659f1f32f82ccdbe76a58107153305d83c1abfbff72c201afabe2f2d440d348a30585d139a38a245a9b6841bdf71351e1b153c61cf5adfd2
 EBUILD fontconfig-2.12.93.ebuild 5073 BLAKE2B f2826657bf7ba5a8319c34bce4c05f85575c41bad341b2b8725ecfaf51b30929e159ea83fd3aff68a1f501a0a9aae4b870a8b07a60d12b8df2f1fd10c2857a0a SHA512 5481e6a6acbdb1a1a50354a2fa34b6f01acc93a6a2ffcc344f94548fe48246c82411a13455fc3f7ba389d1d9f6b5cc1e6f94e7a38ef240a8d4948f29f8c3d1ff
 MISC metadata.xml 729 BLAKE2B 3af0a9c7963c02bf886eb9d7522c2f1776b9b241afc05ae8e71f93ed08bfc937061f5ee9402232f317a207db84e4ee0ad0f9b7c8ba4b72b8600ab30c90822197 SHA512 997967959d02a36cf5187ab42649e7fb581331141fb92aa0aeee622a996959553824424837c56ea0a3abd44cc0abc40cca04abe819c0a4261944072f681260bb
diff --git a/media-libs/fontconfig/fontconfig-2.12.6.ebuild b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
index b23dd8a04001..e8966b4a0b76 100644
--- a/media-libs/fontconfig/fontconfig-2.12.6.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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 ~x86-winnt"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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 ~x86-winnt"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index 043e275e2ff6..3c44dd2d2d73 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -8,5 +8,5 @@ EBUILD gexiv2-0.10.3-r1.ebuild 1302 BLAKE2B 43e272b98068e32d329e71766eadde4dd3b3
 EBUILD gexiv2-0.10.3.ebuild 1263 BLAKE2B 499afbb8cb30cf2f3a6b536fe378c24bacec6e073e4c66005d8432f845c964a8460bd204ae386c2596da04be2973b8529032c42f288e7194c5d088992beb0dac SHA512 8e482c48e8d590633c518b4bfc50b1d38a6996e5f58af84bb60fe1d72d3dd94ac1fc1b1bf06b2dd508088ade154f903350fd38a3b9460f9c26fcd2616504ab9f
 EBUILD gexiv2-0.10.5-r1.ebuild 1388 BLAKE2B f45b369b735e07a3561856d4fbaa86fec086a02dd24841ed5d4d81a081a5ad4663eac1f2c9ed916b0cf387d3c546c991ae6ba90dc001b67c7a29f07786530130 SHA512 7e8c345bbbab1698c845c2c3f30ec66235cb0b80f32b6841ca186c68f50b8ddaef848bec6c75075b649731063e4315ee726edfe589e118cf930b7dba01a4a451
 EBUILD gexiv2-0.10.6.ebuild 1326 BLAKE2B 2a08ca7e489a0b8751a253c9e53ad2379b5d1d989afbdb450e2e0413c9e4bb609e24acbe9e6d83924e3894e8ac15793f39cdf0bf0fc9e632e58f2fb56ff67e5a SHA512 ee6ff6a1d9162d0c8e5001770b8f22c5b53699b49fb78628e92f0463d1fa441d35b87d6476094ff2f3670b1e797986573219e16ea9c538d859980b2987069afe
-EBUILD gexiv2-0.10.8.ebuild 1509 BLAKE2B d9fb46a26cdab466b9572b72af98e0cf3c61805e919136c9691b5aa1b9671db1a3a7e3d8a06f3db06d09fe77a1f1326be0c28c51ae2ad4a883b8fc94bee0df1c SHA512 d4253a72818bb2bf162f5adacb29dee287d1b0d9430ffc66d8d79030cd8f012bc190a10109cb8c51ae91782c19ee4b9d0f082e891cd798bd9b5e20dea6e5421b
+EBUILD gexiv2-0.10.8.ebuild 1508 BLAKE2B 61b5163322648f1c8cdb5abebe246598175e49d97216a53e8b25d353be1790c3cc084fa0a1d6f141075ae64145300acf59de280c2b08843256772affc033431d SHA512 cd3172734d8c341aa93312d4a57622c154af45e8e5a7b0657e27f384b379823548050799fdb7999b8e307ef0b0d6a67762ee4bfd097555c316d54905d1f34189
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-libs/gexiv2/gexiv2-0.10.8.ebuild b/media-libs/gexiv2/gexiv2-0.10.8.ebuild
index d110b1c025e7..5a1e156b91c7 100644
--- a/media-libs/gexiv2/gexiv2-0.10.8.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnome/sources/${PN}/${MY_PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc x86"
 IUSE="introspection python static-libs test vala"
 
 REQUIRED_USE="
diff --git a/media-libs/giblib/Manifest b/media-libs/giblib/Manifest
index a5c6bf87957c..0ffe67070cf1 100644
--- a/media-libs/giblib/Manifest
+++ b/media-libs/giblib/Manifest
@@ -1,4 +1,4 @@
 DIST giblib-1.2.4.tar.gz 287653 BLAKE2B 0b936fe3b56b933a5038751428ec56a872911d3c4ae972e9670cb1ce2496de6a8e21cb4718e7bab4eb1d547eb67ca71b25d77405ff04ebcb1ca0dc03fafea7ef SHA512 4866df223e6d219a5c9a327874bcd67260c83fba8f99862222df41ef86fb31efa0172a777bf46c853ca380dc2a64bbd41bf4fd658fcb84a924cab4e0f525dcfd
-EBUILD giblib-1.2.4-r1.ebuild 902 BLAKE2B 6946f34ed8d7f01624ef799371cf4dcc6c526fca9af80f4b2b0978f44c2d625d985a91b75ab300616fe435408cb25aaa9c3346e617fee07bdc11744fc0ddb718 SHA512 126292c275e11e0911b1f4888ff3032753c4279b1e3165ec202069d2b196ce12c2fa160ed79aa3ebc4c99cdcd2eb59a83ce28f481716aae783bba5931a8e5898
+EBUILD giblib-1.2.4-r1.ebuild 901 BLAKE2B cee40669fa0968b6ba36879835db1d70788ad599c2255cc1687ef4954b3ca19897aca0458bb60eab32df04a2f09897e8582af8d1bec27202ac749eaa37d33d5c SHA512 87126dff717ba56461011252551b70a74347927cb35b349be644253c60513d3369f29fa5e083e617f3051c4006d0a60aebf8072f5ae88f347c1b41631a803f9e
 EBUILD giblib-1.2.4.ebuild 681 BLAKE2B bdaf9b49e82de1e24c8e7ea7a6068693694347a7b91e0b8d7448bd5695633a4a73836d0d6353efaeae6174e024bd40d789b1987a37ed49b5e705e83e2775971d SHA512 4cefd326bdb2a4074c076f91de822fbe254790bcf90138a208ddc5307df9d8ec74db22e14f1962e59970d436922e0d366055545a3eceef83c33100578663290b
 MISC metadata.xml 750 BLAKE2B d02c2f96076c9be5a95d8701e935ed802f3b8759d2c1cc220e6235e6a310773a05dcd5e77398ee3f32f7a55822c407c5d18c3cb79b674ba5124043934b04539b SHA512 4827fa23f4b181c3e0a76eb422bd05b1504f6982edd7b8de4ac0464043b9cb8339939629162ec0f2ca1a663940e3a52f8c95ca890ad1eb9aed6d9df4c6580c34
diff --git a/media-libs/giblib/giblib-1.2.4-r1.ebuild b/media-libs/giblib/giblib-1.2.4-r1.ebuild
index 52b2b7c4e3f0..1c4c401d5513 100644
--- a/media-libs/giblib/giblib-1.2.4-r1.ebuild
+++ b/media-libs/giblib/giblib-1.2.4-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
 
 LICENSE="feh"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/imlib2-1.0.3[X]
diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index 24cbf3b2e589..0ddd44c4961a 100644
--- a/media-libs/lensfun/Manifest
+++ b/media-libs/lensfun/Manifest
@@ -1,6 +1,6 @@
 DIST lensfun-0.3.1.tar.gz 761892 BLAKE2B cbba497195a0efda181c67fa8e501d4efe7db4da153ff59563d9695d93709615bc098b94ef1e933708c8ec82330ecfb427066ada255e78fdf7316d4ebdb9712c SHA512 cd0f142bb7d6aa154f587d89502da35473a7a02660246bd025ccd5d1982f55425359405898e11ce9094351ad44a2d6786b9ff07d227f75699e99e4de8f40938c
 DIST lensfun-0.3.2.tar.gz 784825 BLAKE2B c77cd6b2f1bda0313a980fbd3bbc7ca9ad5ed0b9777cce924f66da5de3974ccfc8939d054c7a7532508b6b0913e2d436a825a83916800b625ff2c552c96a0ae3 SHA512 9c6f546fa70e6dc692e66ef378447345be6d3383812934780d326d772d775c1918cbf3447cd91c067655044cf659025763bf47ba2d938a82a3c2de4d60127446
 EBUILD lensfun-0.3.1.ebuild 1229 BLAKE2B 722636f25c329e927163e57214eb64e0e759c41c42c33681bfe7d8ede0290094b196c135ab556e90709b65554d7122394dd19b153681d3bd5019ae86a6a6581c SHA512 e9df8b1c261cd9e8b207afb72d7922a824d3b479d253f3aa28d06a85baaafb645309e1e6048bf4c5cf367a51d6a314967380b07050262bce7a1b4a31e655a6c8
-EBUILD lensfun-0.3.2-r1.ebuild 1407 BLAKE2B bdfe57b83b94534abb3dd672894cd2169fd74d02af10538a360a9d996e8e2f556a12cda240e7d5997323dcdea0a7e807e3ead410262c0bebed0556df3c92ca1c SHA512 53846f6d9a6aea8ad4849bc892db475451d1cbe0c87925eacffcf0523a7e647fcae83ee8842c737232837f967e9e9a9bdb19000ced0b23185e80809dca7b3c2f
+EBUILD lensfun-0.3.2-r1.ebuild 1406 BLAKE2B 481d349d691f19b273280a0e5304df2dd976aa0d4327d58c9bc578acee424ac773cc283d54fb65df574fd2f7f5d9a82df214222ab08333eb4950d2a0f86f8eaf SHA512 196c65c80841a5f01ce4c874ac368eca91b8ae81df7512082b7cef6daeb4b66f34eaf1d19b52d7c542cc3bb889afa28f23384762d4d013630254a534a63d5dc8
 EBUILD lensfun-0.3.2.ebuild 1290 BLAKE2B 698144bf875b6d1d2c7ef4b80ad4abaaf696a3eeed67abb008e67ec7c4fa31b23c2f622c4c591c2b800b6722c3171fcd5848a9ea7d52b73cf174435d1c7e4cc9 SHA512 3b1c1b190ea09b59737b8e187ab976d44a3801a4190529d602a60f6398bad64ae90ecc286e3c642bd93fbe8a629dbec09bb9832226480bd0915b752bcdaf4b57
 MISC metadata.xml 609 BLAKE2B f9ebe22f93c9622961688f478f0f46c111fda47252c57c96aa4f566107705f27b6beb820c0d3c6df6414f7d31dd3d1c89e31a66b064ff96fc7e7e481faf47b7c SHA512 f3c9ae5432aaae9e83dec01dc9d6a4b8d01998183ef1c6ba7731ea9eb92b4960ddfdd0a2395bfb9f137224e83d4c938a7187f01579eb5c9e882e9f4d8008ee39
diff --git a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild b/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
index 1a7287be7eb7..f1224dbbdf81 100644
--- a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
+++ b/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning.
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc cpu_flags_x86_sse cpu_flags_x86_sse2 test"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/media-libs/libcdr/Manifest b/media-libs/libcdr/Manifest
index 49ead49bff02..cf28fe0975dc 100644
--- a/media-libs/libcdr/Manifest
+++ b/media-libs/libcdr/Manifest
@@ -1,4 +1,4 @@
 DIST libcdr-0.1.4.tar.xz 609592 BLAKE2B 201ed19cfe9aa93137279dfa6b9c3908691b2bddd1e8b7fb25505ab475cb8ae533d1b27857c99e36f618938aa7ee88075c3c7f5780872abe68994f380dc893c8 SHA512 769b0319b5a904ce9f727b7076f82cd915ecd8c9e5e2456416e3e6739c6403bbd4108787ab124d36efb1b47d5c9e37c48b0e12d096eb440ae8f9979ec06048a6
-EBUILD libcdr-0.1.4.ebuild 1159 BLAKE2B a0d496c5cf7895a1e6aa4f2aa34c106fa8b753c0b43d2307d3caa04fd96e222ae98a29f135d20244866ac62dffda3c786991e6204de945f83bcde53bacdbb501 SHA512 249d32d501bc3b3982094707eef1a76bbe5829c3c05fcdc8ef71980e39e3e82f72f496a5b51189c40f2e47ae05042f0e8f4a5754d1d720a5a1b4a985adabcaa7
+EBUILD libcdr-0.1.4.ebuild 1158 BLAKE2B dea22d0cbeb7578430638c1e7d4180c58030647c35c9aba00510145c90f6390f175ed5b0dff4a65b17949b74434bf6eec15bbfb809bbcef8c104dc0cbb79366a SHA512 abd75b34593780d1fc08c138cdcb70beea11ba9ab9641bee159881ca94098d2f604f88e6d2b8ac58192e9db25578666ee36d8f5f0f22ad4259bd2d1384d21ee5
 EBUILD libcdr-9999.ebuild 1162 BLAKE2B da233600b9eb7f57096d37a61c1f6925e38e4905e68a183aa93097f7e4ca7962f040c78d7164dc53e8f8568072186a79b2fd27564ed865db7ed152701688b519 SHA512 74e6b63100144ea92a50f1a664a10c67660b9631d5ba79f386b7a65d997b2c53857a5edcd361e1f92a8963d11c349ca7d7d76358e74c4ca79528938d58f5f4ce
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/media-libs/libcdr/libcdr-0.1.4.ebuild b/media-libs/libcdr/libcdr-0.1.4.ebuild
index 2e4ecae4b778..4b646c840604 100644
--- a/media-libs/libcdr/libcdr-0.1.4.ebuild
+++ b/media-libs/libcdr/libcdr-0.1.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr"
 LICENSE="MPL-2.0"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86"
 IUSE="doc static-libs test"
 
 RDEPEND="
diff --git a/media-libs/libdc1394/Manifest b/media-libs/libdc1394/Manifest
index 4f2f3ff65200..57738870e31d 100644
--- a/media-libs/libdc1394/Manifest
+++ b/media-libs/libdc1394/Manifest
@@ -8,5 +8,5 @@ DIST sdl.m4-20140620.tar.xz 2420 BLAKE2B 2057bd14817809fc4ce8188971e846d70deda49
 EBUILD libdc1394-2.2.1.ebuild 1391 BLAKE2B 8ee0fcbd135891415cf61abeb5902d25182b92a7ee7325a3b8437db3e01f55a3ccd221b243abeb23ffcd792eec1c133dfaf8efe7ff7d26b55381c5c31eb6506b SHA512 a04d57c24bb668d11fe99aa79f6b322701ce908a80b7ea9eea11c7b170254cea2fbd7ae73dc405fe55d2b00c93e33d8f7f68de352b19e6c327e58d8ac96855ee
 EBUILD libdc1394-2.2.3.ebuild 1369 BLAKE2B 2a33c6efabae47445584a2561956745ef73dc136cf8b20e0b25e9148e5bbd92e26fee4d96be441a056a606addf14ed458e6c81443c4932874cdf9d67568a5c20 SHA512 c8b02dc5379fbfd667c8cf55729661af6b7f5aabdd2ccc4b53975f4d90a01f129b3a4696c63e948a5b2ca0d68448b323a2612a0a9e369a5df03233b605d149e4
 EBUILD libdc1394-2.2.4.ebuild 1369 BLAKE2B 2a33c6efabae47445584a2561956745ef73dc136cf8b20e0b25e9148e5bbd92e26fee4d96be441a056a606addf14ed458e6c81443c4932874cdf9d67568a5c20 SHA512 c8b02dc5379fbfd667c8cf55729661af6b7f5aabdd2ccc4b53975f4d90a01f129b3a4696c63e948a5b2ca0d68448b323a2612a0a9e369a5df03233b605d149e4
-EBUILD libdc1394-2.2.5-r1.ebuild 1387 BLAKE2B ab044659b000f86726fe6380056b022ed41569607f9e16a106f336c91869316c9c5fe57e57f1524c8432e25e4a49a24897804672ee810a17c44bc97cb688e09a SHA512 a7d9567a15ef7ac2f34060fddd751bac83602aa2e00bfdb05d38573ddca9bb70a5316088d8731e72a017ca3dfb6e7fb0bab3a93dc4820b5e4fb1e106edcdf65b
+EBUILD libdc1394-2.2.5-r1.ebuild 1386 BLAKE2B 79bef851c8f4390dade5352adc2b2d6b0cc35ba5dc00e73f4fbde1af3975a4f77193ed8418893a0300a9d204b27c67fb5f68f90e9a7c25a3e1403ce944113718 SHA512 16f08a423f333f8dffd87929065c8be65370e2c742c3f78f686d4b4ef839cd4f2c1448d01008fca66e6305056583c557ad7d7f60c9644cbce549614765953410
 MISC metadata.xml 310 BLAKE2B e433df9a1c48848c371f278ef408de74d5a78896a17a511cd1dd7cdf35e77a87070178f22ad55f70a200088f8f2186d970b1c5cea7eed8ca66b8bad58549667b SHA512 2fbb994fc42ad1c7e1da90b5525ddc1ee1b1abeefeed6496b3aea4df79d556e7032291c782c022ab855216ecdf1539e624f951766f19e33564fd80646bec25b1
diff --git a/media-libs/libdc1394/libdc1394-2.2.5-r1.ebuild b/media-libs/libdc1394/libdc1394-2.2.5-r1.ebuild
index e66eea98db4f..8f622c8d9381 100644
--- a/media-libs/libdc1394/libdc1394-2.2.5-r1.ebuild
+++ b/media-libs/libdc1394/libdc1394-2.2.5-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/media-libs/libdvbpsi/Manifest b/media-libs/libdvbpsi/Manifest
index 2a1167996b81..df72a9e80556 100644
--- a/media-libs/libdvbpsi/Manifest
+++ b/media-libs/libdvbpsi/Manifest
@@ -2,6 +2,6 @@ DIST libdvbpsi-1.3.0.tar.bz2 459083 BLAKE2B 50e8e1780ddaf9a07bd8121d1e179464a610
 DIST libdvbpsi-1.3.1.tar.bz2 479964 BLAKE2B a29522d39544d90b34915e2ca9fc9ca455a556097c63639d7604679275b57378822adfb4c022478884c897cdde2c0e5f84355fdecf35fd6bb305d1fc275eed8b SHA512 015d586d1ef1fd35fc4b6a5b79d1ce4570e07070840d7070938c38be64853fb987172ad225f000156166559709061de6f901237bfc0f7f26f219b5950b57c27a
 DIST libdvbpsi-1.3.2.tar.bz2 487807 BLAKE2B ea8d1e121e47d2257d8537beac792e3a420ac957dbf3ec6d89f0c4d063e249616bbc8f3e14ed37769b676ed18d5d4c3c6a33e2a706217854eb2ded91e7c503db SHA512 cb59c2e66a214cad7bb96aa1f80a178399fcd80da9fc05b22c72763f2cd818bfab3724d36eee4c6467fb8bc8bae18b1d8afec64c02e8e47cd7a6e887f0230309
 EBUILD libdvbpsi-1.3.0-r1.ebuild 973 BLAKE2B 4fea8917073fd09569ac206febc7087ec1d6637c306d2eb23631e51c129227ae5e4781e2dc5bc7834c8ceaf6560d4951d6d624c8edaeba56dfc91326f28622b0 SHA512 6616a1d618c225c612b88b6b7b9f2fdba68e24bea57d3105d3290f1bc87756f7be5b28a712684252a61da7d0f3e8adc923afb9ee6a48840c9a086bf45b6a2889
-EBUILD libdvbpsi-1.3.1.ebuild 965 BLAKE2B 2e6700911338eaad57272bd4b28e1ce99ed7e26a1dfa3b0926b39450e65c08ae39d46c7a059b8d4c3560a1d0690fe0fc3443e8767f9ee8f808c79d380b7d0e0b SHA512 a52082e6276b10aa23c35d7f3cd0604aa6a554571e80ccf91360621cfc3435ba52507e633b6f847db3bad9bb9e42e9ccffc798acf07378dc4e2dac91d7e8fda2
+EBUILD libdvbpsi-1.3.1.ebuild 964 BLAKE2B ef2cf6081e4f65350cd6a2999156b577ee4a5165cadcd18b9843eb2816d10a6e7e5dc1ffd8d6d59ae3f4371386450281f0c5690e48dd0cf88b11f2e5c478a5f6 SHA512 6dc4a9129992c27c438c6e47ed50c3f8d9f60827240a6fa2cf4d6d608b44dc403103b8e3cace2bdfb406173b67b8ba1cde1705134e7ceda5fa5a069e5b077615
 EBUILD libdvbpsi-1.3.2.ebuild 968 BLAKE2B c6c59945ea3796164158b9a8623468253f0085050f29d64e34e9e13c0791322e7a8079fcf2a8c300bbd1358aa274dcd68a28f7ba98a0cf99620408fde0984f47 SHA512 fb7484cb854a93e04aa0d199e64751127976af47d1d8f4c5f876b3fd29fa1a9cbcef310d5a42bcedce42b01a2f9d2f96f9a9d05e01b322cd261d2895f84a4ccd
 MISC metadata.xml 212 BLAKE2B f25483a51eb36c195e77aee58c9f94951dbbd719edb1d088524ef3db4f2d8ffc628b6c0c01efb9d5f3083a81e6cd0edeba56af12a9dc643bc3facbf16e89c0b7 SHA512 ad3eb85555c559c56e2fc097ed106671a78bb16ea63253de1786772a1b914833c2af673da087899e1b06f5db150c283cccb81fe8591c257f91913f2ae22a039b
diff --git a/media-libs/libdvbpsi/libdvbpsi-1.3.1.ebuild b/media-libs/libdvbpsi/libdvbpsi-1.3.1.ebuild
index 801cc3f3f2df..6e9ee6786665 100644
--- a/media-libs/libdvbpsi/libdvbpsi-1.3.1.ebuild
+++ b/media-libs/libdvbpsi/libdvbpsi-1.3.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 # Sublot == libdvbpsi.so major
 SLOT="0/10"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libdvdnav/Manifest b/media-libs/libdvdnav/Manifest
index affee6152f74..65b24af538d4 100644
--- a/media-libs/libdvdnav/Manifest
+++ b/media-libs/libdvdnav/Manifest
@@ -1,6 +1,6 @@
 DIST libdvdnav-5.0.3.tar.bz2 372203 BLAKE2B 82b935157cb59c14c0dc2ce043027dca43d181b1dc24435a4876310b4edb9961da96b202c6e99b6531fce22aa05dda2352cdbcfa42ab47051e533ca3fd458158 SHA512 d6d0519f654649bd65b3029224191e7d6acc893d94e8578e435d77b75327584e9f44410a062c1fc60c6211f5bea6b3971228d84de595808733ab7356980e0123
 DIST libdvdnav-6.0.0.tar.bz2 369605 BLAKE2B 911b786f1cf37d32b0516df9f3ae3c388ad352206e67f73f758984795459ced7507f1454747a205b64c2d1f42922ee26ee9d434499ceaf05053dfbeb4d7e52c7 SHA512 89d1e976d8f1cc92692e86e793403759b4d705682ba7418dcfd7dd3c38861238cead303fe4baa2059ebd7e9b82a77bbdbf32e50b20848e78939ee9e75d1b96d4
 EBUILD libdvdnav-5.0.3.ebuild 1085 BLAKE2B f864c4c461f7be859d7efb886f4110c12c7468014427b7db51ba03cc6ade114fd9f0d1239a3da2f3394f11e778ae68bf07c68607cad1f115444aa7271ed34f8d SHA512 77c4bb2c123ab734829e764a762ae4d32ff29817140a287f8660e913a063dff21664aa57a8973b70418bafef6919db45c1db263a0a5541948eadca78d49b70c3
-EBUILD libdvdnav-6.0.0.ebuild 1182 BLAKE2B ac7d9c3604b05be808b5f58e8edeba07ea1d1d334f4bc6e2fb84a3cad95f9d3262ae4aed096761846b3223e68d02c1b17fd119c86e9e2d33c99781c884e53fe7 SHA512 01c969389ffe6b51d0b359f93239a8cff14a62c59a16708d46ba970f5f56eb45d5a9d4e56288d0f5a0382ceb95894cf79882ce77d33a423edd6f804706f6d293
+EBUILD libdvdnav-6.0.0.ebuild 1181 BLAKE2B 4e55d4d09babe404a23b785ee3ad4e9627c5b9866526cd3bde238d39661854550ed295ee99edac88b4e00655e44eddddf866ffbfc33be982e1a4ae6ff4f3eeb3 SHA512 76d5bfa56c8beaeb30301f37eb5123338215213f5bbd09716a01aa99d2658418b792263e77a9bcac5580883a123cca009a3c51f0e5000dbbd5d3099f093d2477
 EBUILD libdvdnav-9999.ebuild 1186 BLAKE2B 2f6ae269963f4ffe99400737fe9bf0b9abdb7ae2d162aeeaafbd2b9afc10feef07647f7059479956a6594e032e63b4ace45ad55cf0b1f215deb16ad0038d7b13 SHA512 5e86d911f940bce20f8e3e962c953116bc306d3fc020e845b104abeab1fd1017a9e6967d17ac5cc639bf2257ff01054ed0945e995e1683df006e06513cbd96d4
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild b/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild
index 25c0c8f6da9e..db981e158cd9 100644
--- a/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdnav.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdnav/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-libs/libdvdread/Manifest b/media-libs/libdvdread/Manifest
index 4712b3712be3..4322aeab6f5d 100644
--- a/media-libs/libdvdread/Manifest
+++ b/media-libs/libdvdread/Manifest
@@ -1,6 +1,6 @@
 DIST libdvdread-5.0.3.tar.bz2 394885 BLAKE2B dc30548b8cdf30b9c114f4314fe0a2350b31e38321f662072e81492d126050eea8a601f12c03a8aa2c10c453f3ff84064fa4768cebe9395e4314cb2a29e872ca SHA512 1ca438f0b5c406549eec62e1abef1e8745b9f932bcd30a3194ee9e37995b269ec8f1652a24cc3d2cb11ddb964e4a47a06e5405f9402e616586ff6263a1af3fc2
 DIST libdvdread-6.0.0.tar.bz2 394627 BLAKE2B 08007113d726f96d2b179aadd2e5737ab9eeee2a52864eeaab3d2633993c66ca076559c920bd291033de794f2037d7480e4ad6f704822303f5c5b29db6b8d7cd SHA512 b07179f2f665adf6ddd7bf8b7c48cd279f3f413c5719b8ca8467e53c7cd0cac02a40101f3717186dc0e4e69e5d9c7ac6bf98a76901412d74150b9fc7bfdd2479
 EBUILD libdvdread-5.0.3.ebuild 1008 BLAKE2B 4e629e1d24dda90ccedff708db1a54d73b435641c997b75805ca784ecc3d8bab106178bbbf9768196b61a962831d30c7b145bdace0bca7f87392059280f61da7 SHA512 557cf66d4d654fbf0f26f1917700209edf7a8ca67f83792224658c6c44559802f4d6da8f6cf67bcf520f9279fbb67542233575dfcf3575dd64a4a7a09bcc4c62
-EBUILD libdvdread-6.0.0.ebuild 1152 BLAKE2B 0648c5ad482db13cc7a3424779428793c8b8066318dc72c5e8456528bd6d5d514a56973656994368e1ca9e2d81a850355e20dce050e746fa7a93a97c54303434 SHA512 88bcca10da24785bd16bb83bc45296ebea2c352cd533bd309e9a71414839b8b402032db3d8cc05e15a2b1fe206927b8526debb6937148b2a585ad91161d7d1a4
+EBUILD libdvdread-6.0.0.ebuild 1151 BLAKE2B e5435ce284b371ecf254b315c870c2ceaab2cb5384cb6ef45fe346249fa8550b88307a550ffe70c228cc7a396bdfee0aabd2ebbcc4a07aa881f4d6c6d30d94e7 SHA512 8ce53a07605dcefbe80e69daf7cf83c1c590644919037bf4360c8c73b9c8a26feb607e6c206d5d4924a16e0c2d6a0d1b5d0d53790ad0bbb00f3ece72a3f1a3cc
 EBUILD libdvdread-9999.ebuild 1156 BLAKE2B ffdc1f7a0f7fd5e2a8e17e64a18f7a6df2f93cb305b5851251ee2c494dec221dc8e50e8d6d69b8a8e7be56b042d7ba36496b7f7c05bed189256bc309d0b02008 SHA512 193e1c2ece5c75ff5e326ee789fe493a5e42ccb8f8afa311edef85196e6dd32506d1443489e6ae5b26edc86d135aa662de84bdb609fc8249b8a068bbd6a7729f
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libdvdread/libdvdread-6.0.0.ebuild b/media-libs/libdvdread/libdvdread-6.0.0.ebuild
index b1d710830ef5..8311ce0fc891 100644
--- a/media-libs/libdvdread/libdvdread-6.0.0.ebuild
+++ b/media-libs/libdvdread/libdvdread-6.0.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdread.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdread/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-libs/libebur128/Manifest b/media-libs/libebur128/Manifest
index 6f4b7886fd02..3b0729fb889b 100644
--- a/media-libs/libebur128/Manifest
+++ b/media-libs/libebur128/Manifest
@@ -14,5 +14,5 @@ EBUILD libebur128-1.0.3.ebuild 1159 BLAKE2B a284d1752c4c0d780c24d8c4ef6a291f824c
 EBUILD libebur128-1.1.0.ebuild 1069 BLAKE2B 44f6662374f5799fe69bc3a301b78b78f30eb02746e08395a5a4f755a1cb460989120981824a3eb9a582488a88d972604648b7a0f8767262951c588a9a8dc491 SHA512 897b218e80356300bcf6494816db7dc487591a21ca35764b34ee7237377b4f9c37b4e3c2eef522ac4469061fc2429db07a016e30ca498b3ffe92763ee85cf5d0
 EBUILD libebur128-1.2.0-r1.ebuild 953 BLAKE2B b25cb6ba208c8db3e762982e16b661e1d4ed82299065be01a59a82dfc1d149b64275290ee630b4cac80ff46173511f3c9cacea8d3f0c1cc8a92d602e16bb6d40 SHA512 a7b1ae3173dd6ce3ced5f947750b4fe223f4d468746f77df471a20753439534269ec3b8b6fc9288cffb80f60d15e84debe165a9a3f8fb7d631d3ce4e7e73889b
 EBUILD libebur128-1.2.2.ebuild 1042 BLAKE2B 134d30fcf7c5df32823c76d719fd0ee6ed74529c87461fc662110c705ddbb572132d0757ca5b5db8a9e5cbb0cadbff0230213212e1a41a50fb0b12bc4c1266d7 SHA512 306c3e3fc377c252b347a9acc2a3376bc1e7ad152272863dba45b508fb32a1dcb9faf9cbbe3e482cfd174ed4e71cf990499d8b277321d53287be9bdbb74c4d57
-EBUILD libebur128-1.2.3.ebuild 964 BLAKE2B 4bbf72fa30fb26911d22fc1b0fe8ee15c062d362310b5d5f81d079ebed8561df23e99530ca0599cd4d6b02b1af368d61118189ff735d23329fa096f4215f9bec SHA512 10424ce73ad2344ce49629e9aaa9189f7ce97da4459f536b91cfa5391d0822427f4978473835f6b3e508047bff5400c20e107286e6ce8783bb521d6ea1403a7b
+EBUILD libebur128-1.2.3.ebuild 963 BLAKE2B bd59b239d40a239fd83244150f491db62d7c586aecb6cd3fa46bf445cb6262eb45952b65aec7dc50184792650b103ebd060fdd694f62de867f79287da6168f8f SHA512 7145961320477a654f12bf8153ccf7666bf1523737de4b8f5d7d4d0fedaf9779f58b0c121ee52450ff7ad070d4a56eab95542c9585430beaa4d1d8d80f788cc9
 MISC metadata.xml 752 BLAKE2B fd4288cd3e104741b109ce1bfaa4562ec9258940a3b43d58d6a6427a6ded2a762c56907012811e2fd9de363ba87f3978aed62c0b1c9c79e1f9eac4134d1c6552 SHA512 d0117447e87d367f45438b1b2ebd3f238b8ddf97491d8d742bb0f6609e6da4cb155249f86f95a330545c89b6433badd93ff2d26b55a3417990d63612e26b6218
diff --git a/media-libs/libebur128/libebur128-1.2.3.ebuild b/media-libs/libebur128/libebur128-1.2.3.ebuild
index 28ac4bae3110..62233ba34a11 100644
--- a/media-libs/libebur128/libebur128-1.2.3.ebuild
+++ b/media-libs/libebur128/libebur128-1.2.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jiixyj/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/1"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 x86"
 IUSE="static-libs test"
 
 DEPEND="test? ( app-arch/unzip
diff --git a/media-libs/libfreehand/Manifest b/media-libs/libfreehand/Manifest
index 04baf2131ecd..3373c1c49e6c 100644
--- a/media-libs/libfreehand/Manifest
+++ b/media-libs/libfreehand/Manifest
@@ -1,4 +1,4 @@
 DIST libfreehand-0.1.2.tar.xz 516132 BLAKE2B 7c2dc629fd2a84f23dcd721ed6f9d4644e3bf7a160be9ca5ec0f15a72ae63b3cf861f80fafa12ef1f99b02e0fbc1c806bc37c466010a420bb425f4f9e2757928 SHA512 4112a76ac99999801d97d1b282596d631d8496a5bf65778ab26aa06da86637b1e2b630648a67ea01bf3316ecec9f2715546baff27af090b900267c87a011b963
-EBUILD libfreehand-0.1.2.ebuild 1187 BLAKE2B 0232e2fcc70e1042731419829f252e90417d2f92c1fb6ca2db092683ea0245637e3097a3c380845225bb3fd73b6599fb781fcb3baaf9cfa277d8c4887ebb5de2 SHA512 b5d351987217e1dfb04d22e931342d8024df00ebeeaa57a354e07bae476a02ac3fd24407cfb9821b72af387e6d396e83c2aa3d7900741408360261dfc3d240aa
+EBUILD libfreehand-0.1.2.ebuild 1186 BLAKE2B 1dd2f3cb65cca6bc8e54597676b02094d71c91e974c6dbeda754df2c6753f6651df3c298210737a9012ecc11878c7f0b4adacde530fe48b2020701cbd3425428 SHA512 099820245d2ca629862e9b9ea4067fed87d0e55fe53e6d2880ba2bd23a040f3eb4560d4fc8f9dbb8fce1c50e8daf671d83446313b71810c68b9c39e63793e067
 EBUILD libfreehand-9999.ebuild 1171 BLAKE2B edf9a99dd928bda98b3d15dcdb2c4943c3499fb14d0d51f0d0287b55236323f1ae0e9377d09bc221fdf42a2c00daace6a9fa26a3a79a797446a91451306c7fdd SHA512 ce17b320bd3c30f4f36d315a45309fd54eba638fe95bc12cef2cb08da575bad983406b1f4725ecd6a0bc7aa6766aea1a542cbdb0080f45e1e5cfd292042b7d80
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/media-libs/libfreehand/libfreehand-0.1.2.ebuild b/media-libs/libfreehand/libfreehand-0.1.2.ebuild
index b7f3a47c5fd7..dc669643a69a 100644
--- a/media-libs/libfreehand/libfreehand-0.1.2.ebuild
+++ b/media-libs/libfreehand/libfreehand-0.1.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand"
 LICENSE="MPL-2.0"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86"
 IUSE="doc static-libs test"
 
 RDEPEND="
diff --git a/media-libs/libkate/Manifest b/media-libs/libkate/Manifest
index 7952eba12fac..8c74865c6fbe 100644
--- a/media-libs/libkate/Manifest
+++ b/media-libs/libkate/Manifest
@@ -1,4 +1,4 @@
 DIST libkate-0.4.1.tar.gz 906896 BLAKE2B 99e755a365fcd9983fcce59f38a313b4c0c23c3a274e3b98c8756aafae29d19dc3ed3d200cf2207dd2d4985d8e99ec0d47dcdadc273a78ff84c4be11330b1e0a SHA512 2635237753abc0f6c43fc07bd0ecc57c2f3c893efa6c62ad08de9191045612477302ed45acd61cdfea7447efd654ebbe0ed2d6a2cbf867eb834581d7ee43377b
 EBUILD libkate-0.4.1-r2.ebuild 1164 BLAKE2B f7f5e938758e94c9cf3726bdb6042e6df47c54a1ac576c12d5c6b26706d1b4f2beff6ab07b8dee237e4d91a72bdff0a3ac44ef574dcb0d7436625b6760ae0091 SHA512 ed50e21d9de360c16151aa3ccb661f021d86f13af6c8c441bb5fe86be3ede6d8236076abfa68bf6dbb480f41527334ba8dacee77271f2cdac391fd504c022fbf
-EBUILD libkate-0.4.1-r3.ebuild 1315 BLAKE2B 45610963488ebf5e3815498086598ffa013b4e3dca69c0b793f020a6b90ac130fe98d566286d4cb96289d83836ba899d5564a3d4478f62c98678c68a8caa60b9 SHA512 6068fbaac7fd0e090aaa00d4a766694dbb3c3b8abc85377f6c238af55a26a449a261804a4acd673be795851e4202f176bc18c3f880a7691766510d0e60ccc4fd
+EBUILD libkate-0.4.1-r3.ebuild 1314 BLAKE2B 88345ae4484c9bea868edfc0117aaf0f5b9851e7c2d7bb53be3e932278d50a0e25d8f60a182da8599f93ebbc7393875b762b4f2522638d7266ba0c37c03f00ab SHA512 5c413b7f201b52f10373bdbd4f38780d25ade309363cde814f755e1cb1034b4ae45fd1d1b926735318e8e4b3175b59cc31542f90657f8824f801baab4c03b665
 MISC metadata.xml 1066 BLAKE2B 61b532ca7ea79a560df1ea1d4e36a0ff5d00a3c1dc81b520d0c9e1a077206d6c9249711f9d76100ed9394a65ab29bbb74d02f4caa51f8f800c14b24ce9a17b47 SHA512 510dadea430ae39da68a3cd97b4a7717b91fcc26cbb0303155718ba5e46d69d2e52e099b272ffe26f34149ef8fe01df80e332009fc905a4f262ef8030327da29
diff --git a/media-libs/libkate/libkate-0.4.1-r3.ebuild b/media-libs/libkate/libkate-0.4.1-r3.ebuild
index 88d963a9bf5e..a55fac070bf5 100644
--- a/media-libs/libkate/libkate-0.4.1-r3.ebuild
+++ b/media-libs/libkate/libkate-0.4.1-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://libkate.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 IUSE="debug doc wxwidgets"
 REQUIRED_USE="wxwidgets? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-libs/libogg/Manifest b/media-libs/libogg/Manifest
index a3c12c890f18..90f83db774ad 100644
--- a/media-libs/libogg/Manifest
+++ b/media-libs/libogg/Manifest
@@ -1,5 +1,5 @@
 DIST libogg-1.3.2.tar.xz 407324 BLAKE2B 193bdff4d2b4dc5418ce76ba2985782e1513cfcee8fec870ec7b577eefdc8c484f5aa2a00212ccea55c317c39084f63cebdcd954b5a45c5773d6360109e04807 SHA512 dc9552b15ceccd7e12bff39a6670120ae53af74ce97254d047c28f49ba6a320f55059ed509ec1d8758a972c72514f2866634d829f3cb528c2f595cb056e9bca6
 DIST libogg-1.3.3.tar.xz 417636 BLAKE2B 2fc69580ed94be520c8e6b764e6271ec60e9d83d4265ca0408df4b2e6233a0f1d68e79400bc3871cc130034697ba97cedc453a574b9c6f618c9b819a93a2d3e8 SHA512 37d8e4329bf7a997a95d84a55c325a5a893ec84bb4d5b7ea638e5cb13201a0619e71ecd9710a8371def69f092c62dcc59ec0a607db246028ee8a62678386260b
 EBUILD libogg-1.3.2.ebuild 872 BLAKE2B b8f65fb3b7565bc251619b5ee13c37cdda48445682e51f5be83da5837f07ccfc4300c37f837d535d5062151c78150823948ce47463c10663931feb67e99ea978 SHA512 4ac4e22ac9da2644af8815a0d6977e643a4a150bb63fc4137daaca68ec4ecb618f390088e96e985e7e9ff5422d5637cf4f4bbcdf77077078fe187b141d1abd33
-EBUILD libogg-1.3.3.ebuild 899 BLAKE2B 3b5baaaed4156f3a67c9676b01bff28967725d080d9db7c76c2dd3d5746223618fa9d18989e38a8c27574891a2f9923bdb5c3b8fb887a33f85133541801e593f SHA512 5378a6f0eca75f905235361c3072f7f6892a4c4b8f35f6ecec90b3a6f37e3df6334d53248f436b1c578bd20562ca134523b2fcf46310fd44d60d486decf7825f
+EBUILD libogg-1.3.3.ebuild 898 BLAKE2B c6bf6d479ef0ed1faac04caba877ebef8521bb0e459a99cedd5f93320be10bc8446d1c54702c1a76b28e59272bdcd67dde553ac7ecbd6f17f1915886de30dca3 SHA512 6eb436e1efb313f850d8e7a7ab2b609d987af76eea17aa4cd5084d0616eb556a0fd65ae659302aeca27b63d15365409dd83fe98600f1276006b80ad68cd9c5d9
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libogg/libogg-1.3.3.ebuild b/media-libs/libogg/libogg-1.3.3.ebuild
index f15afcd8df4f..dd4e95460d16 100644
--- a/media-libs/libogg/libogg-1.3.3.ebuild
+++ b/media-libs/libogg/libogg-1.3.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.xiph.org/releases/ogg/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DOCS=( AUTHORS CHANGES )
diff --git a/media-libs/libpagemaker/Manifest b/media-libs/libpagemaker/Manifest
index 96aed404b069..c4e972f11b77 100644
--- a/media-libs/libpagemaker/Manifest
+++ b/media-libs/libpagemaker/Manifest
@@ -1,6 +1,6 @@
 DIST libpagemaker-0.0.3.tar.xz 292960 BLAKE2B df95adcbf5ff4ee312667b9b5201a53724d9d7d104bb252f5d5cae6719f490fe3541aa39875c1458ef06e8e06a1b23fd19e34e0de05e9e861b24189146c3f865 SHA512 f9a5cb8b2cdfaf550002d5d078eb79537ed29614a2433f8d41101f1e35e9536cbb324c1d96328d21e2d2e0f21ff58d807813e51f8c660b199843fc8710ae29e0
 DIST libpagemaker-0.0.4.tar.xz 306496 BLAKE2B 9928d5759c35359c4983724477e432b6876fa4d6e3039296a880661a4587de612ce93908a93d1d2dfbd033c6478748a4329a1682e327db528ddb7dc0947374ef SHA512 d9d9436622ae378da2a3c8e50a35b6133582a595c9ff0fe0e3b124fd0b83f1f12afdfc6a27d16b509ca9bab33067215d7300e505d4bf6b280be7e4bf46da6c64
-EBUILD libpagemaker-0.0.3-r1.ebuild 962 BLAKE2B b3302c91485e7581c0545620b377445e25ee36dc8ba7c7426b1adb7e42bf0479a94fb12017903cead34354cf035ee603a61a7cf01bd3b907485175a2cb9372db SHA512 a08130e82b144f3fb0568c682ccd5b79c20ed812ee3d4c1c0c5eff085f539a24ccc39bfced0ed724c5072b609e3596651e6eefcef3ad924136ada2ad8f02fcd6
+EBUILD libpagemaker-0.0.3-r1.ebuild 961 BLAKE2B c7b7bb0ffd7f5974c70d8f6cbd262c532c9596977e99115dfdaab262848f12cca3d9074becea6a51297a5cb96d898be7f99a3628ef703c7ec17b01be9b8c5864 SHA512 a21888cc29a0d26cc3c08056b5be8694f112516d1d477afb28ba0b0077ed3c25ad5c40b4b2fac68a88c8bb05194a2888dc30b6013000f8aa57daaa5a77aa2bb9
 EBUILD libpagemaker-0.0.4.ebuild 964 BLAKE2B 84883f3284ea13c357ac2fdd2cb825810618db084123a883b64d894e11885e41203d497bf5a8f9c798f2566c7eedf67f88c3d15167e3a25fa268bb2d179a2f1c SHA512 7c02bb4f8fe43d9a7ddcdf218e3be98a40e966b547f49751a430a8e41e0b27870e48082c56641dd20264033401795cac9e41b382879457c7344b3d7fd7294851
 EBUILD libpagemaker-9999.ebuild 964 BLAKE2B 84883f3284ea13c357ac2fdd2cb825810618db084123a883b64d894e11885e41203d497bf5a8f9c798f2566c7eedf67f88c3d15167e3a25fa268bb2d179a2f1c SHA512 7c02bb4f8fe43d9a7ddcdf218e3be98a40e966b547f49751a430a8e41e0b27870e48082c56641dd20264033401795cac9e41b382879457c7344b3d7fd7294851
 MISC metadata.xml 346 BLAKE2B 3957184c53e81e9b9727c3da9593b8c4e9c3ab4b59c03f4a6deeae528d397affac28282108c760ac4ddd0c6699b3027158ba33abb0540d12aa15c56302b3110d SHA512 2585fb6fd9ef4008842e0a5c7b1db3d86f152e2d012fdddeba02d1ca0c6e1e457f10c01c8e76b030a0316807f38f6a6853c0111790d7cb6a93437259dbdf503c
diff --git a/media-libs/libpagemaker/libpagemaker-0.0.3-r1.ebuild b/media-libs/libpagemaker/libpagemaker-0.0.3-r1.ebuild
index 1fc7723f4e9d..bf509a149801 100644
--- a/media-libs/libpagemaker/libpagemaker-0.0.3-r1.ebuild
+++ b/media-libs/libpagemaker/libpagemaker-0.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ LICENSE="MPL-2.0"
 SLOT="0"
 
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc tools"
 
 RDEPEND="
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 4c30ca34070f..ab5f3917baab 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -9,6 +9,6 @@ DIST SDL2-2.0.8.tar.gz 4909017 BLAKE2B f6b365a6033e10ef0c5d56ee5e17cc1caada99a97
 EBUILD libsdl2-2.0.4.ebuild 4724 BLAKE2B 81b738d8d00280008bc2e764e07210847ed765c4867ed8b2e071c8bbe16ddc250c9600afe30b4c9c2941e56eaa81249e6e8f872f6d15c7c47cdcde81342d683f SHA512 a02673ae1dd84a173d9479ccc572470484666f429fa36a4a2c4cc39bcc21e93b1691ce51cbc012d1c06c1e9cf073e7d694b77f25b1b9a229e5ea719c1c835254
 EBUILD libsdl2-2.0.5-r1.ebuild 4812 BLAKE2B aa3de1979b7a8c4551ab0ca97295683fce4fa7752009309ce1abd523e8059ec8823257e08d001280474e004dfe165a8a49e6c0946aac3c18d793876c7416d619 SHA512 2303183c31c03c36d161097c6db7fd0eb8728c90c9ad4261c6ab9e145ef4ef9310a99e350a87340b40c02838acb3f98f96fccc317449818ac27d0c93b7838522
 EBUILD libsdl2-2.0.5.ebuild 4760 BLAKE2B c23874aa322c300b1f4de2e5d303bd6a60afa27c0ce194e1c3eba2c6f51d86c7aa2f13d2a87ef77de7d3845c6cfde24e6806f7dd7bbc1782669c0516fad24ede SHA512 96834e25594b9d568c261991e24f3c1a7985fde2edc9c17facc726e11790939d0ae6b122e2d80d808781ee01949bea16756a3a7e1112b30ff22c190873d58078
-EBUILD libsdl2-2.0.7.ebuild 4850 BLAKE2B 489bf62e91758d5c9d5ddaca6792cb01b86fa88944c64920300139607391c2a2a697642208eeb10fbb6a6e4f826c157fa7afb58ab68440873dc83b970144b9ec SHA512 5f541a63dfb317f52949337d6dd58d6dadafe2db7966edfd55f44532c976694f8df9c2d6e834b9aa21d7f7de6f7dd4cea4a6f4cea5f9665e49e80d45d826727e
-EBUILD libsdl2-2.0.8.ebuild 4850 BLAKE2B 489bf62e91758d5c9d5ddaca6792cb01b86fa88944c64920300139607391c2a2a697642208eeb10fbb6a6e4f826c157fa7afb58ab68440873dc83b970144b9ec SHA512 5f541a63dfb317f52949337d6dd58d6dadafe2db7966edfd55f44532c976694f8df9c2d6e834b9aa21d7f7de6f7dd4cea4a6f4cea5f9665e49e80d45d826727e
+EBUILD libsdl2-2.0.7.ebuild 4857 BLAKE2B a41d920eb304d9603d4465d8cc5437551ece341a2481ef0d8924c5cc6a2ac553ff7adaa184a0942f31d1663f9adc899b5356e3d6749e3065caa0c5cfd1a8b3a6 SHA512 58cc65b2082d0d2fc3cc09143ae447f0409944a5410fa8560639a5bcf4e386453556ee2aacaab28a074605834c432b5a60335d264631f0e276ed4a8daa826570
+EBUILD libsdl2-2.0.8.ebuild 4857 BLAKE2B a41d920eb304d9603d4465d8cc5437551ece341a2481ef0d8924c5cc6a2ac553ff7adaa184a0942f31d1663f9adc899b5356e3d6749e3065caa0c5cfd1a8b3a6 SHA512 58cc65b2082d0d2fc3cc09143ae447f0409944a5410fa8560639a5bcf4e386453556ee2aacaab28a074605834c432b5a60335d264631f0e276ed4a8daa826570
 MISC metadata.xml 1609 BLAKE2B 036c0f14aa213417757191a7b05d957bb24723733e2a847f6d6e3e23539674eacec37e5e569ab35c8382f0fafdd156b323f3a0468182854848ba3c944e30d9dd SHA512 5e04e0574226a2f3d0bcce5b1aa38b9c95226d9a7192beae0e77ca8769e0ad02d0c8f3b72fa699f4a6704e9ae7f543aa1e5607f3346ba1c021a30aa1b72287a6
diff --git a/media-libs/libsdl2/libsdl2-2.0.7.ebuild b/media-libs/libsdl2/libsdl2-2.0.7.ebuild
index e7d0ad283186..7926374b19b1 100644
--- a/media-libs/libsdl2/libsdl2-2.0.7.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="cpu_flags_x86_3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver"
 REQUIRED_USE="
diff --git a/media-libs/libsdl2/libsdl2-2.0.8.ebuild b/media-libs/libsdl2/libsdl2-2.0.8.ebuild
index e7d0ad283186..7926374b19b1 100644
--- a/media-libs/libsdl2/libsdl2-2.0.8.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="cpu_flags_x86_3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver"
 REQUIRED_USE="
diff --git a/media-libs/libshout/Manifest b/media-libs/libshout/Manifest
index 3348f39a8ae3..ff7eb3b0ff31 100644
--- a/media-libs/libshout/Manifest
+++ b/media-libs/libshout/Manifest
@@ -4,6 +4,6 @@ DIST libshout-2.3.1.tar.gz 464229 BLAKE2B 6266e23d34f551e4d8afacc514a4e2e7bb1275
 DIST libshout-2.4.1.tar.gz 516161 BLAKE2B bedea3c043018eff4675fdb8b95e0bb8ff02a98994a4afcc76537124ebf7357f012f2e9445ebd207b576fc4166fb761d65066fe166fc8b611b96f5c5482a0e92 SHA512 4d4b958947e020de3330d49d39d59220fc89315f25f653a7456b9aa24ca9566fca30bb3d65e6348e79958656096b6b864ea8885157d24e55c8d84d6604670219
 EBUILD libshout-2.3.1-r1.ebuild 1216 BLAKE2B a56149d45dcf464a465558d926ff2378685ee8ef1f99ea584bd397e455b80aeb9ac0126898ec4474a3e100eb9b4b32a58dc30eb274430121e82935b7a88dd6db SHA512 977452a7ea64d3076f968bffd73cf81f5c87e18bfa760108cf3120a77b60ef4aa528afba4b6e7913d9832c122187afbdc9c8430e8d1104f0656eba20be735d53
 EBUILD libshout-2.3.1.ebuild 837 BLAKE2B 06e49c76b036ebe4018cfb40df091f48cda71fe516a32a1517744e89e25c90eb177bfe90cc223255be102cf8cdf2405e8941624f62520b6ca19a4ea8e5ab6169 SHA512 f3ca40a99521c197a07dbcad9458b90243fd1ca36e45cd4c9487feee7115a6598eae6c778307dd22e8133b089c5cfdb47b3d237e9d6bf3f75cefc37d0e657913
-EBUILD libshout-2.4.1-r1.ebuild 1321 BLAKE2B f790cd3c6161aaab0eee99332655430225dfb0f06528210ff4ea272d4b8556b632a88b07727ab2124476087980696a91735e53b587528854606d41743b3f4f2c SHA512 d892812cf2d143f076b1c878b92963018dee91c7841ee545800520bf2837f0662a976e11c061ff119081ee72c5403d58c172d7908fbbd466e0dc906852e2701f
+EBUILD libshout-2.4.1-r1.ebuild 1320 BLAKE2B 4614c00a338516f080be4fb7f5e594f732f5d579005440166187afe4dddab79d176389d06f0d7d6c9a6dfde20b77038c449e20559d067eb9ea89e125770ada93 SHA512 2cfff6ef6e565caf3748b5347f72bb01b1b8d9bc0370245713e369da65c08fa0eb0c2758d6508187bbcab735b9e1b4f522eac176d54298052939c6b9cf054ab7
 EBUILD libshout-2.4.1.ebuild 1340 BLAKE2B 654727adb05205043c5aeeb33b285373a7275a4211f894ec5ae64ac801d98cbfbac84423c7287286e22e12d7e79877a735ee24a21a8485ab274d24210e24e129 SHA512 344835f4c72a272295da03a4a3d9df82049504d8056396b793523965652820b12527d1de9eb2f279a21caf636277d035977c60a4c0b8023c8eafc6d8759ed672
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libshout/libshout-2.4.1-r1.ebuild b/media-libs/libshout/libshout-2.4.1-r1.ebuild
index 8fba886bde80..e693573862e6 100644
--- a/media-libs/libshout/libshout-2.4.1-r1.ebuild
+++ b/media-libs/libshout/libshout-2.4.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="libressl speex static-libs theora"
 
 RDEPEND="
diff --git a/media-libs/libtiger/Manifest b/media-libs/libtiger/Manifest
index b3debe88aa1f..b5ecf104d6d9 100644
--- a/media-libs/libtiger/Manifest
+++ b/media-libs/libtiger/Manifest
@@ -1,4 +1,4 @@
 DIST libtiger-0.3.4.tar.gz 383685 BLAKE2B 92bfb1ec5879c9d4af2eb1ecb26eda007fd583121eaa6e3bb23de9f8b477612eb4c87359ec61869c5a70233f1055eedcef270cb79cdd94944013147e04a85bcf SHA512 559e522b5127f32fdd08d62c40dfb493dc2db1efd1e21707d723ef27cbe03e7e38fb04d40856d824ed0c3c94a223ed1a0358fc11ecb30446b5ee5c7a3b802e6d
-EBUILD libtiger-0.3.4-r1.ebuild 893 BLAKE2B 40a4126acb6b181b381709e14887fd157ed06fe50dd82fdc8cfbe56f90eb4965b91b83a72668030dc16776af70fc1eec1dab2de134cb80f6379d302fc4afc2b5 SHA512 7c7abb1c1535312f507c15dddca2063733b11ef1e855c1f96dcac21bedfadb5ecc3d3a82da0887824328d8af514593cbe3093abf9ff8a95b65b36ce80f92ece1
+EBUILD libtiger-0.3.4-r1.ebuild 892 BLAKE2B c34930b7de7ecec6326041af8a5a8d4ce89a0f4eb08630ca84d3a8d5a176c910cdb2c778ac42585a065f484a0042451e8f77dde86eb8aa179bf488ae857b6a50 SHA512 094a6750e795d0e77c99a205dfa32d1d279be56d0b7eff9b25e4ba445e2e375679233a26055ea959a68f1f1613cf2a578b103a8e2e434a92334730f0248f094e
 EBUILD libtiger-0.3.4.ebuild 798 BLAKE2B ee3c41098e2f60aa373eec044ade439558ebb9f2a0ccf520f1bf0c2fe4b2d13b21c2a998f449d8d8e45e687695b013d7a16266bcb99d6c49448e50337c413288 SHA512 efd46d6eea24aae8159d583a08bc809d6a8dca9f4ee5a32ac998e9855b8c6ce5765ffb7d3188f39ec567aeca57230d32af5757e2729617ebe1bf65b2075dd06d
 MISC metadata.xml 550 BLAKE2B 58756433fc1ab142f1f2dc2c465371e19c3838874b697297cf3cd62c88bbfd5805807db521135ab76972cc176b131657caf6ba1c8b75ca792f539816a3baa3d1 SHA512 2590f113bd0261f583083f51aee3beb97771b4a112ed23d2b75028daba956278ad3a56cb7de84973c9bbcc72d1c0ee0e4281531a01a8a44f6e55289d8081a500
diff --git a/media-libs/libtiger/libtiger-0.3.4-r1.ebuild b/media-libs/libtiger/libtiger-0.3.4-r1.ebuild
index b5c91e4239dd..7de47bae7321 100644
--- a/media-libs/libtiger/libtiger-0.3.4-r1.ebuild
+++ b/media-libs/libtiger/libtiger-0.3.4-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://libtiger.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc"
 
 RDEPEND="x11-libs/pango[${MULTILIB_USEDEP}]
diff --git a/media-libs/opus/Manifest b/media-libs/opus/Manifest
index 5e41be7430ec..b7246166d296 100644
--- a/media-libs/opus/Manifest
+++ b/media-libs/opus/Manifest
@@ -2,5 +2,5 @@ AUX opus-1.1.3-CVE-2017-0381.patch 1011 BLAKE2B 856b9b22525e7eb9bd16ebc1d8b6f078
 DIST opus-1.1.3.tar.gz 978848 BLAKE2B 0b376c2d0e219b5821e4219e937121ecd6c7b0f17f5d38ffe841a711a6f6b0551ee9ef1bf657e67005750a8d2cbe4ed262ad231195abff527f39b764e0773d81 SHA512 99fe272ade3f072e38101ec29f9125c9f4f2bacbcc002a9caca6e64a721f6c4193d7b1b81bd8370225693249c94293c4eea980e66c704424939dabbab890ab43
 DIST opus-1.2.1.tar.gz 1011070 BLAKE2B eff3e20c22cd5370a6a3aabf90cfe6f950a3a8d33cbaed8e053ff637c3c45d1d007a10da2f7983564c0bfcc3768f79ffbc041489fc8835f1faaa2fb6c0ef3800 SHA512 4a98d0a7dbd1a313e89407576805fd733c1192e8ef7e1137e3260025478a1cf1c5a8b71b48c372a0cffe6340524137fe47f181651888284f8221fb4d673f7cd5
 EBUILD opus-1.1.3-r1.ebuild 1065 BLAKE2B 633595386e7135ccaf55bc51992a92d739397bb749c47ab11cd6c1f752a32a1989168ea1b04474c04b4066b291cea93f9a76c3aa2941c131788ae53a0e30aa5a SHA512 2fa3b9611b39b9fa3cbd2f0b57cb717cdd3d3df6acba3f046a19205fd10c3c64201e78b94411f17d3aac2128f11a544a2b8463087f5ad85a225560fe535e6c1f
-EBUILD opus-1.2.1.ebuild 1090 BLAKE2B d83b4ef13a14bea3b9593ee406fff1ac5bd4d7c867181761d78ed15e4f031b6c0246e2c265b579991aa19be87b0bd29a24d274a9b9e4623d37297225a37fd5de SHA512 31b1f82f086bf5072b301257e844916d5c46e53fbdd5512bab2e3c1cb18141c3a2652169ad95c9f64db291cb8b4e5e23f53b9142d03ce583bec9bc7b8cdb1d3b
+EBUILD opus-1.2.1.ebuild 1089 BLAKE2B 79d9553c8364174cc3def35478f05e0e44eeb50f5f740aaab8087dcea8354342cfa6bf1d95f54377a076ba8172696c9eba95107f01262702faa1c5a84fe8897a SHA512 58956d735e14b944598436449b3425fb3015e20f9eaaf23f0f3e12e784ae26f7f1281ae3b5b7f25a03235cd7fd9a97158474314386350cfa4e5c007cff331d68
 MISC metadata.xml 415 BLAKE2B 17b08c77ce2fde1c129cbbe276fc1ffe28d7f200769ac2e811c3923d3c069a00c359f42a1aecc01d13fff5ee78e8c786935d1234ac49557be55028daf3136bac SHA512 0138063170ab15d60dace8a720fbde24bbc6c8406835dc5098a70c78b21b39a2d8046844652014734c2121f03200fcaa25a22418c864aa22999a1dc1a6023800
diff --git a/media-libs/opus/opus-1.2.1.ebuild b/media-libs/opus/opus-1.2.1.ebuild
index eb360df62d24..218593fce563 100644
--- a/media-libs/opus/opus-1.2.1.ebuild
+++ b/media-libs/opus/opus-1.2.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz"
 	if [[ "${PV}" != *_alpha* ]] &&  [[ "${PV}" != *_beta* ]] ; then
-		KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd"
+		KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd"
 	fi
 fi
 
diff --git a/media-libs/resid/Manifest b/media-libs/resid/Manifest
index b085a26d5910..4b8065683749 100644
--- a/media-libs/resid/Manifest
+++ b/media-libs/resid/Manifest
@@ -1,4 +1,4 @@
 DIST resid-0.16-p2.tgz 329919 BLAKE2B 00f93b13351ec6387579755ad2b6b44394d6a1d2f2c0a6077e581db01628e84c07e6707b7c8b580492989adc8b5a5f89de670792b38bf2d8037b4abb22f88c2d SHA512 f7e86e97ea6d17c3e75b7763974b1182b49b2498c5fd3c1b0665c026ea6473cda3f9fc70bc123ac1357034879e3caaf41279d2253a8122246dc7e1c70c063d09
-EBUILD resid-0.16_p2-r1.ebuild 950 BLAKE2B 1d357f81b42fabf4384d726c4fb672067735d9d6649c337ec81d845762f8bc5820e1961887d4a3a9d0650603ac1911eb0722a53b333b5965d3c52577950f1006 SHA512 c0d8829bd26028c89ac605864f93c1d32ffd568b4339cf673a69dbe9b8b78e0c41f140d5b7ffafa9de56a5f8b970c9a254b886cabc32042e76ccc04eeef84de1
+EBUILD resid-0.16_p2-r1.ebuild 949 BLAKE2B b3bf89aef55baa5b237b8f970ea227ecb28addf6043c6d815ba498242e22a8e36703444fcc753c80ab9b8027043a7ff6ad8f79516ad880a778c8674b635faf1b SHA512 af8bbdcf71a6160ec6270b74ae57b73473582ca00e54bf060407f82a5dc4eaa2939b54f3de2673064d524c687cd1344233d9c33b9e8c29c95e7313e92f5e48ae
 EBUILD resid-0.16_p2.ebuild 917 BLAKE2B 29a24f61ba93fbe9fea9c0e2673e73167e9006816c357e5a10343fdac23dc227435e46b5e983345cfd9b4a97c23ca822d7593a0b3b517ef404c759e2c52edf7f SHA512 784a25236b9d5d37fe0c65c955296e556869307530d4856681ed2b8d6553bb5228db20e459df1e4693d7cf748a0d17782dfd633ba52d8bc19fec220f68498605
 MISC metadata.xml 331 BLAKE2B 41bbcd40272e97e1e0b10fd8e9471db6bfa393ac15eead124bd6e5885b1a35d746bd5be4ced94ed97d31ea130ed17aee55f81b6582e1895813661e3cf07e55b6 SHA512 83c0e6c0f4c7a85a10c96db7cb2eadffab0ef5e4614b0a091a4e14bb9a37b90d0d509bec47bf75d03853ab39a06ca12bcb5cd89f89e09901340a76c7b5c392e8
diff --git a/media-libs/resid/resid-0.16_p2-r1.ebuild b/media-libs/resid/resid-0.16_p2-r1.ebuild
index aff86979f431..8b002a261a8f 100644
--- a/media-libs/resid/resid-0.16_p2-r1.ebuild
+++ b/media-libs/resid/resid-0.16_p2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/sidplay2/${P/_p/-p}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE="static-libs"
 
 S=${WORKDIR}/${PN}-${MY_MAJ}
diff --git a/media-libs/sdl2-gfx/Manifest b/media-libs/sdl2-gfx/Manifest
index 6617261c8d10..9da1543c602d 100644
--- a/media-libs/sdl2-gfx/Manifest
+++ b/media-libs/sdl2-gfx/Manifest
@@ -1,5 +1,7 @@
 DIST SDL2_gfx-1.0.1.tar.gz 1078780 BLAKE2B 4d6430b2cda1b0d7b9556cba0f6084ce80747f75e89fbd6e55cdec194ebf6c73e397571463261a4113cdd8f79baa433d42c0e80dd6083d07331064c3c2203125 SHA512 413f0ac8a60b6c4c91f154dd72a512f410e134642fefb80cd3482646c9aab7dd56d2cc9015e78ee59b5bc89adc7397a248fe2132077c004114ad6505ca4194de
 DIST SDL2_gfx-1.0.3.tar.gz 1271457 BLAKE2B 9f264a89e07a6a6ded6eb93c5d37310259e25624d8eb129368de6335c7d81e3b3976e641f84caba6f1e66a6cc90545f62d07538638f7547568ca35bafdc3b4de SHA512 4efb48501d635492efcfe06b1d4691911ce58ffc34e3b622f2124ac6d8aa6994196ffb52f16ced4325db3ef6d93719516deab2bcf1ce934df9af06c2fecbdce5
+DIST SDL2_gfx-1.0.4.tar.gz 1230588 BLAKE2B a14cf8433aa171b8185aab765c934262fd4ecde4e45e9c8bdfb4aa7feb97676cd8fb5274ad0452bcf77fcc8f268254184fedc73f1c791ff42305d518d01a8cc7 SHA512 81a100d3c8c3a7c6bd37a23f1290ff10685f8e62fbecd83b0086aae4edc721483e2153cd4219fbd9168f115eea0ea6b25f9be375faf5761f0babdfb1b52fe482
 EBUILD sdl2-gfx-1.0.1.ebuild 906 BLAKE2B d6710b74e45fe57a6a18450232f29e2c07ab16fc88d8540f91345afc88a5c60c137e6395ca05fcb2b4a10b066806b00a7af8ab1aedc5e9f4a70a212ec0149a3d SHA512 01444251cadbdfa513c766afaba299f806a4a16a52a39392ec8bb4a4b7a5389ac0bcd2914303de50a24d30e214e92e19f86d2c648038bfe57fe20c6353764897
 EBUILD sdl2-gfx-1.0.3.ebuild 1028 BLAKE2B 9c5757708b108ef66609f009c8011d0313006f9a0534242ef77ab7425f2698cfa6d9660008827e8d38abe4da9404ba615dadb1179878ca79e773f8ee22309d62 SHA512 c02be52f8abac5d7c383cae09c225ed17c106df90a085661dd62b5546081dcdee7f83461ddf49f0586a55aaade2f6e170e614f754a274e470068bd8a34ffbe58
+EBUILD sdl2-gfx-1.0.4.ebuild 1068 BLAKE2B ceb7350095507ad2027f92ab0def8b2c06e43a88a597b23a997e9f15d49122f0bd6179acfbca19b11e3f31272afd4aa8c82e8f59df1a12404bb4f7d223cc6890 SHA512 77d565c9166283804a584aad3d21bddcc885ad168f3728c6e10857105e034efdfa996a7f9b17304c4b23106df3cf2f7ef6d46df891567fab09074f05768b4d5e
 MISC metadata.xml 801 BLAKE2B f50f493cdd14251d398a3cd92dc0b282fb7cfeb631998e70654c8c2132a698b375be5bd778cce89944b1ddf98161961e54dcf7db0442ba0b09b61c675a36c9d6 SHA512 9ea5f88ee86ff482c56e86b0e83d4f7c56ec17c46824eac8273981c7f6988df4f83299c98972036551a2bfe96b9b099a9f943de77f3586e9db99dd99909085d4
diff --git a/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild b/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild
new file mode 100644
index 000000000000..50a8e683dc38
--- /dev/null
+++ b/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools multilib-minimal
+
+MY_P="${P/sdl2-/SDL2_}"
+DESCRIPTION="Graphics drawing primitives library for SDL2"
+HOMEPAGE="http://www.ferzkopp.net/joomla/content/view/19/14/"
+SRC_URI="http://www.ferzkopp.net/Software/SDL2_gfx/${MY_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc cpu_flags_x86_mmx static-libs"
+
+DEPEND=">=media-libs/libsdl2-2.0.1-r1[video,${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog README )
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+	mv configure.in configure.ac || die
+	sed -i \
+		-e 's/ -O / /' \
+		configure.ac || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	if use doc ; then
+		docinto html
+		dodoc -r Docs/html/*
+	fi
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/media-libs/sdl2-image/Manifest b/media-libs/sdl2-image/Manifest
index 42453eb4ecc6..9479727a54c2 100644
--- a/media-libs/sdl2-image/Manifest
+++ b/media-libs/sdl2-image/Manifest
@@ -1,5 +1,7 @@
 DIST SDL2_image-2.0.1.tar.gz 7797848 BLAKE2B 2be5fd9714c56040987a66107b49cac60659811fd95bc5b8f9e47196905870793bd258a75b8dad3a83bab50294a8ff5eac0f2132118d9f154019d884ce9cb184 SHA512 99ed5f7b69966cea5fcf9173e7270167c24b55ab459774f10dbf90f26dcb9d5f118971ffd4e583a83148976f44ca166474669398a561169d24ffba80f852306f
 DIST SDL2_image-2.0.2.tar.gz 8680980 BLAKE2B e8930872b572f296744a7a90cb61ee6d8b708b99cde19c2c354f5a3f8a16c3ec7669e21f54632fc4cd69d926e7e18066c89e3099061289999e6ed96c56a2bda0 SHA512 468f1a5aaee0b6920adb80df21aaaa41bfc5c642b4a00ac60244a90c5e9f27b092b73bcdd2c5520aa1de2759e8b174686b186a51f2d07e7e188ce2cd10519724
+DIST SDL2_image-2.0.3.tar.gz 8685512 BLAKE2B c54114f6573632561443bc57af8fe3ddbccc0bfcf027939685add7b06cb6999a5bc41119c474481047a7216ce6110a58a08571fefa6b5c80322f15f0c528ad6f SHA512 869cf3485cc850a91dc1d7f0023f0497bc7bbfd63e721365358b19d19d4da850e52667731d0e5ec80f4a11d7687aa6cfbdd5ceaec956af0e7f5567e87535977a
 EBUILD sdl2-image-2.0.1.ebuild 1513 BLAKE2B 22829c449c686770ea9f7dff2dd32d50db973dc202598008eb83acd9c4c72cd12e8490e8ea4ddba0c996ddac5c127de54007226165fcbfc8fe497e4b25c0b814 SHA512 f3da0090838a632b6a6999671e1c89b907f601d80f7c9e09c98480ed117d7f8c5e210c3febb492cb0df9e47c5b5beae01d0bcee60aaef3e53a31588f959d5266
 EBUILD sdl2-image-2.0.2.ebuild 1526 BLAKE2B ef48f1bb77814177af8a4274b0e7af969077b5b167c4368475635e868b831e748347c0c7b68f27126b15981eab39c9ed789ced0fa3df065be73f81c4af792de9 SHA512 23bce8ebe254a12f4b10b71c8b1429d7b7c58225f5b59d8dd69e90be51d73ee9c8406066909601e0a802d4be14c0792d5ab6254f59def37da6f1d524fccfa8ea
+EBUILD sdl2-image-2.0.3.ebuild 1526 BLAKE2B ecca2f25136abc4915c4bf03289dcb7cf0b5e9539c191b6834475c908b22fd3d369afe1b068231c30b4971db8fc9958b8ad2fab3c285e7f134c5cc9a84176886 SHA512 4f695ce6394a8bd80a380a7e179a5599a2576a5e17f2009df4238ce76ff2d9eb423495b36212a42f46d5fe16adc58f043852cfa73f820546b75bcd1f3e1c93bb
 MISC metadata.xml 323 BLAKE2B 7d9dc08cddd37155dbaada0cf585700675350e874677346366807037987e1329fa141585f64101bd844d2ffb7bb6e80d0f53793af223f7a9a716f2e2b80bd245 SHA512 5502470417abb179d755e9d913a30e654bc961aeadcf91747b72b0be3823137ea0f344454744b7e3c450ef4923bce844f8281c85b6019f8decd63a50ea307089
diff --git a/media-libs/sdl2-image/sdl2-image-2.0.3.ebuild b/media-libs/sdl2-image/sdl2-image-2.0.3.ebuild
new file mode 100644
index 000000000000..b2ec369b489f
--- /dev/null
+++ b/media-libs/sdl2-image/sdl2-image-2.0.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit ltprune multilib multilib-minimal
+
+MY_P="SDL2_image-${PV}"
+DESCRIPTION="Image file loading library"
+HOMEPAGE="http://www.libsdl.org/projects/SDL_image/"
+SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gif jpeg png static-libs tiff webp"
+
+RDEPEND="
+	>=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
+	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-3.9.7-r1:0[${MULTILIB_USEDEP}] )
+	webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )"
+DEPEND=${RDEPEND}
+
+S="${WORKDIR}/${MY_P}"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		--disable-sdltest
+		--enable-bmp
+		$(use_enable gif)
+		$(use_enable jpeg jpg)
+		--disable-jpg-shared
+		--enable-lbm
+		--enable-pcx
+		$(use_enable png)
+		--disable-png-shared
+		--enable-pnm
+		--enable-tga
+		$(use_enable tiff tif)
+		--disable-tif-shared
+		--enable-xcf
+		--enable-xpm
+		--enable-xv
+		$(use_enable webp)
+		--disable-webp-shared
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi && newbin .libs/showimage$(get_exeext) showimage2$(get_exeext)
+}
+
+multilib_src_install_all() {
+	dodoc {CHANGES,README}.txt
+	prune_libtool_files
+}
diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest
index 18bab6b71771..201f9086eabd 100644
--- a/media-libs/simage/Manifest
+++ b/media-libs/simage/Manifest
@@ -1,6 +1,5 @@
 AUX simage-1.7.0-libpng15.patch 572 BLAKE2B 7f4eacdd5aac3e6634fd26824d0dfb7ec779fcf6be86e642f2870c62b1f0bd86b1ef767e19034e05fd62cba9904ef45e13a85be7657e00133febb67b0469c337 SHA512 0a867187b0dbc644182784e56dfd26b51f48c9355b01228fe3386fab05cee084e0066d4b18eb3f63110a25c0d2abf8f8b214d9b94e2e7dc7438e90308653e4e8
 AUX simage-1.7.0-pkgconfig-partial.patch 467 BLAKE2B a2957c1d5fc6939df7ecb1bb15743253294142a87f98d4043368f189dc4f5ee302de16e84572a69e3ea5755124326fb075b2e45d3574a1759c899d9e96eaf828 SHA512 791db9c02fc0dc7526ed43b340ab6f92baea91a5bf9005099f6adf1550a7ab73ef36790d2e761f0b50b88098e9124f3035ff21149cca00d819c2262d8e180618
 DIST simage-1.7.0.tar.gz 752602 BLAKE2B feca31f8d41ae67271e43c9c664243d872985068ffc8496d43c9b59a47ae5c3067956acced3ff9abbdc5a360aec662e3972a93d8523a704a72ac9d12dd4cfaa0 SHA512 944ec009dd7041692073ddd9795fdd633fe3bc9101f1c1234e8be3746487a9431aecf52abde01563e719153fbe1ca7d29f9b64042e4a64ea08d6cb14666dd89f
-EBUILD simage-1.7.0-r1.ebuild 1819 BLAKE2B bf3be9828da38712acf316dc1a44c8c093f019d9b2236aa16cfb55b3eefb4e7bbb8eea9012a9275f07f201ed0698560d52de67b0bbe71773d58e80b55c793565 SHA512 7a16ac76fe956c145983c18b2204b390a2bbb3e793ba556db06303204e763ccac6fa6cb5bb05e05b5f3972825a26b9c4253e2f5ff028052ae887fa78b4b43871
-EBUILD simage-1.7.0.ebuild 1797 BLAKE2B a59ec07def228a517d059b4b7bcb1ee1ec177feb681220c3bfc072ae73e3d431760b1b04c3cdeb75bac6d5840233a8ce7725ba243408be6bf659b0de5b421f49 SHA512 fee38faec0e6671220b7eda84c5639be3ea66d88384bda168296de2184e8cc38b45555801ab0c6988fc737af0b60c3d78a34984f48faad99c0236a3baf6182c3
+EBUILD simage-1.7.0-r1.ebuild 1818 BLAKE2B 1361730da3074b31a7c92ab77eee143c65feb422c4ea273184b13e544b9c11d7c065261df7791e717099e6a5217c96c2a752985383cda91b62582bbe84cb1d80 SHA512 e2b3be8b49a413ae5e81398fe46467c3c42548ebf695ad9cf26c37e1dd80165e8bd03f2470a225a2edad663d7a976a44acd6229541cc1d93e586ad642f82f929
 MISC metadata.xml 298 BLAKE2B 312f7a48552438ce1231a58486f19aca02bbb281b72733645ffad42a3f82df778145bfc66a61c1216e47bd68e54668725fe08274482be7fb3997c99bf3089fdc SHA512 b72572413e5e40d55658049b4624de687dd1011553fc384deb0c837830b6f82d060b6356ad25e803f27d3be697b07a8c3fbc45932d20d89e4d9918ed6fecd84a
diff --git a/media-libs/simage/simage-1.7.0-r1.ebuild b/media-libs/simage/simage-1.7.0-r1.ebuild
index b49018795d74..3b6e40d1cafa 100644
--- a/media-libs/simage/simage-1.7.0-r1.ebuild
+++ b/media-libs/simage/simage-1.7.0-r1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://bitbucket.org/Coin3D/simage"
 SRC_URI="https://bitbucket.org/Coin3D/coin/downloads/${P}.tar.gz"
 
 LICENSE="public-domain mpeg2enc"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 x86"
 SLOT="0"
 IUSE="debug gif jpeg jpeg2k png sndfile static-libs tiff vorbis zlib"
 RESTRICT="mirror bindist" #465086
diff --git a/media-libs/simage/simage-1.7.0.ebuild b/media-libs/simage/simage-1.7.0.ebuild
deleted file mode 100644
index 52c69c5549a7..000000000000
--- a/media-libs/simage/simage-1.7.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit base
-
-DESCRIPTION="Image and video texturing library"
-HOMEPAGE="https://bitbucket.org/Coin3D/simage"
-SRC_URI="https://bitbucket.org/Coin3D/coin/downloads/${P}.tar.gz"
-
-LICENSE="public-domain mpeg2enc"
-KEYWORDS="amd64 ~arm ppc x86"
-SLOT="0"
-IUSE="debug gif jpeg jpeg2k png sndfile static-libs tiff vorbis zlib"
-RESTRICT="mirror bindist" #465086
-
-RDEPEND="
-	gif? ( media-libs/giflib )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/jasper )
-	png? ( media-libs/libpng:0 )
-	sndfile? ( media-libs/libsndfile )
-	tiff? ( media-libs/tiff:0 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS=(AUTHORS ChangeLog NEWS README)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.0-pkgconfig-partial.patch
-	"${FILESDIR}"/${PN}-1.7.0-libpng15.patch
-)
-
-# --with-pic, two defined (PIC and one for image format, sillyt), no not pass
-# --enable-qimage, broken Qt checks, unable to locate FHS-compliant Qt install
-# --with-x, not used anywhere
-src_configure() {
-	econf \
-		--disable-qimage \
-		--disable-quicktime \
-		--with-eps \
-		--with-mpeg2enc \
-		--with-rgb \
-		--with-targa \
-		--with-xwd \
-		--without-x \
-		$(use_with gif) \
-		$(use_enable debug) \
-		$(use_enable debug symbols) \
-		$(use_with jpeg) \
-		$(use_with jpeg2k jasper) \
-		$(use_with png) \
-		$(use_with sndfile libsndfile) \
-		$(use_enable static-libs static) \
-		$(use_with tiff) \
-		$(use_with vorbis oggvorbis) \
-		$(use_with zlib)
-}
-
-src_install() {
-	# Remove simage from Libs.private
-	sed -e '/Libs.private/s/ -lsimage//' -i simage.pc || die
-
-	base_src_install
-
-	# Remove libtool files when not needed.
-	use static-libs || rm -f "${D}"/usr/lib*/*.la
-}
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index dad5efa29bcc..141fc7ab5679 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,6 +1,6 @@
 DIST x264-snapshot-20160712-2245.tar.bz2 730644 BLAKE2B 3d80d831c5a13ab95f9a4ba269f959e36aa35f4f2914d435b9e9817fcbe40105f44881b0dbb92cad4b9c41e25536194ff2b7c35925bff9016ebca5e38b16c54e SHA512 ac97730611e6194701a891a7e73c739696664de2411a7937ab0c36a3ce843f22bf2bd2defe053c2506d95652842b99a905b6f16a2f016a9d73059c2c75b71963
 DIST x264-snapshot-20170701-2245.tar.bz2 750527 BLAKE2B ccf276da31383ab4b4a1ac48866bc49b4b2bc5913361c933fa2359de4d6e90cca091dd4aba781f3735a5b28d6ce006aa9d4e149ba48745b80cb971c2952ca867 SHA512 28fc9850c36ac385fced6dec9a0f68a5605a68805e1ef7b8cedcd78917eaa1ad6e47e57fe5a74fee0a6e482f3a33de6011f675e6c77b5db94c8fe01d5c5f3e9f
 EBUILD x264-0.0.20160712.ebuild 1996 BLAKE2B 57431a358195c6c3a061603ceef6dac39c5e74f1ce6c71505a4e670a6f4ca1daa2a43234184d4721cc03142a86d462616fd43f5ba9d4aa7340c5a01767749d6f SHA512 086681d299da2130bd4362d20af2d7085297616a28b8b12bf540bb60bd8032dc934597d39437b5c12805d6e48bef6c6afc2cefd569291325ef597ae6c11d2599
-EBUILD x264-0.0.20170701.ebuild 1912 BLAKE2B ae545331a0b0f7bf451c4890a55ea82b017c654c4e9f26c891be3f653928befdade365e91a5b200b5ce65c9ad050c99d77a4c2d2d0b6807cf0a1afc99e66e225 SHA512 da229f0c8bc4268dd9e06789cb3143134afcf5ed0e012119c5efd04a9f19755295c6ebae8537cda15c8084fcae26e395ca42fb711e986c47a7558c9faebe596b
+EBUILD x264-0.0.20170701.ebuild 1911 BLAKE2B edce919cb2d75af34fd267c3bbf017090f4680551d6e521d153cd3f420ef3abf136dcfc0dc7fea492ef6fce44808e5732a231c77025d15262a0c4115f2ef1d5a SHA512 04a83e15bc66797f79c3a02b9441123d68e7c8bce8a75938a817f6491e6744761829c02e5bf197b18c2ae0e69e345228626765fb84f56375854a48be8372f057
 EBUILD x264-9999.ebuild 1872 BLAKE2B 11fd5c709aff1160cb47eeff901e5e767a62b78ae099dfd7004a88ad2f8409d0fa239cf838fcdd0c6c971cae08a9f1911602c43caf3fdffc715c0f86dfbcb915 SHA512 b45280bc7602ff5787f337a63e121356ac1f659209eeea8e9247fa17d540a7eadbe85ba67865340921e059d627749445bd93e3ed609fa87579628bdd2265aefe
 MISC metadata.xml 589 BLAKE2B c7ee19e724c9c449efda7bf1733193d71c547bc3a80efb51d6b562a8d0134bb618d1daad542cc61fc5d0026467a4336ec0754f238e441cad8cfe72296c4eae07 SHA512 7a4acc6f2cf54f66efee1fedb379ea155559ddca1ff8bae88b5a8638b23555515e9cc31dff7ae6bb16e6d716e616dcb4b508870ad78ab1fe461ba8b7056f524e
diff --git a/media-libs/x264/x264-0.0.20170701.ebuild b/media-libs/x264/x264-0.0.20170701.ebuild
index 4ad0022af19a..aa57487bbfc0 100644
--- a/media-libs/x264/x264-0.0.20170701.ebuild
+++ b/media-libs/x264/x264-0.0.20170701.ebuild
@@ -14,7 +14,7 @@ else
 	inherit versionator
 	MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
 	SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index ff7bc14d8640..ae66376aa738 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest
index 7a89dc644c9e..c4eb689c23e0 100644
--- a/media-plugins/live/Manifest
+++ b/media-plugins/live/Manifest
@@ -15,6 +15,6 @@ EBUILD live-2017.05.24.ebuild 4083 BLAKE2B ad6936bdf6531802afd6bb4760a9f697adc0b
 EBUILD live-2017.06.04.ebuild 4090 BLAKE2B 50e8ea7a3d60bbaff107d0835eea0f501d43b1cfe579b1b64486e2f0761f6dd5d2c81ed43ad05788effd256cffb81e496855647a217bc353ac122626173d2552 SHA512 05afb93c11e0739f8106c637c63e544ec1344d6de6b77c0da113b70821ea38a2e4a1da1eaef6e1f44b8f8dfc15894f288a19c17696f92ac63fd46f488ecdbaf6
 EBUILD live-2017.07.18.ebuild 4090 BLAKE2B 50e8ea7a3d60bbaff107d0835eea0f501d43b1cfe579b1b64486e2f0761f6dd5d2c81ed43ad05788effd256cffb81e496855647a217bc353ac122626173d2552 SHA512 05afb93c11e0739f8106c637c63e544ec1344d6de6b77c0da113b70821ea38a2e4a1da1eaef6e1f44b8f8dfc15894f288a19c17696f92ac63fd46f488ecdbaf6
 EBUILD live-2017.09.12.ebuild 4090 BLAKE2B 50e8ea7a3d60bbaff107d0835eea0f501d43b1cfe579b1b64486e2f0761f6dd5d2c81ed43ad05788effd256cffb81e496855647a217bc353ac122626173d2552 SHA512 05afb93c11e0739f8106c637c63e544ec1344d6de6b77c0da113b70821ea38a2e4a1da1eaef6e1f44b8f8dfc15894f288a19c17696f92ac63fd46f488ecdbaf6
-EBUILD live-2017.10.28.ebuild 4123 BLAKE2B 9fc91b381b34f9365b7acb2bdf16cf2fd54593c8c5791bfe549e2d5f69531c6626365f0d425f919d2590d3cf850057cc2908d0c4dfaf34c6457f48306923a4ee SHA512 92b84bb96904ca7e49317340e516b76173fb9b777e79337bfe1a020c64f6706b93e38662bb873966261e00820d1516d9e77a35a2633c24614af254e576bf3425
+EBUILD live-2017.10.28.ebuild 4122 BLAKE2B 1e0162be62a04b6167072cc455e40517899b5dddb745f677250d62368508e451f8e4e77fa7a9ab22bbcdbed948507593e1204cad22f9866c23e6a63ff43dc964 SHA512 e65d60b5f94c263a40e217dc542c0d63d78f2fd42f96c1e4619ed33e76a09f709ad8c7c85eebee3494cf1600445b3d4451dc7492d8872a59e878d0280c89cc6d
 EBUILD live-2018.01.29.ebuild 4127 BLAKE2B ec6c5912a3bb8f9ef9c4324ee4d6a854f466ce6cd7ea70a35e787315b0a868626e6669da07e41d188c50bd9b19b3e8289e88c749eea31fdc977687ee98d92bfc SHA512 37d4c1ee272c5b15f2b18a70b245d73c3d4cef288b428d21fa905d38bc9acd43cba28723c70a6708a40d01aa62891796a1cb2ef85015e6567dc5c356d693ba1e
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-plugins/live/live-2017.10.28.ebuild b/media-plugins/live/live-2017.10.28.ebuild
index ca918259be48..00420e4a00f0 100644
--- a/media-plugins/live/live-2017.10.28.ebuild
+++ b/media-plugins/live/live-2017.10.28.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz
 	mirror://gentoo/${P/-/.}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="examples static-libs"
 DOCS=( "live-shared/README" )
 
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 7b4750467f59..cfa3ea5320a1 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/bpmdetect/Manifest b/media-sound/bpmdetect/Manifest
index b8ecd86312e1..db58e3d91e79 100644
--- a/media-sound/bpmdetect/Manifest
+++ b/media-sound/bpmdetect/Manifest
@@ -1,6 +1,3 @@
-AUX bpmdetect-0.6.1-fix-buildsystem.patch 1903 BLAKE2B e4b21370c9b668ce30927f744294e93b552a2cbe9e04277782294bfac54651ea4c1d2c68cc76c7cde1635d3929719871bd7aa4124c97cdbfaf7b85419a194fc2 SHA512 52500e1be213b19d2081e5a0d444afb3f55c955ba29fddd9c799cfe0d2359962c19fc64bc8d6649e8a5261fbf9ec8f16efe83b7decdbcf5b71abfd3ecbf15a4d
-AUX bpmdetect-0.6.1-fix-printf-format.patch 1328 BLAKE2B 0182a1e8027730326a20256a5dbbbd873fa8474743414a865d9c73aa44dbc18c0ec2f34cb7edada9677d8c098243e4c89fad780afd5c2ea450b88b09fef05991 SHA512 fa12b7daaf76e04d20b2a681e4e0849e99c93f2aa7a750aadec32c57d478d97005db294e1b613c29f7ad707a361b120863bf3dd69c18dac1be2bf8cbd61d9254
-AUX bpmdetect-0.6.1-gcc44_and_fmodex_path.patch 1439 BLAKE2B 112d8186f61e368d495699fde536c576db923a9141efa9de06cf0f713b5e2b34777ae2c9da49550cc1e46e06f71dfae0e6ada372da7eaf771b8cf80e7eea8f49 SHA512 abd719d7bb3f6bd773643b6cf082fcd7cb39f48d5f6a4143d5f6ec650e2496f97a311ef9c8f762622e04aeea7fbbe79cd7941615499ce655ab434ae69b46d297
-DIST bpmdetect-0.6.1-src.tar.bz2 1433211 BLAKE2B e77d4d18dbcd935c259e9a5ed44a7719656dd5147004c121ec4dcc05e7b067ae423f2e1b3f3ff27405837278468b7a3063cd4362324d4608870d762594ceed55 SHA512 9018b81d4ccca94d000a304ae640b071a0ac748c9c7922f4d3c6894a647594dd712964870898e01ee1d93fb8890491ed62b1d4e5f60f07dae74bda7525f0672a
-EBUILD bpmdetect-0.6.1-r1.ebuild 945 BLAKE2B 27e52a670709f51988b2eac0500ab16b75b54357dca44345745e6e842a9a88b50ab8943c8799947de8cc0fb0097e92546b6565626fc8cf21c6bca2a114990f73 SHA512 883cd4d0ae80882d5039804398bb8740bc1cf04dab86d4afab56ddb3768b4e22519fd49253909fe8f93de8fd65cabad18aad0a25e5a3932b54faf896a7344238
+DIST bpmdetect-0.7.0_pre20170810.tar.gz 257777 BLAKE2B 8a6cfa43b70883d3bf03328c9e52a642140c5a25cd72ea5a9515394551e2ae108135b284b788e12a53e79cb0e2fd916d35a27d743558abb996ad5eb5db7beb45 SHA512 a2bbb67c2e5c46b08396e85fd4b91a5fa8622222929a4a67abdcb4587f04f1d8f40414800cb476f7aaa66d95571dd2d65332e48ed639b621a4351f70ab545779
+EBUILD bpmdetect-0.7.0_pre20170810.ebuild 721 BLAKE2B 260d5a4953ae75e44a219911bb9105ef3f835e465e75e10a2449f39da656c520d884134cac96d6383ccd83472f47ecad56340e5c77cd687f9c0cb687e98e6d04 SHA512 d0ca38ba6f3e489576be488c7c946be6116a539771311f55b3635c98316532fc2bef7a73d51d4688e62ef9081ee02c07a4edc8c993d091a07247b2fc41b09bf0
 MISC metadata.xml 332 BLAKE2B 85eb37ef9ed0b6efcb8611d66b7d8087424e848bd60b819dc3b095480066de0d64d98fc95de3324542e160bdfd9007c80c6391327681df383c03bac26c83754c SHA512 7a6f93e001d436f33d8ee55b467eb2e398b65193ee0c77c0d087916372cba7a5b9693d15aec27e738ea05d54901c1f4f855722384bb9f86d59e10b7d6b6b17d7
diff --git a/media-sound/bpmdetect/bpmdetect-0.6.1-r1.ebuild b/media-sound/bpmdetect/bpmdetect-0.6.1-r1.ebuild
deleted file mode 100644
index 03402a37eec2..000000000000
--- a/media-sound/bpmdetect/bpmdetect-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils scons-utils toolchain-funcs
-
-DESCRIPTION="Automatic BPM detection utility"
-HOMEPAGE="https://sourceforge.net/projects/bpmdetect"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="media-libs/taglib
-	media-libs/id3lib
-	>=media-libs/fmod-4.25.07-r1:1
-	dev-qt/qtgui:4"
-DEPEND="${RDEPEND}
-	sys-apps/sed
-	dev-util/scons
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}
-PATCHES=(
-	"${FILESDIR}/${P}-gcc44_and_fmodex_path.patch"
-	"${FILESDIR}/${P}-fix-buildsystem.patch"
-	"${FILESDIR}/${P}-fix-printf-format.patch"
-)
-
-src_configure() {
-	myscons=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		QTDIR="/usr/$(get_libdir)"
-		prefix="${D}/usr"
-	)
-}
-
-src_compile() {
-	escons "${myscons[@]}"
-}
-
-src_install() {
-	escons "${myscons[@]}" install
-	dodoc authors readme todo
-}
diff --git a/media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810.ebuild b/media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810.ebuild
new file mode 100644
index 000000000000..3f77ce8b3634
--- /dev/null
+++ b/media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=b13aac15904c1f821b1739d00445f49432705387
+inherit cmake-utils vcs-snapshot
+
+DESCRIPTION="Automatic BPM detection utility"
+HOMEPAGE="https://github.com/Tatsh/bpmdetect"
+SRC_URI="https://github.com/Tatsh/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtwidgets:5
+	media-libs/flac
+	media-libs/libmad
+	media-libs/libvorbis
+	media-libs/portaudio
+	media-libs/taglib
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_install() {
+	einstalldocs
+	dobin "${BUILD_DIR}"/src/${PN}
+}
diff --git a/media-sound/bpmdetect/files/bpmdetect-0.6.1-fix-buildsystem.patch b/media-sound/bpmdetect/files/bpmdetect-0.6.1-fix-buildsystem.patch
deleted file mode 100644
index fa6c0e59db68..000000000000
--- a/media-sound/bpmdetect/files/bpmdetect-0.6.1-fix-buildsystem.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-* Fix QA issues in desktop file
-* Make buildsystem respect CXX, CXXFLAGS and LDFLAGS
-https://bugs.gentoo.org/show_bug.cgi?id=334465
-
---- bpmdetect/src/bpmdetect.desktop
-+++ bpmdetect/src/bpmdetect.desktop
-@@ -2,7 +2,7 @@
- Encoding=UTF-8
- Name=BPMDetect
- Exec=bpmdetect
--Icon=bpmdetect-icon.png
-+Icon=bpmdetect-icon
- Type=Application
- Comment=Automatic BPM detection utility
--Categories=Application;AudioVideo;Audio:
-+Categories=AudioVideo;Audio;
---- bpmdetect/src/SConscript
-+++ bpmdetect/src/SConscript
-@@ -1,5 +1,6 @@
- #! /usr/bin/env python
- import os, sys, glob
-+import SCons.Util
- 
- if not sys.platform.startswith('win'):
-   BOLD   ="\033[1m"
-@@ -156,17 +157,18 @@
-     env.__delitem__('CPPPATH')
-   if env.has_key('CPPDEFINES'):
-     env.__delitem__('CPPDEFINES')
--  if env.has_key('CXXFLAGS'):
--    env.__delitem__('CXXFLAGS')
-   if env.has_key('LIBPATH'):
-     env.__delitem__('LIBPATH')
-   if env.has_key('LIBS'):
-     env.__delitem__('LIBS')
--  if env.has_key('LINKFLAGS'):
--    env.__delitem__('LINKFLAGS')
-   if env.has_key('QT3'):
-     env.__delitem__('QT3')
- 
-+  if os.environ.has_key('CXXFLAGS'):
-+    env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
-+  if os.environ.has_key('LDFLAGS'):
-+    env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
-+
-   print BOLD + """
- --------------------------------------------------""" + NORMAL
-   print "Use MinGW compiler                : ",
-@@ -189,7 +191,6 @@
-       env.Append(CXXFLAGS   = '-g')
-   else:
-     print 'no '
--    env.Append(CXXFLAGS = '-O2' )
-     env.Append(CPPDEFINES = ['NDEBUG', 'NO_DEBUG'])
-     env['DEBUG'] = 0
- 
-@@ -309,6 +310,10 @@
-   ( 'LINKFLAGS', 'linker flags'),
-   ( 'QT3', 'use qt3')
- )
-+if os.environ.has_key('CC'):
-+  env['CC'] = os.environ['CC']
-+if os.environ.has_key('CXX'):
-+  env['CXX'] = os.environ['CXX']
- opts.Update(env)
- 
- # to avoid an error message 'how to make target configure... ?'
diff --git a/media-sound/bpmdetect/files/bpmdetect-0.6.1-fix-printf-format.patch b/media-sound/bpmdetect/files/bpmdetect-0.6.1-fix-printf-format.patch
deleted file mode 100644
index 89bf64445e76..000000000000
--- a/media-sound/bpmdetect/files/bpmdetect-0.6.1-fix-printf-format.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Fix broken printf statements:
-* src/main.cpp:49:62: warning: too many arguments for format [-Wformat-extra-args]
-*    printf("Usage:\n bpmdetect [switches] [files]\n\n", version);
-*
-* src/track.cpp:111:57: warning: format ‘%d’ expects argument of type ‘int’, but argument 4 has type ‘double’ [-Wformat=]
-*      snprintf(buffer, BPM_LEN, "%05d", (int) dBPM * 100. );
-
---- bpmdetect/src/main.cpp
-+++ bpmdetect/src/main.cpp
-@@ -34,6 +34,7 @@
- #endif
- 
- #include <getopt.h>
-+#include <stdio.h>
- 
- #include "track.h"
- #include "trackfmod.h"  // for FMOD system
-@@ -46,7 +47,7 @@
- 
- void display_help() {
-   printf("BPMDetect version %s\n\n", version);
--  printf("Usage:\n bpmdetect [switches] [files]\n\n", version);
-+  fputs("Usage:\n bpmdetect [switches] [files]\n\n", stdout);
-   printf("Switches:\n");
- #ifndef NO_GUI
-   printf("-c --console         - run in console mode\n");
---- bpmdetect/src/track.cpp
-+++ bpmdetect/src/track.cpp
-@@ -108,7 +108,7 @@
-   } else if( format == "000" ) {
-     snprintf(buffer, BPM_LEN, "%03d", (int) dBPM );
-   } else if( format == "00000" ) {
--    snprintf(buffer, BPM_LEN, "%05d", (int) dBPM * 100. );
-+    snprintf(buffer, BPM_LEN, "%05d", static_cast<int>(dBPM * 100.) );
-   } else { // all other formats are converted to "0.00"
-     snprintf(buffer, BPM_LEN, "%.2f", dBPM );
-   }
diff --git a/media-sound/bpmdetect/files/bpmdetect-0.6.1-gcc44_and_fmodex_path.patch b/media-sound/bpmdetect/files/bpmdetect-0.6.1-gcc44_and_fmodex_path.patch
deleted file mode 100644
index c29961645615..000000000000
--- a/media-sound/bpmdetect/files/bpmdetect-0.6.1-gcc44_and_fmodex_path.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur bpmdetect.orig/src/main.cpp bpmdetect/src/main.cpp
---- bpmdetect.orig/src/main.cpp	2008-05-01 12:50:18.000000000 +0300
-+++ bpmdetect/src/main.cpp	2009-06-03 22:24:56.000000000 +0300
-@@ -20,6 +20,8 @@
-  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-  ***************************************************************************/
- 
-+#include <cstdio>
-+
- #ifndef NO_GUI
-  #ifdef USE_QT3
-   #include "dlgbpmdetect3.h"
-diff -ur bpmdetect.orig/src/SConscript bpmdetect/src/SConscript
---- bpmdetect.orig/src/SConscript	2008-04-24 19:49:52.000000000 +0300
-+++ bpmdetect/src/SConscript	2009-06-03 22:33:57.000000000 +0300
-@@ -234,7 +234,7 @@
- 
-   env.Append(LIBS = ['id3', 'fmodex', 'z'])
-   env.Append(CPPPATH = ['.', '..', '../includes'])
--  env.Append(LIBPATH = ['.', '../libs'])
-+  env.Append(LIBPATH = ['.', '../libs', '/opt/fmodex/api/lib'])
-   env['ISCONFIGURED']=1
-   # And finally save the options in the cache
-   opts.Save(cachefile, env)
-diff -ur bpmdetect.orig/src/track.cpp bpmdetect/src/track.cpp
---- bpmdetect.orig/src/track.cpp	2008-04-25 22:33:18.000000000 +0300
-+++ bpmdetect/src/track.cpp	2009-06-03 22:26:24.000000000 +0300
-@@ -20,6 +20,8 @@
-  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-  ***************************************************************************/
- 
-+#include <cstdio>
-+
- #include "track.h"
- #include "trackfmod.h"
- #include "BPMDetect.h"
diff --git a/media-sound/deinvert/Manifest b/media-sound/deinvert/Manifest
new file mode 100644
index 000000000000..ab51ff16ff5b
--- /dev/null
+++ b/media-sound/deinvert/Manifest
@@ -0,0 +1,2 @@
+EBUILD deinvert-9999.ebuild 577 BLAKE2B 73d11db67d8e80b4505d7c5e30d16aa94d0980dc8c029399c1970cb7ce3dbc1df5269323afc192ca2d5199a5c9c71ac7713506ff86e7601480a10d9649b96a50 SHA512 43c85e567aedac7f8d8184d70a87403c4a1385536e60fabb23632c13789a177588fd4a525062da4111a9602f0e01e61ac78d173438ffb4137b5a1d3b95018dd0
+MISC metadata.xml 423 BLAKE2B e479098ed0b83916450f63d88e3cd5f899de281847188b3068cc98cbf5b5a2b3aa5d762b6453cb8063de268ec8fe24a92e96b8debbb24289f2d847cbefbe6a59 SHA512 e464f850132dc3fbc1aa1d5c067e061edb7dc6e1dc8b4ccec22aeff906d9934cc42bc8bb9ce5b79c6a2f7fd0eb45d973f85c4ee9340fdd8e41244d8ecb006265
diff --git a/media-sound/deinvert/deinvert-9999.ebuild b/media-sound/deinvert/deinvert-9999.ebuild
new file mode 100644
index 000000000000..8f9dfb0b0b80
--- /dev/null
+++ b/media-sound/deinvert/deinvert-9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit git-r3 autotools
+
+DESCRIPTION="A voice inversion descrambler"
+HOMEPAGE="https://github.com/windytan/deinvert"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/windytan/deinvert.git"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="+liquid +wav"
+
+DEPEND="liquid? ( net-libs/liquid-dsp )
+		wav? ( media-libs/libsndfile )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with liquid) \
+		$(use_with wav sndfile)
+}
diff --git a/media-sound/deinvert/metadata.xml b/media-sound/deinvert/metadata.xml
new file mode 100644
index 000000000000..a075d9becd13
--- /dev/null
+++ b/media-sound/deinvert/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="project">
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
+	<use>
+		<flag name="liquid">improve sound quality using <pkg>net-libs/liquid-dsp</pkg></flag>
+		<flag name="wav">wav file support using <pkg>media-libs/libsndfile</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index 209ef340c5ac..f98f19b86659 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -2,7 +2,7 @@ DIST grip-3.4.3.tar.gz 740870 BLAKE2B d6b703d4ba08bf976a53e70772977a6b0fd5cd231f
 DIST grip-3.5.2.tar.gz 952153 BLAKE2B e82ccb50636e68ab9862d2004a4dbe59399372b76a835b33350e539a186fed516e7b4961fe930b3beb5168554324a5bebeee5ef03d1cb7731d7f9d7c1fd1feb9 SHA512 25fbc1aadfcbab57ae585afe0a6663d9640a3614c1b655abd238f272116eccf524e4de465784265cd1f12b48c4cdeb9fdd318f989052400a0bfc9855a5420421
 DIST grip-3.6.2.tar.gz 959393 BLAKE2B 09f7c6bbd5e82ada26795f082feb0d35cd21e14bac0e5881502c65d1e64f501eb086d5843b5120408186435ce6a95771bcf94972881fc449d4c4c2130f929066 SHA512 8aba6dbf4cb374dbe76fb5358f4b550187840a1248f9a60d8441a123ad5abe49d6fe4bcd491047d19432dd90a6dbd9060737f9e2ba19fa60e5e4c50ec5fd8cf8
 DIST grip-3.6.3.tar.gz 960255 BLAKE2B 9aad33c04e98f60e5f7871e36f2e4bf616a16486482e7363d165ae7d9fc5343a52583e490b9b9757d31b051e6e96165d35931370e2681d727db7abb0854db2d5 SHA512 f94c5dc24a1355a024833992d05a7c05d84367a004607c9d6c7aa6d4bc24dd93b11e0a061689eb521a8abe637472011a1a4c8e968c48ac8447457cffc4d2957d
-EBUILD grip-3.4.3.ebuild 1208 BLAKE2B 02a70b62576c3c42717e1492e3f2592a5e694722c4f527f5a34c39868df1b5307f812905d7c8d7e072cad9a0a2fa1138a198fde7e872394010dbac5d7ed8381f SHA512 7d9b2282e8c4ff9570fe382c2e8e99ae81505007a2da45379fc83682dcec1324efaf34d695effac0486563dad46a3e7cee8e007f2361e9c480a74e8d9fb6b88e
+EBUILD grip-3.4.3.ebuild 1207 BLAKE2B 014b3ae549e72ae4960820532e746337a3d821684f98e19619ab9314441c2be743df3e7049885c921bd5d09f837d275a661116a9c258cfce1008f7978a5fcb00 SHA512 e6fff5d8728217b346a200ee84bec062212be2a2b37e5e942f730d897e53983df66e032a72e7540be6aa83732cd9bd0bdf20566b66ebf6a37a21f1e909a6f44c
 EBUILD grip-3.5.2.ebuild 1214 BLAKE2B bc9c0ff5cd0ae7969eb7ceaa3b328ffacf090c3e76d828d0e9135bf57b50b872dbf9fa0da9abc0b33aae27e045361d306a1c990af424032d15a326a74cafbe11 SHA512 6da4ad712b0da1f19b2e851a4b6ea7122b97bfd77cc5e5a2393888cccf1a241b0cde2359bebd9486885df15cf890802993655370d404c4d8e31756f4e8191b92
 EBUILD grip-3.6.2.ebuild 1214 BLAKE2B bc9c0ff5cd0ae7969eb7ceaa3b328ffacf090c3e76d828d0e9135bf57b50b872dbf9fa0da9abc0b33aae27e045361d306a1c990af424032d15a326a74cafbe11 SHA512 6da4ad712b0da1f19b2e851a4b6ea7122b97bfd77cc5e5a2393888cccf1a241b0cde2359bebd9486885df15cf890802993655370d404c4d8e31756f4e8191b92
 EBUILD grip-3.6.3.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a
diff --git a/media-sound/grip/grip-3.4.3.ebuild b/media-sound/grip/grip-3.4.3.ebuild
index 42a84e6794cf..7eb40385061a 100644
--- a/media-sound/grip/grip-3.4.3.ebuild
+++ b/media-sound/grip/grip-3.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="vorbis"
 
 # lame and vorbis-tools are no real RDEPENDs. But without them
diff --git a/media-sound/mpfc/Manifest b/media-sound/mpfc/Manifest
index 6f74562bbce0..def659fcbd0b 100644
--- a/media-sound/mpfc/Manifest
+++ b/media-sound/mpfc/Manifest
@@ -8,5 +8,5 @@ AUX mpfc-gcc4.patch 475 BLAKE2B b45c0c674cca9d8cc78fb3e5e0926f35eb1e2f88daf2780d
 DIST mpfc-1.3.7.tar.gz 869364 BLAKE2B 4ce61a80efad417c138b51ae1b994a2db64ed0ed07e5d0af47d69569edb1f2f8fed6a653ac18ef5c10bf2cdc83f21ded71947614c43fe9a79efeee5c9f27da81 SHA512 bef536c639a4d2422d0e04ca9aa6c18cee28e4936349ec796a4a25dd069fe0a7996c0d32b18b29b25f5acfa11e4fd4fe78becfe447d6726574bc320041fdf3d6
 DIST mpfc-1.3.8.1.tar.gz 1042027 BLAKE2B 2d0e1991397930d8251db4c766705b769e24adf518d963bc56bba92f3aaf9deeedca2331e6fbeab609d4fd0dc49a69a35f3180149b7f35c0d94795e6be22ff59 SHA512 071e12ea784a8610aa6621f5afa1c6ba1e2a3ffe0deac8175b8b43b4446f0c54ff049fd8321aff7551766fe4561a974e39bbf93e30b353b25e27673ea9584573
 EBUILD mpfc-1.3.7-r1.ebuild 1218 BLAKE2B 1baf1abcf29ef1bb549bae11e9142b45d94472b3537bbc728c3bfbd5f0dfcfebb43a5805be8f5de9e334e71048cc82602e4bea9751933cbe05058112cfb588f3 SHA512 ccb9d1ea5dd52c4579a21f5a427ee3179a49d93a318982409a2c081f734976c76111b2600c87896ab0b42f1adc3e8d1e734d134f1aa959cce4acec9dc9bc48fa
-EBUILD mpfc-1.3.8.1-r2.ebuild 1138 BLAKE2B 7d38ae6e7466835119b45fe61a1f6a8bfe040d7d8f5b6b3a5b16636a243e387fe48374ac2a3c5b43c6b793653933059f4ba442983fdcf4c513c7c995fe100a50 SHA512 c99f8991562e22511dc85ae595d3e68eb378b49ca28be3b45b6e9840bf6edac5ded005eb7655226127d20a58adc7168ea2978ce6d3cd21a976a56f896a3ab569
+EBUILD mpfc-1.3.8.1-r2.ebuild 1137 BLAKE2B 2927f31392c5f6c32cc9f9636f0c1db5bd74f2fb014e8e05abf2ec25e39637a0e626652b364a212099e24f94b11249996196439211fb16e502eac177bc4b5a15 SHA512 3be5513f85958b9911102319c742659ec0acc0ecc694827b3c78fd7a61a5f704eed693a2460cbb8bff53dc4ef896c053e5128aec587f52b4126f67aec55b1c6b
 MISC metadata.xml 413 BLAKE2B 5ce36b2246ccdaa78683c2964ffb56a1f88956ef6bba4d5582840febeae3d55612a2ec1291b43d6016983763daf23aa7ae325b0a923080a469e520b258d74a1b SHA512 fd972a9e503642f833b6c08bfc662bec020bb9e88959e433e6c20ef582c2b05edd248d2b652cf2b884097fae888ab29413b41efa731399cffb261a10e6435b3a
diff --git a/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild b/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild
index 1888d65c297d..1c9f36d00895 100644
--- a/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild
+++ b/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="alsa cdda flac gpm mad nls oss static-libs vorbis wav"
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0 )
diff --git a/media-sound/twolame/Manifest b/media-sound/twolame/Manifest
index b156fb025d70..ee019b73b15f 100644
--- a/media-sound/twolame/Manifest
+++ b/media-sound/twolame/Manifest
@@ -1,5 +1,5 @@
 AUX 0.3.13-perl-tests.patch 779 BLAKE2B eba221a58a16dc22ec7e6a10388045db6a2b2535a9f0a55e47a01315aa0c0121c1473aa6ff9f53b7bcf4b70a849a0b19bfe3125213f558c17ecb1d4fd1349376 SHA512 1c483daf75991fa6d390360d9108803f65fa894745140d3955f73ce8e87eb813a068efa810988ac462ed22ae0bf3d0f95b63feb5c823ce3bfa3a0dc9b9a8f413
 DIST twolame-0.3.13.tar.gz 660415 BLAKE2B 741e91983546241b984ce95ef3b1c3b00ff2c1e84f496961749b13b932a1c3fdcd44a3fde3a24e44d9a3ff9e859e64780ad60949f827d986608c51c1afe44912 SHA512 241ae5faebf05cb919959bb0545cb89e9b71cfb07f92a7118d864499ea4f0065ddaa646ab1482ffbcbca427d52c2436764074bd67fd19a1eb9979987f23163f7
 EBUILD twolame-0.3.13-r1.ebuild 1278 BLAKE2B c05844c52abfcb8efe905b6dce55f1edd0debbebf9bb34045868f14668febdee46b2fcbd4e874187b6063ac398c73becacceae53197819a7ab5b9aa2ff097f2d SHA512 7bd73ac55b501c24bd9d46946412bdd784e3d11036863b185f81f8a91d1ebdbbc0a12ab9567e8dc5cd1335f61aa6276c976db34464d474905192835cb2a4e8c3
-EBUILD twolame-0.3.13-r2.ebuild 1396 BLAKE2B 726523db64818d25a45438e35f92755cbb6b813667b7edc6ecf9045cdb73497f8c3152650c94354e71322fdd0b519a179a1a5921a9c4a51bb49f1042843cdc2f SHA512 aa876984500c4acc5e44b57979b91105a2e357ed1f678e4943179b71f620fe26426600551e67f10e3298f3b46afea2f881ebc6c9632ca3864b4ab8e83183ad2d
+EBUILD twolame-0.3.13-r2.ebuild 1395 BLAKE2B f7f56565716b0b5e85ecb6f664b88c0d41859b99a012bdc89a64e4161984d09ce7a3b1b2d349b44f4316010d0134d12b09c83fe97eb4d1019617b4f235bd0e1d SHA512 a20d13298ac058438e68dcbc7928af3435fd25a30663566f7bd3a5305c6277374722d5838973cdf056fd92bcfb694f3400c6f84e3b4a909a6ebc90e1e3224b23
 MISC metadata.xml 330 BLAKE2B 71d39da341e5e41047c01d3b77c1090a4d1304c7ae915832d6cebe103c52cee3d0d27dd0b09c66d775efb4ee3bec3696bd6f27ca5cb78acc2a563f3992a26fc2 SHA512 4ef98f0ddd18034ac0ea2e93a84560e62b02c3ee6186f980b20733d88f68e36f3724f2b2b8c138393f9c6da1b4b943f318fcc85b5f57817fbaac33d68e4b6ea8
diff --git a/media-sound/twolame/twolame-0.3.13-r2.ebuild b/media-sound/twolame/twolame-0.3.13-r2.ebuild
index 012958ca1cfb..43c58553aad6 100644
--- a/media-sound/twolame/twolame-0.3.13-r2.ebuild
+++ b/media-sound/twolame/twolame-0.3.13-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}]
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index b12301db2505..ddd21025a284 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest
index 4694ccc73515..c92d4ae8e496 100644
--- a/media-video/mediainfo/Manifest
+++ b/media-video/mediainfo/Manifest
@@ -1,3 +1,3 @@
 DIST mediainfo_17.12.tar.xz 1335676 BLAKE2B 66bf02f74a63b40446cb061fe6422c84d61cb10db53394a7b356e0c0b76a7c934548bf75a8e8e5556a3fab2bd2f65c2a8c3d57040bd404e5258f0cfa4f87bbd9 SHA512 3fd6c8538c7703e657c6c20fec3ba071e5575f6010f41188bdd46749ecad9bddfa2362a5f0df6c23aa98375bb9078f14704b0729d1c54174449871992b968ff9
-EBUILD mediainfo-17.12.ebuild 1548 BLAKE2B a07b5d07fc129aa58dcd70c682f8fbeb6d220304c527589adc544e97af335bea6a40518b6795ba3b5774e547c9b660bf2d22967bf01e9a3b6f99a9683c930ac3 SHA512 7b881f5f0199a8fb044fc5fdbe0856f769bb4e94a3a684e49cd69d089de4cb0921c1a4c47a971ddb3a99bc98e289806054e2581cf9c053b215b8867a85d511d6
+EBUILD mediainfo-17.12.ebuild 1584 BLAKE2B 49cea9ff3121b817481007311568e514170c93a07c1c6eb51b39758d7b1069e48c3e42b253a16d048a1a346cf687df74328cb605e4a4ffd25861b41abb789db9 SHA512 c34ec1a3a435ea8e511da66e370d8924c1583d3193479ac02f492afa0b3830c6a841e80986f37243331f8121969f01dcce2f7e12d6531f5a44c24f8578312e82
 MISC metadata.xml 343 BLAKE2B 53fbddabb217e6584379432d0ee85ef7e8a5a9ba13bf0e9fe71a22c2a1f0495d692e51cf17ea17427f22d65c94fc97bb7c5d0a3407e9c810c91616aa92d3e71e SHA512 3647e319de82c1521bd1e6a28dc7a64435b052130102d7a4b6f1478d92cfc94a164b7d9435855b4929d584be2f886f6bc51c84f6cb63b8431ac028583d57f0a3
diff --git a/media-video/mediainfo/mediainfo-17.12.ebuild b/media-video/mediainfo/mediainfo-17.12.ebuild
index a6625f97df57..904d5ce192e3 100644
--- a/media-video/mediainfo/mediainfo-17.12.ebuild
+++ b/media-video/mediainfo/mediainfo-17.12.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 WX_GTK_VER="3.0"
 
-inherit eutils autotools wxwidgets
+inherit eutils gnome2-utils xdg-utils autotools wxwidgets
 
 DESCRIPTION="MediaInfo supplies technical and tag information about media files"
 HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo"
@@ -34,8 +34,8 @@ src_prepare() {
 
 	local target
 	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		sed -i -e "s:-O2::" configure.ac
+		cd "${S}"/Project/GNU/${target} || die
+		sed -i -e "s:-O2::" configure.ac || die
 		eautoreconf
 	done
 }
@@ -43,7 +43,7 @@ src_prepare() {
 src_configure() {
 	local target
 	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
+		cd "${S}"/Project/GNU/${target} || die
 		local args=""
 		[[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui"
 		econf ${args}
@@ -53,19 +53,25 @@ src_configure() {
 src_compile() {
 	local target
 	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
+		cd "${S}"/Project/GNU/${target} || die
 		default
 	done
 }
 src_install() {
 	local target
 	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
+		cd "${S}"/Project/GNU/${target} || die
 		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
 }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index de34e6ee48c5..ecbb338f9e5d 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -9,7 +9,7 @@ DIST mpv-0.27.2.tar.gz 2957191 BLAKE2B 35e316e5a30869ae44ff229e99ae11a88e2f7d55b
 DIST mpv-0.28.2.tar.gz 2982558 BLAKE2B 5faef4122d456916f43bd603192fc72dee1ad16fa3c842d54a2e53dc8f9db416545549a86af62481fe211dc088821ab13b832c09f82572b36167dd3a73d57f62 SHA512 e6206e8c65dca084e2cfa73ab09278b7113cdfd90b89877d1f75a1068c6379a093ea3955a023857357683edce1aba8c12ee441fd195d887af4d939fc7b66cef4
 DIST waf-1.9.8 100685 BLAKE2B b335115b7ba5af4f8f49fc4da7967fa20e0633bfc7de7ad28fdb58dfcf7ae9c7833d053d298280e26e94b18af70a66fc13d08adf1fc7f9ad9b81e70d95cc74fc SHA512 e7493767f65deeb38aa162adef22adf60ebbd038410e9cdf4fe6f0de8c43395dbbba14962aa2c3855e1277136085fc22ad12ebfb8ac4e76f16358296039b8ea2
 EBUILD mpv-0.25.0-r2.ebuild 10902 BLAKE2B fa9ae811c53d01d32b8288696436783f9cf434d04255c45ae5efb73d68821afe5bfc3a2548fde646e11b35b4329ca61fc4bf3d18e7277538274a10440cde9069 SHA512 00c1edd4c77e859fc03d8cbadfefa7278bceb94d788d1306478fbf7b7535225c15e6dc65058eccf8251b9e6f3a4f9ce7ba04bfbc2065ccff13416fc5a32ebb7b
-EBUILD mpv-0.27.2.ebuild 10487 BLAKE2B 8e1de0d8491f76a535c525ce2a21ff1d63e73598cacf7799d1f42757f858e735aae423603be56f331632c911f3d106053e8a094d5c432e78bd67d0553457b447 SHA512 348e2a0450a5501e059102bfc1990dbc1bb2925dd25d92715b155e74b17a1a9be4e7932679f7a87c95ff985fc1f0ee15e146054ca1bc8a8e4a631593b6f3203b
+EBUILD mpv-0.27.2.ebuild 10486 BLAKE2B a583f569c6750d7e4daa06fa61caedadb1b0b6ac1213ff0020b5a80a456716f46e10b9b6f365e2d1ac41ec09734e5444db880d89498a104045ceffb2c18ff4dc SHA512 d1c8610722510c4995b5e2ebf9dfe70f67eb2d9ffd9a6fb9c9c112136833920165c5d9ad59304e84a219518a560813df75baecc0ec8471f173a7ac6807872508
 EBUILD mpv-0.28.2.ebuild 10152 BLAKE2B 6db64e6256c2d495cd90418d61829b57d362209ad8ab8c7c1ae3d41ea6df7bf1b3d605ca3f86ab67131ac5358dafb438563e6956ff11d1120f62ca1da8069fce SHA512 f2195ec248b398e4733d416e259f36a707bdf17f873ad6be52c01ce986f359ab3defad5bdcade5c57609e6403ee8e47f93a3e3ae54732e14f3beb492e803bad6
 EBUILD mpv-9999.ebuild 10005 BLAKE2B af956f671b10b3789ae90d4a673acb6dd44d32c7e83a2b69c39c0db2f628fcd49d6b886a104ba6c13e001a4287b93cc11f81de38e644df3be9bc360a06e3e81b SHA512 17bd0ddbcc8cfff1397bf9bc115f2996d67386b5c9e32a103cbda91e37f223d19ad10b3331a725af84a2008b9685624e4612f0be46ce2cadc6d42bb30f5a73e9
 MISC metadata.xml 2376 BLAKE2B c585e5f1e6e5c91ad9c3ad25de75bde9f01188950bafdf016c2f3b55a5cc74e48775667e173962178f13bbae5b40d2a386144bba7343ec21a2b60f2ee9c1c6c7 SHA512 8da450ad8b003eacfc8aab85b8774206163305750c559e4e7e4e8a56b4e3c398f9cea970430b37d26069c6ec333a4ae860c012a63d702dfb24dc65089edaa604
diff --git a/media-video/mpv/mpv-0.27.2.ebuild b/media-video/mpv/mpv-0.27.2.ebuild
index d7d0db2307b2..7da7cfa3035c 100644
--- a/media-video/mpv/mpv-0.27.2.ebuild
+++ b/media-video/mpv/mpv-0.27.2.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} != *9999* ]]; then
 		https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~kensington/distfiles/${P}-patches-${PR}.tar.xz
 	"
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux"
+	KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux"
 	DOCS=( RELEASE_NOTES )
 else
 	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 43870be1e649..f190cc16a236 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index a8825650bef3..4577adfbcdee 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 04 Mar 2018 19:38:22 +0000
+Tue, 06 Mar 2018 04:38:21 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 77d8703bdf4d..3397cd997155 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 417232 BLAKE2B 7256b86def71c225a3d9dc487b8217c32b8e0d58d1b9f3a1083e97e2c6b17e54c18da8cf9a71ada0833db640196a3e7d3555def34aec158a2e0c71d1765833a9 SHA512 db3950573646f27d9773367cf555ac709438501ff12e19a7fc8e548310965fa7df325bfa82b64a05710a8bd90473ce9b15232aa53f547d2525ad7fd1cbc4f804
-TIMESTAMP 2018-03-04T19:38:26Z
+TIMESTAMP 2018-03-06T04:38:25Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlqcSzJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlqeG0FfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA0mQ/9HM3H4XPQjE3VnD6nZWxSsMLl4o2mr8qJkk/OyXBW4sCaC+sA0/5pGJwc
-k6AKzbeCOaw8WLfQymuYWnqaq1o323SpnOiJLkOSu2RYO8Txo/ZEbS+SDlskQpHs
-yhz/LX016M+M4S+ICCvoOhOg77ixNm8o1Hd/R5wGSBSXBAgNqmOEZoUFvAlf60uT
-Q5sru/+jL7PH4FBpZ8SSt7qTfEN7k2v8i81f6kuaq5mMebRiZhfmnu6pDLBpzKU8
-pSjPCThQWDPYUsYC4kYdHkwL7msCUToWSqM0e0xVrV0ODVjklU/xikZ8L7T2fJMk
-edZW7dW3jsaudUcH7lJLCqdPFmup6py6iwXWYV5cAPlJ/sn1SaLiX4lik600rGu+
-tupwKX0/nHu3Qx8bwamcQtzvmkDsCFaAqR+m63hKokfnTNzq03+5H4kMMAQiS+9/
-UIb1ZfJZRdOwqG/qmfxJE+fFvnh0w3ZvHlokva5TdjIjE/PS2sih4jNKHtog84oe
-5fRkFMkT79R6dOqlUxCBwjDzv6yH6Q0FWprr8BVC40nlVjrx3iXdZD9dLSE53vQL
-T5cvIfMBwW8m4l4BmQ9G/wNBQqeTAzNXBJh2I0wA9ARVCYQ2AxT5j40ceW4ZJFin
-6h/T8VpDREFSWvhj9y/rvvP7jBGVHEMiWSMK/j0DgSGHzBUj6F4=
-=spci
+klCn6hAAiBsZiCkKBI/diPQaIG0asjijDHXG9XI2rxkHWFU+2sAbDFBskQnYfnH1
+49KW/haW6E7nsEZNj1FiZZFdawoEZhwnoIYFyOXDK9zU9s4KtS2Bwo5T4RNXvRYA
+uhfMFaUK8H8reyRdGjS7+ZUogSgHsYr6xmchE4RoyggVOXVYRNYPO/zBfRHZZIg5
+Hwux2AiNUGqZXHqWn2ZIo+eQ5B8u8560M4URXrCq5qigVIElyynyWEOT/tlJF/6d
+wk2ZV1VAO1nFhsrPCRq3/BMUyYwNkI7mWrurPwNW1uzuMqoD2XFgrk++qclbGLwd
+sFKmkVKGbAQRgkvwpRWzoWEPWrpcyRoTYUJMR1DBfp7gdA7eWb1WU1YGLuFyKVFe
+BiG2bDd/miHPpjGi6Bx98LJyj5UksdWjZk8fkyY8mUQ+AKmu8Balu6jOucLkfnDi
+6cjGo4dHfT54+xlbiy/QYxhsTmUgtwrmHWKPgsTmDJPuA95dq0zQC8wcNjkiNsWm
+6r+RMJduFfP9TGigxbznpfGN9B3z4a8nm6LsDieMu7BUQBjIUzruTgC6NSI+Qqgm
+xRdxBRihOyl0R2/oR2rpCxbNhlUOTuQtNYHIAQniqTVrr0Ce+t8lHBsZOldOu29F
+2G0S/+PF3h38M6BTRIYPbQxY3yJNLdhYO15bQz1kJjKglGIgzUE=
+=Av5z
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index a8825650bef3..979711297af5 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 04 Mar 2018 19:38:22 +0000
+Tue, 06 Mar 2018 04:38:22 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index cdcdd6db5206..a3274dc97698 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index ef7bff05710a..fffd5dc5e6b0 100644
Binary files a/metadata/md5-cache/app-accessibility/Manifest.gz and b/metadata/md5-cache/app-accessibility/Manifest.gz differ
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.24.1 b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.24.1
index 26578dfeccdb..31846c764224 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.24.1
+++ b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.24.1
@@ -4,10 +4,10 @@ DESCRIPTION=Gtk module for bridging AT-SPI to Atk
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Accessibility
 IUSE=test 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 test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2+
 RDEPEND=>=app-accessibility/at-spi2-core-2.17.90[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/atk-2.15.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(-)?] >=dev-libs/glib-2.32: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(-)?] >=sys-apps/dbus-1.5[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(-)?] !<gnome-extra/at-spi-1.32.0-r1
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-atk/2.24/at-spi2-atk-2.24.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=67713bda92fd6b4235432b1b06089e39
+_md5_=aa84fff03e6508370f2adeed0e7c1a9e
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-core-2.24.1 b/metadata/md5-cache/app-accessibility/at-spi2-core-2.24.1
index ba0adc11b35d..6d1f86099984 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-core-2.24.1
+++ b/metadata/md5-cache/app-accessibility/at-spi2-core-2.24.1
@@ -4,10 +4,10 @@ DESCRIPTION=D-Bus accessibility specifications and registration daemon
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Accessibility
 IUSE=X +introspection 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 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.36: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(-)?] >=sys-apps/dbus-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(-)?] x11-libs/libSM[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/libXi[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/libXtst[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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) X? ( 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/libXi[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/libXtst[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=2
 SRC_URI=mirror://gnome/sources/at-spi2-core/2.24/at-spi2-core-2.24.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=79b2b00f42dd9472864bde1ea21cdb78
+_md5_=bc75c0df850bc67f5274cdbfcce4bf81
diff --git a/metadata/md5-cache/app-accessibility/speech-dispatcher-0.8.7 b/metadata/md5-cache/app-accessibility/speech-dispatcher-0.8.7
index 6870928edb3d..bd03891ab676 100644
--- a/metadata/md5-cache/app-accessibility/speech-dispatcher-0.8.7
+++ b/metadata/md5-cache/app-accessibility/speech-dispatcher-0.8.7
@@ -4,11 +4,11 @@ DESCRIPTION=Speech synthesis interface
 EAPI=6
 HOMEPAGE=http://www.freebsoft.org/speechd
 IUSE=alsa ao +espeak flite nas pulseaudio python static-libs python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=python? ( 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-libs/dotconf-1.3 >=dev-libs/glib-2.28:2 dev-libs/libltdl:0 >=media-libs/libsndfile-1.0.2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) espeak? ( app-accessibility/espeak ) flite? ( app-accessibility/flite ) nas? ( media-libs/nas ) pulseaudio? ( media-sound/pulseaudio ) dev-python/pyxdg
 REQUIRED_USE=python? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=http://www.freebsoft.org/pub/projects/speechd/speech-dispatcher-0.8.7.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b9bea1c4d57c21f7cc42178ddd1f43cd
+_md5_=7efb3574f8e3294604a74ae341acd4c0
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 9d150575d8e2..f263598ce0f3 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/conserver-8.1.18-r1 b/metadata/md5-cache/app-admin/conserver-8.1.18-r1
index 1ca1e0ced372..83ba6d751a30 100644
--- a/metadata/md5-cache/app-admin/conserver-8.1.18-r1
+++ b/metadata/md5-cache/app-admin/conserver-8.1.18-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Serial Console Manager
 EAPI=5
 HOMEPAGE=http://www.conserver.com/
 IUSE=kerberos libressl pam ssl tcpd debug ssl
-KEYWORDS=alpha amd64 ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ia64 ppc ~ppc64 ~sparc x86
 LICENSE=BSD GPL-2
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) debug? ( dev-libs/dmalloc ) kerberos? ( virtual/krb5 net-libs/libgssglue ) pam? ( >=sys-auth/pambase-20080219.1 )
 SLOT=0
 SRC_URI=http://www.conserver.com/conserver-8.1.18.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=af08e139fe246f8a55fb26324b8bf582
+_md5_=84ff40c14091d181bc85c7b80aec6a9d
diff --git a/metadata/md5-cache/app-admin/keepassxc-2.3.0 b/metadata/md5-cache/app-admin/keepassxc-2.3.0-r1
similarity index 92%
rename from metadata/md5-cache/app-admin/keepassxc-2.3.0
rename to metadata/md5-cache/app-admin/keepassxc-2.3.0-r1
index e02843c4789a..0c8349780a00 100644
--- a/metadata/md5-cache/app-admin/keepassxc-2.3.0
+++ b/metadata/md5-cache/app-admin/keepassxc-2.3.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) browser? ( >=dev-libs/libsodium-1.0.12 ) yubikey? ( sys-auth/ykpers ) dev-qt/linguist-tools:5 dev-qt/qtconcurrent:5 test? ( dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) browser? ( >=dev-libs/libsodium-1.0.12 ) yubikey? ( sys-auth/ykpers ) dev-qt/linguist-tools:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
 DESCRIPTION=KeePassXC - KeePass Cross-platform Community Edition
 EAPI=6
 HOMEPAGE=https://keepassxc.org
@@ -10,4 +10,4 @@ RDEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtdbus:5
 SLOT=0
 SRC_URI=https://github.com/keepassxreboot/keepassxc/releases/download/2.3.0/keepassxc-2.3.0-src.tar.xz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3a80caae412adf438810539ecf3b9d04
+_md5_=74b8625ac0bfb0918acb11fd15c974b4
diff --git a/metadata/md5-cache/app-admin/keepassxc-9999 b/metadata/md5-cache/app-admin/keepassxc-9999
index 8d55ea0f418a..ffb5665861a4 100644
--- a/metadata/md5-cache/app-admin/keepassxc-9999
+++ b/metadata/md5-cache/app-admin/keepassxc-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) browser? ( >=dev-libs/libsodium-1.0.12 ) yubikey? ( sys-auth/ykpers ) dev-qt/linguist-tools:5 dev-qt/qtconcurrent:5 test? ( dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
+DEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) browser? ( >=dev-libs/libsodium-1.0.12 ) yubikey? ( sys-auth/ykpers ) dev-qt/linguist-tools:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=KeePassXC - KeePass Cross-platform Community Edition
 EAPI=6
 HOMEPAGE=https://keepassxc.org
@@ -8,4 +8,4 @@ LICENSE=LGPL-2.1 GPL-2 GPL-3
 RDEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) browser? ( >=dev-libs/libsodium-1.0.12 ) yubikey? ( sys-auth/ykpers )
 SLOT=0
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3a80caae412adf438810539ecf3b9d04
+_md5_=74b8625ac0bfb0918acb11fd15c974b4
diff --git a/metadata/md5-cache/app-admin/webalizer-2.23.08 b/metadata/md5-cache/app-admin/webalizer-2.23.08
index 38881f8c5fff..8ed3ea92e587 100644
--- a/metadata/md5-cache/app-admin/webalizer-2.23.08
+++ b/metadata/md5-cache/app-admin/webalizer-2.23.08
@@ -4,10 +4,10 @@ DESCRIPTION=Webserver log file analyzer
 EAPI=5
 HOMEPAGE=http://www.webalizer.org/
 IUSE=bzip2 xtended geoip nls vhosts
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/db-4.2:* >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2:0= >=media-libs/gd-1.8.3[png] dev-libs/geoip bzip2? ( app-arch/bzip2 ) >=app-admin/webapp-config-1.50.15
 SLOT=0
 SRC_URI=ftp://ftp.mrunix.net/pub/webalizer/webalizer-2.23-08-src.tar.bz2 xtended? ( http://patrickfrei.ch/webalizer/rb30/webalizer-2.23-08-RB30-patch.tar.gz ) https://dev.gentoo.org/~blueness/webalizer/webalizer.conf.gz ftp://ftp.mrunix.net/pub/webalizer/geodb//webalizer-geodb-20140201.tgz
 _eclasses_=db-use	582140d1a711279e50ce284fc7b609f5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=83ef145f15f8bb53eccfcfa33fefc1e1
+_md5_=12905a8e8da9a8b9797c6a2de3944a4e
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index aa3f852b9b42..f0146ab16633 100644
Binary files a/metadata/md5-cache/app-arch/Manifest.gz and b/metadata/md5-cache/app-arch/Manifest.gz differ
diff --git a/metadata/md5-cache/app-arch/gnome-autoar-0.2.2 b/metadata/md5-cache/app-arch/gnome-autoar-0.2.2
index a1db760b872d..e9aaf837031d 100644
--- a/metadata/md5-cache/app-arch/gnome-autoar-0.2.2
+++ b/metadata/md5-cache/app-arch/gnome-autoar-0.2.2
@@ -4,11 +4,11 @@ DESCRIPTION=Automatic archives creating and extracting library
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gnome-autoar
 IUSE=gtk +introspection vala
-KEYWORDS=~alpha amd64 ~arm64 ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2+ GPL-2+
 RDEPEND=>=app-arch/libarchive-3.2.0 >=dev-libs/glib-2.35.6:2 gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-autoar/0.2/gnome-autoar-0.2.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bce269baad32350dc7a678a1a27b05f2
+_md5_=fac1763c0afbeb60ac019aec494ca14e
diff --git a/metadata/md5-cache/app-arch/lziprecover-1.18 b/metadata/md5-cache/app-arch/lziprecover-1.18
deleted file mode 100644
index 1e13ff1d48c5..000000000000
--- a/metadata/md5-cache/app-arch/lziprecover-1.18
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=Lziprecover is a data recovery tool and decompressor for lzip compressed files
-EAPI=6
-HOMEPAGE=http://www.nongnu.org/lzip/lziprecover.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=http://download.savannah.gnu.org/releases-noredirect/lzip/lziprecover/lziprecover-1.18.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2b4edd93ff7bd9430a7ac43b479b365a
diff --git a/metadata/md5-cache/app-arch/lziprecover-1.20_rc1 b/metadata/md5-cache/app-arch/lziprecover-1.20
similarity index 69%
rename from metadata/md5-cache/app-arch/lziprecover-1.20_rc1
rename to metadata/md5-cache/app-arch/lziprecover-1.20
index 526c23f8dec9..d78d1c3b28da 100644
--- a/metadata/md5-cache/app-arch/lziprecover-1.20_rc1
+++ b/metadata/md5-cache/app-arch/lziprecover-1.20
@@ -5,6 +5,6 @@ HOMEPAGE=http://www.nongnu.org/lzip/lziprecover.html
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
-SRC_URI=http://download.savannah.gnu.org/releases/lzip/lziprecover/lziprecover-1.20-rc1.tar.gz http://download.savannah.gnu.org/releases-noredirect/lzip/lziprecover/lziprecover-1.20-rc1.tar.gz
+SRC_URI=http://download.savannah.gnu.org/releases/lzip/lziprecover/lziprecover-1.20.tar.gz http://download.savannah.gnu.org/releases-noredirect/lzip/lziprecover/lziprecover-1.20.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=76c8f12143ea1193eeda7004a1c9492d
+_md5_=e380a749f60ad6fc8e61f10cc85a9fa5
diff --git a/metadata/md5-cache/app-arch/zip-3.0-r3 b/metadata/md5-cache/app-arch/zip-3.0-r3
index db524df8057d..e4afadccf75c 100644
--- a/metadata/md5-cache/app-arch/zip-3.0-r3
+++ b/metadata/md5-cache/app-arch/zip-3.0-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Info ZIP (encryption support)
 EAPI=4
 HOMEPAGE=http://www.info-zip.org/
 IUSE=bzip2 crypt natspec unicode
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux
 LICENSE=Info-ZIP
 RDEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
 SLOT=0
 SRC_URI=mirror://sourceforge/infozip/zip30.zip
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1a75d158939b2fc30af3e85b53bcc933
+_md5_=9693d0e8b900c7b3ada15a1f8fbfd928
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index ef705192a077..b3bd9032018e 100644
Binary files a/metadata/md5-cache/app-backup/Manifest.gz and b/metadata/md5-cache/app-backup/Manifest.gz differ
diff --git a/metadata/md5-cache/app-backup/btrbk-0.26.1 b/metadata/md5-cache/app-backup/btrbk-0.26.1
new file mode 100644
index 000000000000..bc81c98cedf7
--- /dev/null
+++ b/metadata/md5-cache/app-backup/btrbk-0.26.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst preinst
+DEPEND=>=app-text/asciidoc-8.6.0 app-text/xmlto virtual/pkgconfig
+DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
+EAPI=6
+HOMEPAGE=https://digint.ch/btrbk/
+IUSE=+pv
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-lang/perl net-misc/openssh pv? ( sys-apps/pv ) >=sys-fs/btrfs-progs-3.18.2
+SLOT=0
+SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.26.1.tar.xz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=d84c0089ee1d686a83ecc197f7743377
diff --git a/metadata/md5-cache/app-backup/btrbk-9999 b/metadata/md5-cache/app-backup/btrbk-9999
index 4b95e64f1ad7..1c11be0e6bed 100644
--- a/metadata/md5-cache/app-backup/btrbk-9999
+++ b/metadata/md5-cache/app-backup/btrbk-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-3+
 RDEPEND=dev-lang/perl net-misc/openssh pv? ( sys-apps/pv ) >=sys-fs/btrfs-progs-3.18.2
 SLOT=0
 _eclasses_=git-r3	fec09a83ae965b041b47f5ff7c8ba29a	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=72dd05a9b7b704c16c57d48f820ec99d
+_md5_=d84c0089ee1d686a83ecc197f7743377
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index 3622f609da4c..c96689b6e063 100644
Binary files a/metadata/md5-cache/app-cdr/Manifest.gz and b/metadata/md5-cache/app-cdr/Manifest.gz differ
diff --git a/metadata/md5-cache/app-cdr/isomaster-1.3.11 b/metadata/md5-cache/app-cdr/isomaster-1.3.11
deleted file mode 100644
index 39d85a73b3c6..000000000000
--- a/metadata/md5-cache/app-cdr/isomaster-1.3.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=>=dev-libs/iniparser-3.0.0:0 x11-libs/gtk+:2 virtual/pkgconfig nls? ( >=sys-devel/gettext-0.19.1 )
-DESCRIPTION=Graphical CD image editor for reading, modifying and writing ISO images
-EAPI=4
-HOMEPAGE=http://littlesvr.ca/isomaster
-IUSE=nls
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/iniparser-3.0.0:0 x11-libs/gtk+:2
-SLOT=0
-SRC_URI=http://littlesvr.ca/isomaster/releases/isomaster-1.3.11.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c82bdf7ed531cdf2c334a699362c6e1e
diff --git a/metadata/md5-cache/app-cdr/isomaster-1.3.5 b/metadata/md5-cache/app-cdr/isomaster-1.3.5
deleted file mode 100644
index 4273cf9316c2..000000000000
--- a/metadata/md5-cache/app-cdr/isomaster-1.3.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=x11-libs/gtk+-2:2 virtual/pkgconfig
-DESCRIPTION=Graphical CD image editor for reading, modifying and writing ISO images
-EAPI=2
-HOMEPAGE=http://littlesvr.ca/isomaster
-KEYWORDS=amd64 x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=x11-libs/gtk+-2:2
-SLOT=0
-SRC_URI=http://littlesvr.ca/isomaster/releases/isomaster-1.3.5.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a6b62783fbdfe231d3c523fc58b086c1
diff --git a/metadata/md5-cache/app-cdr/isomaster-1.3.9-r1 b/metadata/md5-cache/app-cdr/isomaster-1.3.9-r1
deleted file mode 100644
index 8477e8ec23c4..000000000000
--- a/metadata/md5-cache/app-cdr/isomaster-1.3.9-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=>=dev-libs/iniparser-3.0.0:0 x11-libs/gtk+:2 virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=Graphical CD image editor for reading, modifying and writing ISO images
-EAPI=4
-HOMEPAGE=http://littlesvr.ca/isomaster
-IUSE=nls
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/iniparser-3.0.0:0 x11-libs/gtk+:2
-SLOT=0
-SRC_URI=http://littlesvr.ca/isomaster/releases/isomaster-1.3.9.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ac4f3d4461636c0a019ead15ad4be6e4
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 26fd063022cf..826ef1bec17b 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/xca-1.4.1 b/metadata/md5-cache/app-crypt/xca-1.4.1
new file mode 100644
index 000000000000..417064ed97f1
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/xca-1.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm
+DEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) doc? ( app-text/linuxdoc-tools )
+DESCRIPTION=A GUI to OpenSSL, RSA public keys, certificates, signing requests etc
+EAPI=6
+HOMEPAGE=http://hohnstaedt.de/xca/
+IUSE=bindist doc libressl
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) doc? ( app-text/linuxdoc-tools )
+SLOT=0
+SRC_URI=https://github.com/chris2511/xca/releases/download/RELEASE.1.4.1/xca-1.4.1.tar.gz
+_eclasses_=xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=da78a89c2e1e9f857a91e6ee3704a78a
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index f8a830903f48..8204854b978b 100644
Binary files a/metadata/md5-cache/app-doc/Manifest.gz and b/metadata/md5-cache/app-doc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-doc/jargon-4.4.7-r1 b/metadata/md5-cache/app-doc/jargon-4.4.7-r1
index 8beee77c7021..92ae81cfffc3 100644
--- a/metadata/md5-cache/app-doc/jargon-4.4.7-r1
+++ b/metadata/md5-cache/app-doc/jargon-4.4.7-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=A compendium of hacker slang illuminating many aspects of hackish tradition
 EAPI=6
 HOMEPAGE=http://www.catb.org/~esr/jargon
-KEYWORDS=~alpha amd64 hppa ia64 ~mips ~ppc ~ppc64 sparc x86
+KEYWORDS=alpha amd64 hppa ia64 ~mips ~ppc ~ppc64 sparc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://www.catb.org/~esr/jargon/jargon-4.4.7.tar.gz
-_md5_=af755f88117be19b890cfb563454f560
+_md5_=0643db99f9e199db92282e37b8a46d84
diff --git a/metadata/md5-cache/app-doc/linux-kernel-in-a-nutshell-1-r1 b/metadata/md5-cache/app-doc/linux-kernel-in-a-nutshell-1-r1
index 479f12c49805..7cd16dddfe3d 100644
--- a/metadata/md5-cache/app-doc/linux-kernel-in-a-nutshell-1-r1
+++ b/metadata/md5-cache/app-doc/linux-kernel-in-a-nutshell-1-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Linux Kernel in a Nutshell: A Desktop Quick Reference
 EAPI=6
 HOMEPAGE=http://www.kroah.com/lkn/
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86
 LICENSE=CC-BY-SA-2.5
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/people/gregkh/lkn/lkn_pdf.tar.bz2 mirror://kernel/linux/kernel/people/gregkh/lkn/lkn_xml.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e9d96e0a74e4ce63958c9a1db1ffa057
+_md5_=7495bb76ab4759d200186d371eddf0a9
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index c63cb3912ea9..967e01fc3112 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/leo-5.1 b/metadata/md5-cache/app-editors/leo-5.1
deleted file mode 100644
index 2cd590be1041..000000000000
--- a/metadata/md5-cache/app-editors/leo-5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/silvercity[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[X,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-arch/unzip 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_python2_7(-)]
-DESCRIPTION=Leo: Literate Editor with Outlines
-EAPI=5
-HOMEPAGE=https://github.com/leo-editor/leo-editor/
-IUSE=doc python_targets_python2_7
-KEYWORDS=amd64 ppc x86
-LICENSE=MIT
-RDEPEND=app-text/silvercity[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[X,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] 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_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/leo/Leo-5.1-final.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5c28811061e04e65bc133dc5bd66785a
diff --git a/metadata/md5-cache/app-editors/leo-5.6 b/metadata/md5-cache/app-editors/leo-5.6
index 8c401f0f06f7..5e985e5320f7 100644
--- a/metadata/md5-cache/app-editors/leo-5.6
+++ b/metadata/md5-cache/app-editors/leo-5.6
@@ -4,11 +4,11 @@ DESCRIPTION=Leo: Literate Editor with Outlines
 EAPI=6
 HOMEPAGE=https://github.com/leo-editor/leo-editor/
 IUSE=doc python_targets_python2_7
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=app-text/silvercity[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] 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_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/leo-editor/leo-editor/archive/5.6.tar.gz -> leo-5.6.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6b44ec36cca55de43cba34fcfa352502
+_md5_=c3f1e7cccfe38390a8760968bcbedb0f
diff --git a/metadata/md5-cache/app-editors/uemacs-pk-4.0.15_p20180117 b/metadata/md5-cache/app-editors/uemacs-pk-4.0.15_p20180117
index b658b8b90a80..4ee5be2616fd 100644
--- a/metadata/md5-cache/app-editors/uemacs-pk-4.0.15_p20180117
+++ b/metadata/md5-cache/app-editors/uemacs-pk-4.0.15_p20180117
@@ -3,10 +3,10 @@ DEPEND=sys-libs/ncurses:0= virtual/pkgconfig
 DESCRIPTION=uEmacs/PK is an enhanced version of MicroEMACS
 EAPI=6
 HOMEPAGE=https://git.kernel.org/?p=editors/uemacs/uemacs.git;a=summary ftp://ftp.cs.helsinki.fi/pub/Software/Local/uEmacs-PK
-KEYWORDS=~amd64 x86 ~x86-fbsd
+KEYWORDS=amd64 x86 ~x86-fbsd
 LICENSE=free-noncomm
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/uemacs-4.0.15_p20180117.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=df296fd7e85b5a470eb52bda20de746d
+_md5_=f56e395aa1efe5f7d357bb962ea05947
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 0a8aa013e9c7..68a6d053f3a0 100644
Binary files a/metadata/md5-cache/app-emacs/Manifest.gz and b/metadata/md5-cache/app-emacs/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emacs/ebuild-mode-1.42 b/metadata/md5-cache/app-emacs/ebuild-mode-1.42
index e3bf678bb587..aa4f51678822 100644
--- a/metadata/md5-cache/app-emacs/ebuild-mode-1.42
+++ b/metadata/md5-cache/app-emacs/ebuild-mode-1.42
@@ -3,10 +3,10 @@ DEPEND=sys-apps/texinfo >=virtual/emacs-23
 DESCRIPTION=Emacs modes for editing ebuilds and other Gentoo specific files
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.42.tar.xz
 _eclasses_=elisp	8a9eaaa38b2345593b1cbc5315dde83c	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
-_md5_=6db77cc15a5f904f37d555f0f4a21cb3
+_md5_=c4e6d816271ac217d3a24e1f2cfd9a49
diff --git a/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6 b/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6
deleted file mode 100644
index 2ba753c406e2..000000000000
--- a/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst setup
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=Common files needed by all GNU Emacs versions
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-IUSE=games X
-KEYWORDS=alpha amd64 arm ~arm64 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 ~x86-solaris
-LICENSE=GPL-3+
-PDEPEND=virtual/emacs
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/emacs/emacs-common-gentoo-1.6.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1a5d9212d3c521707aa22fad9fe6d2f3
diff --git a/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r1 b/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r1
index ea6c5593ccaf..d88ce5bc37b5 100644
--- a/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r1
+++ b/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Common files needed by all GNU Emacs versions
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
 IUSE=games X
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 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 ~x86-solaris
 LICENSE=GPL-3+
 PDEPEND=virtual/emacs
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/emacs-common-gentoo-1.6.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=66bfac68d6c39049e9c839c258fd978e
+_md5_=c3268371a4f857a3536f0fea8e172043
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 426ef2ffb548..c2e8d30f4603 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/fuse-1.4.0 b/metadata/md5-cache/app-emulation/fuse-1.5.1
similarity index 80%
rename from metadata/md5-cache/app-emulation/fuse-1.4.0
rename to metadata/md5-cache/app-emulation/fuse-1.5.1
index 826684c01d98..6e3730327385 100644
--- a/metadata/md5-cache/app-emulation/fuse-1.4.0
+++ b/metadata/md5-cache/app-emulation/fuse-1.5.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure
-DEPEND=>=app-emulation/libspectrum-1.4.0 dev-libs/glib:2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) gpm? ( sys-libs/gpm ) gtk? ( x11-libs/gtk+:3 ) joystick? ( media-libs/libjsw ) png? ( media-libs/libpng:0= sys-libs/zlib ) sdl? ( media-libs/libsdl ) svga? ( media-libs/svgalib ) X? ( x11-libs/libX11 x11-libs/libXext ) xml? ( dev-libs/libxml2:2 ) fbcon? ( virtual/linux-sources ) dev-lang/perl virtual/pkgconfig
+DEPEND=>=app-emulation/libspectrum-1.4.1 dev-libs/glib:2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) gpm? ( sys-libs/gpm ) gtk? ( x11-libs/gtk+:3 ) joystick? ( media-libs/libjsw ) png? ( media-libs/libpng:0= sys-libs/zlib ) sdl? ( media-libs/libsdl ) svga? ( media-libs/svgalib ) X? ( x11-libs/libX11 x11-libs/libXext ) xml? ( dev-libs/libxml2:2 ) fbcon? ( virtual/linux-sources ) dev-lang/perl virtual/pkgconfig
 DESCRIPTION=Free Unix Spectrum Emulator by Philip Kendall
 EAPI=6
 HOMEPAGE=http://fuse-emulator.sourceforge.net
 IUSE=alsa ao fbcon gpm gtk joystick memlimit png sdl svga X xml
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=>=app-emulation/libspectrum-1.4.0 dev-libs/glib:2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) gpm? ( sys-libs/gpm ) gtk? ( x11-libs/gtk+:3 ) joystick? ( media-libs/libjsw ) png? ( media-libs/libpng:0= sys-libs/zlib ) sdl? ( media-libs/libsdl ) svga? ( media-libs/svgalib ) X? ( x11-libs/libX11 x11-libs/libXext ) xml? ( dev-libs/libxml2:2 )
+RDEPEND=>=app-emulation/libspectrum-1.4.1 dev-libs/glib:2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) gpm? ( sys-libs/gpm ) gtk? ( x11-libs/gtk+:3 ) joystick? ( media-libs/libjsw ) png? ( media-libs/libpng:0= sys-libs/zlib ) sdl? ( media-libs/libsdl ) svga? ( media-libs/svgalib ) X? ( x11-libs/libX11 x11-libs/libXext ) xml? ( dev-libs/libxml2:2 )
 REQUIRED_USE=^^ ( X fbcon gtk sdl svga )
 SLOT=0
-SRC_URI=mirror://sourceforge/fuse-emulator/fuse-1.4.0.tar.gz
-_md5_=d58d745782061988786412e6eb3765e6
+SRC_URI=mirror://sourceforge/fuse-emulator/fuse-1.5.1.tar.gz
+_md5_=63c1b580125211b1f49fb056b88a1d5a
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 69d4b5781b20..8983d19e5ade 100644
Binary files a/metadata/md5-cache/app-eselect/Manifest.gz and b/metadata/md5-cache/app-eselect/Manifest.gz differ
diff --git a/metadata/md5-cache/app-eselect/eselect-postgresql-2.3 b/metadata/md5-cache/app-eselect/eselect-postgresql-2.3
index 0e42720496e3..8ca0a42acd34 100644
--- a/metadata/md5-cache/app-eselect/eselect-postgresql-2.3
+++ b/metadata/md5-cache/app-eselect/eselect-postgresql-2.3
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Utility to select the default PostgreSQL slot
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=!<dev-db/postgresql-9.6.2-r1:9.6 !<dev-db/postgresql-9.5.6-r1:9.5 !<dev-db/postgresql-9.4.11-r1:9.4 !<dev-db/postgresql-9.3.16-r1:9.3 !<dev-db/postgresql-9.2.20-r1
 RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~titanofold/eselect-postgresql-2.3.tbz2
-_md5_=8a9b6fe485f98792fc5987ed68e560b1
+_md5_=94cd2b4192f49124428e76f8e61bf16f
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 91e2358e496b..2b0f6283ce7e 100644
Binary files a/metadata/md5-cache/app-i18n/Manifest.gz and b/metadata/md5-cache/app-i18n/Manifest.gz differ
diff --git a/metadata/md5-cache/app-i18n/canna-3.7_p3-r3 b/metadata/md5-cache/app-i18n/canna-3.7_p3-r3
index 4f10c96eb71e..598546375558 100644
--- a/metadata/md5-cache/app-i18n/canna-3.7_p3-r3
+++ b/metadata/md5-cache/app-i18n/canna-3.7_p3-r3
@@ -4,10 +4,10 @@ DESCRIPTION=A client-server based Kana-Kanji conversion system
 EAPI=6
 HOMEPAGE=http://canna.osdn.jp/
 IUSE=canuum doc ipv6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT GPL-2
 RDEPEND=canuum? ( dev-libs/libspt sys-libs/ncurses:= )
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/canna/9565/Canna37p3.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	cannadic	6d8054590c0aef2c11c567e1a815c052	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2d2a0de148165143fffe581271be1f03
+_md5_=b1026274d71d4055f0065f8cf46fb812
diff --git a/metadata/md5-cache/app-i18n/tomoe-0.6.0-r3 b/metadata/md5-cache/app-i18n/tomoe-0.6.0-r3
index aa74c6c29269..5e3c25f9a1aa 100644
--- a/metadata/md5-cache/app-i18n/tomoe-0.6.0-r3
+++ b/metadata/md5-cache/app-i18n/tomoe-0.6.0-r3
@@ -4,7 +4,7 @@ DESCRIPTION=Japanese handwriting recognition engine
 EAPI=6
 HOMEPAGE=http://tomoe.osdn.jp/
 IUSE=hyperestraier mysql python ruby ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 static-libs subversion python_targets_python2_7
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 hyperestraier? ( app-text/hyperestraier ) mysql? ( virtual/libmysqlclient ) python? ( 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(+)] dev-python/pygobject: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/pygtk: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(+)] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 ) virtual/rubygems dev-ruby/ruby-glib2[ruby_targets_ruby22?,ruby_targets_ruby23?,ruby_targets_ruby24?] ) subversion? ( dev-vcs/subversion )
 REQUIRED_USE=python? ( python_targets_python2_7 ) ruby? ( || ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/tomoe/tomoe-0.6.0.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=dd6ff1e88a8d25e4327f312d12a9c08e
+_md5_=924f9761f0e8f244ad6da6880b05e53f
diff --git a/metadata/md5-cache/app-leechcraft/Manifest.gz b/metadata/md5-cache/app-leechcraft/Manifest.gz
index 8c0832d10253..3b8a48003e46 100644
Binary files a/metadata/md5-cache/app-leechcraft/Manifest.gz and b/metadata/md5-cache/app-leechcraft/Manifest.gz differ
diff --git a/metadata/md5-cache/app-leechcraft/lc-popishu-9999 b/metadata/md5-cache/app-leechcraft/lc-popishu-9999
index be0083b665c5..1913375620cb 100644
--- a/metadata/md5-cache/app-leechcraft/lc-popishu-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-popishu-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~app-leechcraft/lc-core-9999 x11-libs/qscintilla[qt5] sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
+DEPEND=~app-leechcraft/lc-core-9999 x11-libs/qscintilla[qt5(+)] sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Popishu, the text editor with IDE features for LeechCraft
 EAPI=6
 HOMEPAGE=https://leechcraft.org/
 IUSE=debug
 LICENSE=Boost-1.0
-RDEPEND=~app-leechcraft/lc-core-9999 x11-libs/qscintilla[qt5]
+RDEPEND=~app-leechcraft/lc-core-9999 x11-libs/qscintilla[qt5(+)]
 SLOT=0
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	leechcraft	fbb3e7bd8381996814635f10596cca6b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=83de8d247715474d97ddde706ca79c9e
+_md5_=8581c56bfd15bd97ff1a8c567ca49fc9
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index c6889bbc65bc..a4dc79295a75 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/calendar-0.9.1-r1 b/metadata/md5-cache/app-misc/calendar-0.9.1-r1
index 97001c071e17..4f7a8dbdcc72 100644
--- a/metadata/md5-cache/app-misc/calendar-0.9.1-r1
+++ b/metadata/md5-cache/app-misc/calendar-0.9.1-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Standard unix calendar program for Linux, ported from OpenBSD
 EAPI=6
 HOMEPAGE=http://bsdcalendar.sourceforge.net/
-KEYWORDS=~alpha amd64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86
+KEYWORDS=alpha amd64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://bsdcalendar.sourceforge.net/calendar-0.9.1.tar.bz2
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a4e950e39fbd613e4cecb61f4921bf23
+_md5_=d759b9e2e633cc5e4d4753d356c84206
diff --git a/metadata/md5-cache/app-misc/dailystrips-1.0.28-r3 b/metadata/md5-cache/app-misc/dailystrips-1.0.28-r3
index 0080d9ea283e..f01891fbd2a0 100644
--- a/metadata/md5-cache/app-misc/dailystrips-1.0.28-r3
+++ b/metadata/md5-cache/app-misc/dailystrips-1.0.28-r3
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=dailystrips automatically downloads your favorite online comics from the web
 EAPI=6
 HOMEPAGE=http://dailystrips.sourceforge.net/
-KEYWORDS=~alpha amd64 ~ppc x86
+KEYWORDS=alpha amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-perl/libwww-perl-5.50 dev-perl/DateTime dev-perl/TimeDate
 SLOT=0
 SRC_URI=mirror://sourceforge/dailystrips/dailystrips-1.0.28.tar.gz
-_md5_=f0c9016a713196dc8351d05127f1e579
+_md5_=2668a282bc1284b0c0017ece20ebee7b
diff --git a/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r2 b/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r2
index 733f59665d1e..85c2c44181fc 100644
--- a/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r2
+++ b/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Inputlirc daemon to utilize /dev/input/event*
 EAPI=6
 HOMEPAGE=https://github.com/ferdinandhuebner/inputlirc
-KEYWORDS=~alpha amd64 ~arm64 ia64 ~ppc ~ppc64 x86
+KEYWORDS=alpha amd64 ~arm64 ia64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://gentooexperimental.org/~genstef/dist/inputlircd-0.0.1_pre15.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2e5d7e484bc91b7dec2430a1c3b02d56
+_md5_=7e7dad1725755c1b16b0db4e4719eb78
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index e4e618b31f70..b6c038e64af1 100644
Binary files a/metadata/md5-cache/app-office/Manifest.gz and b/metadata/md5-cache/app-office/Manifest.gz differ
diff --git a/metadata/md5-cache/app-office/scribus-1.5.3-r1 b/metadata/md5-cache/app-office/scribus-1.5.3-r1
index 2caa7d594a93..bc3fa66d132a 100644
--- a/metadata/md5-cache/app-office/scribus-1.5.3-r1
+++ b/metadata/md5-cache/app-office/scribus-1.5.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Desktop publishing (DTP) and layout program
 EAPI=6
 HOMEPAGE=https://www.scribus.net/
 IUSE=+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk l10n_af l10n_ar l10n_bg l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_de-1901 l10n_de-CH l10n_de-DE l10n_el l10n_en-AU l10n_en-GB l10n_en-US l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_gl l10n_he l10n_hr l10n_hu l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_kab l10n_kn l10n_ko l10n_ku l10n_la l10n_lt l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_sa l10n_sk l10n_sl l10n_so l10n_sq l10n_sr l10n_sv l10n_te l10n_th l10n_tr l10n_uk l10n_zh-CN l10n_zh-TW python_targets_python2_7
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~hppa ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=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-text/libmspub app-text/poppler:= dev-libs/hyphen >=dev-libs/icu-58.2:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.62:= ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,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(+)] ) tk? ( dev-python/pillow[tk?,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-text/ghostscript-gpl
 REQUIRED_USE=python_targets_python2_7 tk? ( scripts )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/scribus/scribus-devel/1.5.3/scribus-1.5.3.tar.xz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3527612b14ccce154ccc488f9b454eb9
+_md5_=a06da8400a47d924816a60eac36a20b6
diff --git a/metadata/md5-cache/app-officeext/Manifest.gz b/metadata/md5-cache/app-officeext/Manifest.gz
index e7b3df948a43..a8925ab50e71 100644
Binary files a/metadata/md5-cache/app-officeext/Manifest.gz and b/metadata/md5-cache/app-officeext/Manifest.gz differ
diff --git a/metadata/md5-cache/app-officeext/ooofbtools-2.48 b/metadata/md5-cache/app-officeext/ooofbtools-2.48
deleted file mode 100644
index 6e675cf5c5ce..000000000000
--- a/metadata/md5-cache/app-officeext/ooofbtools-2.48
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm unpack
-DEPEND=office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) ) office_implementation_openoffice? ( app-office/openoffice-bin ) app-arch/unzip
-DESCRIPTION=OpenOffice extension for the FictionBook2 format with validation
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/fbtools/
-IUSE=office_implementation_libreoffice office_implementation_openoffice
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/libxml2 app-arch/zip office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) ) office_implementation_openoffice? ( app-office/openoffice-bin )
-REQUIRED_USE=|| ( office_implementation_libreoffice office_implementation_openoffice )
-SLOT=0
-SRC_URI=mirror://sourceforge/fbtools/files/release/OOoFBTools-2.48.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	office-ext-r1	bb4127989b6cee094cde73ac366c2b9d	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fbac8914606054d14460e9955b76e002
diff --git a/metadata/md5-cache/app-officeext/ooofbtools-2.50 b/metadata/md5-cache/app-officeext/ooofbtools-2.50
deleted file mode 100644
index a384507ea16f..000000000000
--- a/metadata/md5-cache/app-officeext/ooofbtools-2.50
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm unpack
-DEPEND=office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) ) office_implementation_openoffice? ( app-office/openoffice-bin ) app-arch/unzip
-DESCRIPTION=OpenOffice extension for the FictionBook2 format with validation
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/fbtools/
-IUSE=office_implementation_libreoffice office_implementation_openoffice
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/libxml2 app-arch/zip office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) ) office_implementation_openoffice? ( app-office/openoffice-bin )
-REQUIRED_USE=|| ( office_implementation_libreoffice office_implementation_openoffice )
-SLOT=0
-SRC_URI=mirror://sourceforge/fbtools/files/release/OOoFBTools-2.50.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	office-ext-r1	bb4127989b6cee094cde73ac366c2b9d	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6dcdefde69fcdb5fc20e8d6b9007673a
diff --git a/metadata/md5-cache/app-officeext/ooofbtools-2.51 b/metadata/md5-cache/app-officeext/ooofbtools-2.51
deleted file mode 100644
index 30d962e5faf7..000000000000
--- a/metadata/md5-cache/app-officeext/ooofbtools-2.51
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm unpack
-DEPEND=office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) ) office_implementation_openoffice? ( app-office/openoffice-bin ) app-arch/unzip
-DESCRIPTION=OpenOffice extension for the FictionBook2 format with validation
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/fbtools/
-IUSE=office_implementation_libreoffice office_implementation_openoffice
-KEYWORDS=~amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/libxml2 app-arch/zip office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) ) office_implementation_openoffice? ( app-office/openoffice-bin )
-REQUIRED_USE=|| ( office_implementation_libreoffice office_implementation_openoffice )
-SLOT=0
-SRC_URI=mirror://sourceforge/fbtools/files/release/OOoFBTools-2.51.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	office-ext-r1	bb4127989b6cee094cde73ac366c2b9d	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d4bd7cca556c4d8f83878060061b9a72
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 3213ac931943..e83c8c804e53 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/etc-proposals-1.4.3-r3 b/metadata/md5-cache/app-portage/etc-proposals-1.4.3-r3
index e89f24c0e043..06490fee457a 100644
--- a/metadata/md5-cache/app-portage/etc-proposals-1.4.3-r3
+++ b/metadata/md5-cache/app-portage/etc-proposals-1.4.3-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=gtk? ( >=dev-python/pygtk-2.10 ) qt4? ( >=dev-python/PyQt4-4.1.1[X] ) 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_python2_7(-)]
+DEPEND=>=dev-python/pygtk-2.10 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_python2_7(-)]
 DESCRIPTION=a set of tools for updating gentoo config files
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/etc-proposals.berlios/
-IUSE=gtk qt4 python_targets_python2_7
+IUSE=python_targets_python2_7
 KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=GPL-2
-RDEPEND=gtk? ( >=dev-python/pygtk-2.10 ) qt4? ( >=dev-python/PyQt4-4.1.1[X] ) 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_python2_7(-)]
+RDEPEND=>=dev-python/pygtk-2.10 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_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/etc-proposals.berlios/etc-proposals-1.4.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e53ced18c8275ef9b65d1ebc91fc97fc
+_md5_=053ce392e5e3bdb558a9fd8c072237ca
diff --git a/metadata/md5-cache/app-portage/hashgen-1.0 b/metadata/md5-cache/app-portage/hashgen-1.0
index 336e249fefa1..cfc2de00e31d 100644
--- a/metadata/md5-cache/app-portage/hashgen-1.0
+++ b/metadata/md5-cache/app-portage/hashgen-1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) app-crypt/libb2 dev-libs/openssl:* sys-libs/zlib app-crypt/gpgme
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/repo/proj/prefix.git/plain/scripts/rsync-generation/hashgen.c?id=7fc3cf2b4baddc8b98c994b8ee024330d8f29956 -> hashgen-1.0.c
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=42c30f46c445fd914d2456eaac4b45f2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e77408472d5961dec77da07a062dd33a
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 3431e418d022..c5493fe02996 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r2 b/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r2
index 6459bf950836..f1382f21fd5f 100644
--- a/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r2
+++ b/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Shell scripts to manage DocBook documents
 EAPI=5
 HOMEPAGE=https://sourceware.org/docbook-tools/
 IUSE=jadetex
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5 app-text/docbook-dsssl-stylesheets app-text/openjade dev-perl/SGMLSpm ~app-text/docbook-xml-simple-dtd-4.1.2.4 ~app-text/docbook-xml-simple-dtd-1.0 app-text/docbook-xml-dtd ~app-text/docbook-sgml-dtd-3.0 ~app-text/docbook-sgml-dtd-3.1 ~app-text/docbook-sgml-dtd-4.0 ~app-text/docbook-sgml-dtd-4.1 ~app-text/docbook-sgml-dtd-4.2 ~app-text/docbook-sgml-dtd-4.4 jadetex? ( app-text/jadetex ) userland_GNU? ( sys-apps/which ) || ( www-client/lynx www-client/links www-client/elinks virtual/w3m )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/docbook-tools/new-trials/SOURCES/docbook-utils-0.6.14.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=483f6c23795ca2e547e5a224c2545323
+_md5_=0552e84191878de9aecaa264e9e4dd9b
diff --git a/metadata/md5-cache/app-text/highlight-3.42-r1 b/metadata/md5-cache/app-text/highlight-3.42-r1
index e6f29317c2fc..ba034caa6872 100644
--- a/metadata/md5-cache/app-text/highlight-3.42-r1
+++ b/metadata/md5-cache/app-text/highlight-3.42-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Converts source code to formatted text (HTML, LaTeX, etc.) with synt
 EAPI=6
 HOMEPAGE=http://www.andre-simon.de/
 IUSE=examples qt5
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3
 RDEPEND=dev-lang/lua:0= qt5? ( dev-libs/double-conversion:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 SLOT=0
 SRC_URI=http://www.andre-simon.de/zip/highlight-3.42.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=90f0e3953465b09b6125f9a6c355ed9f
+_md5_=a0cf7c8fd419a87cb73b5c863f9250c3
diff --git a/metadata/md5-cache/app-text/htmltidy-20090325-r2 b/metadata/md5-cache/app-text/htmltidy-20090325-r2
index 0b5cb921d421..65f63be6e956 100644
--- a/metadata/md5-cache/app-text/htmltidy-20090325-r2
+++ b/metadata/md5-cache/app-text/htmltidy-20090325-r2
@@ -4,9 +4,9 @@ DESCRIPTION=Tidy the layout and correct errors in HTML and XML documents
 EAPI=5
 HOMEPAGE=http://tidy.sourceforge.net/
 IUSE=debug doc static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/tidy-20090325.tar.bz2 mirror://gentoo/tidy-20090325-doc.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7df4d73c9161f06c3110ac1bee91eafa
+_md5_=dea2dc6a07edaade91158c47727c10e2
diff --git a/metadata/md5-cache/app-text/iso-codes-3.76 b/metadata/md5-cache/app-text/iso-codes-3.76
index 982f3a011a6c..b888d30356a2 100644
--- a/metadata/md5-cache/app-text/iso-codes-3.76
+++ b/metadata/md5-cache/app-text/iso-codes-3.76
@@ -3,10 +3,10 @@ DEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) app-ar
 DESCRIPTION=ISO language, territory, currency, script codes and their translations
 EAPI=6
 HOMEPAGE=http://pkg-isocodes.alioth.debian.org/
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=LGPL-2.1+
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-3.76.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6954d039b1fa3709be7d8da9a40f90f3
+_md5_=744021f76b36a2fda5fa53039ad9a24d
diff --git a/metadata/md5-cache/app-text/languagetool-3.5-r1 b/metadata/md5-cache/app-text/languagetool-3.5-r1
index 37eb3dd18ed9..6f453ddf472f 100644
--- a/metadata/md5-cache/app-text/languagetool-3.5-r1
+++ b/metadata/md5-cache/app-text/languagetool-3.5-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install preinst prepare setup
 DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
 DESCRIPTION=A proof-reading tool for many languages
 EAPI=6
-HOMEPAGE=http://www.languagetool.org/
+HOMEPAGE=https://www.languagetool.org/
 IUSE=elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.8 dev-java/commons-cli:1 dev-java/commons-collections:4 dev-java/commons-io:1 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/guava:20 dev-java/hamcrest-core:1.3 dev-java/jackson:2 dev-java/jackson-databind:2 dev-java/jcommander:0 dev-java/jna:4 dev-java/slf4j-api:0 dev-java/slf4j-nop:0 >=dev-java/java-config-2.2.0-r3
 SLOT=0
-SRC_URI=http://www.languagetool.org/download/LanguageTool-3.5.zip
+SRC_URI=https://www.languagetool.org/download/LanguageTool-3.5.zip
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2a4ed0fcdaf4d3c4e07c28faee399dc4
+_md5_=b3817ac7edb3677c95666e3e2ff94c60
diff --git a/metadata/md5-cache/app-text/libmspub-0.1.2 b/metadata/md5-cache/app-text/libmspub-0.1.2
index a9dfff04ae65..f5fa816578a6 100644
--- a/metadata/md5-cache/app-text/libmspub-0.1.2
+++ b/metadata/md5-cache/app-text/libmspub-0.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Library parsing Microsoft Publisher documents
 EAPI=6
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libmspub
 IUSE=doc static-libs
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/icu:= dev-libs/librevenge sys-libs/zlib
 SLOT=0
 SRC_URI=https://dev-www.libreoffice.org/src/libmspub/libmspub-0.1.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ecd3f0d964dba6c6a6df63c80a7d3b84
+_md5_=a8b01265e98c3c8305937490d3a6070e
diff --git a/metadata/md5-cache/app-text/texlive-2017 b/metadata/md5-cache/app-text/texlive-2017
index 8f7e77f3fc2e..b0a58ee48bad 100644
--- a/metadata/md5-cache/app-text/texlive-2017
+++ b/metadata/md5-cache/app-text/texlive-2017
@@ -4,8 +4,8 @@ DESCRIPTION=A complete TeX distribution
 EAPI=5
 HOMEPAGE=http://tug.org/texlive/
 IUSE=cjk context detex dvi2tty extra epspdf games graphics humanities jadetex luatex metapost music pdfannotextractor png pstricks publishers science tex4ht texi2html truetype xetex xindy xml X l10n_af l10n_ar l10n_as l10n_bg l10n_bn l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en l10n_en-GB l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_ga l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_kn l10n_la l10n_lo l10n_lt l10n_lv l10n_ml l10n_mn l10n_mr l10n_nb l10n_nl l10n_nn l10n_no l10n_or l10n_pa l10n_pl l10n_pt l10n_rm l10n_ro l10n_ru l10n_sa l10n_sco l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tk l10n_tr l10n_uk l10n_vi l10n_zh
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=metapackage
 RDEPEND=>=app-text/texlive-core-2017 app-text/psutils >=dev-texlive/texlive-fontutils-2017 media-gfx/sam2p texi2html? ( app-text/texi2html ) sys-apps/texinfo app-text/t1utils >=app-text/lcdf-typetools-2.92[kpathsea] truetype? ( >=app-text/ttf2pk2-2.0_p20150521 ) detex? ( dev-tex/detex ) app-text/ps2eps dvi2tty? ( dev-tex/dvi2tty ) png? ( app-text/dvipng ) X? ( >=app-text/xdvik-22.87 ) >=dev-texlive/texlive-basic-2017 >=dev-texlive/texlive-fontsrecommended-2017 >=dev-texlive/texlive-latex-2017 luatex? ( >=dev-texlive/texlive-luatex-2017 ) >=dev-texlive/texlive-latexrecommended-2017 >=dev-tex/xcolor-2.11 >=dev-tex/latex-beamer-3.36 metapost? ( >=dev-texlive/texlive-metapost-2017 dev-tex/feynmf ) >=dev-texlive/texlive-plaingeneric-2017 pdfannotextractor? ( dev-tex/pdfannotextractor ) extra? ( dev-tex/chktex app-text/dvisvgm dev-tex/latexdiff >=dev-tex/latexmk-418 >=app-text/pdfjam-2.02 >=dev-texlive/texlive-bibtexextra-2017 >=dev-texlive/texlive-fontsextra-2017 >=dev-texlive/texlive-formatsextra-2017 >=dev-texlive/texlive-latexextra-2017 >=dev-tex/glossaries-2.07 >=dev-tex/leaflet-20041222 >=dev-tex/currvita-0.9i-r1 >=dev-tex/g-brief-4.0.2 >=dev-tex/envlab-1.2-r1 >=dev-tex/europecv-20060424-r1 >=dev-tex/svninfo-0.7.3-r1 ) xetex? ( >=dev-texlive/texlive-xetex-2017 ) graphics? ( >=dev-texlive/texlive-pictures-2017 dev-tex/dot2texi ) epspdf? ( app-text/epspdf ) science? ( >=dev-texlive/texlive-mathscience-2017 ) publishers? ( >=dev-texlive/texlive-publishers-2017 ) music? ( >=dev-texlive/texlive-music-2017 ) pstricks? ( >=dev-texlive/texlive-pstricks-2017 ) context? ( >=dev-texlive/texlive-context-2017 ) games? ( >=dev-texlive/texlive-games-2017 ) humanities? ( >=dev-texlive/texlive-humanities-2017 ) tex4ht? ( >=dev-tex/tex4ht-20090611_p1038-r3 ) xml? ( >=dev-tex/xmltex-1.9-r2 app-text/passivetex ) jadetex? ( >=app-text/jadetex-3.13-r2 ) l10n_af? ( >=dev-texlive/texlive-langother-2017 >=dev-texlive/texlive-langother-2017 ) l10n_ar? ( >=dev-texlive/texlive-langarabic-2017 ) l10n_fa? ( >=dev-texlive/texlive-langarabic-2017 ) l10n_hy? ( >=dev-texlive/texlive-langeuropean-2017 ) cjk? ( >=dev-texlive/texlive-langcjk-2017 >=dev-tex/cjk-latex-4.8.4 ) l10n_hr? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_bg? ( >=dev-texlive/texlive-langcyrillic-2017 ) l10n_br? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_ru? ( >=dev-texlive/texlive-langcyrillic-2017 ) l10n_uk? ( >=dev-texlive/texlive-langcyrillic-2017 ) l10n_cs? ( >=dev-texlive/texlive-langczechslovak-2017 >=app-text/vlna-1.3 ) l10n_sk? ( >=dev-texlive/texlive-langczechslovak-2017 ) l10n_da? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_nl? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_en? ( >=dev-texlive/texlive-langenglish-2017 ) l10n_en-GB? ( >=dev-texlive/texlive-langenglish-2017 ) l10n_fi? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_eu? ( >=dev-texlive/texlive-langfrench-2017 ) l10n_fr? ( >=dev-texlive/texlive-langfrench-2017 ) l10n_de? ( >=dev-texlive/texlive-langgerman-2017 ) l10n_el? ( >=dev-texlive/texlive-langgreek-2017 ) l10n_he? ( >=dev-texlive/texlive-langother-2017 ) l10n_hu? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_as? ( >=dev-texlive/texlive-langother-2017 ) l10n_bn? ( >=dev-texlive/texlive-langother-2017 ) l10n_gu? ( >=dev-texlive/texlive-langother-2017 ) l10n_hi? ( >=dev-texlive/texlive-langother-2017 ) l10n_kn? ( >=dev-texlive/texlive-langother-2017 ) l10n_ml? ( >=dev-texlive/texlive-langother-2017 ) l10n_mr? ( >=dev-texlive/texlive-langother-2017 ) l10n_or? ( >=dev-texlive/texlive-langother-2017 ) l10n_pa? ( >=dev-texlive/texlive-langother-2017 ) l10n_sa? ( >=dev-texlive/texlive-langother-2017 ) l10n_ta? ( >=dev-texlive/texlive-langother-2017 ) l10n_te? ( >=dev-texlive/texlive-langother-2017 ) l10n_it? ( >=dev-texlive/texlive-langitalian-2017 ) l10n_ja? ( >=dev-texlive/texlive-langjapanese-2017 ) l10n_ko? ( >=dev-texlive/texlive-langkorean-2017 ) l10n_la? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_lt? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_lv? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_mn? ( >=dev-texlive/texlive-langcyrillic-2017 ) l10n_nb? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_nn? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_no? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_cy? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_eo? ( >=dev-texlive/texlive-langother-2017 ) l10n_et? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_ga? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_rm? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_hsb? ( >=dev-texlive/texlive-langother-2017 ) l10n_ia? ( >=dev-texlive/texlive-langother-2017 ) l10n_id? ( >=dev-texlive/texlive-langother-2017 ) l10n_is? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_lo? ( >=dev-texlive/texlive-langother-2017 ) l10n_ro? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_sq? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_sr? ( >=dev-texlive/texlive-langeuropean-2017 >=dev-texlive/texlive-langcyrillic-2017 ) l10n_sl? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_tr? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_pl? ( >=dev-texlive/texlive-langpolish-2017 ) l10n_pt? ( >=dev-texlive/texlive-langportuguese-2017 ) l10n_ca? ( >=dev-texlive/texlive-langspanish-2017 ) l10n_gl? ( >=dev-texlive/texlive-langspanish-2017 ) l10n_es? ( >=dev-texlive/texlive-langspanish-2017 ) l10n_sco? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_sv? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_tk? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_vi? ( >=dev-texlive/texlive-langother-2017 ) l10n_zh? ( >=dev-texlive/texlive-langchinese-2017 ) xindy? ( app-text/xindy )
 SLOT=0
-_md5_=9d6bce4caf240c50a6a0db96d317748b
+_md5_=b4c23fbb46c5fe39d96621a80b6800cf
diff --git a/metadata/md5-cache/app-text/texlive-core-2017-r3 b/metadata/md5-cache/app-text/texlive-core-2017-r3
index 8b44935ebf7b..37cdf8dc410e 100644
--- a/metadata/md5-cache/app-text/texlive-core-2017-r3
+++ b/metadata/md5-cache/app-text/texlive-core-2017-r3
@@ -4,10 +4,10 @@ DESCRIPTION=A complete TeX distribution
 EAPI=5
 HOMEPAGE=http://tug.org/texlive/
 IUSE=cjk X doc source tk +luajittex xetex
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LPPL-1.3c TeX
 RDEPEND=X? ( x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libXaw ) !app-text/ptex !app-text/tetex !<app-text/texlive-2007 !app-text/xetex !<dev-texlive/texlive-basic-2014 !<dev-texlive/texlive-metapost-2011 !app-text/dvibook !dev-tex/luatex !app-text/dvipdfm !app-text/dvipdfmx !app-text/xdvipdfmx sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0= >=app-text/poppler-0.58.0:= >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib app-text/libpaper dev-libs/gmp:0 dev-libs/mpfr:0= xetex? ( >=media-libs/harfbuzz-1.4.5[icu,graphite] >=dev-libs/icu-50:= >=app-text/teckit-2.5.3 media-libs/fontconfig media-gfx/graphite2 ) media-libs/freetype:2 >=dev-libs/kpathsea-6.2.3 cjk? ( >=dev-libs/ptexenc-1.3.5 ) >=app-text/ps2pkm-1.8_p20170524 >=app-text/dvipsk-5.997 >=dev-tex/bibtexu-3.71_p20170524 virtual/perl-Getopt-Long tk? ( dev-perl/Tk )
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-20170524-source.tar.xz mirror://gentoo/texlive-core-patches-70.tar.xz mirror://gentoo/texlive-module-tetex-2017.tar.xz mirror://gentoo/texlive-module-hyphen-base-2017.tar.xz mirror://gentoo/texlive-module-texconfig-2017.tar.xz mirror://gentoo/texlive-module-gsftopk-2017.tar.xz mirror://gentoo/texlive-module-texlive.infra-2017.tar.xz mirror://gentoo/texlive-module-a2ping-2017.tar.xz mirror://gentoo/texlive-module-adhocfilelist-2017.tar.xz mirror://gentoo/texlive-module-arara-2017.tar.xz mirror://gentoo/texlive-module-asymptote-2017.tar.xz mirror://gentoo/texlive-module-bundledoc-2017.tar.xz mirror://gentoo/texlive-module-checklistings-2017.tar.xz mirror://gentoo/texlive-module-ctan_chk-2017.tar.xz mirror://gentoo/texlive-module-ctanify-2017.tar.xz mirror://gentoo/texlive-module-ctanupload-2017.tar.xz mirror://gentoo/texlive-module-ctie-2017.tar.xz mirror://gentoo/texlive-module-cweb-2017.tar.xz mirror://gentoo/texlive-module-de-macro-2017.tar.xz mirror://gentoo/texlive-module-dtl-2017.tar.xz mirror://gentoo/texlive-module-dtxgen-2017.tar.xz mirror://gentoo/texlive-module-dvi2tty-2017.tar.xz mirror://gentoo/texlive-module-dviasm-2017.tar.xz mirror://gentoo/texlive-module-dvicopy-2017.tar.xz mirror://gentoo/texlive-module-dvidvi-2017.tar.xz mirror://gentoo/texlive-module-dviljk-2017.tar.xz mirror://gentoo/texlive-module-dvipos-2017.tar.xz mirror://gentoo/texlive-module-findhyph-2017.tar.xz mirror://gentoo/texlive-module-fragmaster-2017.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg-2017.tar.xz mirror://gentoo/texlive-module-hyphenex-2017.tar.xz mirror://gentoo/texlive-module-installfont-2017.tar.xz mirror://gentoo/texlive-module-lacheck-2017.tar.xz mirror://gentoo/texlive-module-latex-git-log-2017.tar.xz mirror://gentoo/texlive-module-latex-papersize-2017.tar.xz mirror://gentoo/texlive-module-latex2man-2017.tar.xz mirror://gentoo/texlive-module-latex2nemeth-2017.tar.xz mirror://gentoo/texlive-module-latexfileversion-2017.tar.xz mirror://gentoo/texlive-module-latexpand-2017.tar.xz mirror://gentoo/texlive-module-latexindent-2017.tar.xz mirror://gentoo/texlive-module-ltxfileinfo-2017.tar.xz mirror://gentoo/texlive-module-ltximg-2017.tar.xz mirror://gentoo/texlive-module-listings-ext-2017.tar.xz mirror://gentoo/texlive-module-make4ht-2017.tar.xz mirror://gentoo/texlive-module-match_parens-2017.tar.xz mirror://gentoo/texlive-module-mflua-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf-2017.tar.xz mirror://gentoo/texlive-module-patgen-2017.tar.xz mirror://gentoo/texlive-module-pdfbook2-2017.tar.xz mirror://gentoo/texlive-module-pdfcrop-2017.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale-2017.tar.xz mirror://gentoo/texlive-module-pdftools-2017.tar.xz mirror://gentoo/texlive-module-pdfxup-2017.tar.xz mirror://gentoo/texlive-module-pfarrei-2017.tar.xz mirror://gentoo/texlive-module-pkfix-2017.tar.xz mirror://gentoo/texlive-module-pkfix-helper-2017.tar.xz mirror://gentoo/texlive-module-purifyeps-2017.tar.xz mirror://gentoo/texlive-module-seetexk-2017.tar.xz mirror://gentoo/texlive-module-srcredact-2017.tar.xz mirror://gentoo/texlive-module-sty2dtx-2017.tar.xz mirror://gentoo/texlive-module-synctex-2017.tar.xz mirror://gentoo/texlive-module-tex4ebook-2017.tar.xz mirror://gentoo/texlive-module-texcount-2017.tar.xz mirror://gentoo/texlive-module-texdef-2017.tar.xz mirror://gentoo/texlive-module-texdiff-2017.tar.xz mirror://gentoo/texlive-module-texdirflatten-2017.tar.xz mirror://gentoo/texlive-module-texdoc-2017.tar.xz mirror://gentoo/texlive-module-texfot-2017.tar.xz mirror://gentoo/texlive-module-texliveonfly-2017.tar.xz mirror://gentoo/texlive-module-texloganalyser-2017.tar.xz mirror://gentoo/texlive-module-texosquery-2017.tar.xz mirror://gentoo/texlive-module-texware-2017.tar.xz mirror://gentoo/texlive-module-tie-2017.tar.xz mirror://gentoo/texlive-module-tpic2pdftex-2017.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo-2017.tar.xz mirror://gentoo/texlive-module-web-2017.tar.xz mirror://gentoo/texlive-module-collection-binextra-2017.tar.xz doc? ( mirror://gentoo/texlive-module-tetex.doc-2017.tar.xz mirror://gentoo/texlive-module-texconfig.doc-2017.tar.xz mirror://gentoo/texlive-module-gsftopk.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive.infra.doc-2017.tar.xz mirror://gentoo/texlive-module-a2ping.doc-2017.tar.xz mirror://gentoo/texlive-module-adhocfilelist.doc-2017.tar.xz mirror://gentoo/texlive-module-arara.doc-2017.tar.xz mirror://gentoo/texlive-module-asymptote.doc-2017.tar.xz mirror://gentoo/texlive-module-bundledoc.doc-2017.tar.xz mirror://gentoo/texlive-module-checklistings.doc-2017.tar.xz mirror://gentoo/texlive-module-ctan_chk.doc-2017.tar.xz mirror://gentoo/texlive-module-ctanify.doc-2017.tar.xz mirror://gentoo/texlive-module-ctanupload.doc-2017.tar.xz mirror://gentoo/texlive-module-ctie.doc-2017.tar.xz mirror://gentoo/texlive-module-cweb.doc-2017.tar.xz mirror://gentoo/texlive-module-de-macro.doc-2017.tar.xz mirror://gentoo/texlive-module-dtl.doc-2017.tar.xz mirror://gentoo/texlive-module-dtxgen.doc-2017.tar.xz mirror://gentoo/texlive-module-dvi2tty.doc-2017.tar.xz mirror://gentoo/texlive-module-dviasm.doc-2017.tar.xz mirror://gentoo/texlive-module-dvicopy.doc-2017.tar.xz mirror://gentoo/texlive-module-dvidvi.doc-2017.tar.xz mirror://gentoo/texlive-module-dviljk.doc-2017.tar.xz mirror://gentoo/texlive-module-dvipos.doc-2017.tar.xz mirror://gentoo/texlive-module-findhyph.doc-2017.tar.xz mirror://gentoo/texlive-module-fragmaster.doc-2017.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg.doc-2017.tar.xz mirror://gentoo/texlive-module-installfont.doc-2017.tar.xz mirror://gentoo/texlive-module-lacheck.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-git-log.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-papersize.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2man.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2nemeth.doc-2017.tar.xz mirror://gentoo/texlive-module-latexfileversion.doc-2017.tar.xz mirror://gentoo/texlive-module-latexpand.doc-2017.tar.xz mirror://gentoo/texlive-module-latexindent.doc-2017.tar.xz mirror://gentoo/texlive-module-ltxfileinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-ltximg.doc-2017.tar.xz mirror://gentoo/texlive-module-listings-ext.doc-2017.tar.xz mirror://gentoo/texlive-module-make4ht.doc-2017.tar.xz mirror://gentoo/texlive-module-match_parens.doc-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.doc-2017.tar.xz mirror://gentoo/texlive-module-patgen.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfbook2.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfcrop.doc-2017.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale.doc-2017.tar.xz mirror://gentoo/texlive-module-pdftools.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfxup.doc-2017.tar.xz mirror://gentoo/texlive-module-pfarrei.doc-2017.tar.xz mirror://gentoo/texlive-module-pkfix.doc-2017.tar.xz mirror://gentoo/texlive-module-pkfix-helper.doc-2017.tar.xz mirror://gentoo/texlive-module-purifyeps.doc-2017.tar.xz mirror://gentoo/texlive-module-pythontex.doc-2017.tar.xz mirror://gentoo/texlive-module-seetexk.doc-2017.tar.xz mirror://gentoo/texlive-module-srcredact.doc-2017.tar.xz mirror://gentoo/texlive-module-sty2dtx.doc-2017.tar.xz mirror://gentoo/texlive-module-synctex.doc-2017.tar.xz mirror://gentoo/texlive-module-tex4ebook.doc-2017.tar.xz mirror://gentoo/texlive-module-texcount.doc-2017.tar.xz mirror://gentoo/texlive-module-texdef.doc-2017.tar.xz mirror://gentoo/texlive-module-texdiff.doc-2017.tar.xz mirror://gentoo/texlive-module-texdirflatten.doc-2017.tar.xz mirror://gentoo/texlive-module-texdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-texfot.doc-2017.tar.xz mirror://gentoo/texlive-module-texliveonfly.doc-2017.tar.xz mirror://gentoo/texlive-module-texloganalyser.doc-2017.tar.xz mirror://gentoo/texlive-module-texosquery.doc-2017.tar.xz mirror://gentoo/texlive-module-texware.doc-2017.tar.xz mirror://gentoo/texlive-module-tie.doc-2017.tar.xz mirror://gentoo/texlive-module-tpic2pdftex.doc-2017.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-web.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-adhocfilelist.source-2017.tar.xz mirror://gentoo/texlive-module-arara.source-2017.tar.xz mirror://gentoo/texlive-module-checklistings.source-2017.tar.xz mirror://gentoo/texlive-module-hyphenex.source-2017.tar.xz mirror://gentoo/texlive-module-listings-ext.source-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.source-2017.tar.xz mirror://gentoo/texlive-module-pfarrei.source-2017.tar.xz mirror://gentoo/texlive-module-pythontex.source-2017.tar.xz mirror://gentoo/texlive-module-texdef.source-2017.tar.xz mirror://gentoo/texlive-module-texosquery.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3a25e2568471b6f012c45a99421d44a5
+_md5_=d650675e5a80b7c30a9c142867104852
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index e92786dd094f..04a03230ba14 100644
Binary files a/metadata/md5-cache/app-vim/Manifest.gz and b/metadata/md5-cache/app-vim/Manifest.gz differ
diff --git a/metadata/md5-cache/app-vim/airline-0.8 b/metadata/md5-cache/app-vim/airline-0.8
index eeb60ecc5a31..11637533ef6f 100644
--- a/metadata/md5-cache/app-vim/airline-0.8
+++ b/metadata/md5-cache/app-vim/airline-0.8
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm prepare
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: lean & mean statusline for vim that's light as air
 EAPI=5
-HOMEPAGE=https://github.com/vim-airline/vim-airline/ http://www.vim.org/scripts/script.php?script_id=4661
+HOMEPAGE=https://github.com/vim-airline/vim-airline/ https://www.vim.org/scripts/script.php?script_id=4661
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-airline/vim-airline/archive/v0.8.tar.gz -> airline-0.8.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=8ea226543df2d21b0e9aeb7c867bf9d0
+_md5_=f4d6076507888c45d9e58ed648c51c8f
diff --git a/metadata/md5-cache/app-vim/airline-9999 b/metadata/md5-cache/app-vim/airline-9999
index f97390f9b2c1..79eb4c44329b 100644
--- a/metadata/md5-cache/app-vim/airline-9999
+++ b/metadata/md5-cache/app-vim/airline-9999
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst postrm prepare unpack
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=vim plugin: lean & mean statusline for vim that's light as air
 EAPI=5
-HOMEPAGE=https://github.com/vim-airline/vim-airline/ http://www.vim.org/scripts/script.php?script_id=4661
+HOMEPAGE=https://github.com/vim-airline/vim-airline/ https://www.vim.org/scripts/script.php?script_id=4661
 LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=5aff10bd4fc143567b9060c752790f9f
+_md5_=9215bdd45fde25b388b4dacb465ebd63
diff --git a/metadata/md5-cache/app-vim/align-43 b/metadata/md5-cache/app-vim/align-43
index adf2d61c4eef..b3146b75cec6 100644
--- a/metadata/md5-cache/app-vim/align-43
+++ b/metadata/md5-cache/app-vim/align-43
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: commands and maps to help produce aligned text
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=294
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=294
 KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
 LICENSE=vim
 RDEPEND=app-vim/cecutil || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/align-43.tar.bz2 https://dev.gentoo.org/~radhermit/vim/align-43.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=aec4948cfb2cb02f2932f964ca723f8c
+_md5_=fad11c041de7f69a34fcdc559db0833d
diff --git a/metadata/md5-cache/app-vim/alternate-2.18-r1 b/metadata/md5-cache/app-vim/alternate-2.18-r1
index d0ddb9a00d81..cb2e267f226d 100644
--- a/metadata/md5-cache/app-vim/alternate-2.18-r1
+++ b/metadata/md5-cache/app-vim/alternate-2.18-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm prepare
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: quickly switch between .c and .h files
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=31
+HOMEPAGE=https://github.com/vim-scripts/a.vim https://www.vim.org/scripts/script.php?script_id=31
 KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=alternate
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/alternate-2.18.tar.bz2 https://dev.gentoo.org/~radhermit/vim/alternate-2.18.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=6dc5691581df1e2037bf0249181a9960
+_md5_=320a965fd09558862d24995dcad1a951
diff --git a/metadata/md5-cache/app-vim/alternate-2.18-r2 b/metadata/md5-cache/app-vim/alternate-2.18-r2
index c865978427aa..21878bcab1eb 100644
--- a/metadata/md5-cache/app-vim/alternate-2.18-r2
+++ b/metadata/md5-cache/app-vim/alternate-2.18-r2
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm prepare
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: quickly switch between .c and .h files
 EAPI=6
-HOMEPAGE=https://github.com/vim-scripts/a.vim
+HOMEPAGE=https://github.com/vim-scripts/a.vim https://www.vim.org/scripts/script.php?script_id=31
 KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=alternate
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-SRC_URI=https://github.com/vim-scripts/a.vim/archive/2.18.tar.bz2 -> alternate-2.18.tar.bz2 http://www.vim.org/scripts/download_script.php?src_id=6347 -> alternate.txt
+SRC_URI=https://github.com/vim-scripts/a.vim/archive/2.18.tar.gz -> alternate-2.18.tar.gz https://www.vim.org/scripts/download_script.php?src_id=6347 -> alternate.txt
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=b6b1c4f65f6b06f8727187b56a262378
+_md5_=08e804683dead3afe65129c65904d875
diff --git a/metadata/md5-cache/app-vim/ansiesc-12 b/metadata/md5-cache/app-vim/ansiesc-12
index ff96c81a5764..08f93a925d5e 100644
--- a/metadata/md5-cache/app-vim/ansiesc-12
+++ b/metadata/md5-cache/app-vim/ansiesc-12
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: ansi escape sequences concealed, but highlighted as specified
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=302
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=302
 KEYWORDS=amd64 x86
 LICENSE=public-domain
 RDEPEND=app-vim/cecutil || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/ansiesc-12.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ansiesc-12.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=4707888684a86dd5ec934e7dd6512124
+_md5_=f692fefcd1d7ae177fdf7d437dd6710f
diff --git a/metadata/md5-cache/app-vim/ant_menu-0.5.7.1-r1 b/metadata/md5-cache/app-vim/ant_menu-0.5.7.1-r1
index 442f31f20de8..7833eb870e48 100644
--- a/metadata/md5-cache/app-vim/ant_menu-0.5.7.1-r1
+++ b/metadata/md5-cache/app-vim/ant_menu-0.5.7.1-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Java ant build system integration
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=155
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=155
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=LGPL-2
 RDEPEND=dev-java/ant || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/ant_menu-0.5.7.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ant_menu-0.5.7.1.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=f9fa661c2a55bd71d071b9f26e828a79
+_md5_=6fc546a7ba8b0108e52a35a74ec9a0bf
diff --git a/metadata/md5-cache/app-vim/autoalign-14 b/metadata/md5-cache/app-vim/autoalign-14
index 88448e73ab6c..4622040f7538 100644
--- a/metadata/md5-cache/app-vim/autoalign-14
+++ b/metadata/md5-cache/app-vim/autoalign-14
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm prepare
 DEPEND=app-arch/xz-utils || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: automatically align bib, c, c++, tex and vim code
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=884
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=884
 KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
 LICENSE=vim
 RDEPEND=>=app-vim/align-30 >=app-vim/cecutil-4 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/autoalign-14.tar.xz https://dev.gentoo.org/~chutzpah/vim/autoalign-14.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=61b4bc65b8713ed68c9a7493703a29c9
+_md5_=a388c19a19352fdd4e18feb6f7ad3df6
diff --git a/metadata/md5-cache/app-vim/bash-support-4.2.1 b/metadata/md5-cache/app-vim/bash-support-4.2.1
index 141b4d41aa42..8261c830e383 100644
--- a/metadata/md5-cache/app-vim/bash-support-4.2.1
+++ b/metadata/md5-cache/app-vim/bash-support-4.2.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: write and run bash scripts using menus and hotkeys
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=365
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=365
 KEYWORDS=amd64 x86
 LICENSE=public-domain
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/bash-support-4.2.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/bash-support-4.2.1.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=7c961905acd7c69a1a5eb7214a00aec7
+_md5_=f560261234f8d1f57e1c9e1744090509
diff --git a/metadata/md5-cache/app-vim/bnf-syntax-1.2-r2 b/metadata/md5-cache/app-vim/bnf-syntax-1.2-r2
index 14a0e76b9e31..fe2289a8f83b 100644
--- a/metadata/md5-cache/app-vim/bnf-syntax-1.2-r2
+++ b/metadata/md5-cache/app-vim/bnf-syntax-1.2-r2
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm prepare
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: BNF file syntax highlighting
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=250
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=250
 KEYWORDS=alpha amd64 ia64 ~mips ppc ppc64 sparc x86
 LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/bnf-syntax-1.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/bnf-syntax-1.2.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=354c4fa101c4fb844fa05b8571862cd8
+_md5_=82a47db19c387272cc26f2e3d4a6981f
diff --git a/metadata/md5-cache/app-vim/brainfuck-syntax-1.0.2 b/metadata/md5-cache/app-vim/brainfuck-syntax-1.0.2
index 1c8e6753f0d3..29dffb62e1cc 100644
--- a/metadata/md5-cache/app-vim/brainfuck-syntax-1.0.2
+++ b/metadata/md5-cache/app-vim/brainfuck-syntax-1.0.2
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: BrainFuck source file syntax highlighting
 EAPI=0
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=716
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=716
 KEYWORDS=amd64 ~mips ppc ppc64 x86
 LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/brainfuck-syntax-1.0.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/brainfuck-syntax-1.0.2.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=09fbe6db58830ed5936a9ddc954ce42e
+_md5_=4253089e90343a76c83a37f3f4982418
diff --git a/metadata/md5-cache/app-vim/brainfuck-syntax-1.0.3 b/metadata/md5-cache/app-vim/brainfuck-syntax-1.0.3
index 8617493ecb46..6939ea1a9eaf 100644
--- a/metadata/md5-cache/app-vim/brainfuck-syntax-1.0.3
+++ b/metadata/md5-cache/app-vim/brainfuck-syntax-1.0.3
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: BrainFuck source file syntax highlighting
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=716
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=716
 KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~x86
 LICENSE=BSD-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/brainfuck-syntax-1.0.3.tar.bz2 https://dev.gentoo.org/~radhermit/vim/brainfuck-syntax-1.0.3.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=4f6f3a2a3c96e02fe1c044003401157f
+_md5_=d938859aa292109752ef7df4bf4c4b89
diff --git a/metadata/md5-cache/app-vim/breakpts-4.0-r1 b/metadata/md5-cache/app-vim/breakpts-4.0-r1
index d159cf1a2dfc..e2ca75035116 100644
--- a/metadata/md5-cache/app-vim/breakpts-4.0-r1
+++ b/metadata/md5-cache/app-vim/breakpts-4.0-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: sets vim breakpoints visually
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=618
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=618
 KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 ) >=app-vim/multvals-3.6.1 >=app-vim/genutils-1.13 >=app-vim/foldutil-1.6 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/breakpts-4.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/breakpts-4.0.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=47f162774cebfe79ad1d2578c58db554
+_md5_=ef0e47841da38c86361416bf853635f2
diff --git a/metadata/md5-cache/app-vim/bufexplorer-7.4.18 b/metadata/md5-cache/app-vim/bufexplorer-7.4.18
index 84eb93ed1a19..dab0ddb5ee72 100644
--- a/metadata/md5-cache/app-vim/bufexplorer-7.4.18
+++ b/metadata/md5-cache/app-vim/bufexplorer-7.4.18
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm prepare
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: easily browse vim buffers
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/jlanzarotta/bufexplorer/archive/v7.4.18.tar.gz -> bufexplorer-7.4.18.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=554c71067f8955f84c6d49046a3b9c63
+_md5_=a4e6b174db2b8b146321420f26d40ac2
diff --git a/metadata/md5-cache/app-vim/bufexplorer-7.4.19 b/metadata/md5-cache/app-vim/bufexplorer-7.4.19
index 603762f542f9..9019b3b25119 100644
--- a/metadata/md5-cache/app-vim/bufexplorer-7.4.19
+++ b/metadata/md5-cache/app-vim/bufexplorer-7.4.19
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm prepare
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: easily browse vim buffers
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/jlanzarotta/bufexplorer/archive/v7.4.19.tar.gz -> bufexplorer-7.4.19.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=b88bb18c05c87fccdc03ef7c7e2c16f7
+_md5_=18c706bd9c4a9bfc4403461772be47d1
diff --git a/metadata/md5-cache/app-vim/bufexplorer-9999 b/metadata/md5-cache/app-vim/bufexplorer-9999
index 1172ca820e21..b9794bb3dd7d 100644
--- a/metadata/md5-cache/app-vim/bufexplorer-9999
+++ b/metadata/md5-cache/app-vim/bufexplorer-9999
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst postrm prepare unpack
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=vim plugin: easily browse vim buffers
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer
 LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=54099f31c9991450a9aa870c2708d420
+_md5_=f7e2a48b5672799a596195f6cd648d89
diff --git a/metadata/md5-cache/app-vim/c-support-6.0 b/metadata/md5-cache/app-vim/c-support-6.0
index ebe1ae8e2c35..008f327b76a7 100644
--- a/metadata/md5-cache/app-vim/c-support-6.0
+++ b/metadata/md5-cache/app-vim/c-support-6.0
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: C/C++-IDE -- Write and run programs using menus and hotkeys
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=213
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=213
 KEYWORDS=amd64 x86
 LICENSE=public-domain
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/c-support-6.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/c-support-6.0.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=1189a2415b0b01a7fc25705ae2578668
+_md5_=2ffc4054c1c16e498b5bdddbc71db621
diff --git a/metadata/md5-cache/app-vim/c-support-6.1 b/metadata/md5-cache/app-vim/c-support-6.1
index 88d141897a0d..afed61364ddc 100644
--- a/metadata/md5-cache/app-vim/c-support-6.1
+++ b/metadata/md5-cache/app-vim/c-support-6.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: C/C++-IDE -- Write and run programs using menus and hotkeys
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=213
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=213
 KEYWORDS=amd64 x86
 LICENSE=public-domain
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/c-support-6.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/c-support-6.1.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=2a797d47670dd1b714fa4a7b0562fac5
+_md5_=b72bc9b7958aead73bfe2c5fb2008b9d
diff --git a/metadata/md5-cache/app-vim/c-support-6.1.1 b/metadata/md5-cache/app-vim/c-support-6.1.1
index 5774b7cdf242..df1d1de9a06e 100644
--- a/metadata/md5-cache/app-vim/c-support-6.1.1
+++ b/metadata/md5-cache/app-vim/c-support-6.1.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: C/C++-IDE -- Write and run programs using menus and hotkeys
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=213
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=213
 KEYWORDS=amd64 x86
 LICENSE=public-domain
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/c-support-6.1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/c-support-6.1.1.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=b5e5607a34d0c49c7dcc486785da316c
+_md5_=e7f6952818b37e2d9b7cca2a2b547eeb
diff --git a/metadata/md5-cache/app-vim/calendar-2.9 b/metadata/md5-cache/app-vim/calendar-2.9
index a5f060d52226..5e0919943555 100644
--- a/metadata/md5-cache/app-vim/calendar-2.9
+++ b/metadata/md5-cache/app-vim/calendar-2.9
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: calendar window
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=52
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=52
 KEYWORDS=amd64 ~mips ppc x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/calendar-2.9.tar.bz2 https://dev.gentoo.org/~radhermit/vim/calendar-2.9.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=8ccc3a98a566606483893fd65840d791
+_md5_=117a15f90011165fe8f56c376584c338
diff --git a/metadata/md5-cache/app-vim/cecutil-17 b/metadata/md5-cache/app-vim/cecutil-17
index ff9274968845..dc3f771526ca 100644
--- a/metadata/md5-cache/app-vim/cecutil-17
+++ b/metadata/md5-cache/app-vim/cecutil-17
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: library used by many of Charles Campbell's plugins
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=1066
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1066
 KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/cecutil-17.tar.bz2 https://dev.gentoo.org/~radhermit/vim/cecutil-17.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=6dba5f30a19ce12c8ea1fec7432ac6f1
+_md5_=a8c0249bffd4a98dfa1b5f809bc199ae
diff --git a/metadata/md5-cache/app-vim/cfengine-syntax-20141019 b/metadata/md5-cache/app-vim/cfengine-syntax-20141019
index b2c164bcf342..b66c7020a0c8 100644
--- a/metadata/md5-cache/app-vim/cfengine-syntax-20141019
+++ b/metadata/md5-cache/app-vim/cfengine-syntax-20141019
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Cfengine 3 configuration files syntax
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=2904 https://github.com/neilhwatson/vim_cf3
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2904 https://github.com/neilhwatson/vim_cf3
 KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=GPL-3+
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/cfengine-syntax-20141019.tar.bz2 https://dev.gentoo.org/~radhermit/vim/cfengine-syntax-20141019.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=995a160c54d6b4bf1641c391d93a2fb8
+_md5_=5a8a424a4efee6b3e7e539c82d1348e6
diff --git a/metadata/md5-cache/app-vim/checkattach-0.17 b/metadata/md5-cache/app-vim/checkattach-0.17
index 5f967e4390e6..ae093d6ff6af 100644
--- a/metadata/md5-cache/app-vim/checkattach-0.17
+++ b/metadata/md5-cache/app-vim/checkattach-0.17
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: check for attachments when writing mails with mutt
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=2796 https://github.com/chrisbra/CheckAttach
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2796 https://github.com/chrisbra/CheckAttach
 KEYWORDS=amd64 x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/checkattach-0.17.tar.bz2 https://dev.gentoo.org/~radhermit/vim/checkattach-0.17.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=001b60c8da575b0cafd174508d7cbfce
+_md5_=6b848ef0261577654b17e48096f7842b
diff --git a/metadata/md5-cache/app-vim/closetag-0.9.1-r1 b/metadata/md5-cache/app-vim/closetag-0.9.1-r1
index 3c003a1fa2c4..e2ef10253575 100644
--- a/metadata/md5-cache/app-vim/closetag-0.9.1-r1
+++ b/metadata/md5-cache/app-vim/closetag-0.9.1-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: close HTML/XML tags quickly
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=13
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=13
 KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/closetag-0.9.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/closetag-0.9.1.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=89e414614eb7fa44b9eea88a291a11dd
+_md5_=1d7deaebfbe34184995263b18a4483ac
diff --git a/metadata/md5-cache/app-vim/cmdalias-3.0-r1 b/metadata/md5-cache/app-vim/cmdalias-3.0-r1
index 39fb8df8adc4..ebe72644b33f 100644
--- a/metadata/md5-cache/app-vim/cmdalias-3.0-r1
+++ b/metadata/md5-cache/app-vim/cmdalias-3.0-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: library for alias creation
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=746
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=746
 KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/cmdalias-3.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/cmdalias-3.0.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=5f70cc1a30b2374fc9b5c9eec32306f9
+_md5_=4578c49fc1611daeb63fa31f60e5fef9
diff --git a/metadata/md5-cache/app-vim/colorschemes-20140623-r1 b/metadata/md5-cache/app-vim/colorschemes-20140623-r1
index 82bc6a5fa7a9..1435fd3f6e0a 100644
--- a/metadata/md5-cache/app-vim/colorschemes-20140623-r1
+++ b/metadata/md5-cache/app-vim/colorschemes-20140623-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm prepare
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: a collection of color schemes from vim.org
 EAPI=5
-HOMEPAGE=http://www.vim.org/
+HOMEPAGE=https://www.vim.org/
 KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=vim GPL-2 GPL-2+ GPL-3 GPL-3+ MIT BSD WTFPL-2 public-domain vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/colorschemes-20140623.tar.bz2 https://dev.gentoo.org/~radhermit/vim/colorschemes-20140623.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=68539a674e38e6c33ce256504add198d
+_md5_=1900a218b9a581e1ed2cc0fd19cdb249
diff --git a/metadata/md5-cache/app-vim/colorsel-20100406 b/metadata/md5-cache/app-vim/colorsel-20100406
index 9aaa653f32c9..4d8b3b7fd2fb 100644
--- a/metadata/md5-cache/app-vim/colorsel-20100406
+++ b/metadata/md5-cache/app-vim/colorsel-20100406
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: RGB / HSV color selector
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=927
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=927
 KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
 LICENSE=public-domain
 RDEPEND=>=app-editors/gvim-7.0 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-SRC_URI=http://www.vim.org/scripts/download_script.php?src_id=12789 -> colorsel-20100406.zip
+SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=12789 -> colorsel-20100406.zip
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=642e680fa336b99eb4d9e49de01409c2
+_md5_=520b2b0b20f701d6d07d44c5ab0b4c8c
diff --git a/metadata/md5-cache/app-vim/colorv-3.0.2-r1 b/metadata/md5-cache/app-vim/colorv-3.0.2-r1
index 041d81d6dd02..d05610047430 100644
--- a/metadata/md5-cache/app-vim/colorv-3.0.2-r1
+++ b/metadata/md5-cache/app-vim/colorv-3.0.2-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=install postinst postrm prepare setup
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: a color tool for vim
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=3597 https://github.com/Rykka/colorv.vim/
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3597 https://github.com/Rykka/colorv.vim/
 IUSE=python_targets_python2_7
 KEYWORDS=amd64 x86
 LICENSE=MIT
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://gentoo/colorv-3.0.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/colorv-3.0.2.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=143edb834a7b1ce4e9081578b61a0ae2
+_md5_=c39de0773fbcf008d3afc7385f3b2811
diff --git a/metadata/md5-cache/app-vim/command-t-5.0.1 b/metadata/md5-cache/app-vim/command-t-5.0.1
index 5eae939442ec..0c503b79bcf0 100644
--- a/metadata/md5-cache/app-vim/command-t-5.0.1
+++ b/metadata/md5-cache/app-vim/command-t-5.0.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpa
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 DESCRIPTION=vim plugin: fast file navigation for vim
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=3025 https://github.com/wincent/command-t
+HOMEPAGE=https://vim.sourceforge.io/scripts/script.php?script_id=3025 https://github.com/wincent/command-t
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/wincent/command-t/archive/5.0.1.tar.gz -> command-t-5.0.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=e3b372c819d282369c741983331c8ad5
+_md5_=35f4d1122c92cb843334fdc41c9010cd
diff --git a/metadata/md5-cache/app-vim/csv-0.31-r1 b/metadata/md5-cache/app-vim/csv-0.31-r1
index 5939f57cd60e..69ee89c438b3 100644
--- a/metadata/md5-cache/app-vim/csv-0.31-r1
+++ b/metadata/md5-cache/app-vim/csv-0.31-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: display and alter csv files
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=2830
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2830
 KEYWORDS=amd64 x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/csv-0.31.tar.bz2 https://dev.gentoo.org/~radhermit/vim/csv-0.31.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=1d0cd727fdd6dc0f20c9c6765b7c4f0d
+_md5_=8ac9f8c51bf6b9f7a5ffd2fe60e18ef6
diff --git a/metadata/md5-cache/app-vim/curcmdmode-1.0-r1 b/metadata/md5-cache/app-vim/curcmdmode-1.0-r1
index e56e4621ff15..46e0dc1446b3 100644
--- a/metadata/md5-cache/app-vim/curcmdmode-1.0-r1
+++ b/metadata/md5-cache/app-vim/curcmdmode-1.0-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: library for extending vim's mode() function
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=745
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=745
 KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=app-vim/genutils || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/curcmdmode-1.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/curcmdmode-1.0.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=ed3e3cb2577010e024ca06f206c18289
+_md5_=ad72e66b14d51b454503aec2e560d770
diff --git a/metadata/md5-cache/app-vim/cvsmenu-1.147-r1 b/metadata/md5-cache/app-vim/cvsmenu-1.147-r1
index 60d89659b65b..b494e0de7111 100644
--- a/metadata/md5-cache/app-vim/cvsmenu-1.147-r1
+++ b/metadata/md5-cache/app-vim/cvsmenu-1.147-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: CVS(NT) integration script
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=1245
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1245
 KEYWORDS=amd64 ppc x86
 LICENSE=LGPL-2
 RDEPEND=dev-vcs/cvs || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/cvsmenu-1.147.tar.bz2 https://dev.gentoo.org/~radhermit/vim/cvsmenu-1.147.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=1e31d0eec86215db872d849488dd9b21
+_md5_=740fdb8d6b5c2499f844e499f5fdd257
diff --git a/metadata/md5-cache/app-vim/dbext-25.0 b/metadata/md5-cache/app-vim/dbext-25.0
index 514fcce3688a..6935d001439a 100644
--- a/metadata/md5-cache/app-vim/dbext-25.0
+++ b/metadata/md5-cache/app-vim/dbext-25.0
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: easy access to databases
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=356
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=356
 KEYWORDS=amd64 ~mips ppc x86
 LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/dbext-25.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/dbext-25.0.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=827fbbeb406a1f84f7277daeeedcc733
+_md5_=5622978270657b426327143b95317a91
diff --git a/metadata/md5-cache/app-vim/dbext-26.00 b/metadata/md5-cache/app-vim/dbext-26.00
index 66ef5c62803d..bbd65f36fdd5 100644
--- a/metadata/md5-cache/app-vim/dbext-26.00
+++ b/metadata/md5-cache/app-vim/dbext-26.00
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: easy access to databases
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=356
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=356
 KEYWORDS=~amd64 ~mips ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/dbext-26.00.tar.bz2 https://dev.gentoo.org/~radhermit/vim/dbext-26.00.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=66f5331a3dc44c40d871e8534d91e6de
+_md5_=0cc8d754616fb85824723227bcd9f137
diff --git a/metadata/md5-cache/app-vim/dhcpd-syntax-20030825 b/metadata/md5-cache/app-vim/dhcpd-syntax-20030825
index 4ea17b780c4d..0eb338ede2fa 100644
--- a/metadata/md5-cache/app-vim/dhcpd-syntax-20030825
+++ b/metadata/md5-cache/app-vim/dhcpd-syntax-20030825
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm unpack
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: syntax highlighting for dhcpd.conf
 EAPI=0
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=744
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=744
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/dhcpd-syntax-20030825.tar.bz2 https://dev.gentoo.org/~radhermit/vim/dhcpd-syntax-20030825.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=a63e8b5031c0536994b97a67b116b663
+_md5_=2fcc1e44f64e7dd645b4a03ddce2de0c
diff --git a/metadata/md5-cache/app-vim/dhcpd-syntax-20030825-r1 b/metadata/md5-cache/app-vim/dhcpd-syntax-20030825-r1
index da9c90010c27..ee957334dc2d 100644
--- a/metadata/md5-cache/app-vim/dhcpd-syntax-20030825-r1
+++ b/metadata/md5-cache/app-vim/dhcpd-syntax-20030825-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: syntax highlighting for dhcpd.conf
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=744
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=744
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/dhcpd-syntax-20030825.tar.bz2 https://dev.gentoo.org/~radhermit/vim/dhcpd-syntax-20030825.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=b06931796eab687a5b22a122d47de6ae
+_md5_=b8463b18f72853b1627fdc1def6872f5
diff --git a/metadata/md5-cache/app-vim/diffchar-7.01 b/metadata/md5-cache/app-vim/diffchar-7.01
index a5d68bb0a9fb..88c67b912601 100644
--- a/metadata/md5-cache/app-vim/diffchar-7.01
+++ b/metadata/md5-cache/app-vim/diffchar-7.01
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: highlight the exact differences, based on characters and words
 EAPI=6
-HOMEPAGE=https://github.com/rickhowe/diffchar.vim http://www.vim.org/scripts/script.php?script_id=4932
+HOMEPAGE=https://github.com/rickhowe/diffchar.vim https://www.vim.org/scripts/script.php?script_id=4932
 KEYWORDS=amd64 x86
 LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/diffchar-7.01.tar.bz2 https://dev.gentoo.org/~radhermit/vim/diffchar-7.01.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=8d6e700a1e38b2dca14681303304598c
+_md5_=0e5160fe6f5a249c1040778710012884
diff --git a/metadata/md5-cache/app-vim/diffchar-7.2 b/metadata/md5-cache/app-vim/diffchar-7.2
index 1916d9a4a36f..fd09d5b3fdc1 100644
--- a/metadata/md5-cache/app-vim/diffchar-7.2
+++ b/metadata/md5-cache/app-vim/diffchar-7.2
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: highlight the exact differences, based on characters and words
 EAPI=6
-HOMEPAGE=https://github.com/rickhowe/diffchar.vim http://www.vim.org/scripts/script.php?script_id=4932
+HOMEPAGE=https://github.com/rickhowe/diffchar.vim https://www.vim.org/scripts/script.php?script_id=4932
 KEYWORDS=~amd64 ~x86
 LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/diffchar-7.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/diffchar-7.2.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=5562a1f190fb147a1bc690f0a0721303
+_md5_=2f4a2d51c2cce945715a00bb67a66c43
diff --git a/metadata/md5-cache/app-vim/dirdiff-1.1.5 b/metadata/md5-cache/app-vim/dirdiff-1.1.5
index 3725177e6bb2..b5efd0b58eae 100644
--- a/metadata/md5-cache/app-vim/dirdiff-1.1.5
+++ b/metadata/md5-cache/app-vim/dirdiff-1.1.5
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: diff and merge two directories recursively
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=102
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=102
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=sys-apps/diffutils || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/dirdiff-1.1.5.tar.bz2 https://dev.gentoo.org/~radhermit/vim/dirdiff-1.1.5.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=85f5ae713343bbe933d04c3a29373363
+_md5_=2ae5fe30f0b2073de5e3d3b6c4c6b0b9
diff --git a/metadata/md5-cache/app-vim/easy-align-2.10.0 b/metadata/md5-cache/app-vim/easy-align-2.10.0
index ba52babf0515..978440aee2c7 100644
--- a/metadata/md5-cache/app-vim/easy-align-2.10.0
+++ b/metadata/md5-cache/app-vim/easy-align-2.10.0
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm prepare
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: a simple alignment plugin
 EAPI=5
-HOMEPAGE=https://github.com/junegunn/vim-easy-align http://www.vim.org/scripts/script.php?script_id=4520
+HOMEPAGE=https://github.com/junegunn/vim-easy-align https://www.vim.org/scripts/script.php?script_id=4520
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/junegunn/vim-easy-align/archive/2.10.0.tar.gz -> easy-align-2.10.0.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=de3f4993fa73cccb5f752d26c2564847
+_md5_=1cdab99dcb8986216c6cd01de0387cd4
diff --git a/metadata/md5-cache/app-vim/ebnf-syntax-1.1-r1 b/metadata/md5-cache/app-vim/ebnf-syntax-1.1-r1
index 99d764902c50..ab64951498da 100644
--- a/metadata/md5-cache/app-vim/ebnf-syntax-1.1-r1
+++ b/metadata/md5-cache/app-vim/ebnf-syntax-1.1-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm unpack
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: EBNF (ISO/IEC 14997) file syntax highlighting
 EAPI=0
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=545
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=545
 KEYWORDS=alpha amd64 ia64 ~mips ppc ppc64 sparc x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/ebnf-syntax-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ebnf-syntax-1.1.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=35db7d59cf1465edb47c12d007410bff
+_md5_=59e445b88a2dc1463ee0e2cd7986233a
diff --git a/metadata/md5-cache/app-vim/ebnf-syntax-1.1-r2 b/metadata/md5-cache/app-vim/ebnf-syntax-1.1-r2
index aab60be8e858..e8460aaa0880 100644
--- a/metadata/md5-cache/app-vim/ebnf-syntax-1.1-r2
+++ b/metadata/md5-cache/app-vim/ebnf-syntax-1.1-r2
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm prepare
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: EBNF (ISO/IEC 14997) file syntax highlighting
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=545
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=545
 KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/ebnf-syntax-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ebnf-syntax-1.1.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=587c0e2fd7d70df4ffdae9cad18b4b36
+_md5_=592d2cb34be348c0c7af6fa6697a6a1d
diff --git a/metadata/md5-cache/app-vim/emmet-0.85 b/metadata/md5-cache/app-vim/emmet-0.85
index bd85757e26a8..2cc1d0beef4b 100644
--- a/metadata/md5-cache/app-vim/emmet-0.85
+++ b/metadata/md5-cache/app-vim/emmet-0.85
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: HTML and CSS hi-speed coding
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=2981 http://mattn.github.io/emmet-vim/ http://emmet.io/
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2981 https://mattn.github.io/emmet-vim/ https://emmet.io/
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/emmet-0.85.tar.bz2 https://dev.gentoo.org/~radhermit/vim/emmet-0.85.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=b4239d18bba169dedd7a8a9b762a6b99
+_md5_=cb9003fa1a4b08782eba9b76cb120302
diff --git a/metadata/md5-cache/app-vim/enhancedcommentify-2.3-r1 b/metadata/md5-cache/app-vim/enhancedcommentify-2.3-r1
index f9a540a99e85..2a87373562da 100644
--- a/metadata/md5-cache/app-vim/enhancedcommentify-2.3-r1
+++ b/metadata/md5-cache/app-vim/enhancedcommentify-2.3-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=sys-apps/sed || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: enhanced comment creation
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=23
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=23
 KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
 LICENSE=BSD
 RDEPEND=sys-apps/sed !app-vim/ctx || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/enhancedcommentify-2.3.tar.bz2 https://dev.gentoo.org/~radhermit/vim/enhancedcommentify-2.3.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=a20d26bd62301d7553c300c22cb80c22
+_md5_=c2e069b45b4a0e47532b7dbf2b7da88f
diff --git a/metadata/md5-cache/app-vim/errsign-0.1-r1 b/metadata/md5-cache/app-vim/errsign-0.1-r1
index 2069a99f6a06..6dc28d255646 100644
--- a/metadata/md5-cache/app-vim/errsign-0.1-r1
+++ b/metadata/md5-cache/app-vim/errsign-0.1-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: display marks on lines with errors
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=1027
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1027
 KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
 LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/errsign-0.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/errsign-0.1.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=54b1815e39124dd5cf284e480b7f4394
+_md5_=a8ada8ec9c09d794fdc7a046e0a54dfe
diff --git a/metadata/md5-cache/app-vim/eruby-syntax-2.0-r1 b/metadata/md5-cache/app-vim/eruby-syntax-2.0-r1
index c90c584290d0..093a18ef0a3a 100644
--- a/metadata/md5-cache/app-vim/eruby-syntax-2.0-r1
+++ b/metadata/md5-cache/app-vim/eruby-syntax-2.0-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm unpack
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: syntax highlighting for eruby
 EAPI=0
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=403
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=403
 KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/eruby-syntax-2.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/eruby-syntax-2.0.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=c6d9ffa0cf485217c023a738bb80660b
+_md5_=c2655878d264dd519e32cf9f136e0a1d
diff --git a/metadata/md5-cache/app-vim/eruby-syntax-2.0-r2 b/metadata/md5-cache/app-vim/eruby-syntax-2.0-r2
index 28ae59fcfcc9..ecff629d9e02 100644
--- a/metadata/md5-cache/app-vim/eruby-syntax-2.0-r2
+++ b/metadata/md5-cache/app-vim/eruby-syntax-2.0-r2
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm prepare
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: syntax highlighting for eruby
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=403
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=403
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/eruby-syntax-2.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/eruby-syntax-2.0.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=840439af6b6725f676a682faeac1749d
+_md5_=f30fa2216bc6b655e4c3ac6fb4b146d6
diff --git a/metadata/md5-cache/app-vim/extra-syntax-4-r2 b/metadata/md5-cache/app-vim/extra-syntax-4-r2
index e41f3e78ed92..f1a0e0f1d360 100644
--- a/metadata/md5-cache/app-vim/extra-syntax-4-r2
+++ b/metadata/md5-cache/app-vim/extra-syntax-4-r2
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: metapackage for all extra syntax packages
 EAPI=6
-HOMEPAGE=http://www.vim.org/
+HOMEPAGE=https://www.vim.org/
 KEYWORDS=amd64 ~mips ~ppc ppc64 x86
 LICENSE=metapackage
 RDEPEND=app-vim/bnf-syntax app-vim/brainfuck-syntax app-vim/cfengine-syntax app-vim/dhcpd-syntax app-vim/ebnf-syntax app-vim/eruby-syntax app-vim/fluxbox-syntax app-vim/gentoo-syntax app-vim/gtk-syntax app-vim/help-extra-syntax app-vim/nagios-syntax app-vim/ntp-syntax app-vim/pgn-syntax app-vim/selinux-syntax app-vim/wikipedia-syntax app-vim/xquery-syntax app-vim/xsl-syntax || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=91df37f2d04435d9a3624bba40ac02c6
+_md5_=0589a64d7502ed196f93c183e5d3a915
diff --git a/metadata/md5-cache/app-vim/foldutil-3.0-r1 b/metadata/md5-cache/app-vim/foldutil-3.0-r1
index 7417417a9a28..b7a4e9bcd857 100644
--- a/metadata/md5-cache/app-vim/foldutil-3.0-r1
+++ b/metadata/md5-cache/app-vim/foldutil-3.0-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: fold creation utility
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=158
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=158
 KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=>=app-vim/genutils-2.0 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/foldutil-3.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/foldutil-3.0.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=9650ad47ab9b61bdd044179c43d8b0b8
+_md5_=a84967207528a296dd2cc97161cf1aff
diff --git a/metadata/md5-cache/app-vim/fugitive-2.2 b/metadata/md5-cache/app-vim/fugitive-2.2
index 0ba21fb4d70d..eff2281108e3 100644
--- a/metadata/md5-cache/app-vim/fugitive-2.2
+++ b/metadata/md5-cache/app-vim/fugitive-2.2
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm unpack
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: a git wrapper for vim
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/
 KEYWORDS=amd64 x86 ~ppc-macos ~x64-macos
 LICENSE=vim
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tpope/vim-fugitive/archive/v2.2.tar.gz -> fugitive-2.2.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=a9724070c35f81c324dae8b4f7d3298e
+_md5_=f4354fe638606a80e9b4204d1782ccf3
diff --git a/metadata/md5-cache/app-vim/fugitive-9999 b/metadata/md5-cache/app-vim/fugitive-9999
index 1254190b94f8..7b4b752a163b 100644
--- a/metadata/md5-cache/app-vim/fugitive-9999
+++ b/metadata/md5-cache/app-vim/fugitive-9999
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst postrm unpack
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=vim plugin: a git wrapper for vim
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/
 LICENSE=vim
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=a9724070c35f81c324dae8b4f7d3298e
+_md5_=f4354fe638606a80e9b4204d1782ccf3
diff --git a/metadata/md5-cache/app-vim/fuzzyfinder-4.2.2 b/metadata/md5-cache/app-vim/fuzzyfinder-4.2.2
index 3e6e32248901..6cbc1a4c3f6c 100644
--- a/metadata/md5-cache/app-vim/fuzzyfinder-4.2.2
+++ b/metadata/md5-cache/app-vim/fuzzyfinder-4.2.2
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: buffer/file/command/tag/etc explorer with fuzzy matching
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=1984
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1984
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=app-vim/l9 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-SRC_URI=http://www.vim.org/scripts/download_script.php?src_id=13961 -> fuzzyfinder-4.2.2.zip
+SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=13961 -> fuzzyfinder-4.2.2.zip
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=3dad74a33557400cc4b24f56a38c2fd1
+_md5_=b36ed19dd92cfb2a31f9611af235525a
diff --git a/metadata/md5-cache/app-vim/genindent-1.1-r1 b/metadata/md5-cache/app-vim/genindent-1.1-r1
index 59ac8c045de5..09739aad209c 100644
--- a/metadata/md5-cache/app-vim/genindent-1.1-r1
+++ b/metadata/md5-cache/app-vim/genindent-1.1-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: library for simplifying indent files
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=678
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=678
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/genindent-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/genindent-1.1.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=6b0d9272cf737c7a2beab139197387a1
+_md5_=b99d620ee2f05bd4be6690075337919e
diff --git a/metadata/md5-cache/app-vim/genutils-2.5 b/metadata/md5-cache/app-vim/genutils-2.5
index af6589780000..35ba2826443b 100644
--- a/metadata/md5-cache/app-vim/genutils-2.5
+++ b/metadata/md5-cache/app-vim/genutils-2.5
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: library with various useful functions
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=197
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=197
 KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
 LICENSE=GPL-3
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-SRC_URI=http://www.vim.org/scripts/download_script.php?src_id=11399 -> genutils-2.5.zip
+SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=11399 -> genutils-2.5.zip
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=2aec90cbb5c3b5498604bceff13242bd
+_md5_=ce0b206021ebad7ab1b9b93edd395280
diff --git a/metadata/md5-cache/app-vim/gist-7.3 b/metadata/md5-cache/app-vim/gist-7.3
index a02319c2c6fd..09b8317715bd 100644
--- a/metadata/md5-cache/app-vim/gist-7.3
+++ b/metadata/md5-cache/app-vim/gist-7.3
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm prepare
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: interact with gists (gist.github.com)
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=2423 https://github.com/mattn/gist-vim
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2423 https://github.com/mattn/gist-vim
 KEYWORDS=amd64 x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=app-vim/webapi net-misc/curl dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/mattn/gist-vim/archive/7.3.tar.gz -> gist-7.3.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=6a3769ba9ee4d81cae1a99a08c4497c0
+_md5_=c90c9fac6780dfdd8633322c33d1c984
diff --git a/metadata/md5-cache/app-vim/git-patch-tags-0.2 b/metadata/md5-cache/app-vim/git-patch-tags-0.2
index 8ad0d1952c04..954459203087 100644
--- a/metadata/md5-cache/app-vim/git-patch-tags-0.2
+++ b/metadata/md5-cache/app-vim/git-patch-tags-0.2
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: add git patch tags as used in linux kernel development
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=3632
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3632
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/git-patch-tags-0.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/git-patch-tags-0.2.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=42c016a6f68fa635817792c7e5c5ed89
+_md5_=1b19a135c99a0261d783d027aa9f97b2
diff --git a/metadata/md5-cache/app-vim/gitlog-5.1.0 b/metadata/md5-cache/app-vim/gitlog-5.1.0
index 2bac3ddd67f1..c79cb6413a6c 100644
--- a/metadata/md5-cache/app-vim/gitlog-5.1.0
+++ b/metadata/md5-cache/app-vim/gitlog-5.1.0
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: git log and diff plugin for vim
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/
 KEYWORDS=amd64 x86
 LICENSE=Artistic
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/PAntoine/vimgitlog/archive/version_5.1.0.tar.gz -> gitlog-5.1.0.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=f4b9206dbb7e01b0b38251977b81ce72
+_md5_=8838de35d5e3619bb30e165b044d6f9c
diff --git a/metadata/md5-cache/app-vim/gitlog-6.0.0 b/metadata/md5-cache/app-vim/gitlog-6.0.0
index c9c21f1c050f..571748332054 100644
--- a/metadata/md5-cache/app-vim/gitlog-6.0.0
+++ b/metadata/md5-cache/app-vim/gitlog-6.0.0
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: git log and diff plugin for vim
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/
 KEYWORDS=~amd64 ~x86
 LICENSE=Artistic
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/PAntoine/vimgitlog/archive/version_6.0.0.tar.gz -> gitlog-6.0.0.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=8aa1923dd1587d9b81714170d9e2f154
+_md5_=ffaf3e979e660774215ed926ffcb7a4f
diff --git a/metadata/md5-cache/app-vim/gitlog-9999 b/metadata/md5-cache/app-vim/gitlog-9999
index 2c4f673295e2..2eeb8ff0a262 100644
--- a/metadata/md5-cache/app-vim/gitlog-9999
+++ b/metadata/md5-cache/app-vim/gitlog-9999
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst postrm unpack
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=vim plugin: git log and diff plugin for vim
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/
 LICENSE=Artistic
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=8aa1923dd1587d9b81714170d9e2f154
+_md5_=ffaf3e979e660774215ed926ffcb7a4f
diff --git a/metadata/md5-cache/app-vim/gitv-1.3.1 b/metadata/md5-cache/app-vim/gitv-1.3.1
index a8d18ebad645..4f1c999e0abf 100644
--- a/metadata/md5-cache/app-vim/gitv-1.3.1
+++ b/metadata/md5-cache/app-vim/gitv-1.3.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm prepare
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: gitk for vim
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=3574 https://github.com/gregsexton/gitv/
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3574 https://github.com/gregsexton/gitv/
 KEYWORDS=amd64 x86 ~ppc-macos
 LICENSE=vim
 RDEPEND=dev-vcs/git app-vim/fugitive || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/gregsexton/gitv/archive/v1.3.1.tar.gz -> gitv-1.3.1.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=fc99f6f25e6538e5646a89380ad55a69
+_md5_=0e14fb158027ad0885640a0f259cf34d
diff --git a/metadata/md5-cache/app-vim/gitv-9999 b/metadata/md5-cache/app-vim/gitv-9999
index bd9164ff4a5e..e48afb25b0d9 100644
--- a/metadata/md5-cache/app-vim/gitv-9999
+++ b/metadata/md5-cache/app-vim/gitv-9999
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst postrm prepare unpack
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=vim plugin: gitk for vim
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=3574 https://github.com/gregsexton/gitv/
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3574 https://github.com/gregsexton/gitv/
 LICENSE=vim
 RDEPEND=dev-vcs/git app-vim/fugitive || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=885e22482dc90cf5d21a7692d5d720fd
+_md5_=b52cd7c6207c5e1990dfea4b48677507
diff --git a/metadata/md5-cache/app-vim/gnupg-2.6 b/metadata/md5-cache/app-vim/gnupg-2.6
index 0e86177f64d6..5202f75f41f8 100644
--- a/metadata/md5-cache/app-vim/gnupg-2.6
+++ b/metadata/md5-cache/app-vim/gnupg-2.6
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm prepare
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=transparent editing of gpg encrypted files
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=3645
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3645
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=app-crypt/gnupg || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/gnupg-2.6.tar.bz2 https://dev.gentoo.org/~radhermit/vim/gnupg-2.6.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=831e559d66a4875c41e01e5fd7888743
+_md5_=fc9929901bdc803cfdb788e382dfa053
diff --git a/metadata/md5-cache/app-vim/greputils-2.8-r1 b/metadata/md5-cache/app-vim/greputils-2.8-r1
index f5d7182c6d1f..a720ad199331 100644
--- a/metadata/md5-cache/app-vim/greputils-2.8-r1
+++ b/metadata/md5-cache/app-vim/greputils-2.8-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: interface with grep, find and id-utils
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=1062
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1062
 KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=>=app-vim/genutils-1.18 >=app-vim/multvals-3.6.1 >=app-vim/cmdalias-1.0 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/greputils-2.8.tar.bz2 https://dev.gentoo.org/~radhermit/vim/greputils-2.8.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=b1105f57d6e00962b417c17e7cbbf9e5
+_md5_=b5eb7120b4d4d3be48c1dece80b80856
diff --git a/metadata/md5-cache/app-vim/gtk-syntax-20130716 b/metadata/md5-cache/app-vim/gtk-syntax-20130716
index f031ab11835e..c8fc680bdb1f 100644
--- a/metadata/md5-cache/app-vim/gtk-syntax-20130716
+++ b/metadata/md5-cache/app-vim/gtk-syntax-20130716
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Syntax highlighting for GLib, Gtk+, Xlib, Gimp, Gnome, and more
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=1000
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1000
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/gtk-syntax-20130716.tar.bz2 https://dev.gentoo.org/~radhermit/vim/gtk-syntax-20130716.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=6a33c73bba2a47005588d2ffa2f0afce
+_md5_=a846cf852dd91307e9f6138943ea77fc
diff --git a/metadata/md5-cache/app-vim/increment-1.1-r1 b/metadata/md5-cache/app-vim/increment-1.1-r1
index 7541c9f01b8a..af40b61ab0b5 100644
--- a/metadata/md5-cache/app-vim/increment-1.1-r1
+++ b/metadata/md5-cache/app-vim/increment-1.1-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: easily create sequences of incremented values
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=842
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=842
 KEYWORDS=alpha amd64 ia64 ppc sparc x86
 LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/increment-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/increment-1.1.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=329d93da32698f9ba23623690e7f5fd8
+_md5_=3a1ef1fd27fdfebb820d42e02fe11990
diff --git a/metadata/md5-cache/app-vim/indentpython-0.3 b/metadata/md5-cache/app-vim/indentpython-0.3
index 9c3c8f02ac3e..f7682c1f5a80 100644
--- a/metadata/md5-cache/app-vim/indentpython-0.3
+++ b/metadata/md5-cache/app-vim/indentpython-0.3
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Indent Python code according to PEP8
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=974
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=974
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-scripts/indentpython.vim/archive/0.3.zip -> indentpython-0.3.zip
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=2cc9c36f824c2633f949befc76cd449a
+_md5_=6a276818c12d8ddc16067d198a6dd3cd
diff --git a/metadata/md5-cache/app-vim/info-1.7-r2 b/metadata/md5-cache/app-vim/info-1.7-r2
index 9c934a328a1a..ba18ac004fe8 100644
--- a/metadata/md5-cache/app-vim/info-1.7-r2
+++ b/metadata/md5-cache/app-vim/info-1.7-r2
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm prepare
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: GNU info documentation browser
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=21
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=21
 KEYWORDS=x86 alpha sparc ia64 ppc s390 amd64
 LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/info-1.7.tar.bz2 https://dev.gentoo.org/~radhermit/vim/info-1.7.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=c135378c2c556754dd58305b36be2b84
+_md5_=455bf123669a333ccebf10543364542d
diff --git a/metadata/md5-cache/app-xemacs/Manifest.gz b/metadata/md5-cache/app-xemacs/Manifest.gz
index 8b8d27107536..3fba35c063ee 100644
Binary files a/metadata/md5-cache/app-xemacs/Manifest.gz and b/metadata/md5-cache/app-xemacs/Manifest.gz differ
diff --git a/metadata/md5-cache/app-xemacs/ebuild-mode-1.42 b/metadata/md5-cache/app-xemacs/ebuild-mode-1.42
index fd817b7853fd..15f88d98bdb1 100644
--- a/metadata/md5-cache/app-xemacs/ebuild-mode-1.42
+++ b/metadata/md5-cache/app-xemacs/ebuild-mode-1.42
@@ -3,10 +3,10 @@ DEPEND=>=app-editors/xemacs-21.4.20-r5 app-xemacs/sh-script app-editors/xemacs
 DESCRIPTION=Emacs modes for editing ebuilds and other Gentoo specific files
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-KEYWORDS=~amd64 ~hppa x86
+KEYWORDS=amd64 ~hppa x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/xemacs-21.4.20-r5 app-xemacs/sh-script
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.42.tar.xz
 _eclasses_=xemacs-elisp	ec6a89e5b3d4b998d328d445d1c7ec06	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
-_md5_=11734a4780e38dd9132f979cc32e7c67
+_md5_=6de7b316ee1562b1ed75d43cd0c58107
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index d8b728151557..ddd8b2022a15 100644
Binary files a/metadata/md5-cache/dev-cpp/Manifest.gz and b/metadata/md5-cache/dev-cpp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-cpp/glibmm-2.52.1 b/metadata/md5-cache/dev-cpp/glibmm-2.52.1
index 63a8e3d5f5b9..8826d9ebb27c 100644
--- a/metadata/md5-cache/dev-cpp/glibmm-2.52.1
+++ b/metadata/md5-cache/dev-cpp/glibmm-2.52.1
@@ -4,10 +4,10 @@ DESCRIPTION=C++ interface for glib2
 EAPI=6
 HOMEPAGE=https://www.gtkmm.org
 IUSE=doc debug test 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 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=>=dev-libs/libsigc++-2.9.1: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/glib-2.50.0: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(-)?]
 SLOT=2
 SRC_URI=mirror://gnome/sources/glibmm/2.52/glibmm-2.52.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1a98aa535c90607f56899a5ab8ec441b
+_md5_=c48ced5a5e6e84376051b6f687290676
diff --git a/metadata/md5-cache/dev-cpp/gtest-1.8.0-r1 b/metadata/md5-cache/dev-cpp/gtest-1.8.0-r1
index 189a00fc3ea6..e55d529d51fa 100644
--- a/metadata/md5-cache/dev-cpp/gtest-1.8.0-r1
+++ b/metadata/md5-cache/dev-cpp/gtest-1.8.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Google C++ Testing Framework
 EAPI=6
 HOMEPAGE=https://github.com/google/googletest
 IUSE=doc examples test 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
+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
 LICENSE=BSD
 RDEPEND=!dev-cpp/gmock
 SLOT=0
 SRC_URI=https://github.com/google/googletest/archive/release-1.8.0.tar.gz -> gtest-1.8.0.tar.gz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=46a4bdb81396313c28ca4408716f66dd
+_md5_=20d366deaa34119d4220be7d9819c292
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 8ad33aadc0d0..f07edc2d20d1 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/mariadb-10.0.32-r1 b/metadata/md5-cache/dev-db/mariadb-10.0.32-r1
deleted file mode 100644
index d7342290858b..000000000000
--- a/metadata/md5-cache/dev-db/mariadb-10.0.32-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-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 ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) !bindist? ( >=sys-libs/readline-4.1:0= ) server? ( extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35:3=[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(-)?] jdbc? ( >=dev-java/java-config-2.2.0-r3 ) 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=An enhanced, drop-in replacement for MySQL
-EAPI=6
-HOMEPAGE=http://mariadb.org/
-IUSE=bindist jdbc odbc oqgraph pam sphinx tokudb xml elibc_FreeBSD jdbc 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 ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~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=]
-RDEPEND=!bindist? ( >=sys-libs/readline-4.1:0= ) server? ( extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35:3=[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(-)?] perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) 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= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
-REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam ) ^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
-RESTRICT=!bindist? ( bindist )
-SLOT=0/18
-SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.0.32/source/mariadb-10.0.32.tar.gz mirror://gentoo/mysql-extras-20170310-1426Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170310-1426Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170310-1426Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170310-1426Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170310-1426Z.tar.bz2
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-multilib-r1	5ea096b61538a07452de185eea4d1ad9	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a84844aa093cfc91918a8f2f7e34bcf8
diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.26-r1 b/metadata/md5-cache/dev-db/mariadb-10.1.26-r1
deleted file mode 100644
index 2455a27eee57..000000000000
--- a/metadata/md5-cache/dev-db/mariadb-10.1.26-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-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 ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[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(-)?] ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35:3= jdbc? ( >=dev-java/java-config-2.2.0-r3 ) 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=An enhanced, drop-in replacement for MySQL
-EAPI=6
-HOMEPAGE=http://mariadb.org/
-IUSE=+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml elibc_FreeBSD jdbc 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 ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-PDEPEND=galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) 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=]
-RDEPEND=mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[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(-)?] ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35:3= galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) 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= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
-REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam ) ^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
-RESTRICT=!bindist? ( bindist )
-SLOT=0/18
-SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.26/source/mariadb-10.1.26.tar.gz mirror://gentoo/mysql-extras-20170830-1210Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170830-1210Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170830-1210Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170830-1210Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170830-1210Z.tar.bz2
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-multilib-r1	5ea096b61538a07452de185eea4d1ad9	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8a869fd91be4e3e41cba1fa3efa40a27
diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.30 b/metadata/md5-cache/dev-db/mariadb-10.1.30
deleted file mode 100644
index a4e52ce8fc48..000000000000
--- a/metadata/md5-cache/dev-db/mariadb-10.1.30
+++ /dev/null
@@ -1,16 +0,0 @@
-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 ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[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(-)?] ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= jdbc? ( >=dev-java/java-config-2.2.0-r3 ) 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=An enhanced, drop-in replacement for MySQL
-EAPI=6
-HOMEPAGE=http://mariadb.org/
-IUSE=+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-mariabackup sst-xtrabackup tokudb systemd xml elibc_FreeBSD jdbc 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-PDEPEND=galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) 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=]
-RDEPEND=mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[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(-)?] ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) 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= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
-REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam ) ^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
-RESTRICT=!bindist? ( bindist )
-SLOT=0/18
-SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.30/source/mariadb-10.1.30.tar.gz mirror://gentoo/mysql-extras-20170926-1321Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170926-1321Z.tar.bz2
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-multilib-r1	5ea096b61538a07452de185eea4d1ad9	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a527789670c179a0174360e9b9b834f9
diff --git a/metadata/md5-cache/dev-db/mariadb-10.2.10 b/metadata/md5-cache/dev-db/mariadb-10.2.10
deleted file mode 100644
index 0b0447a6df94..000000000000
--- a/metadata/md5-cache/dev-db/mariadb-10.2.10
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare setup test unpack
-DEPEND=virtual/yacc static? ( sys-libs/ncurses[static-libs] ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-connector-c[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( !libressl? ( >=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= mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[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(-)?] ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= virtual/pkgconfig jdbc? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=An enhanced, drop-in replacement for MySQL
-EAPI=6
-HOMEPAGE=http://mariadb.org/
-IUSE=+backup bindist cracklib debug embedded extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup sst-xtrabackup static static-libs systemd systemtap tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2 LGPL-2.1+
-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=] server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )
-RDEPEND=selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r9 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-connector-c[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( !libressl? ( >=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= mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[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(-)?] ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam )
-RESTRICT=!bindist? ( bindist ) libressl? ( test )
-SLOT=0/18
-SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.2.10/source/mariadb-10.2.10.tar.gz mirror://gentoo/mysql-extras-20170926-1321Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170926-1321Z.tar.bz2
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4d69f539f8da5ec6bc14cc4247a74aae
diff --git a/metadata/md5-cache/dev-db/mariadb-10.2.11 b/metadata/md5-cache/dev-db/mariadb-10.2.11
deleted file mode 100644
index 6e6b6cae9a3c..000000000000
--- a/metadata/md5-cache/dev-db/mariadb-10.2.11
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare setup test unpack
-DEPEND=virtual/yacc static? ( sys-libs/ncurses[static-libs] ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-connector-c[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( !libressl? ( >=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= mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[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(-)?] ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= virtual/pkgconfig jdbc? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=An enhanced, drop-in replacement for MySQL
-EAPI=6
-HOMEPAGE=http://mariadb.org/
-IUSE=+backup bindist cracklib debug embedded extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup sst-xtrabackup static static-libs systemd systemtap tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2 LGPL-2.1+
-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=] server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )
-RDEPEND=selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r9 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-connector-c[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( !libressl? ( >=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= mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[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(-)?] ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam )
-RESTRICT=!bindist? ( bindist ) libressl? ( test )
-SLOT=0/18
-SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.2.11/source/mariadb-10.2.11.tar.gz mirror://gentoo/mysql-extras-20170926-1321Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170926-1321Z.tar.bz2
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=923162a419d0c505cac7265e78d534cd
diff --git a/metadata/md5-cache/dev-db/mariadb-5.5.58 b/metadata/md5-cache/dev-db/mariadb-5.5.58
deleted file mode 100644
index 9d9ed9a859fa..000000000000
--- a/metadata/md5-cache/dev-db/mariadb-5.5.58
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack
-DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/make >=dev-util/cmake-3.7.2 ssl? ( >=dev-libs/openssl-0.9.6d:0 ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.3 !bindist? ( >=sys-libs/readline-4.1:0 ) oqgraph? ( >=dev-libs/boost-1.40.0 ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster jemalloc? ( dev-libs/jemalloc[static-libs?] ) tcmalloc? ( dev-util/google-perftools ) >=sys-libs/zlib-1.2.3[static-libs?] ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 >=dev-util/cmake-2.6.3
-DESCRIPTION=An enhanced, drop-in replacement for MySQL
-EAPI=5
-HOMEPAGE=http://mariadb.org/
-IUSE=bindist debug embedded minimal +perl selinux ssl static static-libs test latin1 extraengine cluster max-idx-128 +community profiling oqgraph sphinx pam tokudb jemalloc tcmalloc systemtap
-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 ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) ~virtual/mysql-5.5
-RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d:0 ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.3 !bindist? ( >=sys-libs/readline-4.1:0 ) oqgraph? ( >=dev-libs/boost-1.40.0 ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster jemalloc? ( dev-libs/jemalloc[static-libs?] ) tcmalloc? ( dev-util/google-perftools ) >=sys-libs/zlib-1.2.3[static-libs?] ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) perl? ( virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes )
-REQUIRED_USE=minimal? ( !oqgraph ) minimal? ( !sphinx ) tokudb? ( jemalloc !tcmalloc ) tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )
-RESTRICT=!bindist? ( bindist )
-SLOT=0/18
-SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.5.58/kvm-tarbake-jaunty-x86/mariadb-5.5.58.tar.gz http://ftp.osuosl.org/pub/mariadb/mariadb-5.5.58/source/mariadb-5.5.58.tar.gz http://mirror.jmu.edu/pub/mariadb/mariadb-5.5.58/kvm-tarbake-jaunty-x86/mariadb-5.5.58.tar.gz http://mirrors.coreix.net/mariadb/mariadb-5.5.58/kvm-tarbake-jaunty-x86/mariadb-5.5.58.tar.gz http://mirrors.syringanetworks.net/mariadb/mariadb-5.5.58/kvm-tarbake-jaunty-x86/mariadb-5.5.58.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.5.58/kvm-tarbake-jaunty-x86/mariadb-5.5.58.tar.gz http://mirror2.hs-esslingen.de/mariadb/mariadb-5.5.58/kvm-tarbake-jaunty-x86/mariadb-5.5.58.tar.gz mirror://gentoo/mysql-extras-20160721-1526Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20160721-1526Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20160721-1526Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20160721-1526Z.tar.bz2
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-cmake	84b8e014a55adc91fb42dabaa0d7159e	mysql-v2	c498244d7e52726f86bb9c0a02e0f14b	mysql_fx	fd803e05287868299aac78823b68920e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=572c80a22f908204245c3be6df9ec22f
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-4.7.8 b/metadata/md5-cache/dev-db/phpmyadmin-4.7.8
index 993f4872fed5..28c2b53b3623 100644
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.7.8
+++ b/metadata/md5-cache/dev-db/phpmyadmin-4.7.8
@@ -4,10 +4,10 @@ DESCRIPTION=Web-based administration for MySQL database in PHP
 EAPI=5
 HOMEPAGE=https://www.phpmyadmin.net/
 IUSE=setup vhosts
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=dev-lang/php[ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
 SLOT=4.7.8
 SRC_URI=https://files.phpmyadmin.net/phpMyAdmin/4.7.8/phpMyAdmin-4.7.8-all-languages.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=a7e00760d9a193d2600d07aa314d63b3
+_md5_=4ce7c6c705eccff7020adde3118c3b91
diff --git a/metadata/md5-cache/dev-db/postgresql-10.3 b/metadata/md5-cache/dev-db/postgresql-10.3
index 6431eedd1adf..85050399a668 100644
--- a/metadata/md5-cache/dev-db/postgresql-10.3
+++ b/metadata/md5-cache/dev-db/postgresql-10.3
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD 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
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:10 !dev-db/postgresql-base:10 !dev-db/postgresql-server:10 selinux? ( sec-policy/selinux-postgresql )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=10
 SRC_URI=mirror://postgresql/source/v10.3/postgresql-10.3.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f16592031869d2e1eebd61fd3078559e
+_md5_=2a7ad007cc6367550c5cac0d1d2ff2e4
diff --git a/metadata/md5-cache/dev-db/postgresql-9.3.22 b/metadata/md5-cache/dev-db/postgresql-9.3.22
index d9fde69c5d0e..1a096f29c3c2 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.3.22
+++ b/metadata/md5-cache/dev-db/postgresql-9.3.22
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib 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
-KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:9.3 !dev-db/postgresql-base:9.3 !dev-db/postgresql-server:9.3 selinux? ( sec-policy/selinux-postgresql )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=9.3
 SRC_URI=mirror://postgresql/source/v9.3.22/postgresql-9.3.22.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=0494f926215f95311500a0e62dc6649f
+_md5_=17e42ec79446e0a00ff5a66e1e6a90b8
diff --git a/metadata/md5-cache/dev-db/postgresql-9.4.17 b/metadata/md5-cache/dev-db/postgresql-9.4.17
index 4b33a18db168..c6ce27a70756 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.4.17
+++ b/metadata/md5-cache/dev-db/postgresql-9.4.17
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD 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
-KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.4 !dev-db/postgresql-base:9.4 !dev-db/postgresql-server:9.4 selinux? ( sec-policy/selinux-postgresql )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=9.4
 SRC_URI=mirror://postgresql/source/v9.4.17/postgresql-9.4.17.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=586c4110065c4c7ae8e180d7db5bdede
+_md5_=24a517a5bf5b41178f1266f9a7bf5cf1
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.12 b/metadata/md5-cache/dev-db/postgresql-9.5.12
index 385f299b19e4..4db1fcc87651 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.5.12
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.12
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD 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
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.5 !dev-db/postgresql-base:9.5 !dev-db/postgresql-server:9.5 selinux? ( sec-policy/selinux-postgresql )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=9.5
 SRC_URI=mirror://postgresql/source/v9.5.12/postgresql-9.5.12.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=13095fb9168f5f4216b1efe364803fe4
+_md5_=2c37668c6c0affec4f3b0adfd718a00a
diff --git a/metadata/md5-cache/dev-db/slony1-2.2.6 b/metadata/md5-cache/dev-db/slony1-2.2.6
index d1480da695ee..9b40e48e27cd 100644
--- a/metadata/md5-cache/dev-db/slony1-2.2.6
+++ b/metadata/md5-cache/dev-db/slony1-2.2.6
@@ -4,11 +4,11 @@ DESCRIPTION=A replication system for the PostgreSQL Database Management System
 EAPI=6
 HOMEPAGE=http://slony.info/
 IUSE=doc perl postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 postgres_targets_postgres9_3 postgres_targets_postgres9_2
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=BSD GPL-2
 RDEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10=[server,threads] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server,threads] ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5=[server,threads] ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4=[server,threads] ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3=[server,threads] ) postgres_targets_postgres9_2? ( dev-db/postgresql:9.2=[server,threads] ) perl? ( dev-perl/DBD-Pg )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://main.slony.info/downloads/2.2/source/slony1-2.2.6.tar.bz2 http://main.slony.info/downloads/2.2/source/slony1-2.2.6-docs.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	postgres	c59d58664169a60e232dd018eae69172	postgres-multi	4ad3669c874bed68b375f87035e46db8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=7170436e0bd28c2d125228f1a8c6cdb1
+_md5_=1539075482f17db239e9a11059c2a4b4
diff --git a/metadata/md5-cache/dev-db/unixODBC-2.3.5-r1 b/metadata/md5-cache/dev-db/unixODBC-2.3.5-r1
index 51c18c588183..ea85fec15f92 100644
--- a/metadata/md5-cache/dev-db/unixODBC-2.3.5-r1
+++ b/metadata/md5-cache/dev-db/unixODBC-2.3.5-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A complete ODBC driver manager
 EAPI=6
 HOMEPAGE=http://www.unixodbc.org/
 IUSE=+minimal odbcmanual static-libs unicode 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=|| ( 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(-)?] >=sys-devel/libtool-2.4.2-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-libs/readline-6.2_p5-r1: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(-)?] >=sys-libs/ncurses-5.9-r3: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/libiconv-0-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=ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.5.tar.gz
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=206c083015e178855c620260ffed3c1f
+_md5_=14d305284d1c514cdb437ca49cf79f3e
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index e4d7074ab605..a8bc603ecb77 100644
Binary files a/metadata/md5-cache/dev-games/Manifest.gz and b/metadata/md5-cache/dev-games/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-games/openscenegraph-3.5.5 b/metadata/md5-cache/dev-games/openscenegraph-3.5.5
index 34e16a62f4d2..1b6e6cb535e2 100644
--- a/metadata/md5-cache/dev-games/openscenegraph-3.5.5
+++ b/metadata/md5-cache/dev-games/openscenegraph-3.5.5
@@ -4,11 +4,11 @@ DESCRIPTION=Open source high performance 3D graphics toolkit
 EAPI=6
 HOMEPAGE=http://www.openscenegraph.org/
 IUSE=asio curl debug doc examples ffmpeg fltk fox gdal gif glut gstreamer gtk jpeg jpeg2k las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff truetype vnc wxwidgets xine xrandr zlib
-KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~hppa ~ia64 ppc ~ppc64 ~x86
 LICENSE=wxWinLL-3 LGPL-2.1
 RDEPEND=x11-libs/libSM x11-libs/libXext virtual/glu virtual/opengl asio? ( dev-cpp/asio ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) gtk? ( x11-libs/gtkglext ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0[opengl,X] ) ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gdal? ( sci-libs/gdal ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( >=dev-lang/lua-5.1.5:* ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xine? ( media-libs/xine-lib ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=sdl2? ( sdl )
 SLOT=0/145
 SRC_URI=https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-3.5.5.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=06b580bffccfa858776bc6d6ec297861
+_md5_=0b2dfd2c5cd8479a37388d4e2c6b6065
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 2b3690fbec06..46260cff298c 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/commons-math-2.1-r2 b/metadata/md5-cache/dev-java/commons-math-2.1-r2
new file mode 100644
index 000000000000..cf59726a9f6f
--- /dev/null
+++ b/metadata/md5-cache/dev-java/commons-math-2.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit4 dev-java/hamcrest-core:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Lightweight, self-contained mathematics and statistics components
+EAPI=6
+HOMEPAGE=https://commons.apache.org/math/
+IUSE=elibc_FreeBSD doc test source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=2
+SRC_URI=mirror://apache/commons/math/source/commons-math-2.1-src.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=3c9979bac3086f79459afcd86e89739a
diff --git a/metadata/md5-cache/dev-java/commons-math-3.2 b/metadata/md5-cache/dev-java/commons-math-3.2
index 786cce900e2f..2be90bc249b6 100644
--- a/metadata/md5-cache/dev-java/commons-math-3.2
+++ b/metadata/md5-cache/dev-java/commons-math-3.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install preinst prepare setup
 DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
 DESCRIPTION=Lightweight, self-contained mathematics and statistics components
 EAPI=5
-HOMEPAGE=http://commons.apache.org/math/
+HOMEPAGE=https://commons.apache.org/math/
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD elibc_FreeBSD
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=3
 SRC_URI=mirror://apache/commons/math/source/commons-math3-3.2-src.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d95b579e23b32872e9374adbe5cbcf3b
+_md5_=60e0dc8a5a0435389b235ebfca97ad38
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index b73c9a241263..74097b35cdf0 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/perl-5.26.1-r2 b/metadata/md5-cache/dev-lang/perl-5.26.1-r2
index a282b8293834..fa14509497d2 100644
--- a/metadata/md5-cache/dev-lang/perl-5.26.1-r2
+++ b/metadata/md5-cache/dev-lang/perl-5.26.1-r2
@@ -11,4 +11,4 @@ RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) app-arch/bzip2
 SLOT=0/5.26
 SRC_URI=mirror://cpan/src/5.0/perl-5.26.1.tar.xz mirror://cpan/authors/id/S/SH/SHAY/perl-5.26.1.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.26.1-patches-1/perl-5.26.1-patches-1.tar.xz mirror://gentoo/perl-5.26.1-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.26.1-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.1.7/perl-cross-1.1.7.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=51e8b75b19d5e9c2c44ce255f7f79a89
+_md5_=0e9154c0033e8070547bc7360ea2b6d4
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.4.2 b/metadata/md5-cache/dev-lang/swi-prolog-7.4.2
index f6ecc295e3df..e5bf6c1136ec 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-7.4.2
+++ b/metadata/md5-cache/dev-lang/swi-prolog-7.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=free, small, and standard compliant Prolog compiler
 EAPI=5
 HOMEPAGE=http://www.swi-prolog.org/
 IUSE=archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc readline ssl static-libs test uuid zlib X elibc_FreeBSD java
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.5:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://www.swi-prolog.org/download/stable/src/swipl-7.4.2.tar.gz mirror://gentoo/swi-prolog-7.4.2-gentoo-patchset-3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=165696a3ffdac75b15c623e26017d7e8
+_md5_=860d0a9b271576e72c4c1052758fdea7
diff --git a/metadata/md5-cache/dev-lang/vala-0.36.7 b/metadata/md5-cache/dev-lang/vala-0.36.7
index d359eb23feac..cc982d0828bc 100644
--- a/metadata/md5-cache/dev-lang/vala-0.36.7
+++ b/metadata/md5-cache/dev-lang/vala-0.36.7
@@ -4,10 +4,10 @@ DESCRIPTION=Compiler for the GObject type system
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/vala-common-0.36.7
 SLOT=0.36
 SRC_URI=mirror://gnome/sources/vala/0.36/vala-0.36.7.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9e4ffa211262369bd7ec604e85f381a1
+_md5_=0aba6f27947da169c7c7bb6546eee86d
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index b13d541dd95b..a07ee7e72c94 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/atk-2.24.0 b/metadata/md5-cache/dev-libs/atk-2.24.0
index 6ba053c8dcad..5e0448ec34ca 100644
--- a/metadata/md5-cache/dev-libs/atk-2.24.0
+++ b/metadata/md5-cache/dev-libs/atk-2.24.0
@@ -4,10 +4,10 @@ DESCRIPTION=GTK+ & GNOME Accessibility Toolkit
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Accessibility
 IUSE=+introspection nls test 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 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.34.3: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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/atk/2.24/atk-2.24.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=051bee671c1622b293baae7b7febeb52
+_md5_=101da8f4ccedb94b692d407408969cd6
diff --git a/metadata/md5-cache/dev-libs/glib-2.52.3 b/metadata/md5-cache/dev-libs/glib-2.52.3
index 1b70cb23f328..01710a5b98a1 100644
--- a/metadata/md5-cache/dev-libs/glib-2.52.3
+++ b/metadata/md5-cache/dev-libs/glib-2.52.3
@@ -4,7 +4,7 @@ DESCRIPTION=The GLib library of C routines
 EAPI=6
 HOMEPAGE=https://www.gtk.org/
 IUSE=dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr 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 python_targets_python2_7 test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=LGPL-2.1+
 PDEPEND=!<gnome-base/gvfs-1.6.4-r990 dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
 RDEPEND=!<dev-util/gdbus-codegen-2.52.3 >=dev-libs/libpcre-8.13:3[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?] >=virtual/libiconv-0-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(-)?] >=virtual/libffi-3.0.13-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(-)?] >=virtual/libintl-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(-)?] >=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(-)?] kernel_linux? ( sys-apps/util-linux[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(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[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(-)?] ) xattr? ( >=sys-apps/attr-2.4.47-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(-)?] ) fam? ( >=virtual/fam-0-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(-)?] ) utils? ( 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_python2_7(-)] >=dev-util/gdbus-codegen-2.52.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/libelf:0= )
@@ -12,4 +12,4 @@ REQUIRED_USE=utils? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targ
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.52/glib-2.52.3.tar.xz https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=00a1cb7f9479cca783aaa714563f0b71
+_md5_=6d2dc75fd9553ddc535ee401635e502e
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.52.1 b/metadata/md5-cache/dev-libs/gobject-introspection-1.52.1
index 77e68eca6247..e8d81a634912 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.52.1
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.52.1
@@ -4,7 +4,7 @@ DESCRIPTION=Introspection system for GObject-based libraries
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
 IUSE=cairo doctool test 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
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+ GPL-2+
 PDEPEND=cairo? ( x11-libs/cairo[glib] )
 RDEPEND=>=dev-libs/gobject-introspection-common-1.52.1 >=dev-libs/glib-2.52:2 doctool? ( dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) virtual/libffi:= virtual/pkgconfig !<dev-lang/vala-0.20.0 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.52/gobject-introspection-1.52.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=767579b00766fd8f019b5813bf3ebf63
+_md5_=a7f553a90f655c09eb552a75995046b1
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.52.1 b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.52.1
index 30748978a503..bd22c0e6fc62 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.52.1
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.52.1
@@ -3,10 +3,10 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Build infrastructure for GObject Introspection
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=HPND
 RDEPEND=!<dev-libs/gobject-introspection-1.52.1
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.52/gobject-introspection-1.52.1.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=40baf1c5c7dadc8492d7e70ec2f6bdcb
+_md5_=459d5b0790ef40b6cb28c5d5c09aa676
diff --git a/metadata/md5-cache/dev-libs/judy-1.0.5-r2 b/metadata/md5-cache/dev-libs/judy-1.0.5-r2
index 28e5fadafa1c..b8c5ac14087f 100644
--- a/metadata/md5-cache/dev-libs/judy-1.0.5-r2
+++ b/metadata/md5-cache/dev-libs/judy-1.0.5-r2
@@ -4,9 +4,9 @@ DESCRIPTION=A C library that implements a dynamic array
 EAPI=6
 HOMEPAGE=http://judy.sourceforge.net/
 IUSE=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 ~sparc ~x86
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/judy/Judy-1.0.5.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ea4b24d76bc84f2e21ce4e041c823a01
+_md5_=0519ed8eb669dadb5d372f4418b7b46c
diff --git a/metadata/md5-cache/dev-libs/libinput-1.9.4 b/metadata/md5-cache/dev-libs/libinput-1.9.4
index 6cfd78b742db..97ceee8578e2 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.9.4
+++ b/metadata/md5-cache/dev-libs/libinput-1.9.4
@@ -4,11 +4,11 @@ DESCRIPTION=Library to handle input devices in Wayland
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/
 IUSE=doc input_devices_wacom test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86
 LICENSE=MIT
 RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev
 RESTRICT=test
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.9.4.tar.xz
 _eclasses_=meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=6eeb8e77a07602d10482b5bcf19fba72
+_md5_=1cd5e0ce19702f85ac4234fb273a95ec
diff --git a/metadata/md5-cache/dev-libs/libspt-1.1-r3 b/metadata/md5-cache/dev-libs/libspt-1.1-r3
index ef5c5b242d81..2b526750f90d 100644
--- a/metadata/md5-cache/dev-libs/libspt-1.1-r3
+++ b/metadata/md5-cache/dev-libs/libspt-1.1-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Library for handling root privilege
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=+libtirpc suid
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD-2
 RDEPEND=!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) libtirpc? ( net-libs/libtirpc )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/libspt-1.1.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=831f9d4eac1f4546784f560d834d0f42
+_md5_=712460a9db287474285d9d19418c022b
diff --git a/metadata/md5-cache/dev-libs/libunicode-0.4-r2 b/metadata/md5-cache/dev-libs/libunicode-0.4-r2
index ace1625598f9..ca5a5c3f8611 100644
--- a/metadata/md5-cache/dev-libs/libunicode-0.4-r2
+++ b/metadata/md5-cache/dev-libs/libunicode-0.4-r2
@@ -3,9 +3,9 @@ DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >
 DESCRIPTION=Unicode library
 EAPI=6
 HOMEPAGE=https://www.gnome.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ppc ~sparc x86
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ppc ~sparc x86
 LICENSE=GPL-2 LGPL-2
 SLOT=0
 SRC_URI=ftp://ftp.gnome.org/pub/GNOME/sources/libunicode/0.4/libunicode-0.4.gnome.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b1e2381abd3359d2aa0a424ca54c0ca8
+_md5_=7f74678cea1041c6246e912306a07608
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.7 b/metadata/md5-cache/dev-libs/libxml2-2.9.7
index 702dbdf0cb73..5642820deb27 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.7
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.7
@@ -4,11 +4,11 @@ DESCRIPTION=Version 2 of the library to manipulate XML files
 EAPI=6
 HOMEPAGE=http://www.xmlsoft.org/
 IUSE=debug examples icu ipv6 lzma python readline static-libs test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 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 ~ppc-aix ~x64-cygwin ~amd64-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 ~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=MIT
 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(-)?] icu? ( >=dev-libs/icu-51.2-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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=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(-)] ) readline? ( sys-libs/readline:= )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.7.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=30735b620c48ae352440e0cdcdb931a3
+_md5_=382e737767cc68e313d10137cb87fb00
diff --git a/metadata/md5-cache/dev-libs/libxslt-1.1.30-r2 b/metadata/md5-cache/dev-libs/libxslt-1.1.30-r2
index 7af0c6160863..03c6354da077 100644
--- a/metadata/md5-cache/dev-libs/libxslt-1.1.30-r2
+++ b/metadata/md5-cache/dev-libs/libxslt-1.1.30-r2
@@ -4,11 +4,11 @@ DESCRIPTION=XSLT libraries and tools
 EAPI=6
 HOMEPAGE=http://www.xmlsoft.org/
 IUSE=crypt debug examples python static-libs elibc_Darwin python_targets_python2_7 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 ~ppc-aix ~x64-cygwin ~amd64-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 ~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=MIT
 RDEPEND=>=dev-libs/libxml2-2.9.1-r5: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(-)?] crypt? ( >=dev-libs/libgcrypt-1.5.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(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/libxml2:2[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=ftp://xmlsoft.org/libxslt/libxslt-1.1.30.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c1a7452797438bfb46cb845ef0ccd4bc
+_md5_=03dae86ef45e90943b6d001ceefcb284
diff --git a/metadata/md5-cache/dev-libs/mm-1.4.2-r2 b/metadata/md5-cache/dev-libs/mm-1.4.2-r2
index 4a8859954d46..3eaf83521b3b 100644
--- a/metadata/md5-cache/dev-libs/mm-1.4.2-r2
+++ b/metadata/md5-cache/dev-libs/mm-1.4.2-r2
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure install prepare test
 DESCRIPTION=Shared Memory Abstraction Library
 EAPI=6
 HOMEPAGE=http://www.ossp.org/pkg/lib/mm/
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=mm
 SLOT=1.2
 SRC_URI=ftp://ftp.ossp.org/pkg/lib/mm/mm-1.4.2.tar.gz
-_md5_=dbb8ef9e77a10582539809efcc4e417d
+_md5_=286e453b2134619e7e574511bb486fe5
diff --git a/metadata/md5-cache/dev-libs/nss-3.35 b/metadata/md5-cache/dev-libs/nss-3.35
index 8c48241545a8..5142eb600d02 100644
--- a/metadata/md5-cache/dev-libs/nss-3.35
+++ b/metadata/md5-cache/dev-libs/nss-3.35
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_35_RTM/src/nss-3.35.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch ) nss-pem? ( https://dev.gentoo.org/~polynomial-c/nss-pem-20160329.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a4c0da06f1682b5343f63ebce43bc567
+_md5_=61432a341723feb39cf3ae14de341497
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.5.1.1 b/metadata/md5-cache/dev-libs/protobuf-3.5.1.1
index 2c3884b3bbb7..1d3f7674c6db 100644
--- a/metadata/md5-cache/dev-libs/protobuf-3.5.1.1
+++ b/metadata/md5-cache/dev-libs/protobuf-3.5.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing str
 EAPI=6
 HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf
 IUSE=emacs examples static-libs test 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 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=emacs? ( virtual/emacs ) zlib? ( sys-libs/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(-)?] )
 SLOT=0/15
 SRC_URI=https://github.com/google/protobuf/archive/v3.5.1.1.tar.gz -> protobuf-3.5.1.1.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=207a9054f8184b81562afed6f01b30cf
+_md5_=2d6c83a53c83d2daad2b4b559fcafc89
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.36.7 b/metadata/md5-cache/dev-libs/vala-common-0.36.7
index eb807958737c..cfd59b122bc4 100644
--- a/metadata/md5-cache/dev-libs/vala-common-0.36.7
+++ b/metadata/md5-cache/dev-libs/vala-common-0.36.7
@@ -3,10 +3,10 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Build infrastructure for packages that use Vala
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=LGPL-2.1
 RDEPEND=!<dev-lang/vala-0.10.4-r2 !<dev-lang/vala-0.12.1-r1:0.12 !<dev-lang/vala-0.14.2-r2:0.14 !<dev-lang/vala-0.16.1-r2:0.16 !<dev-lang/vala-0.17.5:0.18
 SLOT=0
 SRC_URI=mirror://gnome/sources/vala/0.36/vala-0.36.7.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9c5c8b7cd3b6bb63a601668ca6f552fa
+_md5_=9fd79df9486a0ed74a6a14953da3d0f4
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index fd773248516c..a4c1ca2f71d3 100644
Binary files a/metadata/md5-cache/dev-lisp/Manifest.gz and b/metadata/md5-cache/dev-lisp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lisp/asdf-3.1.5 b/metadata/md5-cache/dev-lisp/asdf-3.1.5
index 14665fdf8389..9ea425f19cfc 100644
--- a/metadata/md5-cache/dev-lisp/asdf-3.1.5
+++ b/metadata/md5-cache/dev-lisp/asdf-3.1.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install
-DEPEND=!dev-lisp/cl-asdf !dev-lisp/asdf-binary-locations !dev-lisp/gentoo-init !<dev-lisp/asdf-2.33-r3 doc? ( virtual/texi2dvi )
+DEPEND=!dev-lisp/cl-asdf !dev-lisp/asdf-binary-locations !<dev-lisp/gentoo-init-1.0 !<dev-lisp/asdf-2.33-r3 doc? ( virtual/texi2dvi )
 DESCRIPTION=ASDF is Another System Definition Facility for Common Lisp
 EAPI=5
 HOMEPAGE=http://common-lisp.net/project/asdf/
@@ -10,4 +10,4 @@ PDEPEND=~dev-lisp/uiop-3.1.5
 SLOT=0/3.1.5
 SRC_URI=http://common-lisp.net/project/asdf/archives/asdf-3.1.5.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=92b6e7c6b413de9614e7bacaf8138928
+_md5_=b5a296379f94bef6e6facda2dbc66fab
diff --git a/metadata/md5-cache/dev-perl/DBD-SQLite-1.540.0-r1 b/metadata/md5-cache/dev-perl/DBD-SQLite-1.540.0-r1
index 7c854c1035aa..c896d15ba781 100644
--- a/metadata/md5-cache/dev-perl/DBD-SQLite-1.540.0-r1
+++ b/metadata/md5-cache/dev-perl/DBD-SQLite-1.540.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Self Contained RDBMS in a DBI Driver
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/DBD-SQLite/
 IUSE=test system-sqlite
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=system-sqlite? ( >=dev-db/sqlite-3.13.0[extensions(+)] <dev-db/sqlite-3.21.0 ) >=dev-perl/DBI-1.570.0 !<dev-perl/DBD-SQLite-1 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.54.tar.gz https://github.com/kentnl-gentoo/DBD-SQLite/releases/download/1.54-patches-1/DBD-SQLite-1.54-patches-1.tar.xz mirror://gentoo/DBD-SQLite-1.54-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/DBD-SQLite-1.54-patches-1.tar.xz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=eb3fbfd89f989646233267ef4e28ad07
+_md5_=5dcb7110477624582c8481d09da1ab2c
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 8a917452c8d9..2017ba50ed84 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-perl/PadWalker-2.300.0 b/metadata/md5-cache/dev-perl/PadWalker-2.300.0
index 57cb9ac6cef0..7aa501b0ad54 100644
--- a/metadata/md5-cache/dev-perl/PadWalker-2.300.0
+++ b/metadata/md5-cache/dev-perl/PadWalker-2.300.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
 DESCRIPTION=play with other peoples' lexical variables
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/PadWalker/
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RO/ROBIN/PadWalker-2.3.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=1ef8faeafaa48d8d20267748ca5d45e4
+_md5_=68e87edd87b3eb6279072447e018ac1e
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-1.130.0 b/metadata/md5-cache/dev-perl/Perl-Critic-1.130.0
index 92640f9c02ae..6e92c24e42cf 100644
--- a/metadata/md5-cache/dev-perl/Perl-Critic-1.130.0
+++ b/metadata/md5-cache/dev-perl/Perl-Critic-1.130.0
@@ -4,10 +4,10 @@ DESCRIPTION=Critique Perl source code for best-practices
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Perl-Critic/
 IUSE=test minimal examples emacs
-KEYWORDS=~alpha amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=alpha amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/B-Keywords-1.50.0 virtual/perl-Carp >=dev-perl/Config-Tiny-2 >=dev-perl/Email-Address-1.889.0 >=dev-perl/Exception-Class-1.230.0 >=virtual/perl-Exporter-5.630.0 dev-perl/File-HomeDir virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/File-Which virtual/perl-Getopt-Long dev-perl/IO-String >=dev-perl/List-MoreUtils-0.190.0 >=dev-perl/Module-Pluggable-3.100.0 >=dev-perl/PPI-1.224 >=dev-perl/PPIx-Regexp-0.27.0 >=dev-perl/PPIx-Utilities-1.1.0 virtual/perl-Pod-Parser >=dev-perl/Pod-Spell-1 >=dev-perl/Readonly-2 virtual/perl-Scalar-List-Utils >=dev-perl/String-Format-1.130.0 dev-perl/Task-Weaken >=virtual/perl-Term-ANSIColor-2.20.0 >=virtual/perl-Test-Simple-0.920.0 >=virtual/perl-Text-ParseWords-3 dev-perl/Perl-Tidy >=virtual/perl-version-0.770.0 emacs? ( virtual/emacs ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/Perl-Critic-1.130.tar.gz
 _eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=31180e13cb8795ef0596b54ce3627842
+_md5_=59a04b85f6c37b728023efa5ff725df3
diff --git a/metadata/md5-cache/dev-perl/Test-MockModule-0.130.0 b/metadata/md5-cache/dev-perl/Test-MockModule-0.130.0
new file mode 100644
index 000000000000..904a5e93a287
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Test-MockModule-0.130.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp dev-perl/SUPER virtual/perl-Scalar-List-Utils >=dev-perl/Module-Build-0.380.0 test? ( >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl:=
+DESCRIPTION=Override subroutines in a module for unit testing
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Test-MockModule/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp dev-perl/SUPER virtual/perl-Scalar-List-Utils dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-0.13.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=8051571a3a5d49c398fd949cca4fcdfd
diff --git a/metadata/md5-cache/dev-perl/Test-MockTime-0.160.0 b/metadata/md5-cache/dev-perl/Test-MockTime-0.160.0
new file mode 100644
index 000000000000..b621d97b5b29
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Test-MockTime-0.160.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Time-Piece virtual/perl-Time-Local virtual/perl-Test-Simple dev-lang/perl:=
+DESCRIPTION=Replaces actual time with simulated time
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Test-MockTime/
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Time-Piece virtual/perl-Time-Local virtual/perl-Test-Simple dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DD/DDICK/Test-MockTime-0.16.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=35a8274fa6e255f11206f0cce2e46feb
diff --git a/metadata/md5-cache/dev-perl/Test-MockTime-HiRes-0.80.0 b/metadata/md5-cache/dev-perl/Test-MockTime-HiRes-0.80.0
new file mode 100644
index 000000000000..4a59d0c1338a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Test-MockTime-HiRes-0.80.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/Test-MockTime virtual/perl-Test-Simple virtual/perl-Time-HiRes >=dev-perl/Module-Build-Tiny-0.35.0 test? ( dev-perl/Test-Class dev-perl/Test-Requires ) dev-lang/perl:=
+DESCRIPTION=Replace actual time with simulated high resolution time
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Test-MockTime-HiRes/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Test-MockTime virtual/perl-Test-Simple virtual/perl-Time-HiRes dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TA/TARAO/Test-MockTime-HiRes-0.08.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=7cfa1616b137e9f0de23564487cd73eb
diff --git a/metadata/md5-cache/dev-perl/Test-Most-0.350.0 b/metadata/md5-cache/dev-perl/Test-Most-0.350.0
new file mode 100644
index 000000000000..601446acc163
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Test-Most-0.350.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/Exception-Class-1.140.0 >=dev-perl/Test-Deep-0.119.0 >=dev-perl/Test-Differences-0.640.0 >=dev-perl/Test-Exception-0.430.0 >=virtual/perl-Test-Harness-3.350.0 >=virtual/perl-Test-Simple-1.302.47 >=dev-perl/Test-Warn-0.300.0 virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+DESCRIPTION=Most commonly needed test functions and features
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Test-Most/
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Exception-Class-1.140.0 >=dev-perl/Test-Deep-0.119.0 >=dev-perl/Test-Differences-0.640.0 >=dev-perl/Test-Exception-0.430.0 >=virtual/perl-Test-Harness-3.350.0 >=virtual/perl-Test-Simple-1.302.47 >=dev-perl/Test-Warn-0.300.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/O/OV/OVID/Test-Most-0.35.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=42fa885c886019269dd49b8058ffa10b
diff --git a/metadata/md5-cache/dev-perl/Test-Needs-0.2.5 b/metadata/md5-cache/dev-perl/Test-Needs-0.2.5
new file mode 100644
index 000000000000..51c92f4f2331
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Test-Needs-0.2.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.450.0 ) dev-lang/perl:=
+DESCRIPTION=Skip tests when modules not available
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Test-Needs/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Test-Needs-0.002005.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=d1e5b9b44bb6affd0654eb261fb5d74d
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 9d7076879ef7..b7360762df0c 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/PyQt5-5.10 b/metadata/md5-cache/dev-python/PyQt5-5.10.1
similarity index 98%
rename from metadata/md5-cache/dev-python/PyQt5-5.10
rename to metadata/md5-cache/dev-python/PyQt5-5.10.1
index b0cd0e248a75..f6dfa73afc56 100644
--- a/metadata/md5-cache/dev-python/PyQt5-5.10
+++ b/metadata/md5-cache/dev-python/PyQt5-5.10.1
@@ -9,6 +9,6 @@ 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.6:=[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.9.3:5 >=dev-qt/qtxml-5.9.3:5 bluetooth? ( >=dev-qt/qtbluetooth-5.9.3:5 ) dbus? ( dev-python/dbus-python[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/qtdbus-5.9.3:5 ) declarative? ( >=dev-qt/qtdeclarative-5.9.3:5[widgets?] ) designer? ( >=dev-qt/designer-5.9.3:5 ) gui? ( >=dev-qt/qtgui-5.9.3:5[gles2=] ) help? ( >=dev-qt/qthelp-5.9.3:5 ) location? ( >=dev-qt/qtlocation-5.9.3:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.9.3:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.9.3:5 ) opengl? ( >=dev-qt/qtopengl-5.9.3:5 ) positioning? ( >=dev-qt/qtpositioning-5.9.3:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.9.3:5 ) sensors? ( >=dev-qt/qtsensors-5.9.3:5 ) serialport? ( >=dev-qt/qtserialport-5.9.3:5 ) sql? ( >=dev-qt/qtsql-5.9.3:5 ) svg? ( >=dev-qt/qtsvg-5.9.3:5 ) testlib? ( >=dev-qt/qttest-5.9.3:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.9.3:5 ) webengine? ( >=dev-qt/qtwebengine-5.9.3:5[widgets?] ) webkit? ( >=dev-qt/qtwebkit-5.9:5[printsupport] ) websockets? ( >=dev-qt/qtwebsockets-5.9.3:5 ) widgets? ( >=dev-qt/qtwidgets-5.9.3:5 ) x11extras? ( >=dev-qt/qtx11extras-5.9.3:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.9.3:5 )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) bluetooth? ( gui ) declarative? ( gui network ) designer? ( widgets ) help? ( gui widgets ) location? ( positioning ) multimedia? ( gui network ) opengl? ( gui widgets ) positioning? ( gui ) printsupport? ( gui widgets ) sensors? ( gui ) serialport? ( gui ) sql? ( widgets ) svg? ( gui widgets ) testlib? ( widgets ) webchannel? ( network ) webengine? ( network widgets? ( printsupport webchannel ) ) webkit? ( gui network printsupport widgets ) websockets? ( network ) widgets? ( gui ) xmlpatterns? ( network )
 SLOT=0
-SRC_URI=mirror://sourceforge/pyqt/PyQt5_gpl-5.10.tar.gz
+SRC_URI=mirror://sourceforge/pyqt/PyQt5_gpl-5.10.1.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=64fab067f47f710cf90094b26926f1dd
+_md5_=10f51231f894eed368812e1eea5dde9e
diff --git a/metadata/md5-cache/dev-python/aiohttp-cors-0.5.3 b/metadata/md5-cache/dev-python/aiohttp-cors-0.5.3
new file mode 100644
index 000000000000..cb782d77d295
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aiohttp-cors-0.5.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/aiohttp-1.1.1[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(-)] python_targets_python3_4? ( dev-python/typing[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) dev-python/setuptools[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(-)] test? ( dev-python/pytest[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-python/pytest-cov[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-python/pytest-pylint[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-python/pytest-runner[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-python/selenium[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(-)] ) 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(-)]
+DESCRIPTION=Implements CORS support for aiohttp asyncio-powered asynchronous HTTP server
+EAPI=6
+HOMEPAGE=https://github.com/aio-libs/aiohttp-cors
+IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/aiohttp-1.1.1[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(-)] python_targets_python3_4? ( dev-python/typing[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) 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(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/aio-libs/aiohttp-cors/archive/v0.5.3.tar.gz -> aiohttp-cors-0.5.3.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6d059d16d288909ce93ff3e0738db316
diff --git a/metadata/md5-cache/dev-python/awscli-1.14.50 b/metadata/md5-cache/dev-python/awscli-1.14.50
new file mode 100644
index 000000000000..60bd8e3092e3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/awscli-1.14.50
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/botocore-1.8.20[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <=dev-python/colorama-0.3.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <=dev-python/rsa-3.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/s3transfer-0.1.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <=dev-python/pyyaml-3.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=6
+HOMEPAGE=https://pypi.python.org/pypi/awscli
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.8.20[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <=dev-python/colorama-0.3.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <=dev-python/rsa-3.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/s3transfer-0.1.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <=dev-python/pyyaml-3.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/a/awscli/awscli-1.14.50.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=df4a14a3d822b5efd17954b5f21d132b
diff --git a/metadata/md5-cache/dev-python/cliapp-1.20170823 b/metadata/md5-cache/dev-python/cliapp-1.20170823
index 72e366a01f7a..6ea55f36739a 100644
--- a/metadata/md5-cache/dev-python/cliapp-1.20170823
+++ b/metadata/md5-cache/dev-python/cliapp-1.20170823
@@ -4,11 +4,11 @@ DESCRIPTION=Framework for Unix-like command line programs
 EAPI=6
 HOMEPAGE=http://liw.fi/cliapp/
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-python/pyyaml[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(-)] 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 )
 SLOT=0
 SRC_URI=http://git.liw.fi/cgi-bin/cgit/cgit.cgi/cliapp/snapshot/cliapp-1.20170823.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b549c2afad48c600c90ffb49b31fc4ee
+_md5_=124a108a6877814d43b4269d7427dd63
diff --git a/metadata/md5-cache/dev-python/configparser-3.5.0-r1 b/metadata/md5-cache/dev-python/configparser-3.5.0-r1
index 3f090d2645b1..1b148e06d2a5 100644
--- a/metadata/md5-cache/dev-python/configparser-3.5.0-r1
+++ b/metadata/md5-cache/dev-python/configparser-3.5.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Backport of Python-3 built-in configparser
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/configparser/
 IUSE=python_targets_pypy python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=dev-python/backports[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/configparser/configparser-3.5.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eede3b55ef3500a06da37b7039eb3b94
+_md5_=8590a72c3223436ab535802d40baad13
diff --git a/metadata/md5-cache/dev-python/flake8-3.5.0 b/metadata/md5-cache/dev-python/flake8-3.5.0
index c7e1533d3409..6e515719e0f2 100644
--- a/metadata/md5-cache/dev-python/flake8-3.5.0
+++ b/metadata/md5-cache/dev-python/flake8-3.5.0
@@ -4,7 +4,7 @@ DESCRIPTION=A wrapper around PyFlakes, pep8 & mccabe
 EAPI=6
 HOMEPAGE=https://gitlab.com/pycqa/flake8 https://pypi.python.org/pypi/flake8
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 PDEPEND=>=dev-python/mccabe-0.6.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/mccabe-0.7.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 RDEPEND=>=dev-python/pyflakes-1.5.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pyflakes-1.7.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pycodestyle-2.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pycodestyle-2.4.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 SLOT=0
 SRC_URI=mirror://pypi/f/flake8/flake8-3.5.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1a41d271be334c068ee18bb5eb39fb9e
+_md5_=c549b32c21657caebec28e60d339bb3f
diff --git a/metadata/md5-cache/dev-python/funcsigs-1.0.2-r1 b/metadata/md5-cache/dev-python/funcsigs-1.0.2-r1
index ea3217206051..d083cc425d0e 100644
--- a/metadata/md5-cache/dev-python/funcsigs-1.0.2-r1
+++ b/metadata/md5-cache/dev-python/funcsigs-1.0.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Python function signatures backport from PEP362 for Python 2.7-3.5
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/funcsigs
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/f/funcsigs/funcsigs-1.0.2.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b17ed4b872cd18643e05d62f405ad72b
+_md5_=3ce15433ff1048ae10e49ba9aade173b
diff --git a/metadata/md5-cache/dev-python/ipython-5.4.1 b/metadata/md5-cache/dev-python/ipython-5.4.1
index d3c2271bcb00..83fd173e9126 100644
--- a/metadata/md5-cache/dev-python/ipython-5.4.1
+++ b/metadata/md5-cache/dev-python/ipython-5.4.1
@@ -4,7 +4,7 @@ DESCRIPTION=Advanced interactive shell for Python
 EAPI=6
 HOMEPAGE=http://ipython.org/
 IUSE=doc examples matplotlib notebook nbconvert qt5 +smp test wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 PDEPEND=notebook? ( dev-python/notebook[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/ipywidgets[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(-)] ) qt5? ( dev-python/qtconsole[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(-)] ) smp? ( dev-python/ipyparallel[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(-)] )
 RDEPEND=dev-python/decorator[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/jedi-0.10.0[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/pexpect[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/pickleshare[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/prompt_toolkit-1.0.4[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/pyparsing[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/simplegeneric[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/traitlets-4.2.1[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(-)] matplotlib? ( dev-python/matplotlib[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(-)] ) wxwidgets? ( python_targets_python2_7? ( dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) virtual/python-pathlib[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(-)] nbconvert? ( dev-python/nbconvert[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(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[readline,sqlite,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) >=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(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython/ipython-5.4.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=28e3f93c11e49d7c49a6129884ff9170
+_md5_=9f5b0eab4ec26165b4fcd5e07a6a8765
diff --git a/metadata/md5-cache/dev-python/ipython_genutils-0.2.0 b/metadata/md5-cache/dev-python/ipython_genutils-0.2.0
index a6339d28da76..35568271e37f 100644
--- a/metadata/md5-cache/dev-python/ipython_genutils-0.2.0
+++ b/metadata/md5-cache/dev-python/ipython_genutils-0.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Vestigial utilities from IPython
 EAPI=6
 HOMEPAGE=https://github.com/ipython/ipython_genutils
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ppc64 ~x86
 LICENSE=BSD
 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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython_genutils/ipython_genutils-0.2.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0702d88f11334e82bb4a3dba359c7679
+_md5_=b734f39511eeb5acfbf0a8257894504f
diff --git a/metadata/md5-cache/dev-python/jedi-0.11.1 b/metadata/md5-cache/dev-python/jedi-0.11.1
index 2eb1e82699b8..8392c49f9103 100644
--- a/metadata/md5-cache/dev-python/jedi-0.11.1
+++ b/metadata/md5-cache/dev-python/jedi-0.11.1
@@ -4,7 +4,7 @@ DESCRIPTION=Autocompletion library for Python
 EAPI=6
 HOMEPAGE=https://github.com/davidhalter/jedi
 IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/parso-0.1.1[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(-)] 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 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/davidhalter/jedi/archive/v0.11.1.tar.gz -> jedi-0.11.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6a7972631d3143f577866b1d90221cfb
+_md5_=92bafb34e3dcf277e88ee2819ef68bff
diff --git a/metadata/md5-cache/dev-python/markdown-2.6.8 b/metadata/md5-cache/dev-python/markdown-2.6.8
index e927882591da..e0cb0839ea1b 100644
--- a/metadata/md5-cache/dev-python/markdown-2.6.8
+++ b/metadata/md5-cache/dev-python/markdown-2.6.8
@@ -4,11 +4,11 @@ DESCRIPTION=Python implementation of the markdown markup language
 EAPI=6
 HOMEPAGE=http://www.freewisdom.org/projects/python-markdown https://pypi.python.org/pypi/Markdown https://pythonhosted.org/Markdown/ https://github.com/waylan/Python-Markdown
 IUSE=doc test pygments python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( BSD GPL-2 )
 RDEPEND=pygments? ( dev-python/pygments[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/M/Markdown/Markdown-2.6.8.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4bf0b089e55a344ed6874a6ede51cf7b
+_md5_=fe7126b51287b2b1181c7d776317d9fd
diff --git a/metadata/md5-cache/dev-python/mccabe-0.6.1 b/metadata/md5-cache/dev-python/mccabe-0.6.1
index 7f442c9318ab..c5d35814ca59 100644
--- a/metadata/md5-cache/dev-python/mccabe-0.6.1
+++ b/metadata/md5-cache/dev-python/mccabe-0.6.1
@@ -4,11 +4,11 @@ DESCRIPTION=flake8 plugin: McCabe complexity checker
 EAPI=6
 HOMEPAGE=https://github.com/PyCQA/mccabe
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-python/flake8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mccabe/mccabe-0.6.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fbb9df1d7fb5d97638d8684f7124bd2e
+_md5_=04b85241c867d4406781f27d2eb45b3e
diff --git a/metadata/md5-cache/dev-python/mock-2.0.0 b/metadata/md5-cache/dev-python/mock-2.0.0
index d7373d73db3d..d97792245759 100644
--- a/metadata/md5-cache/dev-python/mock-2.0.0
+++ b/metadata/md5-cache/dev-python/mock-2.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=Rolling backport of unittest.mock for all Pythons
 EAPI=6
 HOMEPAGE=https://github.com/testing-cabal/mock
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/pbr-1.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=virtual/python-funcsigs-1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mock/mock-2.0.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5b8516ddf96436cdfa104eb9903422fa
+_md5_=3a34333846dca5ce1a2d6b00d56c8d4f
diff --git a/metadata/md5-cache/dev-python/msgpack-0.5.6 b/metadata/md5-cache/dev-python/msgpack-0.5.6
new file mode 100644
index 000000000000..06feaec39350
--- /dev/null
+++ b/metadata/md5-cache/dev-python/msgpack-0.5.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] native-extensions? ( >=dev-python/cython-0.16[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=MessagePack (de)serializer for Python
+EAPI=6
+HOMEPAGE=http://msgpack.org https://github.com/msgpack/msgpack-python/ https://pypi.python.org/pypi/msgpack/
+IUSE=+native-extensions test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/m/msgpack/msgpack-0.5.6.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=62f49543934617df328ad26f9eb2a732
diff --git a/metadata/md5-cache/dev-python/neovim-python-client-0.1.13 b/metadata/md5-cache/dev-python/neovim-python-client-0.1.13
index 81b4c9081b67..71c1aa3898ee 100644
--- a/metadata/md5-cache/dev-python/neovim-python-client-0.1.13
+++ b/metadata/md5-cache/dev-python/neovim-python-client-0.1.13
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/msgpack-0.4.0[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(-)] virtual/python-greenlet[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(-)] python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( >=dev-python/msgpack-0.4.0[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(-)] virtual/python-greenlet[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(-)] python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=app-editors/neovim-0.1.6 dev-python/nose[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(-)] ) 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(-)]
+DEPEND=<dev-python/msgpack-0.5.2:0[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/msgpack-0.4.0:0[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(-)] virtual/python-greenlet[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(-)] python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( <dev-python/msgpack-0.5.2:0[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/msgpack-0.4.0:0[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(-)] virtual/python-greenlet[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(-)] python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=app-editors/neovim-0.1.6 dev-python/nose[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(-)] ) 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(-)]
 DESCRIPTION=Python client for Neovim
 EAPI=6
 HOMEPAGE=https://github.com/neovim/python-client
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/msgpack-0.4.0[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(-)] virtual/python-greenlet[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(-)] python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=app-editors/neovim-0.1.6 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(-)]
+RDEPEND=<dev-python/msgpack-0.5.2:0[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/msgpack-0.4.0:0[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(-)] virtual/python-greenlet[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(-)] python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=app-editors/neovim-0.1.6 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 )
 SLOT=0
 SRC_URI=https://github.com/neovim/python-client/archive/0.1.13.tar.gz -> neovim-python-client-0.1.13.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7ce040d16d36224195751a72e8bfe4ac
+_md5_=98a418733cb5495407911aacaa58b080
diff --git a/metadata/md5-cache/dev-python/neovim-python-client-0.1.9 b/metadata/md5-cache/dev-python/neovim-python-client-0.1.9
index 2d0c82604c19..041c97397a0d 100644
--- a/metadata/md5-cache/dev-python/neovim-python-client-0.1.9
+++ b/metadata/md5-cache/dev-python/neovim-python-client-0.1.9
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/msgpack-0.4.0[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(-)] virtual/python-greenlet[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(-)] python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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(-)]
+DEPEND=<dev-python/msgpack-0.5.2:0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/msgpack-0.4.0:0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/python-greenlet[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Python client for Neovim
 EAPI=5
 HOMEPAGE=https://github.com/neovim/python-client
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/msgpack-0.4.0[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(-)] virtual/python-greenlet[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(-)] python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=app-editors/neovim-0.1.3 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 )
+RDEPEND=<dev-python/msgpack-0.5.2:0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/msgpack-0.4.0:0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/python-greenlet[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=app-editors/neovim-0.1.3 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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/neovim/python-client/archive/0.1.9.tar.gz -> neovim-python-client-0.1.9.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=69c67c21e42e72f7f181b34c865bc9e8
+_md5_=614460847424e17e7df11b9dc9905b73
diff --git a/metadata/md5-cache/dev-python/neovim-python-client-0.2.0 b/metadata/md5-cache/dev-python/neovim-python-client-0.2.0
index 35bd61756e6b..039265b855e5 100644
--- a/metadata/md5-cache/dev-python/neovim-python-client-0.2.0
+++ b/metadata/md5-cache/dev-python/neovim-python-client-0.2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/msgpack-0.4.0[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(-)] virtual/python-greenlet[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(-)] python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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(-)]
+DEPEND=<dev-python/msgpack-0.5.2:0[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/msgpack-0.4.0:0[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(-)] virtual/python-greenlet[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(-)] python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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(-)]
 DESCRIPTION=Python client for Neovim
 EAPI=5
 HOMEPAGE=https://github.com/neovim/python-client
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/msgpack-0.4.0[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(-)] virtual/python-greenlet[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(-)] python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) app-editors/neovim 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(-)]
+RDEPEND=<dev-python/msgpack-0.5.2:0[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/msgpack-0.4.0:0[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(-)] virtual/python-greenlet[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(-)] python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=app-editors/neovim-0.2.1 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 )
 SLOT=0
 SRC_URI=https://github.com/neovim/python-client/archive/0.2.0.tar.gz -> neovim-python-client-0.2.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2ccf082f8c8bd05d06f5c7691b624f8a
+_md5_=ab468b056059b8196b1aa22f091d442f
diff --git a/metadata/md5-cache/dev-python/neovim-python-client-0.2.1 b/metadata/md5-cache/dev-python/neovim-python-client-0.2.1
new file mode 100644
index 000000000000..502fb56974b2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/neovim-python-client-0.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/msgpack-0.5.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(-)] virtual/python-greenlet[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(-)] python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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(-)]
+DESCRIPTION=Python client for Neovim
+EAPI=6
+HOMEPAGE=https://github.com/neovim/python-client
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/msgpack-0.5.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(-)] virtual/python-greenlet[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(-)] python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=app-editors/neovim-0.2.1 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 )
+SLOT=0
+SRC_URI=https://github.com/neovim/python-client/archive/0.2.1.tar.gz -> neovim-python-client-0.2.1.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0939b618d38cee2f43ad6152a1cba6c8
diff --git a/metadata/md5-cache/dev-python/numpy-1.10.4 b/metadata/md5-cache/dev-python/numpy-1.10.4
index d76e65498c53..f15232e4ef4c 100644
--- a/metadata/md5-cache/dev-python/numpy-1.10.4
+++ b/metadata/md5-cache/dev-python/numpy-1.10.4
@@ -4,11 +4,11 @@ DESCRIPTION=Fast array and numerical python library
 EAPI=5
 HOMEPAGE=http://www.numpy.org/
 IUSE=doc lapack test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[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(-)] lapack? ( virtual/cblas virtual/lapack ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=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(-)] lapack? ( virtual/fortran )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.10.4.tar.gz doc? ( http://docs.scipy.org/doc/numpy-1.10.1/numpy-html-1.10.1.zip http://docs.scipy.org/doc/numpy-1.10.1/numpy-ref-1.10.1.pdf http://docs.scipy.org/doc/numpy-1.10.1/numpy-user-1.10.1.pdf )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ed5f54c60a793adb92b5d90d1118c709
+_md5_=ba65ee27de5d4a7d4ccbccd742c3b9e6
diff --git a/metadata/md5-cache/dev-python/parso-0.1.1 b/metadata/md5-cache/dev-python/parso-0.1.1
index fbcfa3de9f6e..ee847db1cd62 100644
--- a/metadata/md5-cache/dev-python/parso-0.1.1
+++ b/metadata/md5-cache/dev-python/parso-0.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=a python parser that supports error recovery and round-trip parsing
 EAPI=6
 HOMEPAGE=https://github.com/davidhalter/parso https://pypi.python.org/pypi/parso
 IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ppc64 ~x86
 LICENSE=MIT
 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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/davidhalter/parso/archive/v0.1.1.tar.gz -> parso-0.1.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6205495bb1d2b907301e4acc3c82c42b
+_md5_=fccbf47e8d0169c196bc80d732d43b41
diff --git a/metadata/md5-cache/dev-python/pathlib-1.0.1-r1 b/metadata/md5-cache/dev-python/pathlib-1.0.1-r1
index cb5be1371b99..f5ec79ae6f6c 100644
--- a/metadata/md5-cache/dev-python/pathlib-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/pathlib-1.0.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Object-oriented filesystem paths
 EAPI=5
 HOMEPAGE=https://pathlib.readthedocs.org/
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7
-KEYWORDS=amd64 arm64 ia64 x86
+KEYWORDS=amd64 arm64 ia64 ppc64 x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathlib/pathlib-1.0.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=24298ad2429303e2a009cabc4912d1e7
+_md5_=868e37cecaf8d52601f208277353aad3
diff --git a/metadata/md5-cache/dev-python/pathlib2-2.3.0 b/metadata/md5-cache/dev-python/pathlib2-2.3.0
index 08e29ffdf149..8d1898265c80 100644
--- a/metadata/md5-cache/dev-python/pathlib2-2.3.0
+++ b/metadata/md5-cache/dev-python/pathlib2-2.3.0
@@ -4,7 +4,7 @@ DESCRIPTION=Fork of pathlib aiming to support the full stdlib Python API
 EAPI=6
 HOMEPAGE=https://github.com/mcmtroffaes/pathlib2
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ppc64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( dev-python/scandir[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/scandir[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathlib2/pathlib2-2.3.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fbeb40fe069a37e4d8c5b67981e99488
+_md5_=3429f3245dc902daa9ac7adb0a943582
diff --git a/metadata/md5-cache/dev-python/pickleshare-0.7.4-r1 b/metadata/md5-cache/dev-python/pickleshare-0.7.4-r1
index 17fe3f909457..ef55a2c9a245 100644
--- a/metadata/md5-cache/dev-python/pickleshare-0.7.4-r1
+++ b/metadata/md5-cache/dev-python/pickleshare-0.7.4-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A small 'shelve' like datastore with concurrency support
 EAPI=6
 HOMEPAGE=https://github.com/pickleshare/pickleshare
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ppc64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( dev-python/pathlib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/path-py-6.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(-)] 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 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pickleshare/pickleshare-0.7.4.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=524afa25486759b0dfe3c9cca183151b
+_md5_=ea2993841d6ad842b04af751f684cbf6
diff --git a/metadata/md5-cache/dev-python/prompt_toolkit-1.0.15 b/metadata/md5-cache/dev-python/prompt_toolkit-1.0.15
index 101db3946ad7..4f452b32d332 100644
--- a/metadata/md5-cache/dev-python/prompt_toolkit-1.0.15
+++ b/metadata/md5-cache/dev-python/prompt_toolkit-1.0.15
@@ -4,11 +4,11 @@ DESCRIPTION=Building powerful interactive command lines in Python
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/prompt_toolkit/ https://github.com/jonathanslenders/python-prompt-toolkit
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/six-1.9.0[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/wcwidth[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(-)] 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/prompt_toolkit/prompt_toolkit-1.0.15.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=baf2bd0999636f3361720befaf4f2abc
+_md5_=7e8f533b6d4b4e0657e8c8cd730bdbfb
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.5.1.1 b/metadata/md5-cache/dev-python/protobuf-python-3.5.1.1
index afbe4194622f..d12ace4963a2 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.5.1.1
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.5.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Google's Protocol Buffers - Python bindings
 EAPI=6
 HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=BSD
 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-libs/protobuf-3.5.1.1 dev-python/namespace-google[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/setuptools[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/six[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-libs/protobuf-3[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 )
 SLOT=0/15
 SRC_URI=https://github.com/google/protobuf/archive/v3.5.1.1.tar.gz -> protobuf-3.5.1.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fa43edd7a619a48825b03fa11895c284
+_md5_=859f9f110e283f0e87196b8bb3980dc0
diff --git a/metadata/md5-cache/dev-python/pycodestyle-2.3.1 b/metadata/md5-cache/dev-python/pycodestyle-2.3.1
index a8ededa8c0a5..3fe0e6c50ecf 100644
--- a/metadata/md5-cache/dev-python/pycodestyle-2.3.1
+++ b/metadata/md5-cache/dev-python/pycodestyle-2.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python style guide checker (fka pep8)
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/pycodestyle
 IUSE=doc python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycodestyle/pycodestyle-2.3.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7f41d90aa86ba81ab96547c7dff10502
+_md5_=6bee3f7412893edc56edf797dfd42c34
diff --git a/metadata/md5-cache/dev-python/pyflakes-1.6.0 b/metadata/md5-cache/dev-python/pyflakes-1.6.0
index 1fd87b67b880..e1fa7226881a 100644
--- a/metadata/md5-cache/dev-python/pyflakes-1.6.0
+++ b/metadata/md5-cache/dev-python/pyflakes-1.6.0
@@ -4,11 +4,11 @@ DESCRIPTION=Passive checker for Python programs
 EAPI=6
 HOMEPAGE=https://github.com/PyCQA/pyflakes https://pypi.python.org/pypi/pyflakes
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyflakes/pyflakes-1.6.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0394ba59a72af982c4ab239444b2acd1
+_md5_=be0f732d3063ec5da3431093832b62e8
diff --git a/metadata/md5-cache/dev-python/pygobject-3.24.1 b/metadata/md5-cache/dev-python/pygobject-3.24.1
index e54465d0329e..6e3c9a4abf05 100644
--- a/metadata/md5-cache/dev-python/pygobject-3.24.1
+++ b/metadata/md5-cache/dev-python/pygobject-3.24.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=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-libs/glib-2.38:2 >=dev-libs/gobject-introspection-1.46.0:= virtual/libffi:= cairo? ( >=dev-python/pycairo-1.10.0[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/cairo ) virtual/pkgconfig cairo? ( x11-libs/cairo[glib] ) test? ( dev-libs/atk[introspection] media-fonts/font-cursor-misc media-fonts/font-misc-misc x11-libs/cairo[glib] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] python_targets_python2_7? ( dev-python/pyflakes[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=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-libs/glib-2.38:2 >=dev-libs/gobject-introspection-1.46.0:= virtual/libffi:= cairo? ( >=dev-python/pycairo-1.10.0[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/cairo ) virtual/pkgconfig cairo? ( x11-libs/cairo[glib] ) test? ( dev-libs/atk[introspection] media-fonts/font-cursor-misc media-fonts/font-misc-misc x11-libs/cairo[glib] x11-libs/gdk-pixbuf:2[introspection,jpeg] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] python_targets_python2_7? ( dev-python/pyflakes[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=GLib's GObject library bindings for Python
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/PyGObject
 IUSE=+cairo examples test +threads python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 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-libs/glib-2.38:2 >=dev-libs/gobject-introspection-1.46.0:= virtual/libffi:= cairo? ( >=dev-python/pycairo-1.10.0[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/cairo ) !<dev-python/pygtk-2.13 !<dev-python/pygobject-2.28.6-r50:2[introspection]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) test? ( cairo )
 SLOT=3
 SRC_URI=mirror://gnome/sources/pygobject/3.24/pygobject-3.24.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c52ffdcef3111bf910a0a32988c9526a
+_md5_=6daea8ecec679bca10fcf65b27910160
diff --git a/metadata/md5-cache/dev-python/pyqtgraph-0.10.0 b/metadata/md5-cache/dev-python/pyqtgraph-0.10.0
deleted file mode 100644
index b3869433692b..000000000000
--- a/metadata/md5-cache/dev-python/pyqtgraph-0.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[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(-)] sci-libs/scipy[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/PyQt5[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/PyQt4[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/pyside[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(-)] ) opengl? ( dev-python/pyopengl[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(-)] ) doc? ( dev-python/sphinx[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(-)] ) 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(-)]
-DESCRIPTION=a pure-python graphics and GUI library built on PyQt/PySide and numpy
-EAPI=6
-HOMEPAGE=http://www.pyqtgraph.org/ https://github.com/pyqtgraph/pyqtgraph
-IUSE=doc examples opengl python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-python/numpy[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(-)] sci-libs/scipy[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/PyQt5[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/PyQt4[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/pyside[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(-)] ) opengl? ( dev-python/pyopengl[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(-)] ) 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 )
-SLOT=0
-SRC_URI=https://github.com/pyqtgraph/pyqtgraph/archive/pyqtgraph-0.10.0.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=74d4bcaad3ae9bedfb94e01e4c3f8d03
diff --git a/metadata/md5-cache/dev-python/pyqtgraph-0.10.0-r1 b/metadata/md5-cache/dev-python/pyqtgraph-0.10.0-r1
index 770d6f63096c..d3760a9d4e1f 100644
--- a/metadata/md5-cache/dev-python/pyqtgraph-0.10.0-r1
+++ b/metadata/md5-cache/dev-python/pyqtgraph-0.10.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A pure-python graphics and GUI library built on PyQt and numpy
 EAPI=6
 HOMEPAGE=http://www.pyqtgraph.org/ https://pypi.python.org/pypi/pyqtgraph/
 IUSE=doc examples opengl svg python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/numpy[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(-)] sci-libs/scipy[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/PyQt5[gui,widgets,opengl=,svg=,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(-)] opengl? ( dev-python/pyopengl[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(-)] ) 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 )
 SLOT=0
 SRC_URI=http://www.pyqtgraph.org/downloads/0.10.0/pyqtgraph-0.10.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=445be733c987cf21c6531028377a9e6e
+_md5_=6a3a46afd8559585a9caea3e0166b0f8
diff --git a/metadata/md5-cache/dev-python/pyserial-3.2.1 b/metadata/md5-cache/dev-python/pyserial-3.2.1
index 040829e030df..088c7245e7a6 100644
--- a/metadata/md5-cache/dev-python/pyserial-3.2.1
+++ b/metadata/md5-cache/dev-python/pyserial-3.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python Serial Port extension
 EAPI=6
 HOMEPAGE=https://github.com/pyserial/pyserial https://pypi.python.org/pypi/pyserial
 IUSE=doc examples python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=PSF-2
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyserial/pyserial-3.2.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1fe65d787f74e1bf7c55a43a592c059e
+_md5_=0d7fb01bc13505308515095ecc456113
diff --git a/metadata/md5-cache/dev-python/pytidylib-0.2.4 b/metadata/md5-cache/dev-python/pytidylib-0.2.4
index 5d812cbfec40..158fc47c6bed 100644
--- a/metadata/md5-cache/dev-python/pytidylib-0.2.4
+++ b/metadata/md5-cache/dev-python/pytidylib-0.2.4
@@ -4,11 +4,11 @@ DESCRIPTION=Python wrapper for HTML Tidy (tidylib)
 EAPI=6
 HOMEPAGE=http://countergram.com/open-source/pytidylib https://github.com/countergram/pytidylib
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=app-text/htmltidy python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytidylib/pytidylib-0.2.4.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=62f0ddd061b7238546bdf37f7779545d
+_md5_=c2970b8d61bb7722bad07dc411e32327
diff --git a/metadata/md5-cache/dev-python/qscintilla-python-2.10.3 b/metadata/md5-cache/dev-python/qscintilla-python-2.10.3
new file mode 100644
index 000000000000..d0c4f75f5554
--- /dev/null
+++ b/metadata/md5-cache/dev-python/qscintilla-python-2.10.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install
+DEPEND=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(-)] 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 ~x11-libs/qscintilla-2.10.3:=
+DESCRIPTION=Python bindings for Qscintilla
+EAPI=6
+HOMEPAGE=https://www.riverbankcomputing.com/software/qscintilla/intro
+IUSE=debug python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~ppc64 ~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(-)] 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 ~x11-libs/qscintilla-2.10.3:=
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://sourceforge/pyqt/QScintilla_gpl-2.10.3.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=46f480c346760e0a6cc13a40bb3418b3
diff --git a/metadata/md5-cache/dev-python/rtslib-fb-2.1.57 b/metadata/md5-cache/dev-python/rtslib-fb-2.1.57
deleted file mode 100644
index 8754a80abdc6..000000000000
--- a/metadata/md5-cache/dev-python/rtslib-fb-2.1.57
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !dev-python/rtslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=A Python object API for managing the Linux LIO kernel target
-EAPI=5
-HOMEPAGE=https://github.com/agrover/rtslib-fb
-IUSE=python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 ~arm ~arm64 ~mips x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/r/rtslib-fb/rtslib-fb-2.1.57.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=14f731312ef57809756fb256d13d64d9
diff --git a/metadata/md5-cache/dev-python/rtslib-fb-2.1.58 b/metadata/md5-cache/dev-python/rtslib-fb-2.1.58
deleted file mode 100644
index 3d3cdce5b2d6..000000000000
--- a/metadata/md5-cache/dev-python/rtslib-fb-2.1.58
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !dev-python/rtslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A Python object API for managing the Linux LIO kernel target
-EAPI=6
-HOMEPAGE=https://github.com/agrover/rtslib-fb
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm ~arm64 ~mips x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=!dev-python/rtslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/r/rtslib-fb/rtslib-fb-2.1.58.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1f54d6272b74d04c057cebda1a4a02e9
diff --git a/metadata/md5-cache/dev-python/rtslib-fb-2.1.61 b/metadata/md5-cache/dev-python/rtslib-fb-2.1.61
deleted file mode 100644
index 0bf27988f30f..000000000000
--- a/metadata/md5-cache/dev-python/rtslib-fb-2.1.61
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !dev-python/rtslib 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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A Python object API for managing the Linux LIO kernel target
-EAPI=6
-HOMEPAGE=https://github.com/open-iscsi/rtslib-fb
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-python/pyudev[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !dev-python/rtslib 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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/r/rtslib-fb/rtslib-fb-2.1.61.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b8c1e4fe2d860c3e8520c2b7bf029de7
diff --git a/metadata/md5-cache/dev-python/rtslib-fb-2.1.66 b/metadata/md5-cache/dev-python/rtslib-fb-2.1.66
index 94e4087f09d8..750066785d33 100644
--- a/metadata/md5-cache/dev-python/rtslib-fb-2.1.66
+++ b/metadata/md5-cache/dev-python/rtslib-fb-2.1.66
@@ -4,11 +4,11 @@ DESCRIPTION=A Python object API for managing the Linux LIO kernel target
 EAPI=6
 HOMEPAGE=https://github.com/open-iscsi/rtslib-fb
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~mips x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/pyudev[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !dev-python/rtslib 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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rtslib-fb/rtslib-fb-2.1.66.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1f699bf15280ef8c7a3074b111cbd477
+_md5_=6bf0e89ae1b9df8e3a08206c2cff92ed
diff --git a/metadata/md5-cache/dev-python/scandir-1.6 b/metadata/md5-cache/dev-python/scandir-1.6
index ac7c8d575a14..7412ff67d34e 100644
--- a/metadata/md5-cache/dev-python/scandir-1.6
+++ b/metadata/md5-cache/dev-python/scandir-1.6
@@ -4,11 +4,11 @@ DESCRIPTION=A better directory iterator and faster os.walk()
 EAPI=6
 HOMEPAGE=https://github.com/benhoyt/scandir
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ppc64 ~x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/scandir/scandir-1.6.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a4f492d86dcc6daaaea1686c022216eb
+_md5_=4c7ba68c3ab8e385c1d9ce2e47df5295
diff --git a/metadata/md5-cache/dev-python/sip-4.19.6 b/metadata/md5-cache/dev-python/sip-4.19.8
similarity index 95%
rename from metadata/md5-cache/dev-python/sip-4.19.6
rename to metadata/md5-cache/dev-python/sip-4.19.8
index 47d9750afa99..d73c64cea6c6 100644
--- a/metadata/md5-cache/dev-python/sip-4.19.6
+++ b/metadata/md5-cache/dev-python/sip-4.19.8
@@ -9,6 +9,6 @@ LICENSE=|| ( GPL-2 GPL-3 SIP )
 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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0/12
-SRC_URI=mirror://sourceforge/pyqt/sip-4.19.6.tar.gz
+SRC_URI=mirror://sourceforge/pyqt/sip-4.19.8.tar.gz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=745e428dc9441c603cbf9a34cfb263a7
+_md5_=d5ec3f36b0cc16388a043b4304f8832f
diff --git a/metadata/md5-cache/dev-python/testpath-0.3.1 b/metadata/md5-cache/dev-python/testpath-0.3.1
index 195ab5b20836..f594e150d8db 100644
--- a/metadata/md5-cache/dev-python/testpath-0.3.1
+++ b/metadata/md5-cache/dev-python/testpath-0.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=Test utilities for code working with files and commands
 EAPI=6
 HOMEPAGE=http://jupyter.org
 IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ppc64 ~x86
 LICENSE=MIT
 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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/jupyter/testpath/archive/0.3.1.tar.gz -> testpath-0.3.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5519ec2918e160276129e795b6508a92
+_md5_=09bdb891ecd9f669bbe46348332f004c
diff --git a/metadata/md5-cache/dev-python/tinycss2-0.6.1 b/metadata/md5-cache/dev-python/tinycss2-0.6.1
new file mode 100644
index 000000000000..4c78aeb6fd9a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tinycss2-0.6.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/webencodings[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(-)] test? ( dev-python/pytest[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(-)] ) 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(-)]
+DESCRIPTION=A complete yet simple CSS parser for Python
+EAPI=6
+HOMEPAGE=https://github.com/SimonSapin/tinycss2/ https://pypi.python.org/pypi/tinycss2/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/webencodings[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(-)] 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=mirror://pypi/t/tinycss2/tinycss2-0.6.1.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0599880e28985648b77bd6378edc631e
diff --git a/metadata/md5-cache/dev-python/traitlets-4.3.2 b/metadata/md5-cache/dev-python/traitlets-4.3.2
index f1263ee753de..bfc1731c9aec 100644
--- a/metadata/md5-cache/dev-python/traitlets-4.3.2
+++ b/metadata/md5-cache/dev-python/traitlets-4.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=A configuration system for Python applications
 EAPI=6
 HOMEPAGE=https://github.com/ipython/traitlets
 IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ppc64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/decorator[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(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/ipython_genutils[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/six[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(-)] 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 )
 SLOT=0
 SRC_URI=mirror://pypi/t/traitlets/traitlets-4.3.2.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6bfbbe5cc1fc23f0f35f81c5f5e81d0d
+_md5_=d176391622d999ed452c34ae210fc570
diff --git a/metadata/md5-cache/dev-python/ttystatus-0.35 b/metadata/md5-cache/dev-python/ttystatus-0.35
index 612c1896eabd..771403a04035 100644
--- a/metadata/md5-cache/dev-python/ttystatus-0.35
+++ b/metadata/md5-cache/dev-python/ttystatus-0.35
@@ -4,11 +4,11 @@ DESCRIPTION=Terminal progress bar and status output for command line
 EAPI=5
 HOMEPAGE=http://liw.fi/ttystatus/
 IUSE=python_targets_python2_7
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd
 LICENSE=GPL-3
 RDEPEND=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_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://git.liw.fi/cgi-bin/cgit/cgit.cgi/ttystatus/snapshot/ttystatus-0.35.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c09b86602ef86a2bc0c04e5ac1bfbb66
+_md5_=5220c2abfc10cd25e2fb98dc9f86a002
diff --git a/metadata/md5-cache/dev-python/wcwidth-0.1.7-r1 b/metadata/md5-cache/dev-python/wcwidth-0.1.7-r1
index c4026db0e58b..8557208c21fa 100644
--- a/metadata/md5-cache/dev-python/wcwidth-0.1.7-r1
+++ b/metadata/md5-cache/dev-python/wcwidth-0.1.7-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Measures number of Terminal column cells of wide-character codes
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/wcwidth/ https://github.com/jquast/wcwidth
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/w/wcwidth/wcwidth-0.1.7.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2465883a7e964836216029ace75d6c52
+_md5_=5f511c2ddd2541b2bc057e753e4000a9
diff --git a/metadata/md5-cache/dev-python/zope-event-4.2.0 b/metadata/md5-cache/dev-python/zope-event-4.2.0
index f58f7020e456..d5e8399134d0 100644
--- a/metadata/md5-cache/dev-python/zope-event-4.2.0
+++ b/metadata/md5-cache/dev-python/zope-event-4.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Event publishing / dispatch, used by Zope Component Architecture
 EAPI=6
 HOMEPAGE=https://github.com/zopefoundation/zope.event http://docs.zope.org/zope.event/
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ZPL
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.event/zope.event-4.2.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4154eeca4421ca5e7fc6b4b5cbfb1c1c
+_md5_=077d1100751a1c6508ad043e88c0a06d
diff --git a/metadata/md5-cache/dev-python/zope-interface-4.3.2 b/metadata/md5-cache/dev-python/zope-interface-4.3.2
index 918c692d08d1..e6c2e196d7e5 100644
--- a/metadata/md5-cache/dev-python/zope-interface-4.3.2
+++ b/metadata/md5-cache/dev-python/zope-interface-4.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=Interfaces for Python
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/zope.interface https://github.com/zopefoundation/zope.interface
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ZPL
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.interface/zope.interface-4.3.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5ab68d68f6dac3444a9d2123b33bae4a
+_md5_=bfc0aee7dbabfdab8814bafae1734f23
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 2659609d1766..58d001437ece 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/axiom-types-0.1.1 b/metadata/md5-cache/dev-ruby/axiom-types-0.1.1
index d6c94a23e97d..5c1309b61294 100644
--- a/metadata/md5-cache/dev-ruby/axiom-types-0.1.1
+++ b/metadata/md5-cache/dev-ruby/axiom-types-0.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby22] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby22] >=dev-ruby/ice_nine-0.11.0[ruby_targets_ruby22] <dev-ruby/ice_nine-0.12[ruby_targets_ruby22] >=dev-ruby/thread_safe-0.3.1[ruby_targets_ruby22] <dev-ruby/thread_safe-1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby23] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby23] >=dev-ruby/ice_nine-0.11.0[ruby_targets_ruby23] <dev-ruby/ice_nine-0.12[ruby_targets_ruby23] >=dev-ruby/thread_safe-0.3.1[ruby_targets_ruby23] <dev-ruby/thread_safe-1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby22] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby22] >=dev-ruby/ice_nine-0.11.0[ruby_targets_ruby22] <dev-ruby/ice_nine-0.12[ruby_targets_ruby22] >=dev-ruby/thread_safe-0.3.1[ruby_targets_ruby22] <dev-ruby/thread_safe-1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby23] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby23] >=dev-ruby/ice_nine-0.11.0[ruby_targets_ruby23] <dev-ruby/ice_nine-0.12[ruby_targets_ruby23] >=dev-ruby/thread_safe-0.3.1[ruby_targets_ruby23] <dev-ruby/thread_safe-1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby24] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby24] >=dev-ruby/ice_nine-0.11.0[ruby_targets_ruby24] <dev-ruby/ice_nine-0.12[ruby_targets_ruby24] >=dev-ruby/thread_safe-0.3.1[ruby_targets_ruby24] <dev-ruby/thread_safe-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? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[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=Define types with optional constraints for use within axiom and other libraries
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/axiom-types https://github.com/dkubb/axiom-types
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby22] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby22] >=dev-ruby/ice_nine-0.11.0[ruby_targets_ruby22] <dev-ruby/ice_nine-0.12[ruby_targets_ruby22] >=dev-ruby/thread_safe-0.3.1[ruby_targets_ruby22] <dev-ruby/thread_safe-1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby23] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby23] >=dev-ruby/ice_nine-0.11.0[ruby_targets_ruby23] <dev-ruby/ice_nine-0.12[ruby_targets_ruby23] >=dev-ruby/thread_safe-0.3.1[ruby_targets_ruby23] <dev-ruby/thread_safe-1[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby22] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby22] >=dev-ruby/ice_nine-0.11.0[ruby_targets_ruby22] <dev-ruby/ice_nine-0.12[ruby_targets_ruby22] >=dev-ruby/thread_safe-0.3.1[ruby_targets_ruby22] <dev-ruby/thread_safe-1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby23] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby23] >=dev-ruby/ice_nine-0.11.0[ruby_targets_ruby23] <dev-ruby/ice_nine-0.12[ruby_targets_ruby23] >=dev-ruby/thread_safe-0.3.1[ruby_targets_ruby23] <dev-ruby/thread_safe-1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby24] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby24] >=dev-ruby/ice_nine-0.11.0[ruby_targets_ruby24] <dev-ruby/ice_nine-0.12[ruby_targets_ruby24] >=dev-ruby/thread_safe-0.3.1[ruby_targets_ruby24] <dev-ruby/thread_safe-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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/axiom-types-0.1.1.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=6f23ed46233ce8b4090fd74f2bf8e7de
+_md5_=bc81d249c6983aebf59f9e8d4123619a
diff --git a/metadata/md5-cache/dev-ruby/faraday-0.14.0 b/metadata/md5-cache/dev-ruby/faraday-0.14.0
new file mode 100644
index 000000000000..a150e90ce5a8
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/faraday-0.14.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( sys-process/lsof ) test? ( ruby_targets_ruby22? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby22] <dev-ruby/multipart-post-3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby23] <dev-ruby/multipart-post-3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby24] <dev-ruby/multipart-post-3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby22] dev-ruby/httpclient[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] dev-ruby/sinatra[ruby_targets_ruby22] dev-ruby/net-http-persistent[ruby_targets_ruby22] dev-ruby/patron[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby23] dev-ruby/httpclient[ruby_targets_ruby23] dev-ruby/rack-test[ruby_targets_ruby23] dev-ruby/sinatra[ruby_targets_ruby23] dev-ruby/net-http-persistent[ruby_targets_ruby23] dev-ruby/patron[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby24] dev-ruby/httpclient[ruby_targets_ruby24] dev-ruby/rack-test[ruby_targets_ruby24] dev-ruby/sinatra[ruby_targets_ruby24] dev-ruby/net-http-persistent[ruby_targets_ruby24] dev-ruby/patron[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? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[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=HTTP/REST API client library with pluggable components
+EAPI=6
+HOMEPAGE=https://github.com/lostisland/faraday
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby22] <dev-ruby/multipart-post-3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby23] <dev-ruby/multipart-post-3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby24] <dev-ruby/multipart-post-3[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
+SRC_URI=https://github.com/lostisland/faraday/archive/v0.14.0.tar.gz -> faraday-0.14.0.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=107f8f20457b7f11d1a5df864df449c9
diff --git a/metadata/md5-cache/dev-ruby/http-form_data-2.1.0 b/metadata/md5-cache/dev-ruby/http-form_data-2.1.0
new file mode 100644
index 000000000000..52e1a8190c39
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/http-form_data-2.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=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? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[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=Utility-belt to build form data request bodies
+EAPI=6
+HOMEPAGE=https://github.com/httprb/form_data.rb
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+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=2
+SRC_URI=mirror://rubygems/http-form_data-2.1.0.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=5b06e2f7077ad3190f5d0593e5afb522
diff --git a/metadata/md5-cache/dev-ruby/parser-2.5.0.2 b/metadata/md5-cache/dev-ruby/parser-2.5.0.2
new file mode 100644
index 000000000000..59aac4cf9473
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/parser-2.5.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/racc[ruby_targets_ruby22] dev-ruby/cliver[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/racc[ruby_targets_ruby23] dev-ruby/cliver[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/racc[ruby_targets_ruby24] dev-ruby/cliver[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( =dev-ruby/ast-2.4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/ast-2.4*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/ast-2.4*[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/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[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=A production-ready Ruby parser written in pure Ruby
+EAPI=6
+HOMEPAGE=https://github.com/whitequark/parser
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( =dev-ruby/ast-2.4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/ast-2.4*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/ast-2.4*[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
+SRC_URI=mirror://rubygems/parser-2.5.0.2.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=42fab5b2dd6e1031da7ef0d89d0da3ae
diff --git a/metadata/md5-cache/dev-ruby/ruby-glib2-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-glib2-3.1.1
index 92daa114ec8d..4ba58503731a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-glib2-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-glib2-3.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby Glib2 bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
-KEYWORDS=~amd64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=Ruby
 RDEPEND=>=dev-libs/glib-2 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_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=594047944bbebf3074aa28a39531152d
+_md5_=2d925dd1256211310ef7f2f3803248f3
diff --git a/metadata/md5-cache/dev-ruby/slop-4.5.0 b/metadata/md5-cache/dev-ruby/slop-4.5.0
deleted file mode 100644
index bc0c754ffb98..000000000000
--- a/metadata/md5-cache/dev-ruby/slop-4.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[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? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[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=A simple option parser with an easy to remember syntax and friendly API
-EAPI=6
-HOMEPAGE=https://github.com/injekt/slop
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~ppc64 ~x86
-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=4
-SRC_URI=https://github.com/injekt/slop/archive/v4.5.0.tar.gz -> slop-4.5.0.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c3f092ecbe11b8897179b4faee845300
diff --git a/metadata/md5-cache/dev-ruby/slop-4.6.0 b/metadata/md5-cache/dev-ruby/slop-4.6.0
deleted file mode 100644
index ba3d34ace2fa..000000000000
--- a/metadata/md5-cache/dev-ruby/slop-4.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[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? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[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=A simple option parser with an easy to remember syntax and friendly API
-EAPI=6
-HOMEPAGE=https://github.com/injekt/slop
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~ppc64 ~x86
-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=4
-SRC_URI=https://github.com/injekt/slop/archive/v4.6.0.tar.gz -> slop-4.6.0.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=fa04995cb9c1f2c1d65d7f1737500531
diff --git a/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r6 b/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r6
index 731809892015..40fa3f1ab81e 100644
--- a/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r6
+++ b/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/tidy_table[ruby_targets_ruby22] dev-ruby/dust[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/tidy_table[ruby_targets_ruby23] dev-ruby/dust[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/tidy_table[ruby_targets_ruby22] dev-ruby/dust[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/tidy_table[ruby_targets_ruby23] dev-ruby/dust[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/tidy_table[ruby_targets_ruby24] dev-ruby/dust[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? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[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=Create sparklines, small graphs to be used inline in texts
 EAPI=5
 HOMEPAGE=http://sparklines.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=amd64 x86 ~x86-macos
 LICENSE=MIT
-RDEPEND=dev-ruby/rmagick ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=dev-ruby/rmagick 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=mirror://rubygems/sparklines-0.5.2.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=5f76d380bc220b892a04331d72b9ae7c
+_md5_=8c68917b1e3ed29dce355b3e0bd88fb9
diff --git a/metadata/md5-cache/dev-ruby/spring-1.7.2 b/metadata/md5-cache/dev-ruby/spring-1.7.2
deleted file mode 100644
index 72d9b154437b..000000000000
--- a/metadata/md5-cache/dev-ruby/spring-1.7.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/rubygems-2.1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rubygems-2.1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] dev-ruby/activesupport[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/activesupport[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Rails application preloader
-EAPI=5
-HOMEPAGE=https://github.com/rails/spring
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=~amd64 ~arm ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/rubygems-2.1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rubygems-2.1.0[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=1.1
-SRC_URI=https://github.com/rails/spring/archive/v1.7.2.tar.gz -> spring-1.7.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=73b72a8c8b8c244a29e1dce8d0a5799c
diff --git a/metadata/md5-cache/dev-ruby/spring-2.0.1 b/metadata/md5-cache/dev-ruby/spring-2.0.1
deleted file mode 100644
index 71bf8b7b6b0d..000000000000
--- a/metadata/md5-cache/dev-ruby/spring-2.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] dev-ruby/activesupport[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/activesupport[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Rails application preloader
-EAPI=5
-HOMEPAGE=https://github.com/rails/spring
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=~amd64 ~arm ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=1.1
-SRC_URI=https://github.com/rails/spring/archive/v2.0.1.tar.gz -> spring-2.0.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=52d2a5977cfb466ebc41fdf1ff2822e2
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-3.1.1 b/metadata/md5-cache/dev-ruby/sprockets-rails-3.1.1
deleted file mode 100644
index fdc69b593cce..000000000000
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-3.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby22] dev-ruby/sprockets:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby23] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby23] dev-ruby/sprockets:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby22] >=dev-ruby/railties-4[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby23] >=dev-ruby/railties-4[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Sprockets implementation for Rails 4.x (and beyond) Asset Pipeline
-EAPI=5
-HOMEPAGE=https://github.com/rails/sprockets-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby22] dev-ruby/sprockets:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby23] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby23] dev-ruby/sprockets:3[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=3
-SRC_URI=https://github.com/rails/sprockets-rails/archive/v3.1.1.tar.gz -> sprockets-rails-3.1.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=abf5fa69a085d59d71bba7e9f249cb45
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-3.2.0 b/metadata/md5-cache/dev-ruby/sprockets-rails-3.2.0
deleted file mode 100644
index cc15db6f0339..000000000000
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-3.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby22] dev-ruby/sprockets:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby23] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby23] dev-ruby/sprockets:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby22] >=dev-ruby/railties-4[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby23] >=dev-ruby/railties-4[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Sprockets implementation for Rails 4.x (and beyond) Asset Pipeline
-EAPI=5
-HOMEPAGE=https://github.com/rails/sprockets-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby22] dev-ruby/sprockets:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby23] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby23] dev-ruby/sprockets:3[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=3
-SRC_URI=https://github.com/rails/sprockets-rails/archive/v3.2.0.tar.gz -> sprockets-rails-3.2.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=28ee8c83247439f0173fa97d7844bdcc
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-3.2.0-r1 b/metadata/md5-cache/dev-ruby/sprockets-rails-3.2.0-r1
deleted file mode 100644
index e96fd9a0387e..000000000000
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-3.2.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby22] dev-ruby/sprockets:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby23] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby23] dev-ruby/sprockets:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby24] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby24] dev-ruby/sprockets:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby22] >=dev-ruby/railties-4[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby23] >=dev-ruby/railties-4[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby24] >=dev-ruby/railties-4[ruby_targets_ruby24] dev-ruby/test-unit:2[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? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[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=Sprockets implementation for Rails 4.x (and beyond) Asset Pipeline
-EAPI=5
-HOMEPAGE=https://github.com/rails/sprockets-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby22] dev-ruby/sprockets:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby23] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby23] dev-ruby/sprockets:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby24] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby24] dev-ruby/sprockets:3[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=3
-SRC_URI=https://github.com/rails/sprockets-rails/archive/v3.2.0.tar.gz -> sprockets-rails-3.2.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9e140c11f35f881f74d7307d30bcaffb
diff --git a/metadata/md5-cache/dev-ruby/sshkey-1.8.0 b/metadata/md5-cache/dev-ruby/sshkey-1.8.0
deleted file mode 100644
index 4a3c00ff08f4..000000000000
--- a/metadata/md5-cache/dev-ruby/sshkey-1.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=SSH private and public key generator in pure Ruby
-EAPI=5
-HOMEPAGE=https://rubygems.org/gems/sshkey
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://rubygems/sshkey-1.8.0.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ca3c182a24041f8ad71674756eac7e93
diff --git a/metadata/md5-cache/dev-ruby/syslogger-1.6.4 b/metadata/md5-cache/dev-ruby/syslogger-1.6.4
deleted file mode 100644
index cc5ab942d6f0..000000000000
--- a/metadata/md5-cache/dev-ruby/syslogger-1.6.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( doc? ( >=dev-ruby/rdoc-2.4.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/rdoc-2.4.2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Drop-in replacement for the standard Logger, that logs to the syslog
-EAPI=5
-HOMEPAGE=https://github.com/crohr/syslogger
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/syslogger-1.6.4.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=0fee2aba52c288ac98fd9caa073b6e59
diff --git a/metadata/md5-cache/dev-ruby/temple-0.7.7 b/metadata/md5-cache/dev-ruby/temple-0.7.7
deleted file mode 100644
index 7a7eb568a080..000000000000
--- a/metadata/md5-cache/dev-ruby/temple-0.7.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] dev-ruby/erubis[ruby_targets_ruby22] >=dev-ruby/tilt-2.0.1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[ruby_targets_ruby23] dev-ruby/erubis[ruby_targets_ruby23] >=dev-ruby/tilt-2.0.1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=An abstraction and a framework for compiling templates to pure Ruby
-EAPI=5
-HOMEPAGE=https://github.com/judofyr/temple
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0.7
-SRC_URI=mirror://rubygems/temple-0.7.7.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=4953170bae6e9e930722cdf370521d92
diff --git a/metadata/md5-cache/dev-ruby/timers-4.1.1 b/metadata/md5-cache/dev-ruby/timers-4.1.1
deleted file mode 100644
index 9e0817db8b2d..000000000000
--- a/metadata/md5-cache/dev-ruby/timers-4.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/hitimes[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hitimes[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Pure Ruby one-shot and periodic timers
-EAPI=5
-HOMEPAGE=https://github.com/tarcieri/timers
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/hitimes[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hitimes[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=4
-SRC_URI=mirror://rubygems/timers-4.1.1.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2084882749881e88a7c98ce3081a16a2
diff --git a/metadata/md5-cache/dev-ruby/totoridipjp-0.1.0 b/metadata/md5-cache/dev-ruby/totoridipjp-0.1.0
index cf5330e89e19..7a4e2dd32c0c 100644
--- a/metadata/md5-cache/dev-ruby/totoridipjp-0.1.0
+++ b/metadata/md5-cache/dev-ruby/totoridipjp-0.1.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=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_ruby25? ( dev-lang/ruby:2.5 ) 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_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) 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] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=A ruby binding to use totori.dip.jp Web API
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/totoridipjp
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+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_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/totoridipjp-0.1.0.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=17c8f7a7d30697566c813080665e0832
+_md5_=b3d90cece2a02f406085737a61f9e126
diff --git a/metadata/md5-cache/dev-ruby/treetop-1.6.8 b/metadata/md5-cache/dev-ruby/treetop-1.6.8
deleted file mode 100644
index 6e8c53eb78cd..000000000000
--- a/metadata/md5-cache/dev-ruby/treetop-1.6.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/rr-1.0[ruby_targets_ruby22] dev-ruby/activesupport[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rr-1.0[ruby_targets_ruby23] dev-ruby/activesupport[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/polyglot-0.3.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/polyglot-0.3.1:0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Treetop is a language for describing languages
-EAPI=5
-HOMEPAGE=https://github.com/cjheath/treetop
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/polyglot-0.3.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/polyglot-0.3.1:0[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/treetop-1.6.8.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ac4dba1d23ed97d0e859280bb23d7b2e
diff --git a/metadata/md5-cache/dev-ruby/ttfunk-1.4.0 b/metadata/md5-cache/dev-ruby/ttfunk-1.4.0
index c3bf2d5c3c37..892beb7856f0 100644
--- a/metadata/md5-cache/dev-ruby/ttfunk-1.4.0
+++ b/metadata/md5-cache/dev-ruby/ttfunk-1.4.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=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? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[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=A TrueType font parser written in pure ruby
 EAPI=5
 HOMEPAGE=https://github.com/prawnpdf/ttfunk/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( GPL-2 GPL-3 Ruby )
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+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=1.4
 SRC_URI=https://github.com/prawnpdf/ttfunk/archive/1.4.0.tar.gz -> ttfunk-1.4.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=fe76c5d86d568bdb90244083b9faac2d
+_md5_=4ccc3d5caf0b4db5a502168eaf4a885f
diff --git a/metadata/md5-cache/dev-ruby/warden-1.2.6 b/metadata/md5-cache/dev-ruby/warden-1.2.6
deleted file mode 100644
index 2148560177ff..000000000000
--- a/metadata/md5-cache/dev-ruby/warden-1.2.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=General Rack Authentication Framework
-EAPI=5
-HOMEPAGE=https://github.com/hassox/warden
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/warden-1.2.6.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=6ade31b296551210ebe8b82665060424
diff --git a/metadata/md5-cache/dev-ruby/websocket-1.2.3 b/metadata/md5-cache/dev-ruby/websocket-1.2.3
deleted file mode 100644
index 62f9c9d619bc..000000000000
--- a/metadata/md5-cache/dev-ruby/websocket-1.2.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Universal Ruby library to handle WebSocket protocol
-EAPI=5
-HOMEPAGE=https://github.com/imanel/websocket-ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/websocket-1.2.3.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=17864324da8e18c2a865948209d95c54
diff --git a/metadata/md5-cache/dev-ruby/wirble-0.1.3-r4 b/metadata/md5-cache/dev-ruby/wirble-0.1.3-r4
index 1a9d28a5c89e..08fe1bb5b96c 100644
--- a/metadata/md5-cache/dev-ruby/wirble-0.1.3-r4
+++ b/metadata/md5-cache/dev-ruby/wirble-0.1.3-r4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=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_ruby25? ( dev-lang/ruby:2.5 ) 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_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) 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] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Wirble is a set of enhancements for Irb
 EAPI=5
 HOMEPAGE=http://pablotron.org/software/wirble/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
 KEYWORDS=amd64 ppc x86
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+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_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/wirble-0.1.3.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=3e63548a8d486ab6f2f4d5ce72d1f997
+_md5_=efd87de24d0175145532f1e00500e1aa
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index 9d5a622cb736..5401eb11506e 100644
Binary files a/metadata/md5-cache/dev-scheme/Manifest.gz and b/metadata/md5-cache/dev-scheme/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-scheme/slib-3.2.5-r1 b/metadata/md5-cache/dev-scheme/slib-3.2.5-r1
index 6516bd490644..2d7de4b8e73e 100644
--- a/metadata/md5-cache/dev-scheme/slib-3.2.5-r1
+++ b/metadata/md5-cache/dev-scheme/slib-3.2.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Portable Scheme library for all standard Scheme implementations
 EAPI=6
 HOMEPAGE=http://people.csail.mit.edu/jaffer/SLIB
 IUSE=gambit scm
-KEYWORDS=~alpha amd64 ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=public-domain BSD
 RDEPEND=>=sys-apps/texinfo-5.0 >=dev-scheme/guile-1.8.8:= gambit? ( dev-scheme/gambit ) scm? ( dev-scheme/scm )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://swiss.csail.mit.edu/ftpdir/scm/slib-3b5.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ae625b2906f6bd2be8d8e71f029e5b0c
+_md5_=587b44f9afe69df08dddc6556d8cdf99
diff --git a/metadata/md5-cache/dev-texlive/Manifest.gz b/metadata/md5-cache/dev-texlive/Manifest.gz
index 3fabec5f4b38..283024eeb7c7 100644
Binary files a/metadata/md5-cache/dev-texlive/Manifest.gz and b/metadata/md5-cache/dev-texlive/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-texlive/texlive-basic-2017-r1 b/metadata/md5-cache/dev-texlive/texlive-basic-2017-r1
index 920e0cb5562c..108903a14195 100644
--- a/metadata/md5-cache/dev-texlive/texlive-basic-2017-r1
+++ b/metadata/md5-cache/dev-texlive/texlive-basic-2017-r1
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Essential programs and files
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc +luajittex
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.3 OFL public-domain TeX TeX-other-free
 RDEPEND=!<dev-texlive/texlive-latex-2009 !<dev-texlive/texlive-latexrecommended-2009 !dev-texlive/texlive-documentation-base !<app-text/dvipsk-5.996_p20160523 >=app-text/texlive-core-2015[luajittex?] !<dev-texlive/texlive-latex-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-amsfonts-2017.tar.xz mirror://gentoo/texlive-module-bibtex-2017.tar.xz mirror://gentoo/texlive-module-cm-2017.tar.xz mirror://gentoo/texlive-module-enctex-2017.tar.xz mirror://gentoo/texlive-module-etex-2017.tar.xz mirror://gentoo/texlive-module-etex-pkg-2017.tar.xz mirror://gentoo/texlive-module-graphics-def-2017.tar.xz mirror://gentoo/texlive-module-hyph-utf8-2017.tar.xz mirror://gentoo/texlive-module-ifluatex-2017.tar.xz mirror://gentoo/texlive-module-ifxetex-2017.tar.xz mirror://gentoo/texlive-module-knuth-lib-2017.tar.xz mirror://gentoo/texlive-module-knuth-local-2017.tar.xz mirror://gentoo/texlive-module-lua-alt-getopt-2017.tar.xz mirror://gentoo/texlive-module-luatex-2017.tar.xz mirror://gentoo/texlive-module-makeindex-2017.tar.xz mirror://gentoo/texlive-module-metafont-2017.tar.xz mirror://gentoo/texlive-module-mflogo-2017.tar.xz mirror://gentoo/texlive-module-mfware-2017.tar.xz mirror://gentoo/texlive-module-pdftex-2017.tar.xz mirror://gentoo/texlive-module-plain-2017.tar.xz mirror://gentoo/texlive-module-tex-2017.tar.xz mirror://gentoo/texlive-module-tex-ini-files-2017.tar.xz mirror://gentoo/texlive-module-texlive-common-2017.tar.xz mirror://gentoo/texlive-module-texlive-docindex-2017.tar.xz mirror://gentoo/texlive-module-texlive-en-2017.tar.xz mirror://gentoo/texlive-module-texlive-msg-translations-2017.tar.xz mirror://gentoo/texlive-module-texlive-scripts-2017.tar.xz mirror://gentoo/texlive-module-unicode-data-2017.tar.xz mirror://gentoo/texlive-module-updmap-map-2017.tar.xz mirror://gentoo/texlive-module-collection-basic-2017.tar.xz doc? ( mirror://gentoo/texlive-module-amsfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-bibtex.doc-2017.tar.xz mirror://gentoo/texlive-module-cm.doc-2017.tar.xz mirror://gentoo/texlive-module-enctex.doc-2017.tar.xz mirror://gentoo/texlive-module-etex.doc-2017.tar.xz mirror://gentoo/texlive-module-etex-pkg.doc-2017.tar.xz mirror://gentoo/texlive-module-graphics-def.doc-2017.tar.xz mirror://gentoo/texlive-module-hyph-utf8.doc-2017.tar.xz mirror://gentoo/texlive-module-ifluatex.doc-2017.tar.xz mirror://gentoo/texlive-module-ifxetex.doc-2017.tar.xz mirror://gentoo/texlive-module-lua-alt-getopt.doc-2017.tar.xz mirror://gentoo/texlive-module-luatex.doc-2017.tar.xz mirror://gentoo/texlive-module-makeindex.doc-2017.tar.xz mirror://gentoo/texlive-module-metafont.doc-2017.tar.xz mirror://gentoo/texlive-module-mflogo.doc-2017.tar.xz mirror://gentoo/texlive-module-mfware.doc-2017.tar.xz mirror://gentoo/texlive-module-pdftex.doc-2017.tar.xz mirror://gentoo/texlive-module-tex.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-ini-files.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-common.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-docindex.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-en.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-scripts.doc-2017.tar.xz mirror://gentoo/texlive-module-unicode-data.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-amsfonts.source-2017.tar.xz mirror://gentoo/texlive-module-hyph-utf8.source-2017.tar.xz mirror://gentoo/texlive-module-ifluatex.source-2017.tar.xz mirror://gentoo/texlive-module-ifxetex.source-2017.tar.xz mirror://gentoo/texlive-module-mflogo.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6bcfca747eb831931d6c62013ebce7aa
+_md5_=d20c0292b242547c3c8f85a38ecc4555
diff --git a/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2017 b/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2017
index 456eb543e9a8..9e84c45587da 100644
--- a/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive BibTeX additional styles
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=Artistic GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-latex-2017 !=dev-texlive/texlive-latexextra-2007* !<dev-texlive/texlive-latex-2009 !<dev-texlive/texlive-publishers-2014 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-aichej-2017.tar.xz mirror://gentoo/texlive-module-ajl-2017.tar.xz mirror://gentoo/texlive-module-amsrefs-2017.tar.xz mirror://gentoo/texlive-module-apacite-2017.tar.xz mirror://gentoo/texlive-module-apalike2-2017.tar.xz mirror://gentoo/texlive-module-archaeologie-2017.tar.xz mirror://gentoo/texlive-module-beebe-2017.tar.xz mirror://gentoo/texlive-module-besjournals-2017.tar.xz mirror://gentoo/texlive-module-bestpapers-2017.tar.xz mirror://gentoo/texlive-module-bibarts-2017.tar.xz mirror://gentoo/texlive-module-biber-2017.tar.xz mirror://gentoo/texlive-module-bibexport-2017.tar.xz mirror://gentoo/texlive-module-bibhtml-2017.tar.xz mirror://gentoo/texlive-module-biblatex-abnt-2017.tar.xz mirror://gentoo/texlive-module-biblatex-anonymous-2017.tar.xz mirror://gentoo/texlive-module-biblatex-apa-2017.tar.xz mirror://gentoo/texlive-module-biblatex-archaeology-2017.tar.xz mirror://gentoo/texlive-module-biblatex-arthistory-bonn-2017.tar.xz mirror://gentoo/texlive-module-biblatex-bookinarticle-2017.tar.xz mirror://gentoo/texlive-module-biblatex-bookinother-2017.tar.xz mirror://gentoo/texlive-module-biblatex-bwl-2017.tar.xz mirror://gentoo/texlive-module-biblatex-caspervector-2017.tar.xz mirror://gentoo/texlive-module-biblatex-chem-2017.tar.xz mirror://gentoo/texlive-module-biblatex-chicago-2017.tar.xz mirror://gentoo/texlive-module-biblatex-claves-2017.tar.xz mirror://gentoo/texlive-module-biblatex-dw-2017.tar.xz mirror://gentoo/texlive-module-biblatex-fiwi-2017.tar.xz mirror://gentoo/texlive-module-biblatex-gb7714-2015-2017.tar.xz mirror://gentoo/texlive-module-biblatex-gost-2017.tar.xz mirror://gentoo/texlive-module-biblatex-historian-2017.tar.xz mirror://gentoo/texlive-module-biblatex-ieee-2017.tar.xz mirror://gentoo/texlive-module-biblatex-ijsra-2017.tar.xz mirror://gentoo/texlive-module-biblatex-iso690-2017.tar.xz mirror://gentoo/texlive-module-biblatex-juradiss-2017.tar.xz mirror://gentoo/texlive-module-biblatex-lni-2017.tar.xz mirror://gentoo/texlive-module-biblatex-luh-ipw-2017.tar.xz mirror://gentoo/texlive-module-biblatex-manuscripts-philology-2017.tar.xz mirror://gentoo/texlive-module-biblatex-mla-2017.tar.xz mirror://gentoo/texlive-module-biblatex-morenames-2017.tar.xz mirror://gentoo/texlive-module-biblatex-multiple-dm-2017.tar.xz mirror://gentoo/texlive-module-biblatex-musuos-2017.tar.xz mirror://gentoo/texlive-module-biblatex-nature-2017.tar.xz mirror://gentoo/texlive-module-biblatex-nejm-2017.tar.xz mirror://gentoo/texlive-module-biblatex-nottsclassic-2017.tar.xz mirror://gentoo/texlive-module-biblatex-opcit-booktitle-2017.tar.xz mirror://gentoo/texlive-module-biblatex-oxref-2017.tar.xz mirror://gentoo/texlive-module-biblatex-philosophy-2017.tar.xz mirror://gentoo/texlive-module-biblatex-phys-2017.tar.xz mirror://gentoo/texlive-module-biblatex-publist-2017.tar.xz mirror://gentoo/texlive-module-biblatex-realauthor-2017.tar.xz mirror://gentoo/texlive-module-biblatex-sbl-2017.tar.xz mirror://gentoo/texlive-module-biblatex-science-2017.tar.xz mirror://gentoo/texlive-module-biblatex-shortfields-2017.tar.xz mirror://gentoo/texlive-module-biblatex-source-division-2017.tar.xz mirror://gentoo/texlive-module-biblatex-subseries-2017.tar.xz mirror://gentoo/texlive-module-biblatex-swiss-legal-2017.tar.xz mirror://gentoo/texlive-module-biblatex-trad-2017.tar.xz mirror://gentoo/texlive-module-biblatex-true-citepages-omit-2017.tar.xz mirror://gentoo/texlive-module-biblist-2017.tar.xz mirror://gentoo/texlive-module-bibtexperllibs-2017.tar.xz mirror://gentoo/texlive-module-bibtopic-2017.tar.xz mirror://gentoo/texlive-module-bibtopicprefix-2017.tar.xz mirror://gentoo/texlive-module-bibunits-2017.tar.xz mirror://gentoo/texlive-module-biolett-bst-2017.tar.xz mirror://gentoo/texlive-module-bookdb-2017.tar.xz mirror://gentoo/texlive-module-breakcites-2017.tar.xz mirror://gentoo/texlive-module-cell-2017.tar.xz mirror://gentoo/texlive-module-chbibref-2017.tar.xz mirror://gentoo/texlive-module-chicago-2017.tar.xz mirror://gentoo/texlive-module-chicago-annote-2017.tar.xz mirror://gentoo/texlive-module-chembst-2017.tar.xz mirror://gentoo/texlive-module-chscite-2017.tar.xz mirror://gentoo/texlive-module-citeall-2017.tar.xz mirror://gentoo/texlive-module-collref-2017.tar.xz mirror://gentoo/texlive-module-compactbib-2017.tar.xz mirror://gentoo/texlive-module-crossrefware-2017.tar.xz mirror://gentoo/texlive-module-custom-bib-2017.tar.xz mirror://gentoo/texlive-module-din1505-2017.tar.xz mirror://gentoo/texlive-module-dk-bib-2017.tar.xz mirror://gentoo/texlive-module-doipubmed-2017.tar.xz mirror://gentoo/texlive-module-ecobiblatex-2017.tar.xz mirror://gentoo/texlive-module-economic-2017.tar.xz mirror://gentoo/texlive-module-fbs-2017.tar.xz mirror://gentoo/texlive-module-figbib-2017.tar.xz mirror://gentoo/texlive-module-footbib-2017.tar.xz mirror://gentoo/texlive-module-francais-bst-2017.tar.xz mirror://gentoo/texlive-module-geschichtsfrkl-2017.tar.xz mirror://gentoo/texlive-module-harvard-2017.tar.xz mirror://gentoo/texlive-module-harvmac-2017.tar.xz mirror://gentoo/texlive-module-historische-zeitschrift-2017.tar.xz mirror://gentoo/texlive-module-ietfbibs-2017.tar.xz mirror://gentoo/texlive-module-ijqc-2017.tar.xz mirror://gentoo/texlive-module-inlinebib-2017.tar.xz mirror://gentoo/texlive-module-iopart-num-2017.tar.xz mirror://gentoo/texlive-module-jneurosci-2017.tar.xz mirror://gentoo/texlive-module-jurabib-2017.tar.xz mirror://gentoo/texlive-module-ksfh_nat-2017.tar.xz mirror://gentoo/texlive-module-ltb2bib-2017.tar.xz mirror://gentoo/texlive-module-listbib-2017.tar.xz mirror://gentoo/texlive-module-logreq-2017.tar.xz mirror://gentoo/texlive-module-margbib-2017.tar.xz mirror://gentoo/texlive-module-multibib-2017.tar.xz mirror://gentoo/texlive-module-multibibliography-2017.tar.xz mirror://gentoo/texlive-module-munich-2017.tar.xz mirror://gentoo/texlive-module-nar-2017.tar.xz mirror://gentoo/texlive-module-nmbib-2017.tar.xz mirror://gentoo/texlive-module-notes2bib-2017.tar.xz mirror://gentoo/texlive-module-notex-bst-2017.tar.xz mirror://gentoo/texlive-module-oscola-2017.tar.xz mirror://gentoo/texlive-module-perception-2017.tar.xz mirror://gentoo/texlive-module-pnas2009-2017.tar.xz mirror://gentoo/texlive-module-rsc-2017.tar.xz mirror://gentoo/texlive-module-showtags-2017.tar.xz mirror://gentoo/texlive-module-sort-by-letters-2017.tar.xz mirror://gentoo/texlive-module-splitbib-2017.tar.xz mirror://gentoo/texlive-module-turabian-formatting-2017.tar.xz mirror://gentoo/texlive-module-uni-wtal-ger-2017.tar.xz mirror://gentoo/texlive-module-uni-wtal-lin-2017.tar.xz mirror://gentoo/texlive-module-urlbst-2017.tar.xz mirror://gentoo/texlive-module-usebib-2017.tar.xz mirror://gentoo/texlive-module-vak-2017.tar.xz mirror://gentoo/texlive-module-xcite-2017.tar.xz mirror://gentoo/texlive-module-collection-bibtexextra-2017.tar.xz doc? ( mirror://gentoo/texlive-module-amsrefs.doc-2017.tar.xz mirror://gentoo/texlive-module-apacite.doc-2017.tar.xz mirror://gentoo/texlive-module-archaeologie.doc-2017.tar.xz mirror://gentoo/texlive-module-besjournals.doc-2017.tar.xz mirror://gentoo/texlive-module-bestpapers.doc-2017.tar.xz mirror://gentoo/texlive-module-bibarts.doc-2017.tar.xz mirror://gentoo/texlive-module-biber.doc-2017.tar.xz mirror://gentoo/texlive-module-bibexport.doc-2017.tar.xz mirror://gentoo/texlive-module-bibhtml.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-abnt.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-anonymous.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-apa.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-archaeology.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-arthistory-bonn.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-bookinarticle.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-bookinother.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-bwl.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-caspervector.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-chem.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-chicago.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-claves.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-dw.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-fiwi.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-gb7714-2015.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-gost.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-historian.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-ieee.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-ijsra.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-iso690.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-juradiss.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-lni.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-luh-ipw.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-manuscripts-philology.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-mla.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-morenames.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-multiple-dm.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-musuos.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-nature.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-nejm.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-nottsclassic.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-opcit-booktitle.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-oxref.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-philosophy.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-phys.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-publist.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-realauthor.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-sbl.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-science.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-shortfields.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-source-division.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-subseries.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-swiss-legal.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-trad.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-true-citepages-omit.doc-2017.tar.xz mirror://gentoo/texlive-module-biblist.doc-2017.tar.xz mirror://gentoo/texlive-module-bibtexperllibs.doc-2017.tar.xz mirror://gentoo/texlive-module-bibtopic.doc-2017.tar.xz mirror://gentoo/texlive-module-bibtopicprefix.doc-2017.tar.xz mirror://gentoo/texlive-module-bibunits.doc-2017.tar.xz mirror://gentoo/texlive-module-biolett-bst.doc-2017.tar.xz mirror://gentoo/texlive-module-bookdb.doc-2017.tar.xz mirror://gentoo/texlive-module-breakcites.doc-2017.tar.xz mirror://gentoo/texlive-module-cell.doc-2017.tar.xz mirror://gentoo/texlive-module-chbibref.doc-2017.tar.xz mirror://gentoo/texlive-module-chicago-annote.doc-2017.tar.xz mirror://gentoo/texlive-module-chembst.doc-2017.tar.xz mirror://gentoo/texlive-module-chscite.doc-2017.tar.xz mirror://gentoo/texlive-module-citeall.doc-2017.tar.xz mirror://gentoo/texlive-module-collref.doc-2017.tar.xz mirror://gentoo/texlive-module-crossrefware.doc-2017.tar.xz mirror://gentoo/texlive-module-custom-bib.doc-2017.tar.xz mirror://gentoo/texlive-module-din1505.doc-2017.tar.xz mirror://gentoo/texlive-module-dk-bib.doc-2017.tar.xz mirror://gentoo/texlive-module-doipubmed.doc-2017.tar.xz mirror://gentoo/texlive-module-ecobiblatex.doc-2017.tar.xz mirror://gentoo/texlive-module-economic.doc-2017.tar.xz mirror://gentoo/texlive-module-figbib.doc-2017.tar.xz mirror://gentoo/texlive-module-footbib.doc-2017.tar.xz mirror://gentoo/texlive-module-francais-bst.doc-2017.tar.xz mirror://gentoo/texlive-module-geschichtsfrkl.doc-2017.tar.xz mirror://gentoo/texlive-module-harvard.doc-2017.tar.xz mirror://gentoo/texlive-module-harvmac.doc-2017.tar.xz mirror://gentoo/texlive-module-historische-zeitschrift.doc-2017.tar.xz mirror://gentoo/texlive-module-ietfbibs.doc-2017.tar.xz mirror://gentoo/texlive-module-ijqc.doc-2017.tar.xz mirror://gentoo/texlive-module-inlinebib.doc-2017.tar.xz mirror://gentoo/texlive-module-iopart-num.doc-2017.tar.xz mirror://gentoo/texlive-module-jneurosci.doc-2017.tar.xz mirror://gentoo/texlive-module-jurabib.doc-2017.tar.xz mirror://gentoo/texlive-module-ltb2bib.doc-2017.tar.xz mirror://gentoo/texlive-module-listbib.doc-2017.tar.xz mirror://gentoo/texlive-module-logreq.doc-2017.tar.xz mirror://gentoo/texlive-module-margbib.doc-2017.tar.xz mirror://gentoo/texlive-module-multibib.doc-2017.tar.xz mirror://gentoo/texlive-module-multibibliography.doc-2017.tar.xz mirror://gentoo/texlive-module-munich.doc-2017.tar.xz mirror://gentoo/texlive-module-nmbib.doc-2017.tar.xz mirror://gentoo/texlive-module-notes2bib.doc-2017.tar.xz mirror://gentoo/texlive-module-oscola.doc-2017.tar.xz mirror://gentoo/texlive-module-perception.doc-2017.tar.xz mirror://gentoo/texlive-module-rsc.doc-2017.tar.xz mirror://gentoo/texlive-module-showtags.doc-2017.tar.xz mirror://gentoo/texlive-module-sort-by-letters.doc-2017.tar.xz mirror://gentoo/texlive-module-splitbib.doc-2017.tar.xz mirror://gentoo/texlive-module-turabian-formatting.doc-2017.tar.xz mirror://gentoo/texlive-module-uni-wtal-ger.doc-2017.tar.xz mirror://gentoo/texlive-module-uni-wtal-lin.doc-2017.tar.xz mirror://gentoo/texlive-module-urlbst.doc-2017.tar.xz mirror://gentoo/texlive-module-usebib.doc-2017.tar.xz mirror://gentoo/texlive-module-vak.doc-2017.tar.xz mirror://gentoo/texlive-module-xcite.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-amsrefs.source-2017.tar.xz mirror://gentoo/texlive-module-apacite.source-2017.tar.xz mirror://gentoo/texlive-module-bibarts.source-2017.tar.xz mirror://gentoo/texlive-module-biber.source-2017.tar.xz mirror://gentoo/texlive-module-bibexport.source-2017.tar.xz mirror://gentoo/texlive-module-biblatex-archaeology.source-2017.tar.xz mirror://gentoo/texlive-module-biblatex-gb7714-2015.source-2017.tar.xz mirror://gentoo/texlive-module-biblatex-oxref.source-2017.tar.xz mirror://gentoo/texlive-module-biblatex-philosophy.source-2017.tar.xz mirror://gentoo/texlive-module-bibtexperllibs.source-2017.tar.xz mirror://gentoo/texlive-module-bibtopic.source-2017.tar.xz mirror://gentoo/texlive-module-bibtopicprefix.source-2017.tar.xz mirror://gentoo/texlive-module-bibunits.source-2017.tar.xz mirror://gentoo/texlive-module-chembst.source-2017.tar.xz mirror://gentoo/texlive-module-chscite.source-2017.tar.xz mirror://gentoo/texlive-module-collref.source-2017.tar.xz mirror://gentoo/texlive-module-custom-bib.source-2017.tar.xz mirror://gentoo/texlive-module-dk-bib.source-2017.tar.xz mirror://gentoo/texlive-module-doipubmed.source-2017.tar.xz mirror://gentoo/texlive-module-footbib.source-2017.tar.xz mirror://gentoo/texlive-module-geschichtsfrkl.source-2017.tar.xz mirror://gentoo/texlive-module-harvard.source-2017.tar.xz mirror://gentoo/texlive-module-jurabib.source-2017.tar.xz mirror://gentoo/texlive-module-ltb2bib.source-2017.tar.xz mirror://gentoo/texlive-module-listbib.source-2017.tar.xz mirror://gentoo/texlive-module-margbib.source-2017.tar.xz mirror://gentoo/texlive-module-multibib.source-2017.tar.xz mirror://gentoo/texlive-module-multibibliography.source-2017.tar.xz mirror://gentoo/texlive-module-nmbib.source-2017.tar.xz mirror://gentoo/texlive-module-notes2bib.source-2017.tar.xz mirror://gentoo/texlive-module-rsc.source-2017.tar.xz mirror://gentoo/texlive-module-splitbib.source-2017.tar.xz mirror://gentoo/texlive-module-urlbst.source-2017.tar.xz mirror://gentoo/texlive-module-usebib.source-2017.tar.xz mirror://gentoo/texlive-module-xcite.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1cee55c6e08720d03baf31c054f76f3a
+_md5_=ee2380e53a7478974014c0cd1e35ec59
diff --git a/metadata/md5-cache/dev-texlive/texlive-context-2017 b/metadata/md5-cache/dev-texlive/texlive-context-2017
index f9bde37b9fd4..4cbba6297741 100644
--- a/metadata/md5-cache/dev-texlive/texlive-context-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-context-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive ConTeXt and packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=BSD GPL-1 GPL-2 GPL-3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 >=dev-texlive/texlive-latex-2010 !<dev-texlive/texlive-latex-2010 >=app-text/texlive-core-2010[xetex] >=dev-texlive/texlive-metapost-2010 dev-lang/ruby >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-context-2017.tar.xz mirror://gentoo/texlive-module-jmn-2017.tar.xz mirror://gentoo/texlive-module-context-notes-zh-cn-2017.tar.xz mirror://gentoo/texlive-module-context-account-2017.tar.xz mirror://gentoo/texlive-module-context-algorithmic-2017.tar.xz mirror://gentoo/texlive-module-context-animation-2017.tar.xz mirror://gentoo/texlive-module-context-annotation-2017.tar.xz mirror://gentoo/texlive-module-context-bnf-2017.tar.xz mirror://gentoo/texlive-module-context-chromato-2017.tar.xz mirror://gentoo/texlive-module-context-cmscbf-2017.tar.xz mirror://gentoo/texlive-module-context-cmttbf-2017.tar.xz mirror://gentoo/texlive-module-context-construction-plan-2017.tar.xz mirror://gentoo/texlive-module-context-cyrillicnumbers-2017.tar.xz mirror://gentoo/texlive-module-context-degrade-2017.tar.xz mirror://gentoo/texlive-module-context-fancybreak-2017.tar.xz mirror://gentoo/texlive-module-context-filter-2017.tar.xz mirror://gentoo/texlive-module-context-french-2017.tar.xz mirror://gentoo/texlive-module-context-fullpage-2017.tar.xz mirror://gentoo/texlive-module-context-gantt-2017.tar.xz mirror://gentoo/texlive-module-context-gnuplot-2017.tar.xz mirror://gentoo/texlive-module-context-inifile-2017.tar.xz mirror://gentoo/texlive-module-context-layout-2017.tar.xz mirror://gentoo/texlive-module-context-letter-2017.tar.xz mirror://gentoo/texlive-module-context-lettrine-2017.tar.xz mirror://gentoo/texlive-module-context-mathsets-2017.tar.xz mirror://gentoo/texlive-module-context-rst-2017.tar.xz mirror://gentoo/texlive-module-context-ruby-2017.tar.xz mirror://gentoo/texlive-module-context-simplefonts-2017.tar.xz mirror://gentoo/texlive-module-context-simpleslides-2017.tar.xz mirror://gentoo/texlive-module-context-title-2017.tar.xz mirror://gentoo/texlive-module-context-transliterator-2017.tar.xz mirror://gentoo/texlive-module-context-typearea-2017.tar.xz mirror://gentoo/texlive-module-context-typescripts-2017.tar.xz mirror://gentoo/texlive-module-context-vim-2017.tar.xz mirror://gentoo/texlive-module-context-visualcounter-2017.tar.xz mirror://gentoo/texlive-module-collection-context-2017.tar.xz doc? ( mirror://gentoo/texlive-module-context.doc-2017.tar.xz mirror://gentoo/texlive-module-context-notes-zh-cn.doc-2017.tar.xz mirror://gentoo/texlive-module-context-account.doc-2017.tar.xz mirror://gentoo/texlive-module-context-animation.doc-2017.tar.xz mirror://gentoo/texlive-module-context-annotation.doc-2017.tar.xz mirror://gentoo/texlive-module-context-bnf.doc-2017.tar.xz mirror://gentoo/texlive-module-context-chromato.doc-2017.tar.xz mirror://gentoo/texlive-module-context-cmscbf.doc-2017.tar.xz mirror://gentoo/texlive-module-context-cmttbf.doc-2017.tar.xz mirror://gentoo/texlive-module-context-construction-plan.doc-2017.tar.xz mirror://gentoo/texlive-module-context-cyrillicnumbers.doc-2017.tar.xz mirror://gentoo/texlive-module-context-degrade.doc-2017.tar.xz mirror://gentoo/texlive-module-context-fancybreak.doc-2017.tar.xz mirror://gentoo/texlive-module-context-filter.doc-2017.tar.xz mirror://gentoo/texlive-module-context-french.doc-2017.tar.xz mirror://gentoo/texlive-module-context-fullpage.doc-2017.tar.xz mirror://gentoo/texlive-module-context-gantt.doc-2017.tar.xz mirror://gentoo/texlive-module-context-gnuplot.doc-2017.tar.xz mirror://gentoo/texlive-module-context-inifile.doc-2017.tar.xz mirror://gentoo/texlive-module-context-layout.doc-2017.tar.xz mirror://gentoo/texlive-module-context-letter.doc-2017.tar.xz mirror://gentoo/texlive-module-context-lettrine.doc-2017.tar.xz mirror://gentoo/texlive-module-context-mathsets.doc-2017.tar.xz mirror://gentoo/texlive-module-context-rst.doc-2017.tar.xz mirror://gentoo/texlive-module-context-ruby.doc-2017.tar.xz mirror://gentoo/texlive-module-context-simplefonts.doc-2017.tar.xz mirror://gentoo/texlive-module-context-simpleslides.doc-2017.tar.xz mirror://gentoo/texlive-module-context-title.doc-2017.tar.xz mirror://gentoo/texlive-module-context-transliterator.doc-2017.tar.xz mirror://gentoo/texlive-module-context-typearea.doc-2017.tar.xz mirror://gentoo/texlive-module-context-typescripts.doc-2017.tar.xz mirror://gentoo/texlive-module-context-vim.doc-2017.tar.xz mirror://gentoo/texlive-module-context-visualcounter.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-context-visualcounter.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6210cd63ce2c9b169d8ff4bca2ee2978
+_md5_=3bcaefc8e86e425042d7e21aaf8a4838
diff --git a/metadata/md5-cache/dev-texlive/texlive-fontsextra-2017 b/metadata/md5-cache/dev-texlive/texlive-fontsextra-2017
index 66aea41a5ec9..714f678e5ddc 100644
--- a/metadata/md5-cache/dev-texlive/texlive-fontsextra-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-fontsextra-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Additional fonts
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 MIT OFL public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !=dev-texlive/texlive-langpolish-2007* !<dev-texlive/texlive-latexextra-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-Asana-Math-2017.tar.xz mirror://gentoo/texlive-module-academicons-2017.tar.xz mirror://gentoo/texlive-module-accanthis-2017.tar.xz mirror://gentoo/texlive-module-adforn-2017.tar.xz mirror://gentoo/texlive-module-adfsymbols-2017.tar.xz mirror://gentoo/texlive-module-aecc-2017.tar.xz mirror://gentoo/texlive-module-alegreya-2017.tar.xz mirror://gentoo/texlive-module-allrunes-2017.tar.xz mirror://gentoo/texlive-module-almfixed-2017.tar.xz mirror://gentoo/texlive-module-anonymouspro-2017.tar.xz mirror://gentoo/texlive-module-antiqua-2017.tar.xz mirror://gentoo/texlive-module-antt-2017.tar.xz mirror://gentoo/texlive-module-archaic-2017.tar.xz mirror://gentoo/texlive-module-arev-2017.tar.xz mirror://gentoo/texlive-module-arimo-2017.tar.xz mirror://gentoo/texlive-module-asapsym-2017.tar.xz mirror://gentoo/texlive-module-ascii-font-2017.tar.xz mirror://gentoo/texlive-module-aspectratio-2017.tar.xz mirror://gentoo/texlive-module-astro-2017.tar.xz mirror://gentoo/texlive-module-augie-2017.tar.xz mirror://gentoo/texlive-module-auncial-new-2017.tar.xz mirror://gentoo/texlive-module-aurical-2017.tar.xz mirror://gentoo/texlive-module-b1encoding-2017.tar.xz mirror://gentoo/texlive-module-barcodes-2017.tar.xz mirror://gentoo/texlive-module-baskervald-2017.tar.xz mirror://gentoo/texlive-module-baskervaldx-2017.tar.xz mirror://gentoo/texlive-module-baskervillef-2017.tar.xz mirror://gentoo/texlive-module-bbding-2017.tar.xz mirror://gentoo/texlive-module-bbm-2017.tar.xz mirror://gentoo/texlive-module-bbm-macros-2017.tar.xz mirror://gentoo/texlive-module-bbold-2017.tar.xz mirror://gentoo/texlive-module-bbold-type1-2017.tar.xz mirror://gentoo/texlive-module-belleek-2017.tar.xz mirror://gentoo/texlive-module-bera-2017.tar.xz mirror://gentoo/texlive-module-berenisadf-2017.tar.xz mirror://gentoo/texlive-module-beuron-2017.tar.xz mirror://gentoo/texlive-module-bguq-2017.tar.xz mirror://gentoo/texlive-module-blacklettert1-2017.tar.xz mirror://gentoo/texlive-module-boisik-2017.tar.xz mirror://gentoo/texlive-module-bookhands-2017.tar.xz mirror://gentoo/texlive-module-boondox-2017.tar.xz mirror://gentoo/texlive-module-braille-2017.tar.xz mirror://gentoo/texlive-module-brushscr-2017.tar.xz mirror://gentoo/texlive-module-cabin-2017.tar.xz mirror://gentoo/texlive-module-caladea-2017.tar.xz mirror://gentoo/texlive-module-calligra-2017.tar.xz mirror://gentoo/texlive-module-calligra-type1-2017.tar.xz mirror://gentoo/texlive-module-cantarell-2017.tar.xz mirror://gentoo/texlive-module-carlito-2017.tar.xz mirror://gentoo/texlive-module-carolmin-ps-2017.tar.xz mirror://gentoo/texlive-module-ccicons-2017.tar.xz mirror://gentoo/texlive-module-cfr-initials-2017.tar.xz mirror://gentoo/texlive-module-cfr-lm-2017.tar.xz mirror://gentoo/texlive-module-cherokee-2017.tar.xz mirror://gentoo/texlive-module-chivo-2017.tar.xz mirror://gentoo/texlive-module-cinzel-2017.tar.xz mirror://gentoo/texlive-module-clearsans-2017.tar.xz mirror://gentoo/texlive-module-cm-lgc-2017.tar.xz mirror://gentoo/texlive-module-cm-unicode-2017.tar.xz mirror://gentoo/texlive-module-cmbright-2017.tar.xz mirror://gentoo/texlive-module-cmexb-2017.tar.xz mirror://gentoo/texlive-module-cmll-2017.tar.xz mirror://gentoo/texlive-module-cmpica-2017.tar.xz mirror://gentoo/texlive-module-cmtiup-2017.tar.xz mirror://gentoo/texlive-module-cochineal-2017.tar.xz mirror://gentoo/texlive-module-comfortaa-2017.tar.xz mirror://gentoo/texlive-module-comicneue-2017.tar.xz mirror://gentoo/texlive-module-concmath-fonts-2017.tar.xz mirror://gentoo/texlive-module-cookingsymbols-2017.tar.xz mirror://gentoo/texlive-module-cormorantgaramond-2017.tar.xz mirror://gentoo/texlive-module-countriesofeurope-2017.tar.xz mirror://gentoo/texlive-module-courier-scaled-2017.tar.xz mirror://gentoo/texlive-module-crimson-2017.tar.xz mirror://gentoo/texlive-module-cryst-2017.tar.xz mirror://gentoo/texlive-module-cyklop-2017.tar.xz mirror://gentoo/texlive-module-dancers-2017.tar.xz mirror://gentoo/texlive-module-dantelogo-2017.tar.xz mirror://gentoo/texlive-module-dejavu-2017.tar.xz mirror://gentoo/texlive-module-dice-2017.tar.xz mirror://gentoo/texlive-module-dictsym-2017.tar.xz mirror://gentoo/texlive-module-dingbat-2017.tar.xz mirror://gentoo/texlive-module-doublestroke-2017.tar.xz mirror://gentoo/texlive-module-dozenal-2017.tar.xz mirror://gentoo/texlive-module-drm-2017.tar.xz mirror://gentoo/texlive-module-droid-2017.tar.xz mirror://gentoo/texlive-module-duerer-2017.tar.xz mirror://gentoo/texlive-module-duerer-latex-2017.tar.xz mirror://gentoo/texlive-module-dutchcal-2017.tar.xz mirror://gentoo/texlive-module-ean-2017.tar.xz mirror://gentoo/texlive-module-ebgaramond-2017.tar.xz mirror://gentoo/texlive-module-ebgaramond-maths-2017.tar.xz mirror://gentoo/texlive-module-ecc-2017.tar.xz mirror://gentoo/texlive-module-eco-2017.tar.xz mirror://gentoo/texlive-module-eiad-2017.tar.xz mirror://gentoo/texlive-module-eiad-ltx-2017.tar.xz mirror://gentoo/texlive-module-electrum-2017.tar.xz mirror://gentoo/texlive-module-elvish-2017.tar.xz mirror://gentoo/texlive-module-epigrafica-2017.tar.xz mirror://gentoo/texlive-module-epsdice-2017.tar.xz mirror://gentoo/texlive-module-erewhon-2017.tar.xz mirror://gentoo/texlive-module-esrelation-2017.tar.xz mirror://gentoo/texlive-module-esstix-2017.tar.xz mirror://gentoo/texlive-module-esvect-2017.tar.xz mirror://gentoo/texlive-module-eulervm-2017.tar.xz mirror://gentoo/texlive-module-euxm-2017.tar.xz mirror://gentoo/texlive-module-fbb-2017.tar.xz mirror://gentoo/texlive-module-fdsymbol-2017.tar.xz mirror://gentoo/texlive-module-fetamont-2017.tar.xz mirror://gentoo/texlive-module-feyn-2017.tar.xz mirror://gentoo/texlive-module-fge-2017.tar.xz mirror://gentoo/texlive-module-fira-2017.tar.xz mirror://gentoo/texlive-module-foekfont-2017.tar.xz mirror://gentoo/texlive-module-fonetika-2017.tar.xz mirror://gentoo/texlive-module-fontawesome-2017.tar.xz mirror://gentoo/texlive-module-fontmfizz-2017.tar.xz mirror://gentoo/texlive-module-fonts-churchslavonic-2017.tar.xz mirror://gentoo/texlive-module-fourier-2017.tar.xz mirror://gentoo/texlive-module-fouriernc-2017.tar.xz mirror://gentoo/texlive-module-frcursive-2017.tar.xz mirror://gentoo/texlive-module-frederika2016-2017.tar.xz mirror://gentoo/texlive-module-genealogy-2017.tar.xz mirror://gentoo/texlive-module-gentium-tug-2017.tar.xz mirror://gentoo/texlive-module-gfsartemisia-2017.tar.xz mirror://gentoo/texlive-module-gfsbodoni-2017.tar.xz mirror://gentoo/texlive-module-gfscomplutum-2017.tar.xz mirror://gentoo/texlive-module-gfsdidot-2017.tar.xz mirror://gentoo/texlive-module-gfsneohellenic-2017.tar.xz mirror://gentoo/texlive-module-gfssolomos-2017.tar.xz mirror://gentoo/texlive-module-gillcm-2017.tar.xz mirror://gentoo/texlive-module-gillius-2017.tar.xz mirror://gentoo/texlive-module-gnu-freefont-2017.tar.xz mirror://gentoo/texlive-module-gofonts-2017.tar.xz mirror://gentoo/texlive-module-gothic-2017.tar.xz mirror://gentoo/texlive-module-greenpoint-2017.tar.xz mirror://gentoo/texlive-module-grotesq-2017.tar.xz mirror://gentoo/texlive-module-hacm-2017.tar.xz mirror://gentoo/texlive-module-hands-2017.tar.xz mirror://gentoo/texlive-module-heuristica-2017.tar.xz mirror://gentoo/texlive-module-hfbright-2017.tar.xz mirror://gentoo/texlive-module-hfoldsty-2017.tar.xz mirror://gentoo/texlive-module-ifsym-2017.tar.xz mirror://gentoo/texlive-module-imfellenglish-2017.tar.xz mirror://gentoo/texlive-module-inconsolata-2017.tar.xz mirror://gentoo/texlive-module-initials-2017.tar.xz mirror://gentoo/texlive-module-ipaex-type1-2017.tar.xz mirror://gentoo/texlive-module-iwona-2017.tar.xz mirror://gentoo/texlive-module-jablantile-2017.tar.xz mirror://gentoo/texlive-module-jamtimes-2017.tar.xz mirror://gentoo/texlive-module-junicode-2017.tar.xz mirror://gentoo/texlive-module-kixfont-2017.tar.xz mirror://gentoo/texlive-module-knuthotherfonts-2017.tar.xz mirror://gentoo/texlive-module-kpfonts-2017.tar.xz mirror://gentoo/texlive-module-kurier-2017.tar.xz mirror://gentoo/texlive-module-lato-2017.tar.xz mirror://gentoo/texlive-module-lfb-2017.tar.xz mirror://gentoo/texlive-module-libertine-2017.tar.xz mirror://gentoo/texlive-module-libertinegc-2017.tar.xz mirror://gentoo/texlive-module-libertinus-2017.tar.xz mirror://gentoo/texlive-module-libertinust1math-2017.tar.xz mirror://gentoo/texlive-module-librebaskerville-2017.tar.xz mirror://gentoo/texlive-module-librebodoni-2017.tar.xz mirror://gentoo/texlive-module-librecaslon-2017.tar.xz mirror://gentoo/texlive-module-libris-2017.tar.xz mirror://gentoo/texlive-module-linearA-2017.tar.xz mirror://gentoo/texlive-module-lobster2-2017.tar.xz mirror://gentoo/texlive-module-lxfonts-2017.tar.xz mirror://gentoo/texlive-module-ly1-2017.tar.xz mirror://gentoo/texlive-module-mathabx-2017.tar.xz mirror://gentoo/texlive-module-mathabx-type1-2017.tar.xz mirror://gentoo/texlive-module-mathdesign-2017.tar.xz mirror://gentoo/texlive-module-mdputu-2017.tar.xz mirror://gentoo/texlive-module-mdsymbol-2017.tar.xz mirror://gentoo/texlive-module-merriweather-2017.tar.xz mirror://gentoo/texlive-module-miama-2017.tar.xz mirror://gentoo/texlive-module-mintspirit-2017.tar.xz mirror://gentoo/texlive-module-missaali-2017.tar.xz mirror://gentoo/texlive-module-mnsymbol-2017.tar.xz mirror://gentoo/texlive-module-montserrat-2017.tar.xz mirror://gentoo/texlive-module-mweights-2017.tar.xz mirror://gentoo/texlive-module-newpx-2017.tar.xz mirror://gentoo/texlive-module-newtx-2017.tar.xz mirror://gentoo/texlive-module-newtxsf-2017.tar.xz mirror://gentoo/texlive-module-newtxtt-2017.tar.xz mirror://gentoo/texlive-module-nimbus15-2017.tar.xz mirror://gentoo/texlive-module-nkarta-2017.tar.xz mirror://gentoo/texlive-module-noto-2017.tar.xz mirror://gentoo/texlive-module-obnov-2017.tar.xz mirror://gentoo/texlive-module-ocherokee-2017.tar.xz mirror://gentoo/texlive-module-ocr-b-2017.tar.xz mirror://gentoo/texlive-module-ocr-b-outline-2017.tar.xz mirror://gentoo/texlive-module-ogham-2017.tar.xz mirror://gentoo/texlive-module-oinuit-2017.tar.xz mirror://gentoo/texlive-module-old-arrows-2017.tar.xz mirror://gentoo/texlive-module-oldlatin-2017.tar.xz mirror://gentoo/texlive-module-oldstandard-2017.tar.xz mirror://gentoo/texlive-module-opensans-2017.tar.xz mirror://gentoo/texlive-module-orkhun-2017.tar.xz mirror://gentoo/texlive-module-overlock-2017.tar.xz mirror://gentoo/texlive-module-pacioli-2017.tar.xz mirror://gentoo/texlive-module-paratype-2017.tar.xz mirror://gentoo/texlive-module-phaistos-2017.tar.xz mirror://gentoo/texlive-module-phonetic-2017.tar.xz mirror://gentoo/texlive-module-pigpen-2017.tar.xz mirror://gentoo/texlive-module-playfair-2017.tar.xz mirror://gentoo/texlive-module-poltawski-2017.tar.xz mirror://gentoo/texlive-module-prodint-2017.tar.xz mirror://gentoo/texlive-module-punk-2017.tar.xz mirror://gentoo/texlive-module-punk-latex-2017.tar.xz mirror://gentoo/texlive-module-punknova-2017.tar.xz mirror://gentoo/texlive-module-pxtxalfa-2017.tar.xz mirror://gentoo/texlive-module-quattrocento-2017.tar.xz mirror://gentoo/texlive-module-raleway-2017.tar.xz mirror://gentoo/texlive-module-recycle-2017.tar.xz mirror://gentoo/texlive-module-roboto-2017.tar.xz mirror://gentoo/texlive-module-romande-2017.tar.xz mirror://gentoo/texlive-module-rosario-2017.tar.xz mirror://gentoo/texlive-module-rsfso-2017.tar.xz mirror://gentoo/texlive-module-sansmathaccent-2017.tar.xz mirror://gentoo/texlive-module-sansmathfonts-2017.tar.xz mirror://gentoo/texlive-module-sauter-2017.tar.xz mirror://gentoo/texlive-module-sauterfonts-2017.tar.xz mirror://gentoo/texlive-module-schulschriften-2017.tar.xz mirror://gentoo/texlive-module-semaphor-2017.tar.xz mirror://gentoo/texlive-module-skull-2017.tar.xz mirror://gentoo/texlive-module-sourcecodepro-2017.tar.xz mirror://gentoo/texlive-module-sourcesanspro-2017.tar.xz mirror://gentoo/texlive-module-sourceserifpro-2017.tar.xz mirror://gentoo/texlive-module-starfont-2017.tar.xz mirror://gentoo/texlive-module-staves-2017.tar.xz mirror://gentoo/texlive-module-stix-2017.tar.xz mirror://gentoo/texlive-module-superiors-2017.tar.xz mirror://gentoo/texlive-module-svrsymbols-2017.tar.xz mirror://gentoo/texlive-module-tapir-2017.tar.xz mirror://gentoo/texlive-module-tempora-2017.tar.xz mirror://gentoo/texlive-module-tengwarscript-2017.tar.xz mirror://gentoo/texlive-module-tfrupee-2017.tar.xz mirror://gentoo/texlive-module-tinos-2017.tar.xz mirror://gentoo/texlive-module-tpslifonts-2017.tar.xz mirror://gentoo/texlive-module-trajan-2017.tar.xz mirror://gentoo/texlive-module-txfontsb-2017.tar.xz mirror://gentoo/texlive-module-txuprcal-2017.tar.xz mirror://gentoo/texlive-module-typicons-2017.tar.xz mirror://gentoo/texlive-module-umtypewriter-2017.tar.xz mirror://gentoo/texlive-module-universa-2017.tar.xz mirror://gentoo/texlive-module-universalis-2017.tar.xz mirror://gentoo/texlive-module-uppunctlm-2017.tar.xz mirror://gentoo/texlive-module-urwchancal-2017.tar.xz mirror://gentoo/texlive-module-venturisadf-2017.tar.xz mirror://gentoo/texlive-module-wsuipa-2017.tar.xz mirror://gentoo/texlive-module-xcharter-2017.tar.xz mirror://gentoo/texlive-module-xits-2017.tar.xz mirror://gentoo/texlive-module-yfonts-2017.tar.xz mirror://gentoo/texlive-module-yfonts-t1-2017.tar.xz mirror://gentoo/texlive-module-yinit-otf-2017.tar.xz mirror://gentoo/texlive-module-zlmtt-2017.tar.xz mirror://gentoo/texlive-module-collection-fontsextra-2017.tar.xz doc? ( mirror://gentoo/texlive-module-Asana-Math.doc-2017.tar.xz mirror://gentoo/texlive-module-academicons.doc-2017.tar.xz mirror://gentoo/texlive-module-accanthis.doc-2017.tar.xz mirror://gentoo/texlive-module-adforn.doc-2017.tar.xz mirror://gentoo/texlive-module-adfsymbols.doc-2017.tar.xz mirror://gentoo/texlive-module-aecc.doc-2017.tar.xz mirror://gentoo/texlive-module-alegreya.doc-2017.tar.xz mirror://gentoo/texlive-module-allrunes.doc-2017.tar.xz mirror://gentoo/texlive-module-almfixed.doc-2017.tar.xz mirror://gentoo/texlive-module-anonymouspro.doc-2017.tar.xz mirror://gentoo/texlive-module-antiqua.doc-2017.tar.xz mirror://gentoo/texlive-module-antt.doc-2017.tar.xz mirror://gentoo/texlive-module-archaic.doc-2017.tar.xz mirror://gentoo/texlive-module-arev.doc-2017.tar.xz mirror://gentoo/texlive-module-arimo.doc-2017.tar.xz mirror://gentoo/texlive-module-asapsym.doc-2017.tar.xz mirror://gentoo/texlive-module-ascii-font.doc-2017.tar.xz mirror://gentoo/texlive-module-aspectratio.doc-2017.tar.xz mirror://gentoo/texlive-module-astro.doc-2017.tar.xz mirror://gentoo/texlive-module-augie.doc-2017.tar.xz mirror://gentoo/texlive-module-auncial-new.doc-2017.tar.xz mirror://gentoo/texlive-module-aurical.doc-2017.tar.xz mirror://gentoo/texlive-module-b1encoding.doc-2017.tar.xz mirror://gentoo/texlive-module-barcodes.doc-2017.tar.xz mirror://gentoo/texlive-module-baskervald.doc-2017.tar.xz mirror://gentoo/texlive-module-baskervaldx.doc-2017.tar.xz mirror://gentoo/texlive-module-baskervillef.doc-2017.tar.xz mirror://gentoo/texlive-module-bbding.doc-2017.tar.xz mirror://gentoo/texlive-module-bbm.doc-2017.tar.xz mirror://gentoo/texlive-module-bbm-macros.doc-2017.tar.xz mirror://gentoo/texlive-module-bbold.doc-2017.tar.xz mirror://gentoo/texlive-module-bbold-type1.doc-2017.tar.xz mirror://gentoo/texlive-module-belleek.doc-2017.tar.xz mirror://gentoo/texlive-module-bera.doc-2017.tar.xz mirror://gentoo/texlive-module-berenisadf.doc-2017.tar.xz mirror://gentoo/texlive-module-beuron.doc-2017.tar.xz mirror://gentoo/texlive-module-bguq.doc-2017.tar.xz mirror://gentoo/texlive-module-blacklettert1.doc-2017.tar.xz mirror://gentoo/texlive-module-boisik.doc-2017.tar.xz mirror://gentoo/texlive-module-bookhands.doc-2017.tar.xz mirror://gentoo/texlive-module-boondox.doc-2017.tar.xz mirror://gentoo/texlive-module-braille.doc-2017.tar.xz mirror://gentoo/texlive-module-brushscr.doc-2017.tar.xz mirror://gentoo/texlive-module-cabin.doc-2017.tar.xz mirror://gentoo/texlive-module-caladea.doc-2017.tar.xz mirror://gentoo/texlive-module-calligra.doc-2017.tar.xz mirror://gentoo/texlive-module-calligra-type1.doc-2017.tar.xz mirror://gentoo/texlive-module-cantarell.doc-2017.tar.xz mirror://gentoo/texlive-module-carlito.doc-2017.tar.xz mirror://gentoo/texlive-module-carolmin-ps.doc-2017.tar.xz mirror://gentoo/texlive-module-ccicons.doc-2017.tar.xz mirror://gentoo/texlive-module-cfr-initials.doc-2017.tar.xz mirror://gentoo/texlive-module-cfr-lm.doc-2017.tar.xz mirror://gentoo/texlive-module-cherokee.doc-2017.tar.xz mirror://gentoo/texlive-module-chivo.doc-2017.tar.xz mirror://gentoo/texlive-module-cinzel.doc-2017.tar.xz mirror://gentoo/texlive-module-clearsans.doc-2017.tar.xz mirror://gentoo/texlive-module-cm-lgc.doc-2017.tar.xz mirror://gentoo/texlive-module-cm-unicode.doc-2017.tar.xz mirror://gentoo/texlive-module-cmbright.doc-2017.tar.xz mirror://gentoo/texlive-module-cmexb.doc-2017.tar.xz mirror://gentoo/texlive-module-cmll.doc-2017.tar.xz mirror://gentoo/texlive-module-cmpica.doc-2017.tar.xz mirror://gentoo/texlive-module-cmtiup.doc-2017.tar.xz mirror://gentoo/texlive-module-cochineal.doc-2017.tar.xz mirror://gentoo/texlive-module-comfortaa.doc-2017.tar.xz mirror://gentoo/texlive-module-comicneue.doc-2017.tar.xz mirror://gentoo/texlive-module-concmath-fonts.doc-2017.tar.xz mirror://gentoo/texlive-module-cookingsymbols.doc-2017.tar.xz mirror://gentoo/texlive-module-cormorantgaramond.doc-2017.tar.xz mirror://gentoo/texlive-module-countriesofeurope.doc-2017.tar.xz mirror://gentoo/texlive-module-courier-scaled.doc-2017.tar.xz mirror://gentoo/texlive-module-crimson.doc-2017.tar.xz mirror://gentoo/texlive-module-cryst.doc-2017.tar.xz mirror://gentoo/texlive-module-cyklop.doc-2017.tar.xz mirror://gentoo/texlive-module-dantelogo.doc-2017.tar.xz mirror://gentoo/texlive-module-dejavu.doc-2017.tar.xz mirror://gentoo/texlive-module-dice.doc-2017.tar.xz mirror://gentoo/texlive-module-dictsym.doc-2017.tar.xz mirror://gentoo/texlive-module-dingbat.doc-2017.tar.xz mirror://gentoo/texlive-module-doublestroke.doc-2017.tar.xz mirror://gentoo/texlive-module-dozenal.doc-2017.tar.xz mirror://gentoo/texlive-module-drm.doc-2017.tar.xz mirror://gentoo/texlive-module-droid.doc-2017.tar.xz mirror://gentoo/texlive-module-duerer.doc-2017.tar.xz mirror://gentoo/texlive-module-duerer-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-dutchcal.doc-2017.tar.xz mirror://gentoo/texlive-module-ean.doc-2017.tar.xz mirror://gentoo/texlive-module-ebgaramond.doc-2017.tar.xz mirror://gentoo/texlive-module-ebgaramond-maths.doc-2017.tar.xz mirror://gentoo/texlive-module-ecc.doc-2017.tar.xz mirror://gentoo/texlive-module-eco.doc-2017.tar.xz mirror://gentoo/texlive-module-eiad.doc-2017.tar.xz mirror://gentoo/texlive-module-eiad-ltx.doc-2017.tar.xz mirror://gentoo/texlive-module-electrum.doc-2017.tar.xz mirror://gentoo/texlive-module-elvish.doc-2017.tar.xz mirror://gentoo/texlive-module-epigrafica.doc-2017.tar.xz mirror://gentoo/texlive-module-epsdice.doc-2017.tar.xz mirror://gentoo/texlive-module-erewhon.doc-2017.tar.xz mirror://gentoo/texlive-module-esrelation.doc-2017.tar.xz mirror://gentoo/texlive-module-esstix.doc-2017.tar.xz mirror://gentoo/texlive-module-esvect.doc-2017.tar.xz mirror://gentoo/texlive-module-eulervm.doc-2017.tar.xz mirror://gentoo/texlive-module-fbb.doc-2017.tar.xz mirror://gentoo/texlive-module-fdsymbol.doc-2017.tar.xz mirror://gentoo/texlive-module-fetamont.doc-2017.tar.xz mirror://gentoo/texlive-module-feyn.doc-2017.tar.xz mirror://gentoo/texlive-module-fge.doc-2017.tar.xz mirror://gentoo/texlive-module-fira.doc-2017.tar.xz mirror://gentoo/texlive-module-foekfont.doc-2017.tar.xz mirror://gentoo/texlive-module-fonetika.doc-2017.tar.xz mirror://gentoo/texlive-module-fontawesome.doc-2017.tar.xz mirror://gentoo/texlive-module-fontmfizz.doc-2017.tar.xz mirror://gentoo/texlive-module-fonts-churchslavonic.doc-2017.tar.xz mirror://gentoo/texlive-module-fourier.doc-2017.tar.xz mirror://gentoo/texlive-module-fouriernc.doc-2017.tar.xz mirror://gentoo/texlive-module-frcursive.doc-2017.tar.xz mirror://gentoo/texlive-module-frederika2016.doc-2017.tar.xz mirror://gentoo/texlive-module-genealogy.doc-2017.tar.xz mirror://gentoo/texlive-module-gentium-tug.doc-2017.tar.xz mirror://gentoo/texlive-module-gfsartemisia.doc-2017.tar.xz mirror://gentoo/texlive-module-gfsbodoni.doc-2017.tar.xz mirror://gentoo/texlive-module-gfscomplutum.doc-2017.tar.xz mirror://gentoo/texlive-module-gfsdidot.doc-2017.tar.xz mirror://gentoo/texlive-module-gfsneohellenic.doc-2017.tar.xz mirror://gentoo/texlive-module-gfssolomos.doc-2017.tar.xz mirror://gentoo/texlive-module-gillcm.doc-2017.tar.xz mirror://gentoo/texlive-module-gillius.doc-2017.tar.xz mirror://gentoo/texlive-module-gnu-freefont.doc-2017.tar.xz mirror://gentoo/texlive-module-gofonts.doc-2017.tar.xz mirror://gentoo/texlive-module-gothic.doc-2017.tar.xz mirror://gentoo/texlive-module-greenpoint.doc-2017.tar.xz mirror://gentoo/texlive-module-grotesq.doc-2017.tar.xz mirror://gentoo/texlive-module-hacm.doc-2017.tar.xz mirror://gentoo/texlive-module-heuristica.doc-2017.tar.xz mirror://gentoo/texlive-module-hfbright.doc-2017.tar.xz mirror://gentoo/texlive-module-hfoldsty.doc-2017.tar.xz mirror://gentoo/texlive-module-ifsym.doc-2017.tar.xz mirror://gentoo/texlive-module-imfellenglish.doc-2017.tar.xz mirror://gentoo/texlive-module-inconsolata.doc-2017.tar.xz mirror://gentoo/texlive-module-initials.doc-2017.tar.xz mirror://gentoo/texlive-module-ipaex-type1.doc-2017.tar.xz mirror://gentoo/texlive-module-iwona.doc-2017.tar.xz mirror://gentoo/texlive-module-jablantile.doc-2017.tar.xz mirror://gentoo/texlive-module-jamtimes.doc-2017.tar.xz mirror://gentoo/texlive-module-junicode.doc-2017.tar.xz mirror://gentoo/texlive-module-kixfont.doc-2017.tar.xz mirror://gentoo/texlive-module-kpfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-kurier.doc-2017.tar.xz mirror://gentoo/texlive-module-lato.doc-2017.tar.xz mirror://gentoo/texlive-module-lfb.doc-2017.tar.xz mirror://gentoo/texlive-module-libertine.doc-2017.tar.xz mirror://gentoo/texlive-module-libertinegc.doc-2017.tar.xz mirror://gentoo/texlive-module-libertinus.doc-2017.tar.xz mirror://gentoo/texlive-module-libertinust1math.doc-2017.tar.xz mirror://gentoo/texlive-module-librebaskerville.doc-2017.tar.xz mirror://gentoo/texlive-module-librebodoni.doc-2017.tar.xz mirror://gentoo/texlive-module-librecaslon.doc-2017.tar.xz mirror://gentoo/texlive-module-libris.doc-2017.tar.xz mirror://gentoo/texlive-module-linearA.doc-2017.tar.xz mirror://gentoo/texlive-module-lobster2.doc-2017.tar.xz mirror://gentoo/texlive-module-lxfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-ly1.doc-2017.tar.xz mirror://gentoo/texlive-module-mathabx.doc-2017.tar.xz mirror://gentoo/texlive-module-mathabx-type1.doc-2017.tar.xz mirror://gentoo/texlive-module-mathdesign.doc-2017.tar.xz mirror://gentoo/texlive-module-mdputu.doc-2017.tar.xz mirror://gentoo/texlive-module-mdsymbol.doc-2017.tar.xz mirror://gentoo/texlive-module-merriweather.doc-2017.tar.xz mirror://gentoo/texlive-module-miama.doc-2017.tar.xz mirror://gentoo/texlive-module-mintspirit.doc-2017.tar.xz mirror://gentoo/texlive-module-missaali.doc-2017.tar.xz mirror://gentoo/texlive-module-mnsymbol.doc-2017.tar.xz mirror://gentoo/texlive-module-montserrat.doc-2017.tar.xz mirror://gentoo/texlive-module-mweights.doc-2017.tar.xz mirror://gentoo/texlive-module-newpx.doc-2017.tar.xz mirror://gentoo/texlive-module-newtx.doc-2017.tar.xz mirror://gentoo/texlive-module-newtxsf.doc-2017.tar.xz mirror://gentoo/texlive-module-newtxtt.doc-2017.tar.xz mirror://gentoo/texlive-module-nimbus15.doc-2017.tar.xz mirror://gentoo/texlive-module-nkarta.doc-2017.tar.xz mirror://gentoo/texlive-module-noto.doc-2017.tar.xz mirror://gentoo/texlive-module-obnov.doc-2017.tar.xz mirror://gentoo/texlive-module-ocherokee.doc-2017.tar.xz mirror://gentoo/texlive-module-ocr-b.doc-2017.tar.xz mirror://gentoo/texlive-module-ocr-b-outline.doc-2017.tar.xz mirror://gentoo/texlive-module-ogham.doc-2017.tar.xz mirror://gentoo/texlive-module-oinuit.doc-2017.tar.xz mirror://gentoo/texlive-module-old-arrows.doc-2017.tar.xz mirror://gentoo/texlive-module-oldlatin.doc-2017.tar.xz mirror://gentoo/texlive-module-oldstandard.doc-2017.tar.xz mirror://gentoo/texlive-module-opensans.doc-2017.tar.xz mirror://gentoo/texlive-module-orkhun.doc-2017.tar.xz mirror://gentoo/texlive-module-overlock.doc-2017.tar.xz mirror://gentoo/texlive-module-pacioli.doc-2017.tar.xz mirror://gentoo/texlive-module-paratype.doc-2017.tar.xz mirror://gentoo/texlive-module-phaistos.doc-2017.tar.xz mirror://gentoo/texlive-module-phonetic.doc-2017.tar.xz mirror://gentoo/texlive-module-pigpen.doc-2017.tar.xz mirror://gentoo/texlive-module-playfair.doc-2017.tar.xz mirror://gentoo/texlive-module-poltawski.doc-2017.tar.xz mirror://gentoo/texlive-module-prodint.doc-2017.tar.xz mirror://gentoo/texlive-module-punk.doc-2017.tar.xz mirror://gentoo/texlive-module-punk-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-punknova.doc-2017.tar.xz mirror://gentoo/texlive-module-pxtxalfa.doc-2017.tar.xz mirror://gentoo/texlive-module-quattrocento.doc-2017.tar.xz mirror://gentoo/texlive-module-raleway.doc-2017.tar.xz mirror://gentoo/texlive-module-recycle.doc-2017.tar.xz mirror://gentoo/texlive-module-roboto.doc-2017.tar.xz mirror://gentoo/texlive-module-romande.doc-2017.tar.xz mirror://gentoo/texlive-module-rosario.doc-2017.tar.xz mirror://gentoo/texlive-module-rsfso.doc-2017.tar.xz mirror://gentoo/texlive-module-sansmathaccent.doc-2017.tar.xz mirror://gentoo/texlive-module-sansmathfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-sauterfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-schulschriften.doc-2017.tar.xz mirror://gentoo/texlive-module-semaphor.doc-2017.tar.xz mirror://gentoo/texlive-module-sourcecodepro.doc-2017.tar.xz mirror://gentoo/texlive-module-sourcesanspro.doc-2017.tar.xz mirror://gentoo/texlive-module-sourceserifpro.doc-2017.tar.xz mirror://gentoo/texlive-module-starfont.doc-2017.tar.xz mirror://gentoo/texlive-module-staves.doc-2017.tar.xz mirror://gentoo/texlive-module-stix.doc-2017.tar.xz mirror://gentoo/texlive-module-superiors.doc-2017.tar.xz mirror://gentoo/texlive-module-svrsymbols.doc-2017.tar.xz mirror://gentoo/texlive-module-tapir.doc-2017.tar.xz mirror://gentoo/texlive-module-tempora.doc-2017.tar.xz mirror://gentoo/texlive-module-tengwarscript.doc-2017.tar.xz mirror://gentoo/texlive-module-tfrupee.doc-2017.tar.xz mirror://gentoo/texlive-module-tinos.doc-2017.tar.xz mirror://gentoo/texlive-module-tpslifonts.doc-2017.tar.xz mirror://gentoo/texlive-module-trajan.doc-2017.tar.xz mirror://gentoo/texlive-module-txfontsb.doc-2017.tar.xz mirror://gentoo/texlive-module-txuprcal.doc-2017.tar.xz mirror://gentoo/texlive-module-typicons.doc-2017.tar.xz mirror://gentoo/texlive-module-universa.doc-2017.tar.xz mirror://gentoo/texlive-module-universalis.doc-2017.tar.xz mirror://gentoo/texlive-module-uppunctlm.doc-2017.tar.xz mirror://gentoo/texlive-module-urwchancal.doc-2017.tar.xz mirror://gentoo/texlive-module-venturisadf.doc-2017.tar.xz mirror://gentoo/texlive-module-wsuipa.doc-2017.tar.xz mirror://gentoo/texlive-module-xcharter.doc-2017.tar.xz mirror://gentoo/texlive-module-xits.doc-2017.tar.xz mirror://gentoo/texlive-module-yfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-yfonts-t1.doc-2017.tar.xz mirror://gentoo/texlive-module-yinit-otf.doc-2017.tar.xz mirror://gentoo/texlive-module-zlmtt.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-allrunes.source-2017.tar.xz mirror://gentoo/texlive-module-anonymouspro.source-2017.tar.xz mirror://gentoo/texlive-module-archaic.source-2017.tar.xz mirror://gentoo/texlive-module-arev.source-2017.tar.xz mirror://gentoo/texlive-module-asapsym.source-2017.tar.xz mirror://gentoo/texlive-module-ascii-font.source-2017.tar.xz mirror://gentoo/texlive-module-auncial-new.source-2017.tar.xz mirror://gentoo/texlive-module-b1encoding.source-2017.tar.xz mirror://gentoo/texlive-module-barcodes.source-2017.tar.xz mirror://gentoo/texlive-module-baskervald.source-2017.tar.xz mirror://gentoo/texlive-module-bbding.source-2017.tar.xz mirror://gentoo/texlive-module-bbm-macros.source-2017.tar.xz mirror://gentoo/texlive-module-bbold.source-2017.tar.xz mirror://gentoo/texlive-module-belleek.source-2017.tar.xz mirror://gentoo/texlive-module-bguq.source-2017.tar.xz mirror://gentoo/texlive-module-blacklettert1.source-2017.tar.xz mirror://gentoo/texlive-module-bookhands.source-2017.tar.xz mirror://gentoo/texlive-module-cantarell.source-2017.tar.xz mirror://gentoo/texlive-module-ccicons.source-2017.tar.xz mirror://gentoo/texlive-module-cfr-lm.source-2017.tar.xz mirror://gentoo/texlive-module-chivo.source-2017.tar.xz mirror://gentoo/texlive-module-cmbright.source-2017.tar.xz mirror://gentoo/texlive-module-cmll.source-2017.tar.xz mirror://gentoo/texlive-module-comfortaa.source-2017.tar.xz mirror://gentoo/texlive-module-cookingsymbols.source-2017.tar.xz mirror://gentoo/texlive-module-dingbat.source-2017.tar.xz mirror://gentoo/texlive-module-dozenal.source-2017.tar.xz mirror://gentoo/texlive-module-drm.source-2017.tar.xz mirror://gentoo/texlive-module-droid.source-2017.tar.xz mirror://gentoo/texlive-module-eco.source-2017.tar.xz mirror://gentoo/texlive-module-eiad-ltx.source-2017.tar.xz mirror://gentoo/texlive-module-electrum.source-2017.tar.xz mirror://gentoo/texlive-module-epsdice.source-2017.tar.xz mirror://gentoo/texlive-module-esrelation.source-2017.tar.xz mirror://gentoo/texlive-module-esvect.source-2017.tar.xz mirror://gentoo/texlive-module-eulervm.source-2017.tar.xz mirror://gentoo/texlive-module-fdsymbol.source-2017.tar.xz mirror://gentoo/texlive-module-fetamont.source-2017.tar.xz mirror://gentoo/texlive-module-feyn.source-2017.tar.xz mirror://gentoo/texlive-module-fge.source-2017.tar.xz mirror://gentoo/texlive-module-fourier.source-2017.tar.xz mirror://gentoo/texlive-module-gentium-tug.source-2017.tar.xz mirror://gentoo/texlive-module-gnu-freefont.source-2017.tar.xz mirror://gentoo/texlive-module-gothic.source-2017.tar.xz mirror://gentoo/texlive-module-hfoldsty.source-2017.tar.xz mirror://gentoo/texlive-module-lato.source-2017.tar.xz mirror://gentoo/texlive-module-libris.source-2017.tar.xz mirror://gentoo/texlive-module-linearA.source-2017.tar.xz mirror://gentoo/texlive-module-lxfonts.source-2017.tar.xz mirror://gentoo/texlive-module-mdsymbol.source-2017.tar.xz mirror://gentoo/texlive-module-miama.source-2017.tar.xz mirror://gentoo/texlive-module-mnsymbol.source-2017.tar.xz mirror://gentoo/texlive-module-nkarta.source-2017.tar.xz mirror://gentoo/texlive-module-ocr-b-outline.source-2017.tar.xz mirror://gentoo/texlive-module-oinuit.source-2017.tar.xz mirror://gentoo/texlive-module-opensans.source-2017.tar.xz mirror://gentoo/texlive-module-pacioli.source-2017.tar.xz mirror://gentoo/texlive-module-phaistos.source-2017.tar.xz mirror://gentoo/texlive-module-romande.source-2017.tar.xz mirror://gentoo/texlive-module-rosario.source-2017.tar.xz mirror://gentoo/texlive-module-sauterfonts.source-2017.tar.xz mirror://gentoo/texlive-module-skull.source-2017.tar.xz mirror://gentoo/texlive-module-staves.source-2017.tar.xz mirror://gentoo/texlive-module-stix.source-2017.tar.xz mirror://gentoo/texlive-module-svrsymbols.source-2017.tar.xz mirror://gentoo/texlive-module-tengwarscript.source-2017.tar.xz mirror://gentoo/texlive-module-tfrupee.source-2017.tar.xz mirror://gentoo/texlive-module-tpslifonts.source-2017.tar.xz mirror://gentoo/texlive-module-trajan.source-2017.tar.xz mirror://gentoo/texlive-module-txfontsb.source-2017.tar.xz mirror://gentoo/texlive-module-universa.source-2017.tar.xz mirror://gentoo/texlive-module-venturisadf.source-2017.tar.xz mirror://gentoo/texlive-module-xits.source-2017.tar.xz mirror://gentoo/texlive-module-yfonts.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e185e88ff24a00f1ee7462f59d3f8c35
+_md5_=20da774bac72730eea5727269db20217
diff --git a/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2017 b/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2017
index d0125b1b2531..357e918caf14 100644
--- a/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Recommended fonts
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=BSD GPL-1 GPL-2 LPPL-1.3 OFL public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !=dev-texlive/texlive-basic-2007* !<dev-texlive/texlive-fontsextra-2010 !<dev-texlive/texlive-latexrecommended-2014 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-avantgar-2017.tar.xz mirror://gentoo/texlive-module-bookman-2017.tar.xz mirror://gentoo/texlive-module-charter-2017.tar.xz mirror://gentoo/texlive-module-cm-super-2017.tar.xz mirror://gentoo/texlive-module-cmextra-2017.tar.xz mirror://gentoo/texlive-module-courier-2017.tar.xz mirror://gentoo/texlive-module-ec-2017.tar.xz mirror://gentoo/texlive-module-euro-2017.tar.xz mirror://gentoo/texlive-module-euro-ce-2017.tar.xz mirror://gentoo/texlive-module-eurosym-2017.tar.xz mirror://gentoo/texlive-module-fpl-2017.tar.xz mirror://gentoo/texlive-module-helvetic-2017.tar.xz mirror://gentoo/texlive-module-lm-2017.tar.xz mirror://gentoo/texlive-module-lm-math-2017.tar.xz mirror://gentoo/texlive-module-marvosym-2017.tar.xz mirror://gentoo/texlive-module-mathpazo-2017.tar.xz mirror://gentoo/texlive-module-manfnt-font-2017.tar.xz mirror://gentoo/texlive-module-mflogo-font-2017.tar.xz mirror://gentoo/texlive-module-ncntrsbk-2017.tar.xz mirror://gentoo/texlive-module-palatino-2017.tar.xz mirror://gentoo/texlive-module-pxfonts-2017.tar.xz mirror://gentoo/texlive-module-rsfs-2017.tar.xz mirror://gentoo/texlive-module-symbol-2017.tar.xz mirror://gentoo/texlive-module-tex-gyre-2017.tar.xz mirror://gentoo/texlive-module-tex-gyre-math-2017.tar.xz mirror://gentoo/texlive-module-times-2017.tar.xz mirror://gentoo/texlive-module-tipa-2017.tar.xz mirror://gentoo/texlive-module-txfonts-2017.tar.xz mirror://gentoo/texlive-module-utopia-2017.tar.xz mirror://gentoo/texlive-module-wasy-2017.tar.xz mirror://gentoo/texlive-module-wasy2-ps-2017.tar.xz mirror://gentoo/texlive-module-wasysym-2017.tar.xz mirror://gentoo/texlive-module-zapfchan-2017.tar.xz mirror://gentoo/texlive-module-zapfding-2017.tar.xz mirror://gentoo/texlive-module-collection-fontsrecommended-2017.tar.xz doc? ( mirror://gentoo/texlive-module-charter.doc-2017.tar.xz mirror://gentoo/texlive-module-cm-super.doc-2017.tar.xz mirror://gentoo/texlive-module-ec.doc-2017.tar.xz mirror://gentoo/texlive-module-euro.doc-2017.tar.xz mirror://gentoo/texlive-module-euro-ce.doc-2017.tar.xz mirror://gentoo/texlive-module-eurosym.doc-2017.tar.xz mirror://gentoo/texlive-module-fpl.doc-2017.tar.xz mirror://gentoo/texlive-module-lm.doc-2017.tar.xz mirror://gentoo/texlive-module-lm-math.doc-2017.tar.xz mirror://gentoo/texlive-module-marvosym.doc-2017.tar.xz mirror://gentoo/texlive-module-mathpazo.doc-2017.tar.xz mirror://gentoo/texlive-module-mflogo-font.doc-2017.tar.xz mirror://gentoo/texlive-module-pxfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-rsfs.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-gyre.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-gyre-math.doc-2017.tar.xz mirror://gentoo/texlive-module-tipa.doc-2017.tar.xz mirror://gentoo/texlive-module-txfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-utopia.doc-2017.tar.xz mirror://gentoo/texlive-module-wasy.doc-2017.tar.xz mirror://gentoo/texlive-module-wasy2-ps.doc-2017.tar.xz mirror://gentoo/texlive-module-wasysym.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-euro.source-2017.tar.xz mirror://gentoo/texlive-module-fpl.source-2017.tar.xz mirror://gentoo/texlive-module-lm.source-2017.tar.xz mirror://gentoo/texlive-module-marvosym.source-2017.tar.xz mirror://gentoo/texlive-module-mathpazo.source-2017.tar.xz mirror://gentoo/texlive-module-tex-gyre-math.source-2017.tar.xz mirror://gentoo/texlive-module-wasysym.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=745692cec39e56e258ce4ce9e8b33c49
+_md5_=3a8ef143ca58b23d89e98d2902f4a316
diff --git a/metadata/md5-cache/dev-texlive/texlive-fontutils-2017 b/metadata/md5-cache/dev-texlive/texlive-fontutils-2017
index 4a60f7c0772e..d2a0ac60e4d5 100644
--- a/metadata/md5-cache/dev-texlive/texlive-fontutils-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-fontutils-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Graphics and font utilities
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=Artistic GPL-1 GPL-2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-psutils !<dev-texlive/texlive-fontsextra-2009 !<app-text/texlive-core-2013 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-accfonts-2017.tar.xz mirror://gentoo/texlive-module-afm2pl-2017.tar.xz mirror://gentoo/texlive-module-dosepsbin-2017.tar.xz mirror://gentoo/texlive-module-epstopdf-2017.tar.xz mirror://gentoo/texlive-module-fontware-2017.tar.xz mirror://gentoo/texlive-module-lcdftypetools-2017.tar.xz mirror://gentoo/texlive-module-metatype1-2017.tar.xz mirror://gentoo/texlive-module-ps2pk-2017.tar.xz mirror://gentoo/texlive-module-pstools-2017.tar.xz mirror://gentoo/texlive-module-psutils-2017.tar.xz mirror://gentoo/texlive-module-dvipsconfig-2017.tar.xz mirror://gentoo/texlive-module-fontinst-2017.tar.xz mirror://gentoo/texlive-module-fontools-2017.tar.xz mirror://gentoo/texlive-module-mf2pt1-2017.tar.xz mirror://gentoo/texlive-module-t1utils-2017.tar.xz mirror://gentoo/texlive-module-collection-fontutils-2017.tar.xz doc? ( mirror://gentoo/texlive-module-accfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-afm2pl.doc-2017.tar.xz mirror://gentoo/texlive-module-dosepsbin.doc-2017.tar.xz mirror://gentoo/texlive-module-epstopdf.doc-2017.tar.xz mirror://gentoo/texlive-module-fontware.doc-2017.tar.xz mirror://gentoo/texlive-module-lcdftypetools.doc-2017.tar.xz mirror://gentoo/texlive-module-ps2pk.doc-2017.tar.xz mirror://gentoo/texlive-module-pstools.doc-2017.tar.xz mirror://gentoo/texlive-module-psutils.doc-2017.tar.xz mirror://gentoo/texlive-module-fontinst.doc-2017.tar.xz mirror://gentoo/texlive-module-fontools.doc-2017.tar.xz mirror://gentoo/texlive-module-mf2pt1.doc-2017.tar.xz mirror://gentoo/texlive-module-t1utils.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-dosepsbin.source-2017.tar.xz mirror://gentoo/texlive-module-metatype1.source-2017.tar.xz mirror://gentoo/texlive-module-fontinst.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=02176c9623c90fd408c5a73053cd5347
+_md5_=f8772c020ad19380542b39748c145eb4
diff --git a/metadata/md5-cache/dev-texlive/texlive-formatsextra-2017 b/metadata/md5-cache/dev-texlive/texlive-formatsextra-2017
index 7e8363da6c5f..35c1b61e0935 100644
--- a/metadata/md5-cache/dev-texlive/texlive-formatsextra-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-formatsextra-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Additional formats
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 GPL-3 LPPL-1.3 public-domain TeX
 RDEPEND=>=dev-texlive/texlive-basic-2017 >=dev-texlive/texlive-latex-2017 >=dev-texlive/texlive-latex-2008 dev-texlive/texlive-xetex !<dev-texlive/texlive-fontsextra-2009 !dev-texlive/texlive-langtibetan !<dev-texlive/texlive-basic-2014 !dev-texlive/texlive-omega >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-edmac-2017.tar.xz mirror://gentoo/texlive-module-eplain-2017.tar.xz mirror://gentoo/texlive-module-lollipop-2017.tar.xz mirror://gentoo/texlive-module-mltex-2017.tar.xz mirror://gentoo/texlive-module-psizzl-2017.tar.xz mirror://gentoo/texlive-module-startex-2017.tar.xz mirror://gentoo/texlive-module-texsis-2017.tar.xz mirror://gentoo/texlive-module-xmltexconfig-2017.tar.xz mirror://gentoo/texlive-module-aleph-2017.tar.xz mirror://gentoo/texlive-module-antomega-2017.tar.xz mirror://gentoo/texlive-module-lambda-2017.tar.xz mirror://gentoo/texlive-module-mxedruli-2017.tar.xz mirror://gentoo/texlive-module-omega-2017.tar.xz mirror://gentoo/texlive-module-omegaware-2017.tar.xz mirror://gentoo/texlive-module-otibet-2017.tar.xz mirror://gentoo/texlive-module-collection-formatsextra-2017.tar.xz doc? ( mirror://gentoo/texlive-module-edmac.doc-2017.tar.xz mirror://gentoo/texlive-module-eplain.doc-2017.tar.xz mirror://gentoo/texlive-module-lollipop.doc-2017.tar.xz mirror://gentoo/texlive-module-mltex.doc-2017.tar.xz mirror://gentoo/texlive-module-psizzl.doc-2017.tar.xz mirror://gentoo/texlive-module-startex.doc-2017.tar.xz mirror://gentoo/texlive-module-texsis.doc-2017.tar.xz mirror://gentoo/texlive-module-aleph.doc-2017.tar.xz mirror://gentoo/texlive-module-antomega.doc-2017.tar.xz mirror://gentoo/texlive-module-mxedruli.doc-2017.tar.xz mirror://gentoo/texlive-module-omega.doc-2017.tar.xz mirror://gentoo/texlive-module-omegaware.doc-2017.tar.xz mirror://gentoo/texlive-module-otibet.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-edmac.source-2017.tar.xz mirror://gentoo/texlive-module-eplain.source-2017.tar.xz mirror://gentoo/texlive-module-psizzl.source-2017.tar.xz mirror://gentoo/texlive-module-startex.source-2017.tar.xz mirror://gentoo/texlive-module-antomega.source-2017.tar.xz mirror://gentoo/texlive-module-otibet.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=12d77bf447d494266c7d10fa90510919
+_md5_=db900ff0d7a9d6fb466f92f1fd45b0fa
diff --git a/metadata/md5-cache/dev-texlive/texlive-games-2017 b/metadata/md5-cache/dev-texlive/texlive-games-2017
index c24ffde82bc1..5ce3353aedc0 100644
--- a/metadata/md5-cache/dev-texlive/texlive-games-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-games-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Games typesetting
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-latex-2017 !<dev-texlive/texlive-latexextra-2009 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-bartel-chess-fonts-2017.tar.xz mirror://gentoo/texlive-module-chess-2017.tar.xz mirror://gentoo/texlive-module-chess-problem-diagrams-2017.tar.xz mirror://gentoo/texlive-module-chessboard-2017.tar.xz mirror://gentoo/texlive-module-chessfss-2017.tar.xz mirror://gentoo/texlive-module-crossword-2017.tar.xz mirror://gentoo/texlive-module-crosswrd-2017.tar.xz mirror://gentoo/texlive-module-egameps-2017.tar.xz mirror://gentoo/texlive-module-gamebook-2017.tar.xz mirror://gentoo/texlive-module-go-2017.tar.xz mirror://gentoo/texlive-module-hanoi-2017.tar.xz mirror://gentoo/texlive-module-havannah-2017.tar.xz mirror://gentoo/texlive-module-hexgame-2017.tar.xz mirror://gentoo/texlive-module-horoscop-2017.tar.xz mirror://gentoo/texlive-module-labyrinth-2017.tar.xz mirror://gentoo/texlive-module-logicpuzzle-2017.tar.xz mirror://gentoo/texlive-module-othello-2017.tar.xz mirror://gentoo/texlive-module-othelloboard-2017.tar.xz mirror://gentoo/texlive-module-pas-crosswords-2017.tar.xz mirror://gentoo/texlive-module-psgo-2017.tar.xz mirror://gentoo/texlive-module-reverxii-2017.tar.xz mirror://gentoo/texlive-module-rubik-2017.tar.xz mirror://gentoo/texlive-module-schwalbe-chess-2017.tar.xz mirror://gentoo/texlive-module-sgame-2017.tar.xz mirror://gentoo/texlive-module-skak-2017.tar.xz mirror://gentoo/texlive-module-skaknew-2017.tar.xz mirror://gentoo/texlive-module-soup-2017.tar.xz mirror://gentoo/texlive-module-sudoku-2017.tar.xz mirror://gentoo/texlive-module-sudokubundle-2017.tar.xz mirror://gentoo/texlive-module-xq-2017.tar.xz mirror://gentoo/texlive-module-xskak-2017.tar.xz mirror://gentoo/texlive-module-collection-games-2017.tar.xz doc? ( mirror://gentoo/texlive-module-bartel-chess-fonts.doc-2017.tar.xz mirror://gentoo/texlive-module-chess.doc-2017.tar.xz mirror://gentoo/texlive-module-chess-problem-diagrams.doc-2017.tar.xz mirror://gentoo/texlive-module-chessboard.doc-2017.tar.xz mirror://gentoo/texlive-module-chessfss.doc-2017.tar.xz mirror://gentoo/texlive-module-crossword.doc-2017.tar.xz mirror://gentoo/texlive-module-crosswrd.doc-2017.tar.xz mirror://gentoo/texlive-module-egameps.doc-2017.tar.xz mirror://gentoo/texlive-module-gamebook.doc-2017.tar.xz mirror://gentoo/texlive-module-go.doc-2017.tar.xz mirror://gentoo/texlive-module-havannah.doc-2017.tar.xz mirror://gentoo/texlive-module-hexgame.doc-2017.tar.xz mirror://gentoo/texlive-module-horoscop.doc-2017.tar.xz mirror://gentoo/texlive-module-labyrinth.doc-2017.tar.xz mirror://gentoo/texlive-module-logicpuzzle.doc-2017.tar.xz mirror://gentoo/texlive-module-othello.doc-2017.tar.xz mirror://gentoo/texlive-module-othelloboard.doc-2017.tar.xz mirror://gentoo/texlive-module-pas-crosswords.doc-2017.tar.xz mirror://gentoo/texlive-module-psgo.doc-2017.tar.xz mirror://gentoo/texlive-module-reverxii.doc-2017.tar.xz mirror://gentoo/texlive-module-rubik.doc-2017.tar.xz mirror://gentoo/texlive-module-schwalbe-chess.doc-2017.tar.xz mirror://gentoo/texlive-module-sgame.doc-2017.tar.xz mirror://gentoo/texlive-module-skak.doc-2017.tar.xz mirror://gentoo/texlive-module-skaknew.doc-2017.tar.xz mirror://gentoo/texlive-module-soup.doc-2017.tar.xz mirror://gentoo/texlive-module-sudoku.doc-2017.tar.xz mirror://gentoo/texlive-module-sudokubundle.doc-2017.tar.xz mirror://gentoo/texlive-module-xq.doc-2017.tar.xz mirror://gentoo/texlive-module-xskak.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-chess-problem-diagrams.source-2017.tar.xz mirror://gentoo/texlive-module-chessboard.source-2017.tar.xz mirror://gentoo/texlive-module-chessfss.source-2017.tar.xz mirror://gentoo/texlive-module-crossword.source-2017.tar.xz mirror://gentoo/texlive-module-crosswrd.source-2017.tar.xz mirror://gentoo/texlive-module-gamebook.source-2017.tar.xz mirror://gentoo/texlive-module-go.source-2017.tar.xz mirror://gentoo/texlive-module-havannah.source-2017.tar.xz mirror://gentoo/texlive-module-horoscop.source-2017.tar.xz mirror://gentoo/texlive-module-rubik.source-2017.tar.xz mirror://gentoo/texlive-module-schwalbe-chess.source-2017.tar.xz mirror://gentoo/texlive-module-soup.source-2017.tar.xz mirror://gentoo/texlive-module-sudoku.source-2017.tar.xz mirror://gentoo/texlive-module-sudokubundle.source-2017.tar.xz mirror://gentoo/texlive-module-xskak.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=352097ad2b8ebf154cbe44609fe44ec3
+_md5_=dc79bfb61655c1718b293127b3285a81
diff --git a/metadata/md5-cache/dev-texlive/texlive-humanities-2017 b/metadata/md5-cache/dev-texlive/texlive-humanities-2017
index 692c6ad9db66..e23be7114eb8 100644
--- a/metadata/md5-cache/dev-texlive/texlive-humanities-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-humanities-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Humanities packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.2 LPPL-1.3
 RDEPEND=>=dev-texlive/texlive-latex-2017 !dev-tex/lineno >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-adtrees-2017.tar.xz mirror://gentoo/texlive-module-bibleref-2017.tar.xz mirror://gentoo/texlive-module-bibleref-lds-2017.tar.xz mirror://gentoo/texlive-module-bibleref-mouth-2017.tar.xz mirror://gentoo/texlive-module-bibleref-parse-2017.tar.xz mirror://gentoo/texlive-module-covington-2017.tar.xz mirror://gentoo/texlive-module-diadia-2017.tar.xz mirror://gentoo/texlive-module-dramatist-2017.tar.xz mirror://gentoo/texlive-module-dvgloss-2017.tar.xz mirror://gentoo/texlive-module-ecltree-2017.tar.xz mirror://gentoo/texlive-module-edfnotes-2017.tar.xz mirror://gentoo/texlive-module-ednotes-2017.tar.xz mirror://gentoo/texlive-module-eledform-2017.tar.xz mirror://gentoo/texlive-module-eledmac-2017.tar.xz mirror://gentoo/texlive-module-expex-2017.tar.xz mirror://gentoo/texlive-module-gb4e-2017.tar.xz mirror://gentoo/texlive-module-gmverse-2017.tar.xz mirror://gentoo/texlive-module-jura-2017.tar.xz mirror://gentoo/texlive-module-juraabbrev-2017.tar.xz mirror://gentoo/texlive-module-juramisc-2017.tar.xz mirror://gentoo/texlive-module-jurarsp-2017.tar.xz mirror://gentoo/texlive-module-ledmac-2017.tar.xz mirror://gentoo/texlive-module-leipzig-2017.tar.xz mirror://gentoo/texlive-module-lexikon-2017.tar.xz mirror://gentoo/texlive-module-lexref-2017.tar.xz mirror://gentoo/texlive-module-ling-macros-2017.tar.xz mirror://gentoo/texlive-module-linguex-2017.tar.xz mirror://gentoo/texlive-module-liturg-2017.tar.xz mirror://gentoo/texlive-module-metrix-2017.tar.xz mirror://gentoo/texlive-module-parallel-2017.tar.xz mirror://gentoo/texlive-module-parrun-2017.tar.xz mirror://gentoo/texlive-module-phonrule-2017.tar.xz mirror://gentoo/texlive-module-plari-2017.tar.xz mirror://gentoo/texlive-module-play-2017.tar.xz mirror://gentoo/texlive-module-poemscol-2017.tar.xz mirror://gentoo/texlive-module-poetrytex-2017.tar.xz mirror://gentoo/texlive-module-qobitree-2017.tar.xz mirror://gentoo/texlive-module-qtree-2017.tar.xz mirror://gentoo/texlive-module-reledmac-2017.tar.xz mirror://gentoo/texlive-module-rrgtrees-2017.tar.xz mirror://gentoo/texlive-module-rtklage-2017.tar.xz mirror://gentoo/texlive-module-screenplay-2017.tar.xz mirror://gentoo/texlive-module-screenplay-pkg-2017.tar.xz mirror://gentoo/texlive-module-sides-2017.tar.xz mirror://gentoo/texlive-module-stage-2017.tar.xz mirror://gentoo/texlive-module-textglos-2017.tar.xz mirror://gentoo/texlive-module-thalie-2017.tar.xz mirror://gentoo/texlive-module-tree-dvips-2017.tar.xz mirror://gentoo/texlive-module-verse-2017.tar.xz mirror://gentoo/texlive-module-xyling-2017.tar.xz mirror://gentoo/texlive-module-collection-humanities-2017.tar.xz doc? ( mirror://gentoo/texlive-module-adtrees.doc-2017.tar.xz mirror://gentoo/texlive-module-bibleref.doc-2017.tar.xz mirror://gentoo/texlive-module-bibleref-lds.doc-2017.tar.xz mirror://gentoo/texlive-module-bibleref-mouth.doc-2017.tar.xz mirror://gentoo/texlive-module-bibleref-parse.doc-2017.tar.xz mirror://gentoo/texlive-module-covington.doc-2017.tar.xz mirror://gentoo/texlive-module-diadia.doc-2017.tar.xz mirror://gentoo/texlive-module-dramatist.doc-2017.tar.xz mirror://gentoo/texlive-module-dvgloss.doc-2017.tar.xz mirror://gentoo/texlive-module-ecltree.doc-2017.tar.xz mirror://gentoo/texlive-module-edfnotes.doc-2017.tar.xz mirror://gentoo/texlive-module-ednotes.doc-2017.tar.xz mirror://gentoo/texlive-module-eledform.doc-2017.tar.xz mirror://gentoo/texlive-module-eledmac.doc-2017.tar.xz mirror://gentoo/texlive-module-expex.doc-2017.tar.xz mirror://gentoo/texlive-module-gb4e.doc-2017.tar.xz mirror://gentoo/texlive-module-gmverse.doc-2017.tar.xz mirror://gentoo/texlive-module-jura.doc-2017.tar.xz mirror://gentoo/texlive-module-juraabbrev.doc-2017.tar.xz mirror://gentoo/texlive-module-juramisc.doc-2017.tar.xz mirror://gentoo/texlive-module-jurarsp.doc-2017.tar.xz mirror://gentoo/texlive-module-ledmac.doc-2017.tar.xz mirror://gentoo/texlive-module-leipzig.doc-2017.tar.xz mirror://gentoo/texlive-module-lexikon.doc-2017.tar.xz mirror://gentoo/texlive-module-lexref.doc-2017.tar.xz mirror://gentoo/texlive-module-ling-macros.doc-2017.tar.xz mirror://gentoo/texlive-module-linguex.doc-2017.tar.xz mirror://gentoo/texlive-module-liturg.doc-2017.tar.xz mirror://gentoo/texlive-module-metrix.doc-2017.tar.xz mirror://gentoo/texlive-module-parallel.doc-2017.tar.xz mirror://gentoo/texlive-module-parrun.doc-2017.tar.xz mirror://gentoo/texlive-module-phonrule.doc-2017.tar.xz mirror://gentoo/texlive-module-plari.doc-2017.tar.xz mirror://gentoo/texlive-module-play.doc-2017.tar.xz mirror://gentoo/texlive-module-poemscol.doc-2017.tar.xz mirror://gentoo/texlive-module-poetrytex.doc-2017.tar.xz mirror://gentoo/texlive-module-qobitree.doc-2017.tar.xz mirror://gentoo/texlive-module-qtree.doc-2017.tar.xz mirror://gentoo/texlive-module-reledmac.doc-2017.tar.xz mirror://gentoo/texlive-module-rrgtrees.doc-2017.tar.xz mirror://gentoo/texlive-module-rtklage.doc-2017.tar.xz mirror://gentoo/texlive-module-screenplay.doc-2017.tar.xz mirror://gentoo/texlive-module-screenplay-pkg.doc-2017.tar.xz mirror://gentoo/texlive-module-sides.doc-2017.tar.xz mirror://gentoo/texlive-module-stage.doc-2017.tar.xz mirror://gentoo/texlive-module-textglos.doc-2017.tar.xz mirror://gentoo/texlive-module-thalie.doc-2017.tar.xz mirror://gentoo/texlive-module-tree-dvips.doc-2017.tar.xz mirror://gentoo/texlive-module-verse.doc-2017.tar.xz mirror://gentoo/texlive-module-xyling.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-bibleref.source-2017.tar.xz mirror://gentoo/texlive-module-bibleref-lds.source-2017.tar.xz mirror://gentoo/texlive-module-bibleref-mouth.source-2017.tar.xz mirror://gentoo/texlive-module-dramatist.source-2017.tar.xz mirror://gentoo/texlive-module-dvgloss.source-2017.tar.xz mirror://gentoo/texlive-module-edfnotes.source-2017.tar.xz mirror://gentoo/texlive-module-eledform.source-2017.tar.xz mirror://gentoo/texlive-module-eledmac.source-2017.tar.xz mirror://gentoo/texlive-module-jura.source-2017.tar.xz mirror://gentoo/texlive-module-juraabbrev.source-2017.tar.xz mirror://gentoo/texlive-module-jurarsp.source-2017.tar.xz mirror://gentoo/texlive-module-ledmac.source-2017.tar.xz mirror://gentoo/texlive-module-leipzig.source-2017.tar.xz mirror://gentoo/texlive-module-liturg.source-2017.tar.xz mirror://gentoo/texlive-module-metrix.source-2017.tar.xz mirror://gentoo/texlive-module-parallel.source-2017.tar.xz mirror://gentoo/texlive-module-parrun.source-2017.tar.xz mirror://gentoo/texlive-module-plari.source-2017.tar.xz mirror://gentoo/texlive-module-play.source-2017.tar.xz mirror://gentoo/texlive-module-poemscol.source-2017.tar.xz mirror://gentoo/texlive-module-poetrytex.source-2017.tar.xz mirror://gentoo/texlive-module-reledmac.source-2017.tar.xz mirror://gentoo/texlive-module-rrgtrees.source-2017.tar.xz mirror://gentoo/texlive-module-screenplay.source-2017.tar.xz mirror://gentoo/texlive-module-textglos.source-2017.tar.xz mirror://gentoo/texlive-module-thalie.source-2017.tar.xz mirror://gentoo/texlive-module-verse.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fb6c283cdb0f909e6cff872dae4cb7ca
+_md5_=7aa3b1b83edf10ff2b33c4c51c383745
diff --git a/metadata/md5-cache/dev-texlive/texlive-langarabic-2017 b/metadata/md5-cache/dev-texlive/texlive-langarabic-2017
index 949ec588ad95..7e80bedb5575 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langarabic-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langarabic-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Arabic
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=CC-BY-SA-4.0 GPL-2 GPL-3+ LPPL-1.3 LPPL-1.3c OFL public-domain
 RDEPEND=>=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-langarab !<dev-texlive/texlive-xetex-2016 !<dev-texlive/texlive-publishers-2013 !dev-texlive/texlive-documentation-arabic !<dev-texlive/texlive-latexextra-2013 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-amiri-2017.tar.xz mirror://gentoo/texlive-module-arabi-2017.tar.xz mirror://gentoo/texlive-module-arabi-add-2017.tar.xz mirror://gentoo/texlive-module-arabluatex-2017.tar.xz mirror://gentoo/texlive-module-arabtex-2017.tar.xz mirror://gentoo/texlive-module-bidi-2017.tar.xz mirror://gentoo/texlive-module-bidihl-2017.tar.xz mirror://gentoo/texlive-module-dad-2017.tar.xz mirror://gentoo/texlive-module-ghab-2017.tar.xz mirror://gentoo/texlive-module-hyphen-arabic-2017.tar.xz mirror://gentoo/texlive-module-hyphen-farsi-2017.tar.xz mirror://gentoo/texlive-module-imsproc-2017.tar.xz mirror://gentoo/texlive-module-lshort-persian-2017.tar.xz mirror://gentoo/texlive-module-persian-bib-2017.tar.xz mirror://gentoo/texlive-module-simurgh-2017.tar.xz mirror://gentoo/texlive-module-tram-2017.tar.xz mirror://gentoo/texlive-module-xepersian-2017.tar.xz mirror://gentoo/texlive-module-collection-langarabic-2017.tar.xz doc? ( mirror://gentoo/texlive-module-amiri.doc-2017.tar.xz mirror://gentoo/texlive-module-arabi.doc-2017.tar.xz mirror://gentoo/texlive-module-arabi-add.doc-2017.tar.xz mirror://gentoo/texlive-module-arabluatex.doc-2017.tar.xz mirror://gentoo/texlive-module-arabtex.doc-2017.tar.xz mirror://gentoo/texlive-module-bidi.doc-2017.tar.xz mirror://gentoo/texlive-module-bidihl.doc-2017.tar.xz mirror://gentoo/texlive-module-dad.doc-2017.tar.xz mirror://gentoo/texlive-module-ghab.doc-2017.tar.xz mirror://gentoo/texlive-module-imsproc.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-persian.doc-2017.tar.xz mirror://gentoo/texlive-module-persian-bib.doc-2017.tar.xz mirror://gentoo/texlive-module-simurgh.doc-2017.tar.xz mirror://gentoo/texlive-module-tram.doc-2017.tar.xz mirror://gentoo/texlive-module-xepersian.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-arabluatex.source-2017.tar.xz mirror://gentoo/texlive-module-bidi.source-2017.tar.xz mirror://gentoo/texlive-module-xepersian.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6be57f513cfec579670cbef9e56adc2a
+_md5_=9640b3e6ed87992535317c5860579f83
diff --git a/metadata/md5-cache/dev-texlive/texlive-langchinese-2017 b/metadata/md5-cache/dev-texlive/texlive-langchinese-2017
index cf13c5828a87..9025fa5e001f 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langchinese-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langchinese-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Chinese
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=FDL-1.1 GPL-1 GPL-2 LGPL-2 LPPL-1.3 TeX-other-free
 RDEPEND=>=dev-texlive/texlive-langcjk-2017 !<dev-texlive/texlive-langcjk-2014 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-arphic-2017.tar.xz mirror://gentoo/texlive-module-arphic-ttf-2017.tar.xz mirror://gentoo/texlive-module-asymptote-by-example-zh-cn-2017.tar.xz mirror://gentoo/texlive-module-asymptote-faq-zh-cn-2017.tar.xz mirror://gentoo/texlive-module-asymptote-manual-zh-cn-2017.tar.xz mirror://gentoo/texlive-module-cns-2017.tar.xz mirror://gentoo/texlive-module-ctex-2017.tar.xz mirror://gentoo/texlive-module-ctex-faq-2017.tar.xz mirror://gentoo/texlive-module-fandol-2017.tar.xz mirror://gentoo/texlive-module-hyphen-chinese-2017.tar.xz mirror://gentoo/texlive-module-impatient-cn-2017.tar.xz mirror://gentoo/texlive-module-latex-notes-zh-cn-2017.tar.xz mirror://gentoo/texlive-module-lshort-chinese-2017.tar.xz mirror://gentoo/texlive-module-texlive-zh-cn-2017.tar.xz mirror://gentoo/texlive-module-texproposal-2017.tar.xz mirror://gentoo/texlive-module-xpinyin-2017.tar.xz mirror://gentoo/texlive-module-zhmetrics-2017.tar.xz mirror://gentoo/texlive-module-zhmetrics-uptex-2017.tar.xz mirror://gentoo/texlive-module-zhnumber-2017.tar.xz mirror://gentoo/texlive-module-zhspacing-2017.tar.xz mirror://gentoo/texlive-module-collection-langchinese-2017.tar.xz doc? ( mirror://gentoo/texlive-module-arphic.doc-2017.tar.xz mirror://gentoo/texlive-module-arphic-ttf.doc-2017.tar.xz mirror://gentoo/texlive-module-asymptote-by-example-zh-cn.doc-2017.tar.xz mirror://gentoo/texlive-module-asymptote-faq-zh-cn.doc-2017.tar.xz mirror://gentoo/texlive-module-asymptote-manual-zh-cn.doc-2017.tar.xz mirror://gentoo/texlive-module-cns.doc-2017.tar.xz mirror://gentoo/texlive-module-ctex.doc-2017.tar.xz mirror://gentoo/texlive-module-ctex-faq.doc-2017.tar.xz mirror://gentoo/texlive-module-fandol.doc-2017.tar.xz mirror://gentoo/texlive-module-impatient-cn.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-notes-zh-cn.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-chinese.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-zh-cn.doc-2017.tar.xz mirror://gentoo/texlive-module-texproposal.doc-2017.tar.xz mirror://gentoo/texlive-module-xpinyin.doc-2017.tar.xz mirror://gentoo/texlive-module-zhmetrics.doc-2017.tar.xz mirror://gentoo/texlive-module-zhmetrics-uptex.doc-2017.tar.xz mirror://gentoo/texlive-module-zhnumber.doc-2017.tar.xz mirror://gentoo/texlive-module-zhspacing.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-ctex.source-2017.tar.xz mirror://gentoo/texlive-module-xpinyin.source-2017.tar.xz mirror://gentoo/texlive-module-zhmetrics.source-2017.tar.xz mirror://gentoo/texlive-module-zhnumber.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e08a38a92444cb2916e4476da20228f2
+_md5_=9395f5481229df0cd75b03da7bbb9fcb
diff --git a/metadata/md5-cache/dev-texlive/texlive-langcjk-2017 b/metadata/md5-cache/dev-texlive/texlive-langcjk-2017
index 2a8b7bb31857..edefa8784d56 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langcjk-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langcjk-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Chinese/Japanese/Korean (base)
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=BSD GPL-2 GPL-3 LPPL-1.3 MIT TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 >=app-text/texlive-core-2010[cjk] >=dev-texlive/texlive-latex-2011 !!<dev-texlive/texlive-langcjk-2012 !dev-texlive/texlive-documentation-chinese !dev-texlive/texlive-documentation-korean !dev-texlive/texlive-documentation-japanese !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-adobemapping-2017.tar.xz mirror://gentoo/texlive-module-c90-2017.tar.xz mirror://gentoo/texlive-module-cjk-gs-integrate-2017.tar.xz mirror://gentoo/texlive-module-cjkpunct-2017.tar.xz mirror://gentoo/texlive-module-dnp-2017.tar.xz mirror://gentoo/texlive-module-garuda-c90-2017.tar.xz mirror://gentoo/texlive-module-norasi-c90-2017.tar.xz mirror://gentoo/texlive-module-pxtatescale-2017.tar.xz mirror://gentoo/texlive-module-xcjk2uni-2017.tar.xz mirror://gentoo/texlive-module-zxjafont-2017.tar.xz mirror://gentoo/texlive-module-collection-langcjk-2017.tar.xz doc? ( mirror://gentoo/texlive-module-c90.doc-2017.tar.xz mirror://gentoo/texlive-module-cjk-gs-integrate.doc-2017.tar.xz mirror://gentoo/texlive-module-cjkpunct.doc-2017.tar.xz mirror://gentoo/texlive-module-pxtatescale.doc-2017.tar.xz mirror://gentoo/texlive-module-xcjk2uni.doc-2017.tar.xz mirror://gentoo/texlive-module-zxjafont.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-c90.source-2017.tar.xz mirror://gentoo/texlive-module-cjkpunct.source-2017.tar.xz mirror://gentoo/texlive-module-garuda-c90.source-2017.tar.xz mirror://gentoo/texlive-module-norasi-c90.source-2017.tar.xz mirror://gentoo/texlive-module-xcjk2uni.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3d114dd0b302743dee4ec81e60a71441
+_md5_=e5f6aeb4900333bbf16a09a7a63c67d5
diff --git a/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2017 b/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2017
index 225b896be260..6f419a872c0b 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Cyrillic
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.3 MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 >=dev-texlive/texlive-latex-2017 !dev-texlive/texlive-documentation-ukrainian !dev-texlive/texlive-documentation-bulgarian !dev-texlive/texlive-documentation-russian !dev-texlive/texlive-documentation-mongolian !dev-texlive/texlive-langmongolian !<dev-texlive/texlive-langother-2013 !dev-texlive/texlive-documentation-serbian !<app-text/texlive-core-2013 !<dev-texlive/texlive-latexextra-2013 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-belarusian-2017.tar.xz mirror://gentoo/texlive-module-babel-bulgarian-2017.tar.xz mirror://gentoo/texlive-module-babel-russian-2017.tar.xz mirror://gentoo/texlive-module-babel-serbian-2017.tar.xz mirror://gentoo/texlive-module-babel-serbianc-2017.tar.xz mirror://gentoo/texlive-module-babel-ukrainian-2017.tar.xz mirror://gentoo/texlive-module-churchslavonic-2017.tar.xz mirror://gentoo/texlive-module-cmcyr-2017.tar.xz mirror://gentoo/texlive-module-cyrillic-2017.tar.xz mirror://gentoo/texlive-module-cyrillic-bin-2017.tar.xz mirror://gentoo/texlive-module-cyrplain-2017.tar.xz mirror://gentoo/texlive-module-disser-2017.tar.xz mirror://gentoo/texlive-module-eskd-2017.tar.xz mirror://gentoo/texlive-module-eskdx-2017.tar.xz mirror://gentoo/texlive-module-gost-2017.tar.xz mirror://gentoo/texlive-module-hyphen-belarusian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-bulgarian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-churchslavonic-2017.tar.xz mirror://gentoo/texlive-module-hyphen-mongolian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-russian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-serbian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-ukrainian-2017.tar.xz mirror://gentoo/texlive-module-lcyw-2017.tar.xz mirror://gentoo/texlive-module-lh-2017.tar.xz mirror://gentoo/texlive-module-lhcyr-2017.tar.xz mirror://gentoo/texlive-module-lshort-bulgarian-2017.tar.xz mirror://gentoo/texlive-module-lshort-mongol-2017.tar.xz mirror://gentoo/texlive-module-lshort-russian-2017.tar.xz mirror://gentoo/texlive-module-lshort-ukr-2017.tar.xz mirror://gentoo/texlive-module-mongolian-babel-2017.tar.xz mirror://gentoo/texlive-module-montex-2017.tar.xz mirror://gentoo/texlive-module-mpman-ru-2017.tar.xz mirror://gentoo/texlive-module-pst-eucl-translation-bg-2017.tar.xz mirror://gentoo/texlive-module-ruhyphen-2017.tar.xz mirror://gentoo/texlive-module-russ-2017.tar.xz mirror://gentoo/texlive-module-serbian-apostrophe-2017.tar.xz mirror://gentoo/texlive-module-serbian-date-lat-2017.tar.xz mirror://gentoo/texlive-module-serbian-def-cyr-2017.tar.xz mirror://gentoo/texlive-module-serbian-lig-2017.tar.xz mirror://gentoo/texlive-module-t2-2017.tar.xz mirror://gentoo/texlive-module-texlive-ru-2017.tar.xz mirror://gentoo/texlive-module-texlive-sr-2017.tar.xz mirror://gentoo/texlive-module-ukrhyph-2017.tar.xz mirror://gentoo/texlive-module-collection-langcyrillic-2017.tar.xz doc? ( mirror://gentoo/texlive-module-babel-belarusian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-bulgarian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-russian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-serbian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-serbianc.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-ukrainian.doc-2017.tar.xz mirror://gentoo/texlive-module-churchslavonic.doc-2017.tar.xz mirror://gentoo/texlive-module-cmcyr.doc-2017.tar.xz mirror://gentoo/texlive-module-cyrillic.doc-2017.tar.xz mirror://gentoo/texlive-module-cyrillic-bin.doc-2017.tar.xz mirror://gentoo/texlive-module-disser.doc-2017.tar.xz mirror://gentoo/texlive-module-eskd.doc-2017.tar.xz mirror://gentoo/texlive-module-eskdx.doc-2017.tar.xz mirror://gentoo/texlive-module-gost.doc-2017.tar.xz mirror://gentoo/texlive-module-hyphen-bulgarian.doc-2017.tar.xz mirror://gentoo/texlive-module-lcyw.doc-2017.tar.xz mirror://gentoo/texlive-module-lh.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-bulgarian.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-mongol.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-russian.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-ukr.doc-2017.tar.xz mirror://gentoo/texlive-module-mongolian-babel.doc-2017.tar.xz mirror://gentoo/texlive-module-montex.doc-2017.tar.xz mirror://gentoo/texlive-module-mpman-ru.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-eucl-translation-bg.doc-2017.tar.xz mirror://gentoo/texlive-module-russ.doc-2017.tar.xz mirror://gentoo/texlive-module-serbian-apostrophe.doc-2017.tar.xz mirror://gentoo/texlive-module-serbian-date-lat.doc-2017.tar.xz mirror://gentoo/texlive-module-serbian-def-cyr.doc-2017.tar.xz mirror://gentoo/texlive-module-serbian-lig.doc-2017.tar.xz mirror://gentoo/texlive-module-t2.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-ru.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-sr.doc-2017.tar.xz mirror://gentoo/texlive-module-ukrhyph.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-belarusian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-bulgarian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-russian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-serbian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-serbianc.source-2017.tar.xz mirror://gentoo/texlive-module-babel-ukrainian.source-2017.tar.xz mirror://gentoo/texlive-module-cyrillic.source-2017.tar.xz mirror://gentoo/texlive-module-disser.source-2017.tar.xz mirror://gentoo/texlive-module-eskd.source-2017.tar.xz mirror://gentoo/texlive-module-gost.source-2017.tar.xz mirror://gentoo/texlive-module-lcyw.source-2017.tar.xz mirror://gentoo/texlive-module-lh.source-2017.tar.xz mirror://gentoo/texlive-module-lhcyr.source-2017.tar.xz mirror://gentoo/texlive-module-mongolian-babel.source-2017.tar.xz mirror://gentoo/texlive-module-ruhyphen.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7cf5cdda4ab1489a27faecfab3c9dda2
+_md5_=3b42421a3b85cdad690a7a043f2efa16
diff --git a/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2017 b/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2017
index 8009ce921ebf..84eecb5ecf43 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Czech/Slovak
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.3 TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 >=dev-texlive/texlive-latex-2017 !dev-texlive/texlive-documentation-czechslovak >=app-text/texlive-core-2014[xetex] !<dev-texlive/texlive-basic-2016 >=dev-texlive/texlive-luatex-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-czech-2017.tar.xz mirror://gentoo/texlive-module-babel-slovak-2017.tar.xz mirror://gentoo/texlive-module-cnbwp-2017.tar.xz mirror://gentoo/texlive-module-cs-2017.tar.xz mirror://gentoo/texlive-module-csbulletin-2017.tar.xz mirror://gentoo/texlive-module-cslatex-2017.tar.xz mirror://gentoo/texlive-module-csplain-2017.tar.xz mirror://gentoo/texlive-module-cstex-2017.tar.xz mirror://gentoo/texlive-module-hyphen-czech-2017.tar.xz mirror://gentoo/texlive-module-hyphen-slovak-2017.tar.xz mirror://gentoo/texlive-module-lshort-czech-2017.tar.xz mirror://gentoo/texlive-module-lshort-slovak-2017.tar.xz mirror://gentoo/texlive-module-texlive-cz-2017.tar.xz mirror://gentoo/texlive-module-collection-langczechslovak-2017.tar.xz doc? ( mirror://gentoo/texlive-module-babel-czech.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-slovak.doc-2017.tar.xz mirror://gentoo/texlive-module-cnbwp.doc-2017.tar.xz mirror://gentoo/texlive-module-csbulletin.doc-2017.tar.xz mirror://gentoo/texlive-module-cstex.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-czech.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-slovak.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-cz.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-czech.source-2017.tar.xz mirror://gentoo/texlive-module-babel-slovak.source-2017.tar.xz mirror://gentoo/texlive-module-cslatex.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=938f1ab00bdacb0fde7c01adf03d0b0f
+_md5_=e7bbd1ca83bc4d357c6941c1b0f8b8a7
diff --git a/metadata/md5-cache/dev-texlive/texlive-langenglish-2017 b/metadata/md5-cache/dev-texlive/texlive-langenglish-2017
index bc05747e3a67..d3478236d734 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langenglish-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langenglish-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive US and UK English
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=FDL-1.1 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-documentation-english !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-hyphen-english-2017.tar.xz mirror://gentoo/texlive-module-FAQ-en-2017.tar.xz mirror://gentoo/texlive-module-MemoirChapStyles-2017.tar.xz mirror://gentoo/texlive-module-Type1fonts-2017.tar.xz mirror://gentoo/texlive-module-amslatex-primer-2017.tar.xz mirror://gentoo/texlive-module-around-the-bend-2017.tar.xz mirror://gentoo/texlive-module-ascii-chart-2017.tar.xz mirror://gentoo/texlive-module-biblatex-cheatsheet-2017.tar.xz mirror://gentoo/texlive-module-components-of-TeX-2017.tar.xz mirror://gentoo/texlive-module-comprehensive-2017.tar.xz mirror://gentoo/texlive-module-dickimaw-2017.tar.xz mirror://gentoo/texlive-module-docsurvey-2017.tar.xz mirror://gentoo/texlive-module-dtxtut-2017.tar.xz mirror://gentoo/texlive-module-first-latex-doc-2017.tar.xz mirror://gentoo/texlive-module-forest-quickstart-2017.tar.xz mirror://gentoo/texlive-module-gentle-2017.tar.xz mirror://gentoo/texlive-module-guide-to-latex-2017.tar.xz mirror://gentoo/texlive-module-happy4th-2017.tar.xz mirror://gentoo/texlive-module-impatient-2017.tar.xz mirror://gentoo/texlive-module-intro-scientific-2017.tar.xz mirror://gentoo/texlive-module-knuth-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-english-2017.tar.xz mirror://gentoo/texlive-module-latex-brochure-2017.tar.xz mirror://gentoo/texlive-module-latex-course-2017.tar.xz mirror://gentoo/texlive-module-latex-doc-ptr-2017.tar.xz mirror://gentoo/texlive-module-latex-graphics-companion-2017.tar.xz mirror://gentoo/texlive-module-latex-veryshortguide-2017.tar.xz mirror://gentoo/texlive-module-latex-web-companion-2017.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-2017.tar.xz mirror://gentoo/texlive-module-latex4wp-2017.tar.xz mirror://gentoo/texlive-module-latexcheat-2017.tar.xz mirror://gentoo/texlive-module-latexcourse-rug-2017.tar.xz mirror://gentoo/texlive-module-latexfileinfo-pkgs-2017.tar.xz mirror://gentoo/texlive-module-lshort-english-2017.tar.xz mirror://gentoo/texlive-module-macros2e-2017.tar.xz mirror://gentoo/texlive-module-math-e-2017.tar.xz mirror://gentoo/texlive-module-math-into-latex-4-2017.tar.xz mirror://gentoo/texlive-module-maths-symbols-2017.tar.xz mirror://gentoo/texlive-module-memdesign-2017.tar.xz mirror://gentoo/texlive-module-metafont-beginners-2017.tar.xz mirror://gentoo/texlive-module-metapost-examples-2017.tar.xz mirror://gentoo/texlive-module-patgen2-tutorial-2017.tar.xz mirror://gentoo/texlive-module-pictexsum-2017.tar.xz mirror://gentoo/texlive-module-plain-doc-2017.tar.xz mirror://gentoo/texlive-module-presentations-en-2017.tar.xz mirror://gentoo/texlive-module-simplified-latex-2017.tar.xz mirror://gentoo/texlive-module-svg-inkscape-2017.tar.xz mirror://gentoo/texlive-module-tabulars-e-2017.tar.xz mirror://gentoo/texlive-module-tamethebeast-2017.tar.xz mirror://gentoo/texlive-module-tds-2017.tar.xz mirror://gentoo/texlive-module-tex-font-errors-cheatsheet-2017.tar.xz mirror://gentoo/texlive-module-tex-overview-2017.tar.xz mirror://gentoo/texlive-module-tex-refs-2017.tar.xz mirror://gentoo/texlive-module-texbytopic-2017.tar.xz mirror://gentoo/texlive-module-titlepages-2017.tar.xz mirror://gentoo/texlive-module-tlc2-2017.tar.xz mirror://gentoo/texlive-module-undergradmath-2017.tar.xz mirror://gentoo/texlive-module-visualfaq-2017.tar.xz mirror://gentoo/texlive-module-webguide-2017.tar.xz mirror://gentoo/texlive-module-xetexref-2017.tar.xz mirror://gentoo/texlive-module-collection-langenglish-2017.tar.xz doc? ( mirror://gentoo/texlive-module-FAQ-en.doc-2017.tar.xz mirror://gentoo/texlive-module-MemoirChapStyles.doc-2017.tar.xz mirror://gentoo/texlive-module-Type1fonts.doc-2017.tar.xz mirror://gentoo/texlive-module-amslatex-primer.doc-2017.tar.xz mirror://gentoo/texlive-module-around-the-bend.doc-2017.tar.xz mirror://gentoo/texlive-module-ascii-chart.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-cheatsheet.doc-2017.tar.xz mirror://gentoo/texlive-module-components-of-TeX.doc-2017.tar.xz mirror://gentoo/texlive-module-comprehensive.doc-2017.tar.xz mirror://gentoo/texlive-module-dickimaw.doc-2017.tar.xz mirror://gentoo/texlive-module-docsurvey.doc-2017.tar.xz mirror://gentoo/texlive-module-dtxtut.doc-2017.tar.xz mirror://gentoo/texlive-module-first-latex-doc.doc-2017.tar.xz mirror://gentoo/texlive-module-forest-quickstart.doc-2017.tar.xz mirror://gentoo/texlive-module-gentle.doc-2017.tar.xz mirror://gentoo/texlive-module-guide-to-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-happy4th.doc-2017.tar.xz mirror://gentoo/texlive-module-impatient.doc-2017.tar.xz mirror://gentoo/texlive-module-intro-scientific.doc-2017.tar.xz mirror://gentoo/texlive-module-knuth.doc-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-english.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-brochure.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-course.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-doc-ptr.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-graphics-companion.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-veryshortguide.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-web-companion.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-latex4wp.doc-2017.tar.xz mirror://gentoo/texlive-module-latexcheat.doc-2017.tar.xz mirror://gentoo/texlive-module-latexcourse-rug.doc-2017.tar.xz mirror://gentoo/texlive-module-latexfileinfo-pkgs.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-english.doc-2017.tar.xz mirror://gentoo/texlive-module-macros2e.doc-2017.tar.xz mirror://gentoo/texlive-module-math-e.doc-2017.tar.xz mirror://gentoo/texlive-module-math-into-latex-4.doc-2017.tar.xz mirror://gentoo/texlive-module-maths-symbols.doc-2017.tar.xz mirror://gentoo/texlive-module-memdesign.doc-2017.tar.xz mirror://gentoo/texlive-module-metafont-beginners.doc-2017.tar.xz mirror://gentoo/texlive-module-metapost-examples.doc-2017.tar.xz mirror://gentoo/texlive-module-patgen2-tutorial.doc-2017.tar.xz mirror://gentoo/texlive-module-pictexsum.doc-2017.tar.xz mirror://gentoo/texlive-module-plain-doc.doc-2017.tar.xz mirror://gentoo/texlive-module-presentations-en.doc-2017.tar.xz mirror://gentoo/texlive-module-simplified-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-svg-inkscape.doc-2017.tar.xz mirror://gentoo/texlive-module-tabulars-e.doc-2017.tar.xz mirror://gentoo/texlive-module-tamethebeast.doc-2017.tar.xz mirror://gentoo/texlive-module-tds.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-font-errors-cheatsheet.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-overview.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-refs.doc-2017.tar.xz mirror://gentoo/texlive-module-texbytopic.doc-2017.tar.xz mirror://gentoo/texlive-module-titlepages.doc-2017.tar.xz mirror://gentoo/texlive-module-tlc2.doc-2017.tar.xz mirror://gentoo/texlive-module-undergradmath.doc-2017.tar.xz mirror://gentoo/texlive-module-visualfaq.doc-2017.tar.xz mirror://gentoo/texlive-module-webguide.doc-2017.tar.xz mirror://gentoo/texlive-module-xetexref.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-knuth.source-2017.tar.xz mirror://gentoo/texlive-module-latexfileinfo-pkgs.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b66fa781aa0a93c88ed4627ef150de8a
+_md5_=d660d865320a245cc40f0da7e679f06a
diff --git a/metadata/md5-cache/dev-texlive/texlive-langeuropean-2017 b/metadata/md5-cache/dev-texlive/texlive-langeuropean-2017
index 8bdebef88c0b..46078782221f 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langeuropean-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langeuropean-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Other European languages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-langarmenian !dev-texlive/texlive-langcroatian !dev-texlive/texlive-langdanish !dev-texlive/texlive-langdutch !dev-texlive/texlive-langfinnish !dev-texlive/texlive-langhungarian !dev-texlive/texlive-langnorwegia !dev-texlive/texlive-langturkmen !<dev-texlive/texlive-langother-2013 !dev-texlive/texlive-langswedish !dev-texlive/texlive-langlithuanian !dev-texlive/texlive-langlatvian !dev-texlive/texlive-langlatin !dev-texlive/texlive-langnorwegian !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-armtex-2017.tar.xz mirror://gentoo/texlive-module-babel-albanian-2017.tar.xz mirror://gentoo/texlive-module-babel-bosnian-2017.tar.xz mirror://gentoo/texlive-module-babel-breton-2017.tar.xz mirror://gentoo/texlive-module-babel-croatian-2017.tar.xz mirror://gentoo/texlive-module-babel-danish-2017.tar.xz mirror://gentoo/texlive-module-babel-dutch-2017.tar.xz mirror://gentoo/texlive-module-babel-estonian-2017.tar.xz mirror://gentoo/texlive-module-babel-finnish-2017.tar.xz mirror://gentoo/texlive-module-babel-friulan-2017.tar.xz mirror://gentoo/texlive-module-babel-hungarian-2017.tar.xz mirror://gentoo/texlive-module-babel-icelandic-2017.tar.xz mirror://gentoo/texlive-module-babel-irish-2017.tar.xz mirror://gentoo/texlive-module-babel-kurmanji-2017.tar.xz mirror://gentoo/texlive-module-babel-latin-2017.tar.xz mirror://gentoo/texlive-module-babel-latvian-2017.tar.xz mirror://gentoo/texlive-module-babel-macedonian-2017.tar.xz mirror://gentoo/texlive-module-babel-norsk-2017.tar.xz mirror://gentoo/texlive-module-babel-occitan-2017.tar.xz mirror://gentoo/texlive-module-babel-piedmontese-2017.tar.xz mirror://gentoo/texlive-module-babel-romanian-2017.tar.xz mirror://gentoo/texlive-module-babel-romansh-2017.tar.xz mirror://gentoo/texlive-module-babel-samin-2017.tar.xz mirror://gentoo/texlive-module-babel-scottish-2017.tar.xz mirror://gentoo/texlive-module-babel-slovenian-2017.tar.xz mirror://gentoo/texlive-module-babel-swedish-2017.tar.xz mirror://gentoo/texlive-module-babel-turkish-2017.tar.xz mirror://gentoo/texlive-module-babel-welsh-2017.tar.xz mirror://gentoo/texlive-module-finbib-2017.tar.xz mirror://gentoo/texlive-module-gloss-occitan-2017.tar.xz mirror://gentoo/texlive-module-hrlatex-2017.tar.xz mirror://gentoo/texlive-module-hyphen-croatian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-danish-2017.tar.xz mirror://gentoo/texlive-module-hyphen-dutch-2017.tar.xz mirror://gentoo/texlive-module-hyphen-estonian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-finnish-2017.tar.xz mirror://gentoo/texlive-module-hyphen-friulan-2017.tar.xz mirror://gentoo/texlive-module-hyphen-hungarian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-icelandic-2017.tar.xz mirror://gentoo/texlive-module-hyphen-irish-2017.tar.xz mirror://gentoo/texlive-module-hyphen-kurmanji-2017.tar.xz mirror://gentoo/texlive-module-hyphen-latin-2017.tar.xz mirror://gentoo/texlive-module-hyphen-latvian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-lithuanian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-norwegian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-occitan-2017.tar.xz mirror://gentoo/texlive-module-hyphen-piedmontese-2017.tar.xz mirror://gentoo/texlive-module-hyphen-romanian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-romansh-2017.tar.xz mirror://gentoo/texlive-module-hyphen-slovenian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-swedish-2017.tar.xz mirror://gentoo/texlive-module-hyphen-turkish-2017.tar.xz mirror://gentoo/texlive-module-hyphen-uppersorbian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-welsh-2017.tar.xz mirror://gentoo/texlive-module-lithuanian-2017.tar.xz mirror://gentoo/texlive-module-lshort-dutch-2017.tar.xz mirror://gentoo/texlive-module-lshort-estonian-2017.tar.xz mirror://gentoo/texlive-module-lshort-finnish-2017.tar.xz mirror://gentoo/texlive-module-lshort-slovenian-2017.tar.xz mirror://gentoo/texlive-module-lshort-turkish-2017.tar.xz mirror://gentoo/texlive-module-nevelok-2017.tar.xz mirror://gentoo/texlive-module-swebib-2017.tar.xz mirror://gentoo/texlive-module-turkmen-2017.tar.xz mirror://gentoo/texlive-module-collection-langeuropean-2017.tar.xz doc? ( mirror://gentoo/texlive-module-armtex.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-albanian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-bosnian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-breton.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-croatian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-danish.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-dutch.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-estonian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-finnish.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-friulan.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-hungarian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-icelandic.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-irish.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-kurmanji.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-latin.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-latvian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-macedonian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-norsk.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-occitan.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-piedmontese.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-romanian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-romansh.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-samin.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-scottish.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-slovenian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-swedish.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-turkish.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-welsh.doc-2017.tar.xz mirror://gentoo/texlive-module-gloss-occitan.doc-2017.tar.xz mirror://gentoo/texlive-module-hrlatex.doc-2017.tar.xz mirror://gentoo/texlive-module-hyphen-hungarian.doc-2017.tar.xz mirror://gentoo/texlive-module-lithuanian.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-dutch.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-estonian.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-finnish.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-slovenian.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-turkish.doc-2017.tar.xz mirror://gentoo/texlive-module-nevelok.doc-2017.tar.xz mirror://gentoo/texlive-module-swebib.doc-2017.tar.xz mirror://gentoo/texlive-module-turkmen.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-albanian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-bosnian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-breton.source-2017.tar.xz mirror://gentoo/texlive-module-babel-croatian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-danish.source-2017.tar.xz mirror://gentoo/texlive-module-babel-dutch.source-2017.tar.xz mirror://gentoo/texlive-module-babel-estonian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-finnish.source-2017.tar.xz mirror://gentoo/texlive-module-babel-friulan.source-2017.tar.xz mirror://gentoo/texlive-module-babel-icelandic.source-2017.tar.xz mirror://gentoo/texlive-module-babel-irish.source-2017.tar.xz mirror://gentoo/texlive-module-babel-kurmanji.source-2017.tar.xz mirror://gentoo/texlive-module-babel-latin.source-2017.tar.xz mirror://gentoo/texlive-module-babel-latvian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-macedonian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-norsk.source-2017.tar.xz mirror://gentoo/texlive-module-babel-occitan.source-2017.tar.xz mirror://gentoo/texlive-module-babel-piedmontese.source-2017.tar.xz mirror://gentoo/texlive-module-babel-romanian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-romansh.source-2017.tar.xz mirror://gentoo/texlive-module-babel-samin.source-2017.tar.xz mirror://gentoo/texlive-module-babel-scottish.source-2017.tar.xz mirror://gentoo/texlive-module-babel-slovenian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-swedish.source-2017.tar.xz mirror://gentoo/texlive-module-babel-turkish.source-2017.tar.xz mirror://gentoo/texlive-module-babel-welsh.source-2017.tar.xz mirror://gentoo/texlive-module-gloss-occitan.source-2017.tar.xz mirror://gentoo/texlive-module-hrlatex.source-2017.tar.xz mirror://gentoo/texlive-module-hyphen-turkish.source-2017.tar.xz mirror://gentoo/texlive-module-nevelok.source-2017.tar.xz mirror://gentoo/texlive-module-turkmen.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=32909157fef5c0e38b884d5d480b50c5
+_md5_=47370ec8ce3f550b28da74794f12cc57
diff --git a/metadata/md5-cache/dev-texlive/texlive-langfrench-2017 b/metadata/md5-cache/dev-texlive/texlive-langfrench-2017
index 1f2d5045e226..3053e1bf0dd5 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langfrench-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langfrench-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive French
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=FDL-1.1 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-documentation-french !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-aeguill-2017.tar.xz mirror://gentoo/texlive-module-apprends-latex-2017.tar.xz mirror://gentoo/texlive-module-babel-basque-2017.tar.xz mirror://gentoo/texlive-module-babel-french-2017.tar.xz mirror://gentoo/texlive-module-basque-book-2017.tar.xz mirror://gentoo/texlive-module-basque-date-2017.tar.xz mirror://gentoo/texlive-module-bib-fr-2017.tar.xz mirror://gentoo/texlive-module-bibleref-french-2017.tar.xz mirror://gentoo/texlive-module-booktabs-fr-2017.tar.xz mirror://gentoo/texlive-module-droit-fr-2017.tar.xz mirror://gentoo/texlive-module-e-french-2017.tar.xz mirror://gentoo/texlive-module-epslatex-fr-2017.tar.xz mirror://gentoo/texlive-module-facture-2017.tar.xz mirror://gentoo/texlive-module-formation-latex-ul-2017.tar.xz mirror://gentoo/texlive-module-frletter-2017.tar.xz mirror://gentoo/texlive-module-hyphen-basque-2017.tar.xz mirror://gentoo/texlive-module-hyphen-french-2017.tar.xz mirror://gentoo/texlive-module-impatient-fr-2017.tar.xz mirror://gentoo/texlive-module-impnattypo-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-french-2017.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-fr-2017.tar.xz mirror://gentoo/texlive-module-lshort-french-2017.tar.xz mirror://gentoo/texlive-module-mafr-2017.tar.xz mirror://gentoo/texlive-module-tabvar-2017.tar.xz mirror://gentoo/texlive-module-tdsfrmath-2017.tar.xz mirror://gentoo/texlive-module-texlive-fr-2017.tar.xz mirror://gentoo/texlive-module-translation-array-fr-2017.tar.xz mirror://gentoo/texlive-module-translation-dcolumn-fr-2017.tar.xz mirror://gentoo/texlive-module-translation-natbib-fr-2017.tar.xz mirror://gentoo/texlive-module-translation-tabbing-fr-2017.tar.xz mirror://gentoo/texlive-module-variations-2017.tar.xz mirror://gentoo/texlive-module-visualtikz-2017.tar.xz mirror://gentoo/texlive-module-collection-langfrench-2017.tar.xz doc? ( mirror://gentoo/texlive-module-aeguill.doc-2017.tar.xz mirror://gentoo/texlive-module-apprends-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-basque.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-french.doc-2017.tar.xz mirror://gentoo/texlive-module-basque-book.doc-2017.tar.xz mirror://gentoo/texlive-module-basque-date.doc-2017.tar.xz mirror://gentoo/texlive-module-bib-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-bibleref-french.doc-2017.tar.xz mirror://gentoo/texlive-module-booktabs-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-droit-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-e-french.doc-2017.tar.xz mirror://gentoo/texlive-module-epslatex-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-facture.doc-2017.tar.xz mirror://gentoo/texlive-module-formation-latex-ul.doc-2017.tar.xz mirror://gentoo/texlive-module-frletter.doc-2017.tar.xz mirror://gentoo/texlive-module-impatient-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-impnattypo.doc-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-french.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-french.doc-2017.tar.xz mirror://gentoo/texlive-module-mafr.doc-2017.tar.xz mirror://gentoo/texlive-module-tabvar.doc-2017.tar.xz mirror://gentoo/texlive-module-tdsfrmath.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-array-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-dcolumn-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-natbib-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-tabbing-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-variations.doc-2017.tar.xz mirror://gentoo/texlive-module-visualtikz.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-basque.source-2017.tar.xz mirror://gentoo/texlive-module-babel-french.source-2017.tar.xz mirror://gentoo/texlive-module-basque-book.source-2017.tar.xz mirror://gentoo/texlive-module-basque-date.source-2017.tar.xz mirror://gentoo/texlive-module-bibleref-french.source-2017.tar.xz mirror://gentoo/texlive-module-facture.source-2017.tar.xz mirror://gentoo/texlive-module-formation-latex-ul.source-2017.tar.xz mirror://gentoo/texlive-module-hyphen-basque.source-2017.tar.xz mirror://gentoo/texlive-module-impnattypo.source-2017.tar.xz mirror://gentoo/texlive-module-tabvar.source-2017.tar.xz mirror://gentoo/texlive-module-tdsfrmath.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f7927d5e53a1d1efe9ee6fb9327e8f7f
+_md5_=726496befced804327eaeac602c6a165
diff --git a/metadata/md5-cache/dev-texlive/texlive-langgerman-2017 b/metadata/md5-cache/dev-texlive/texlive-langgerman-2017
index a2b1cd750209..51ec570fbfef 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langgerman-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langgerman-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive German
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=FDL-1.1 GPL-1 GPL-2 LPPL-1.3 MIT OPL TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !<dev-texlive/texlive-latexextra-2009 !dev-texlive/texlive-documentation-german !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-apalike-german-2017.tar.xz mirror://gentoo/texlive-module-babel-german-2017.tar.xz mirror://gentoo/texlive-module-bibleref-german-2017.tar.xz mirror://gentoo/texlive-module-booktabs-de-2017.tar.xz mirror://gentoo/texlive-module-csquotes-de-2017.tar.xz mirror://gentoo/texlive-module-dehyph-exptl-2017.tar.xz mirror://gentoo/texlive-module-dhua-2017.tar.xz mirror://gentoo/texlive-module-einfuehrung-2017.tar.xz mirror://gentoo/texlive-module-einfuehrung2-2017.tar.xz mirror://gentoo/texlive-module-etdipa-2017.tar.xz mirror://gentoo/texlive-module-etoolbox-de-2017.tar.xz mirror://gentoo/texlive-module-fifinddo-info-2017.tar.xz mirror://gentoo/texlive-module-geometry-de-2017.tar.xz mirror://gentoo/texlive-module-german-2017.tar.xz mirror://gentoo/texlive-module-germbib-2017.tar.xz mirror://gentoo/texlive-module-germkorr-2017.tar.xz mirror://gentoo/texlive-module-hausarbeit-jura-2017.tar.xz mirror://gentoo/texlive-module-hyphen-german-2017.tar.xz mirror://gentoo/texlive-module-koma-script-examples-2017.tar.xz mirror://gentoo/texlive-module-l2picfaq-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-2017.tar.xz mirror://gentoo/texlive-module-latex-bib-ex-2017.tar.xz mirror://gentoo/texlive-module-latex-bib2-ex-2017.tar.xz mirror://gentoo/texlive-module-latex-referenz-2017.tar.xz mirror://gentoo/texlive-module-latex-tabellen-2017.tar.xz mirror://gentoo/texlive-module-latexcheat-de-2017.tar.xz mirror://gentoo/texlive-module-lshort-german-2017.tar.xz mirror://gentoo/texlive-module-lualatex-doc-de-2017.tar.xz mirror://gentoo/texlive-module-microtype-de-2017.tar.xz mirror://gentoo/texlive-module-milog-2017.tar.xz mirror://gentoo/texlive-module-presentations-2017.tar.xz mirror://gentoo/texlive-module-r_und_s-2017.tar.xz mirror://gentoo/texlive-module-templates-fenn-2017.tar.xz mirror://gentoo/texlive-module-templates-sommer-2017.tar.xz mirror://gentoo/texlive-module-texlive-de-2017.tar.xz mirror://gentoo/texlive-module-tipa-de-2017.tar.xz mirror://gentoo/texlive-module-translation-arsclassica-de-2017.tar.xz mirror://gentoo/texlive-module-translation-biblatex-de-2017.tar.xz mirror://gentoo/texlive-module-translation-chemsym-de-2017.tar.xz mirror://gentoo/texlive-module-translation-ecv-de-2017.tar.xz mirror://gentoo/texlive-module-translation-enumitem-de-2017.tar.xz mirror://gentoo/texlive-module-translation-europecv-de-2017.tar.xz mirror://gentoo/texlive-module-translation-filecontents-de-2017.tar.xz mirror://gentoo/texlive-module-translation-moreverb-de-2017.tar.xz mirror://gentoo/texlive-module-udesoftec-2017.tar.xz mirror://gentoo/texlive-module-uhrzeit-2017.tar.xz mirror://gentoo/texlive-module-umlaute-2017.tar.xz mirror://gentoo/texlive-module-voss-mathcol-2017.tar.xz mirror://gentoo/texlive-module-collection-langgerman-2017.tar.xz doc? ( mirror://gentoo/texlive-module-apalike-german.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-german.doc-2017.tar.xz mirror://gentoo/texlive-module-bibleref-german.doc-2017.tar.xz mirror://gentoo/texlive-module-booktabs-de.doc-2017.tar.xz mirror://gentoo/texlive-module-csquotes-de.doc-2017.tar.xz mirror://gentoo/texlive-module-dehyph-exptl.doc-2017.tar.xz mirror://gentoo/texlive-module-dhua.doc-2017.tar.xz mirror://gentoo/texlive-module-einfuehrung.doc-2017.tar.xz mirror://gentoo/texlive-module-einfuehrung2.doc-2017.tar.xz mirror://gentoo/texlive-module-etdipa.doc-2017.tar.xz mirror://gentoo/texlive-module-etoolbox-de.doc-2017.tar.xz mirror://gentoo/texlive-module-fifinddo-info.doc-2017.tar.xz mirror://gentoo/texlive-module-geometry-de.doc-2017.tar.xz mirror://gentoo/texlive-module-german.doc-2017.tar.xz mirror://gentoo/texlive-module-germbib.doc-2017.tar.xz mirror://gentoo/texlive-module-germkorr.doc-2017.tar.xz mirror://gentoo/texlive-module-hausarbeit-jura.doc-2017.tar.xz mirror://gentoo/texlive-module-koma-script-examples.doc-2017.tar.xz mirror://gentoo/texlive-module-l2picfaq.doc-2017.tar.xz mirror://gentoo/texlive-module-l2tabu.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-bib-ex.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-bib2-ex.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-referenz.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-tabellen.doc-2017.tar.xz mirror://gentoo/texlive-module-latexcheat-de.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-german.doc-2017.tar.xz mirror://gentoo/texlive-module-lualatex-doc-de.doc-2017.tar.xz mirror://gentoo/texlive-module-microtype-de.doc-2017.tar.xz mirror://gentoo/texlive-module-milog.doc-2017.tar.xz mirror://gentoo/texlive-module-presentations.doc-2017.tar.xz mirror://gentoo/texlive-module-r_und_s.doc-2017.tar.xz mirror://gentoo/texlive-module-templates-fenn.doc-2017.tar.xz mirror://gentoo/texlive-module-templates-sommer.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-de.doc-2017.tar.xz mirror://gentoo/texlive-module-tipa-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-arsclassica-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-biblatex-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-chemsym-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-ecv-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-enumitem-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-europecv-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-filecontents-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-moreverb-de.doc-2017.tar.xz mirror://gentoo/texlive-module-udesoftec.doc-2017.tar.xz mirror://gentoo/texlive-module-uhrzeit.doc-2017.tar.xz mirror://gentoo/texlive-module-umlaute.doc-2017.tar.xz mirror://gentoo/texlive-module-voss-mathcol.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-german.source-2017.tar.xz mirror://gentoo/texlive-module-dhua.source-2017.tar.xz mirror://gentoo/texlive-module-fifinddo-info.source-2017.tar.xz mirror://gentoo/texlive-module-german.source-2017.tar.xz mirror://gentoo/texlive-module-hausarbeit-jura.source-2017.tar.xz mirror://gentoo/texlive-module-udesoftec.source-2017.tar.xz mirror://gentoo/texlive-module-umlaute.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f2b7a6679768fd086b57bdfcf8d1d022
+_md5_=88d42bc244edf68c0f64888ea3a44ad9
diff --git a/metadata/md5-cache/dev-texlive/texlive-langgreek-2017 b/metadata/md5-cache/dev-texlive/texlive-langgreek-2017
index bfc9b108a936..ff40289db9be 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langgreek-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langgreek-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Greek
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LGPL-3 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-greek-2017.tar.xz mirror://gentoo/texlive-module-begingreek-2017.tar.xz mirror://gentoo/texlive-module-betababel-2017.tar.xz mirror://gentoo/texlive-module-bgreek-2017.tar.xz mirror://gentoo/texlive-module-cbfonts-2017.tar.xz mirror://gentoo/texlive-module-cbfonts-fd-2017.tar.xz mirror://gentoo/texlive-module-gfsbaskerville-2017.tar.xz mirror://gentoo/texlive-module-gfsporson-2017.tar.xz mirror://gentoo/texlive-module-greek-fontenc-2017.tar.xz mirror://gentoo/texlive-module-greek-inputenc-2017.tar.xz mirror://gentoo/texlive-module-greekdates-2017.tar.xz mirror://gentoo/texlive-module-greektex-2017.tar.xz mirror://gentoo/texlive-module-greektonoi-2017.tar.xz mirror://gentoo/texlive-module-hyphen-greek-2017.tar.xz mirror://gentoo/texlive-module-hyphen-ancientgreek-2017.tar.xz mirror://gentoo/texlive-module-ibycus-babel-2017.tar.xz mirror://gentoo/texlive-module-ibygrk-2017.tar.xz mirror://gentoo/texlive-module-kerkis-2017.tar.xz mirror://gentoo/texlive-module-levy-2017.tar.xz mirror://gentoo/texlive-module-lgreek-2017.tar.xz mirror://gentoo/texlive-module-mkgrkindex-2017.tar.xz mirror://gentoo/texlive-module-teubner-2017.tar.xz mirror://gentoo/texlive-module-xgreek-2017.tar.xz mirror://gentoo/texlive-module-yannisgr-2017.tar.xz mirror://gentoo/texlive-module-collection-langgreek-2017.tar.xz doc? ( mirror://gentoo/texlive-module-babel-greek.doc-2017.tar.xz mirror://gentoo/texlive-module-begingreek.doc-2017.tar.xz mirror://gentoo/texlive-module-betababel.doc-2017.tar.xz mirror://gentoo/texlive-module-bgreek.doc-2017.tar.xz mirror://gentoo/texlive-module-cbfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-cbfonts-fd.doc-2017.tar.xz mirror://gentoo/texlive-module-gfsbaskerville.doc-2017.tar.xz mirror://gentoo/texlive-module-gfsporson.doc-2017.tar.xz mirror://gentoo/texlive-module-greek-fontenc.doc-2017.tar.xz mirror://gentoo/texlive-module-greek-inputenc.doc-2017.tar.xz mirror://gentoo/texlive-module-greekdates.doc-2017.tar.xz mirror://gentoo/texlive-module-greektex.doc-2017.tar.xz mirror://gentoo/texlive-module-greektonoi.doc-2017.tar.xz mirror://gentoo/texlive-module-hyphen-greek.doc-2017.tar.xz mirror://gentoo/texlive-module-ibycus-babel.doc-2017.tar.xz mirror://gentoo/texlive-module-ibygrk.doc-2017.tar.xz mirror://gentoo/texlive-module-kerkis.doc-2017.tar.xz mirror://gentoo/texlive-module-levy.doc-2017.tar.xz mirror://gentoo/texlive-module-lgreek.doc-2017.tar.xz mirror://gentoo/texlive-module-mkgrkindex.doc-2017.tar.xz mirror://gentoo/texlive-module-teubner.doc-2017.tar.xz mirror://gentoo/texlive-module-xgreek.doc-2017.tar.xz mirror://gentoo/texlive-module-yannisgr.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-greek.source-2017.tar.xz mirror://gentoo/texlive-module-begingreek.source-2017.tar.xz mirror://gentoo/texlive-module-cbfonts-fd.source-2017.tar.xz mirror://gentoo/texlive-module-greekdates.source-2017.tar.xz mirror://gentoo/texlive-module-ibycus-babel.source-2017.tar.xz mirror://gentoo/texlive-module-teubner.source-2017.tar.xz mirror://gentoo/texlive-module-xgreek.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=235b7a35ffcf2b0afb0e53b487cd5e54
+_md5_=6d6c99305252c5bb2925427571d67b69
diff --git a/metadata/md5-cache/dev-texlive/texlive-langitalian-2017 b/metadata/md5-cache/dev-texlive/texlive-langitalian-2017
index 7290b055d24b..7a8e8781403e 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langitalian-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langitalian-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Italian
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=FDL-1.1 GPL-1 GPL-2 LGPL-2 LPPL-1.3 TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-documentation-italian !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-amsldoc-it-2017.tar.xz mirror://gentoo/texlive-module-amsmath-it-2017.tar.xz mirror://gentoo/texlive-module-amsthdoc-it-2017.tar.xz mirror://gentoo/texlive-module-babel-italian-2017.tar.xz mirror://gentoo/texlive-module-codicefiscaleitaliano-2017.tar.xz mirror://gentoo/texlive-module-fancyhdr-it-2017.tar.xz mirror://gentoo/texlive-module-fixltxhyph-2017.tar.xz mirror://gentoo/texlive-module-frontespizio-2017.tar.xz mirror://gentoo/texlive-module-hyphen-italian-2017.tar.xz mirror://gentoo/texlive-module-itnumpar-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-italian-2017.tar.xz mirror://gentoo/texlive-module-latex4wp-it-2017.tar.xz mirror://gentoo/texlive-module-layaureo-2017.tar.xz mirror://gentoo/texlive-module-lshort-italian-2017.tar.xz mirror://gentoo/texlive-module-psfrag-italian-2017.tar.xz mirror://gentoo/texlive-module-texlive-it-2017.tar.xz mirror://gentoo/texlive-module-collection-langitalian-2017.tar.xz doc? ( mirror://gentoo/texlive-module-amsldoc-it.doc-2017.tar.xz mirror://gentoo/texlive-module-amsmath-it.doc-2017.tar.xz mirror://gentoo/texlive-module-amsthdoc-it.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-italian.doc-2017.tar.xz mirror://gentoo/texlive-module-codicefiscaleitaliano.doc-2017.tar.xz mirror://gentoo/texlive-module-fancyhdr-it.doc-2017.tar.xz mirror://gentoo/texlive-module-fixltxhyph.doc-2017.tar.xz mirror://gentoo/texlive-module-frontespizio.doc-2017.tar.xz mirror://gentoo/texlive-module-itnumpar.doc-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-italian.doc-2017.tar.xz mirror://gentoo/texlive-module-latex4wp-it.doc-2017.tar.xz mirror://gentoo/texlive-module-layaureo.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-italian.doc-2017.tar.xz mirror://gentoo/texlive-module-psfrag-italian.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-it.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-italian.source-2017.tar.xz mirror://gentoo/texlive-module-codicefiscaleitaliano.source-2017.tar.xz mirror://gentoo/texlive-module-fixltxhyph.source-2017.tar.xz mirror://gentoo/texlive-module-frontespizio.source-2017.tar.xz mirror://gentoo/texlive-module-itnumpar.source-2017.tar.xz mirror://gentoo/texlive-module-layaureo.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0a54d9b49e921e2186a17c76f1513715
+_md5_=694e7a301bb44c6df04139c0194f2521
diff --git a/metadata/md5-cache/dev-texlive/texlive-langjapanese-2017 b/metadata/md5-cache/dev-texlive/texlive-langjapanese-2017
index 5c3e1c7a20a7..294c0a959bc6 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langjapanese-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langjapanese-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Japanese
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=BSD BSD-2 GPL-1 GPL-2 GPL-3 LPPL-1.3 MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-langcjk-2017 !<dev-texlive/texlive-langcjk-2014 !<dev-texlive/texlive-basic-2016 dev-lang/ruby >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-japanese-2017.tar.xz mirror://gentoo/texlive-module-bxbase-2017.tar.xz mirror://gentoo/texlive-module-bxcjkjatype-2017.tar.xz mirror://gentoo/texlive-module-bxjalipsum-2017.tar.xz mirror://gentoo/texlive-module-bxjscls-2017.tar.xz mirror://gentoo/texlive-module-bxorigcapt-2017.tar.xz mirror://gentoo/texlive-module-convbkmk-2017.tar.xz mirror://gentoo/texlive-module-ifptex-2017.tar.xz mirror://gentoo/texlive-module-ipaex-2017.tar.xz mirror://gentoo/texlive-module-japanese-otf-2017.tar.xz mirror://gentoo/texlive-module-japanese-otf-uptex-2017.tar.xz mirror://gentoo/texlive-module-jlreq-2017.tar.xz mirror://gentoo/texlive-module-jsclasses-2017.tar.xz mirror://gentoo/texlive-module-lshort-japanese-2017.tar.xz mirror://gentoo/texlive-module-luatexja-2017.tar.xz mirror://gentoo/texlive-module-mendex-doc-2017.tar.xz mirror://gentoo/texlive-module-pbibtex-base-2017.tar.xz mirror://gentoo/texlive-module-platex-2017.tar.xz mirror://gentoo/texlive-module-platex-tools-2017.tar.xz mirror://gentoo/texlive-module-platexcheat-2017.tar.xz mirror://gentoo/texlive-module-ptex-2017.tar.xz mirror://gentoo/texlive-module-ptex-base-2017.tar.xz mirror://gentoo/texlive-module-ptex-fonts-2017.tar.xz mirror://gentoo/texlive-module-ptex-fontmaps-2017.tar.xz mirror://gentoo/texlive-module-ptex2pdf-2017.tar.xz mirror://gentoo/texlive-module-pxbase-2017.tar.xz mirror://gentoo/texlive-module-pxchfon-2017.tar.xz mirror://gentoo/texlive-module-pxcjkcat-2017.tar.xz mirror://gentoo/texlive-module-pxjahyper-2017.tar.xz mirror://gentoo/texlive-module-pxrubrica-2017.tar.xz mirror://gentoo/texlive-module-uplatex-2017.tar.xz mirror://gentoo/texlive-module-uptex-2017.tar.xz mirror://gentoo/texlive-module-uptex-base-2017.tar.xz mirror://gentoo/texlive-module-uptex-fonts-2017.tar.xz mirror://gentoo/texlive-module-wadalab-2017.tar.xz mirror://gentoo/texlive-module-zxjafbfont-2017.tar.xz mirror://gentoo/texlive-module-zxjatype-2017.tar.xz mirror://gentoo/texlive-module-collection-langjapanese-2017.tar.xz doc? ( mirror://gentoo/texlive-module-babel-japanese.doc-2017.tar.xz mirror://gentoo/texlive-module-bxbase.doc-2017.tar.xz mirror://gentoo/texlive-module-bxcjkjatype.doc-2017.tar.xz mirror://gentoo/texlive-module-bxjalipsum.doc-2017.tar.xz mirror://gentoo/texlive-module-bxjscls.doc-2017.tar.xz mirror://gentoo/texlive-module-bxorigcapt.doc-2017.tar.xz mirror://gentoo/texlive-module-convbkmk.doc-2017.tar.xz mirror://gentoo/texlive-module-ifptex.doc-2017.tar.xz mirror://gentoo/texlive-module-ipaex.doc-2017.tar.xz mirror://gentoo/texlive-module-japanese-otf.doc-2017.tar.xz mirror://gentoo/texlive-module-japanese-otf-uptex.doc-2017.tar.xz mirror://gentoo/texlive-module-jlreq.doc-2017.tar.xz mirror://gentoo/texlive-module-jsclasses.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-japanese.doc-2017.tar.xz mirror://gentoo/texlive-module-luatexja.doc-2017.tar.xz mirror://gentoo/texlive-module-mendex-doc.doc-2017.tar.xz mirror://gentoo/texlive-module-pbibtex-base.doc-2017.tar.xz mirror://gentoo/texlive-module-platex.doc-2017.tar.xz mirror://gentoo/texlive-module-platex-tools.doc-2017.tar.xz mirror://gentoo/texlive-module-platexcheat.doc-2017.tar.xz mirror://gentoo/texlive-module-ptex.doc-2017.tar.xz mirror://gentoo/texlive-module-ptex-base.doc-2017.tar.xz mirror://gentoo/texlive-module-ptex-fonts.doc-2017.tar.xz mirror://gentoo/texlive-module-ptex-fontmaps.doc-2017.tar.xz mirror://gentoo/texlive-module-ptex2pdf.doc-2017.tar.xz mirror://gentoo/texlive-module-pxbase.doc-2017.tar.xz mirror://gentoo/texlive-module-pxchfon.doc-2017.tar.xz mirror://gentoo/texlive-module-pxcjkcat.doc-2017.tar.xz mirror://gentoo/texlive-module-pxjahyper.doc-2017.tar.xz mirror://gentoo/texlive-module-pxrubrica.doc-2017.tar.xz mirror://gentoo/texlive-module-uplatex.doc-2017.tar.xz mirror://gentoo/texlive-module-uptex.doc-2017.tar.xz mirror://gentoo/texlive-module-uptex-base.doc-2017.tar.xz mirror://gentoo/texlive-module-uptex-fonts.doc-2017.tar.xz mirror://gentoo/texlive-module-wadalab.doc-2017.tar.xz mirror://gentoo/texlive-module-zxjafbfont.doc-2017.tar.xz mirror://gentoo/texlive-module-zxjatype.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-japanese.source-2017.tar.xz mirror://gentoo/texlive-module-bxjscls.source-2017.tar.xz mirror://gentoo/texlive-module-japanese-otf.source-2017.tar.xz mirror://gentoo/texlive-module-japanese-otf-uptex.source-2017.tar.xz mirror://gentoo/texlive-module-jsclasses.source-2017.tar.xz mirror://gentoo/texlive-module-luatexja.source-2017.tar.xz mirror://gentoo/texlive-module-platex.source-2017.tar.xz mirror://gentoo/texlive-module-ptex-fontmaps.source-2017.tar.xz mirror://gentoo/texlive-module-pxrubrica.source-2017.tar.xz mirror://gentoo/texlive-module-uplatex.source-2017.tar.xz mirror://gentoo/texlive-module-uptex-fonts.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5e79b2af5de98c62fe95e787d9980483
+_md5_=2732cb7b7f939480bccaf1c7fdb07cfd
diff --git a/metadata/md5-cache/dev-texlive/texlive-langkorean-2017 b/metadata/md5-cache/dev-texlive/texlive-langkorean-2017
index d2ed0adc5509..3c45c35542e7 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langkorean-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langkorean-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Korean
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=FDL-1.1 GPL-2 LPPL-1.3 OFL TeX-other-free
 RDEPEND=>=dev-texlive/texlive-langcjk-2017 !<dev-texlive/texlive-langcjk-2014 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-baekmuk-2017.tar.xz mirror://gentoo/texlive-module-cjk-ko-2017.tar.xz mirror://gentoo/texlive-module-kotex-oblivoir-2017.tar.xz mirror://gentoo/texlive-module-kotex-plain-2017.tar.xz mirror://gentoo/texlive-module-kotex-utf-2017.tar.xz mirror://gentoo/texlive-module-kotex-utils-2017.tar.xz mirror://gentoo/texlive-module-lshort-korean-2017.tar.xz mirror://gentoo/texlive-module-nanumtype1-2017.tar.xz mirror://gentoo/texlive-module-uhc-2017.tar.xz mirror://gentoo/texlive-module-unfonts-core-2017.tar.xz mirror://gentoo/texlive-module-unfonts-extra-2017.tar.xz mirror://gentoo/texlive-module-collection-langkorean-2017.tar.xz doc? ( mirror://gentoo/texlive-module-baekmuk.doc-2017.tar.xz mirror://gentoo/texlive-module-cjk-ko.doc-2017.tar.xz mirror://gentoo/texlive-module-kotex-oblivoir.doc-2017.tar.xz mirror://gentoo/texlive-module-kotex-plain.doc-2017.tar.xz mirror://gentoo/texlive-module-kotex-utf.doc-2017.tar.xz mirror://gentoo/texlive-module-kotex-utils.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-korean.doc-2017.tar.xz mirror://gentoo/texlive-module-nanumtype1.doc-2017.tar.xz mirror://gentoo/texlive-module-uhc.doc-2017.tar.xz mirror://gentoo/texlive-module-unfonts-core.doc-2017.tar.xz mirror://gentoo/texlive-module-unfonts-extra.doc-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3b08f59882a6acf8701fc8581df949be
+_md5_=f869b5f82f5e79e9df3cb07b20d78d57
diff --git a/metadata/md5-cache/dev-texlive/texlive-langother-2017 b/metadata/md5-cache/dev-texlive/texlive-langother-2017
index e33af814b22b..f1fbc01469bd 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langother-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langother-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Other languages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LGPL-2 LPPL-1.3 OFL public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !<dev-texlive/texlive-basic-2009 !dev-texlive/texlive-documentation-vietnamese !dev-texlive/texlive-langvietnamese !<dev-texlive/texlive-langcjk-2013 !dev-texlive/texlive-langhebrew !dev-texlive/texlive-documentation-thai !dev-texlive/texlive-langturkmen !dev-texlive/texlive-langtibetan !<dev-texlive/texlive-basic-2016 !<dev-texlive/texlive-langafrican-2017 !<dev-texlive/texlive-langindic-2017 !<dev-texlive/texlive-langeuropean-2017 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-amsldoc-vn-2017.tar.xz mirror://gentoo/texlive-module-aramaic-serto-2017.tar.xz mirror://gentoo/texlive-module-hyphen-armenian-2017.tar.xz mirror://gentoo/texlive-module-babel-azerbaijani-2017.tar.xz mirror://gentoo/texlive-module-babel-esperanto-2017.tar.xz mirror://gentoo/texlive-module-babel-georgian-2017.tar.xz mirror://gentoo/texlive-module-babel-hebrew-2017.tar.xz mirror://gentoo/texlive-module-babel-indonesian-2017.tar.xz mirror://gentoo/texlive-module-babel-interlingua-2017.tar.xz mirror://gentoo/texlive-module-babel-malay-2017.tar.xz mirror://gentoo/texlive-module-babel-sorbian-2017.tar.xz mirror://gentoo/texlive-module-babel-thai-2017.tar.xz mirror://gentoo/texlive-module-babel-vietnamese-2017.tar.xz mirror://gentoo/texlive-module-bangtex-2017.tar.xz mirror://gentoo/texlive-module-bengali-2017.tar.xz mirror://gentoo/texlive-module-burmese-2017.tar.xz mirror://gentoo/texlive-module-cjhebrew-2017.tar.xz mirror://gentoo/texlive-module-ctib-2017.tar.xz mirror://gentoo/texlive-module-ebong-2017.tar.xz mirror://gentoo/texlive-module-ethiop-2017.tar.xz mirror://gentoo/texlive-module-ethiop-t1-2017.tar.xz mirror://gentoo/texlive-module-fc-2017.tar.xz mirror://gentoo/texlive-module-fonts-tlwg-2017.tar.xz mirror://gentoo/texlive-module-hyphen-afrikaans-2017.tar.xz mirror://gentoo/texlive-module-hyphen-coptic-2017.tar.xz mirror://gentoo/texlive-module-hyphen-esperanto-2017.tar.xz mirror://gentoo/texlive-module-hyphen-ethiopic-2017.tar.xz mirror://gentoo/texlive-module-hyphen-georgian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-indic-2017.tar.xz mirror://gentoo/texlive-module-hyphen-indonesian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-interlingua-2017.tar.xz mirror://gentoo/texlive-module-hyphen-sanskrit-2017.tar.xz mirror://gentoo/texlive-module-hyphen-thai-2017.tar.xz mirror://gentoo/texlive-module-hyphen-turkmen-2017.tar.xz mirror://gentoo/texlive-module-latexbangla-2017.tar.xz mirror://gentoo/texlive-module-lshort-thai-2017.tar.xz mirror://gentoo/texlive-module-lshort-vietnamese-2017.tar.xz mirror://gentoo/texlive-module-ntheorem-vn-2017.tar.xz mirror://gentoo/texlive-module-padauk-2017.tar.xz mirror://gentoo/texlive-module-sanskrit-2017.tar.xz mirror://gentoo/texlive-module-sanskrit-t1-2017.tar.xz mirror://gentoo/texlive-module-thaienum-2017.tar.xz mirror://gentoo/texlive-module-velthuis-2017.tar.xz mirror://gentoo/texlive-module-vntex-2017.tar.xz mirror://gentoo/texlive-module-wnri-2017.tar.xz mirror://gentoo/texlive-module-wnri-latex-2017.tar.xz mirror://gentoo/texlive-module-xetex-devanagari-2017.tar.xz mirror://gentoo/texlive-module-collection-langother-2017.tar.xz doc? ( mirror://gentoo/texlive-module-amsldoc-vn.doc-2017.tar.xz mirror://gentoo/texlive-module-aramaic-serto.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-azerbaijani.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-esperanto.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-georgian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-hebrew.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-indonesian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-interlingua.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-malay.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-sorbian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-thai.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-vietnamese.doc-2017.tar.xz mirror://gentoo/texlive-module-bangtex.doc-2017.tar.xz mirror://gentoo/texlive-module-bengali.doc-2017.tar.xz mirror://gentoo/texlive-module-burmese.doc-2017.tar.xz mirror://gentoo/texlive-module-cjhebrew.doc-2017.tar.xz mirror://gentoo/texlive-module-ctib.doc-2017.tar.xz mirror://gentoo/texlive-module-ebong.doc-2017.tar.xz mirror://gentoo/texlive-module-ethiop.doc-2017.tar.xz mirror://gentoo/texlive-module-ethiop-t1.doc-2017.tar.xz mirror://gentoo/texlive-module-fc.doc-2017.tar.xz mirror://gentoo/texlive-module-fonts-tlwg.doc-2017.tar.xz mirror://gentoo/texlive-module-hyphen-sanskrit.doc-2017.tar.xz mirror://gentoo/texlive-module-latexbangla.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-thai.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-vietnamese.doc-2017.tar.xz mirror://gentoo/texlive-module-ntheorem-vn.doc-2017.tar.xz mirror://gentoo/texlive-module-padauk.doc-2017.tar.xz mirror://gentoo/texlive-module-sanskrit.doc-2017.tar.xz mirror://gentoo/texlive-module-sanskrit-t1.doc-2017.tar.xz mirror://gentoo/texlive-module-thaienum.doc-2017.tar.xz mirror://gentoo/texlive-module-velthuis.doc-2017.tar.xz mirror://gentoo/texlive-module-vntex.doc-2017.tar.xz mirror://gentoo/texlive-module-wnri.doc-2017.tar.xz mirror://gentoo/texlive-module-wnri-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-xetex-devanagari.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-hyphen-armenian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-azerbaijani.source-2017.tar.xz mirror://gentoo/texlive-module-babel-esperanto.source-2017.tar.xz mirror://gentoo/texlive-module-babel-hebrew.source-2017.tar.xz mirror://gentoo/texlive-module-babel-indonesian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-interlingua.source-2017.tar.xz mirror://gentoo/texlive-module-babel-malay.source-2017.tar.xz mirror://gentoo/texlive-module-babel-sorbian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-thai.source-2017.tar.xz mirror://gentoo/texlive-module-babel-vietnamese.source-2017.tar.xz mirror://gentoo/texlive-module-bengali.source-2017.tar.xz mirror://gentoo/texlive-module-burmese.source-2017.tar.xz mirror://gentoo/texlive-module-ctib.source-2017.tar.xz mirror://gentoo/texlive-module-ethiop.source-2017.tar.xz mirror://gentoo/texlive-module-fonts-tlwg.source-2017.tar.xz mirror://gentoo/texlive-module-hyphen-ethiopic.source-2017.tar.xz mirror://gentoo/texlive-module-hyphen-turkmen.source-2017.tar.xz mirror://gentoo/texlive-module-sanskrit.source-2017.tar.xz mirror://gentoo/texlive-module-vntex.source-2017.tar.xz mirror://gentoo/texlive-module-wnri-latex.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=412ec58c410667202808266dfba662f2
+_md5_=0ae66a7c700e711d37e7a8c9b80ac464
diff --git a/metadata/md5-cache/dev-texlive/texlive-langpolish-2017 b/metadata/md5-cache/dev-texlive/texlive-langpolish-2017
index 3b9e9ae18719..2a0473a6c296 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langpolish-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langpolish-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Polish
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX
 RDEPEND=>=dev-texlive/texlive-latex-2017 >=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-documentation-polish !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-polish-2017.tar.xz mirror://gentoo/texlive-module-bredzenie-2017.tar.xz mirror://gentoo/texlive-module-cc-pl-2017.tar.xz mirror://gentoo/texlive-module-gustlib-2017.tar.xz mirror://gentoo/texlive-module-gustprog-2017.tar.xz mirror://gentoo/texlive-module-hyphen-polish-2017.tar.xz mirror://gentoo/texlive-module-lshort-polish-2017.tar.xz mirror://gentoo/texlive-module-mex-2017.tar.xz mirror://gentoo/texlive-module-mwcls-2017.tar.xz mirror://gentoo/texlive-module-pl-2017.tar.xz mirror://gentoo/texlive-module-polski-2017.tar.xz mirror://gentoo/texlive-module-przechlewski-book-2017.tar.xz mirror://gentoo/texlive-module-qpxqtx-2017.tar.xz mirror://gentoo/texlive-module-tap-2017.tar.xz mirror://gentoo/texlive-module-tex-virtual-academy-pl-2017.tar.xz mirror://gentoo/texlive-module-texlive-pl-2017.tar.xz mirror://gentoo/texlive-module-utf8mex-2017.tar.xz mirror://gentoo/texlive-module-collection-langpolish-2017.tar.xz doc? ( mirror://gentoo/texlive-module-babel-polish.doc-2017.tar.xz mirror://gentoo/texlive-module-bredzenie.doc-2017.tar.xz mirror://gentoo/texlive-module-cc-pl.doc-2017.tar.xz mirror://gentoo/texlive-module-gustlib.doc-2017.tar.xz mirror://gentoo/texlive-module-gustprog.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-polish.doc-2017.tar.xz mirror://gentoo/texlive-module-mex.doc-2017.tar.xz mirror://gentoo/texlive-module-mwcls.doc-2017.tar.xz mirror://gentoo/texlive-module-pl.doc-2017.tar.xz mirror://gentoo/texlive-module-polski.doc-2017.tar.xz mirror://gentoo/texlive-module-przechlewski-book.doc-2017.tar.xz mirror://gentoo/texlive-module-qpxqtx.doc-2017.tar.xz mirror://gentoo/texlive-module-tap.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-virtual-academy-pl.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-pl.doc-2017.tar.xz mirror://gentoo/texlive-module-utf8mex.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-polish.source-2017.tar.xz mirror://gentoo/texlive-module-mex.source-2017.tar.xz mirror://gentoo/texlive-module-mwcls.source-2017.tar.xz mirror://gentoo/texlive-module-polski.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9b068247003457adb9ae4e58c433490d
+_md5_=4272f36a032d86352e3c60c9faa35152
diff --git a/metadata/md5-cache/dev-texlive/texlive-langportuguese-2017 b/metadata/md5-cache/dev-texlive/texlive-langportuguese-2017
index 1ba652b9c270..8fbeac9aa640 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langportuguese-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langportuguese-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Portuguese
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.3 public-domain
 RDEPEND=>=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-documentation-portuguese !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-portuges-2017.tar.xz mirror://gentoo/texlive-module-beamer-tut-pt-2017.tar.xz mirror://gentoo/texlive-module-cursolatex-2017.tar.xz mirror://gentoo/texlive-module-feupphdteses-2017.tar.xz mirror://gentoo/texlive-module-hyphen-portuguese-2017.tar.xz mirror://gentoo/texlive-module-latexcheat-ptbr-2017.tar.xz mirror://gentoo/texlive-module-lshort-portuguese-2017.tar.xz mirror://gentoo/texlive-module-ordinalpt-2017.tar.xz mirror://gentoo/texlive-module-xypic-tut-pt-2017.tar.xz mirror://gentoo/texlive-module-collection-langportuguese-2017.tar.xz doc? ( mirror://gentoo/texlive-module-babel-portuges.doc-2017.tar.xz mirror://gentoo/texlive-module-beamer-tut-pt.doc-2017.tar.xz mirror://gentoo/texlive-module-cursolatex.doc-2017.tar.xz mirror://gentoo/texlive-module-feupphdteses.doc-2017.tar.xz mirror://gentoo/texlive-module-latexcheat-ptbr.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-portuguese.doc-2017.tar.xz mirror://gentoo/texlive-module-ordinalpt.doc-2017.tar.xz mirror://gentoo/texlive-module-xypic-tut-pt.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-portuges.source-2017.tar.xz mirror://gentoo/texlive-module-ordinalpt.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3532c28103008c94ef2b42b23ef8a9b6
+_md5_=343840d277001815fc19780aa3b12ae3
diff --git a/metadata/md5-cache/dev-texlive/texlive-langspanish-2017 b/metadata/md5-cache/dev-texlive/texlive-langspanish-2017
index 557cf48dbaff..63c61fc17cec 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langspanish-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langspanish-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Spanish
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-documentation-spanish !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-catalan-2017.tar.xz mirror://gentoo/texlive-module-babel-galician-2017.tar.xz mirror://gentoo/texlive-module-babel-spanglish-2017.tar.xz mirror://gentoo/texlive-module-babel-spanish-2017.tar.xz mirror://gentoo/texlive-module-es-tex-faq-2017.tar.xz mirror://gentoo/texlive-module-hyphen-catalan-2017.tar.xz mirror://gentoo/texlive-module-hyphen-galician-2017.tar.xz mirror://gentoo/texlive-module-hyphen-spanish-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-spanish-2017.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-spanish-2017.tar.xz mirror://gentoo/texlive-module-latexcheat-esmx-2017.tar.xz mirror://gentoo/texlive-module-lshort-spanish-2017.tar.xz mirror://gentoo/texlive-module-spanish-mx-2017.tar.xz mirror://gentoo/texlive-module-texlive-es-2017.tar.xz mirror://gentoo/texlive-module-collection-langspanish-2017.tar.xz doc? ( mirror://gentoo/texlive-module-babel-catalan.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-galician.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-spanglish.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-spanish.doc-2017.tar.xz mirror://gentoo/texlive-module-es-tex-faq.doc-2017.tar.xz mirror://gentoo/texlive-module-hyphen-spanish.doc-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-spanish.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-spanish.doc-2017.tar.xz mirror://gentoo/texlive-module-latexcheat-esmx.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-spanish.doc-2017.tar.xz mirror://gentoo/texlive-module-spanish-mx.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-es.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-catalan.source-2017.tar.xz mirror://gentoo/texlive-module-babel-galician.source-2017.tar.xz mirror://gentoo/texlive-module-babel-spanish.source-2017.tar.xz mirror://gentoo/texlive-module-hyphen-galician.source-2017.tar.xz mirror://gentoo/texlive-module-hyphen-spanish.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e90de670693efa7f46c6f41b6a4ada7d
+_md5_=3703ab30f5d8060812a89b804fe4bdb9
diff --git a/metadata/md5-cache/dev-texlive/texlive-latex-2017 b/metadata/md5-cache/dev-texlive/texlive-latex-2017
index 5b75427f3f4d..48c324f3c8e7 100644
--- a/metadata/md5-cache/dev-texlive/texlive-latex-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-latex-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive LaTeX fundamental packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LPPL-1.3 public-domain
 RDEPEND=>=dev-texlive/texlive-basic-2017 !!<dev-texlive/texlive-latex-2016 !<dev-texlive/texlive-context-2010 !<dev-texlive/texlive-latexrecommended-2014 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-ae-2017.tar.xz mirror://gentoo/texlive-module-amscls-2017.tar.xz mirror://gentoo/texlive-module-amsmath-2017.tar.xz mirror://gentoo/texlive-module-babel-2017.tar.xz mirror://gentoo/texlive-module-babel-english-2017.tar.xz mirror://gentoo/texlive-module-babelbib-2017.tar.xz mirror://gentoo/texlive-module-carlisle-2017.tar.xz mirror://gentoo/texlive-module-colortbl-2017.tar.xz mirror://gentoo/texlive-module-fancyhdr-2017.tar.xz mirror://gentoo/texlive-module-fix2col-2017.tar.xz mirror://gentoo/texlive-module-geometry-2017.tar.xz mirror://gentoo/texlive-module-graphics-2017.tar.xz mirror://gentoo/texlive-module-graphics-cfg-2017.tar.xz mirror://gentoo/texlive-module-hyperref-2017.tar.xz mirror://gentoo/texlive-module-latex-2017.tar.xz mirror://gentoo/texlive-module-latex-bin-2017.tar.xz mirror://gentoo/texlive-module-latex-fonts-2017.tar.xz mirror://gentoo/texlive-module-latexconfig-2017.tar.xz mirror://gentoo/texlive-module-ltxmisc-2017.tar.xz mirror://gentoo/texlive-module-mfnfss-2017.tar.xz mirror://gentoo/texlive-module-mptopdf-2017.tar.xz mirror://gentoo/texlive-module-natbib-2017.tar.xz mirror://gentoo/texlive-module-oberdiek-2017.tar.xz mirror://gentoo/texlive-module-pslatex-2017.tar.xz mirror://gentoo/texlive-module-psnfss-2017.tar.xz mirror://gentoo/texlive-module-pspicture-2017.tar.xz mirror://gentoo/texlive-module-tools-2017.tar.xz mirror://gentoo/texlive-module-url-2017.tar.xz mirror://gentoo/texlive-module-collection-latex-2017.tar.xz doc? ( mirror://gentoo/texlive-module-ae.doc-2017.tar.xz mirror://gentoo/texlive-module-amscls.doc-2017.tar.xz mirror://gentoo/texlive-module-amsmath.doc-2017.tar.xz mirror://gentoo/texlive-module-babel.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-english.doc-2017.tar.xz mirror://gentoo/texlive-module-babelbib.doc-2017.tar.xz mirror://gentoo/texlive-module-carlisle.doc-2017.tar.xz mirror://gentoo/texlive-module-colortbl.doc-2017.tar.xz mirror://gentoo/texlive-module-fancyhdr.doc-2017.tar.xz mirror://gentoo/texlive-module-fix2col.doc-2017.tar.xz mirror://gentoo/texlive-module-geometry.doc-2017.tar.xz mirror://gentoo/texlive-module-graphics.doc-2017.tar.xz mirror://gentoo/texlive-module-graphics-cfg.doc-2017.tar.xz mirror://gentoo/texlive-module-hyperref.doc-2017.tar.xz mirror://gentoo/texlive-module-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-bin.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-fonts.doc-2017.tar.xz mirror://gentoo/texlive-module-mfnfss.doc-2017.tar.xz mirror://gentoo/texlive-module-mptopdf.doc-2017.tar.xz mirror://gentoo/texlive-module-natbib.doc-2017.tar.xz mirror://gentoo/texlive-module-oberdiek.doc-2017.tar.xz mirror://gentoo/texlive-module-psnfss.doc-2017.tar.xz mirror://gentoo/texlive-module-pspicture.doc-2017.tar.xz mirror://gentoo/texlive-module-tools.doc-2017.tar.xz mirror://gentoo/texlive-module-url.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-ae.source-2017.tar.xz mirror://gentoo/texlive-module-amscls.source-2017.tar.xz mirror://gentoo/texlive-module-amsmath.source-2017.tar.xz mirror://gentoo/texlive-module-babel.source-2017.tar.xz mirror://gentoo/texlive-module-babel-english.source-2017.tar.xz mirror://gentoo/texlive-module-carlisle.source-2017.tar.xz mirror://gentoo/texlive-module-colortbl.source-2017.tar.xz mirror://gentoo/texlive-module-fix2col.source-2017.tar.xz mirror://gentoo/texlive-module-geometry.source-2017.tar.xz mirror://gentoo/texlive-module-graphics.source-2017.tar.xz mirror://gentoo/texlive-module-hyperref.source-2017.tar.xz mirror://gentoo/texlive-module-latex.source-2017.tar.xz mirror://gentoo/texlive-module-mfnfss.source-2017.tar.xz mirror://gentoo/texlive-module-natbib.source-2017.tar.xz mirror://gentoo/texlive-module-oberdiek.source-2017.tar.xz mirror://gentoo/texlive-module-pslatex.source-2017.tar.xz mirror://gentoo/texlive-module-psnfss.source-2017.tar.xz mirror://gentoo/texlive-module-pspicture.source-2017.tar.xz mirror://gentoo/texlive-module-tools.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=35fdded5fd4596af31051fa0a93630ff
+_md5_=6f434b82ed287160d4c7a4dc95c2d0bb
diff --git a/metadata/md5-cache/dev-texlive/texlive-latexextra-2017 b/metadata/md5-cache/dev-texlive/texlive-latexextra-2017
index 51534dbff8ca..b5fbfb7ab058 100644
--- a/metadata/md5-cache/dev-texlive/texlive-latexextra-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-latexextra-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive LaTeX additional packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 Artistic BSD GPL-1 GPL-2 GPL-3 GPL-3+ LGPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-latexrecommended-2017 >=dev-texlive/texlive-pictures-2017 >=dev-texlive/texlive-fontsrecommended-2014 !dev-tex/achemso !dev-tex/prosper !dev-tex/ha-prosper !dev-tex/texpower !dev-tex/cdcover !dev-tex/ppower4 !=dev-texlive/texlive-latexrecommended-2007* !=dev-texlive/texlive-latex3-2007* !<dev-texlive/texlive-humanities-2014 !<dev-texlive/texlive-mathextra-2010 !<dev-texlive/texlive-plainextra-2010 !<dev-texlive/texlive-pictures-2013 dev-perl/Spreadsheet-ParseExcel >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-2up-2017.tar.xz mirror://gentoo/texlive-module-ESIEEcv-2017.tar.xz mirror://gentoo/texlive-module-GS1-2017.tar.xz mirror://gentoo/texlive-module-HA-prosper-2017.tar.xz mirror://gentoo/texlive-module-Tabbing-2017.tar.xz mirror://gentoo/texlive-module-a0poster-2017.tar.xz mirror://gentoo/texlive-module-a4wide-2017.tar.xz mirror://gentoo/texlive-module-a5comb-2017.tar.xz mirror://gentoo/texlive-module-abraces-2017.tar.xz mirror://gentoo/texlive-module-abstract-2017.tar.xz mirror://gentoo/texlive-module-achemso-2017.tar.xz mirror://gentoo/texlive-module-acro-2017.tar.xz mirror://gentoo/texlive-module-acronym-2017.tar.xz mirror://gentoo/texlive-module-acroterm-2017.tar.xz mirror://gentoo/texlive-module-actuarialangle-2017.tar.xz mirror://gentoo/texlive-module-actuarialsymbol-2017.tar.xz mirror://gentoo/texlive-module-addfont-2017.tar.xz mirror://gentoo/texlive-module-addlines-2017.tar.xz mirror://gentoo/texlive-module-adjmulticol-2017.tar.xz mirror://gentoo/texlive-module-adjustbox-2017.tar.xz mirror://gentoo/texlive-module-adrconv-2017.tar.xz mirror://gentoo/texlive-module-advdate-2017.tar.xz mirror://gentoo/texlive-module-akktex-2017.tar.xz mirror://gentoo/texlive-module-akletter-2017.tar.xz mirror://gentoo/texlive-module-alertmessage-2017.tar.xz mirror://gentoo/texlive-module-alnumsec-2017.tar.xz mirror://gentoo/texlive-module-alterqcm-2017.tar.xz mirror://gentoo/texlive-module-altfont-2017.tar.xz mirror://gentoo/texlive-module-amsaddr-2017.tar.xz mirror://gentoo/texlive-module-animate-2017.tar.xz mirror://gentoo/texlive-module-anonchap-2017.tar.xz mirror://gentoo/texlive-module-answers-2017.tar.xz mirror://gentoo/texlive-module-anyfontsize-2017.tar.xz mirror://gentoo/texlive-module-appendix-2017.tar.xz mirror://gentoo/texlive-module-appendixnumberbeamer-2017.tar.xz mirror://gentoo/texlive-module-apptools-2017.tar.xz mirror://gentoo/texlive-module-arcs-2017.tar.xz mirror://gentoo/texlive-module-arrayjobx-2017.tar.xz mirror://gentoo/texlive-module-arraysort-2017.tar.xz mirror://gentoo/texlive-module-arydshln-2017.tar.xz mirror://gentoo/texlive-module-asciilist-2017.tar.xz mirror://gentoo/texlive-module-assignment-2017.tar.xz mirror://gentoo/texlive-module-assoccnt-2017.tar.xz mirror://gentoo/texlive-module-attachfile-2017.tar.xz mirror://gentoo/texlive-module-aurl-2017.tar.xz mirror://gentoo/texlive-module-authoraftertitle-2017.tar.xz mirror://gentoo/texlive-module-authorindex-2017.tar.xz mirror://gentoo/texlive-module-autonum-2017.tar.xz mirror://gentoo/texlive-module-autopdf-2017.tar.xz mirror://gentoo/texlive-module-avremu-2017.tar.xz mirror://gentoo/texlive-module-background-2017.tar.xz mirror://gentoo/texlive-module-bankstatement-2017.tar.xz mirror://gentoo/texlive-module-bashful-2017.tar.xz mirror://gentoo/texlive-module-basicarith-2017.tar.xz mirror://gentoo/texlive-module-bchart-2017.tar.xz mirror://gentoo/texlive-module-beamer2thesis-2017.tar.xz mirror://gentoo/texlive-module-beameraudience-2017.tar.xz mirror://gentoo/texlive-module-beamercolorthemeowl-2017.tar.xz mirror://gentoo/texlive-module-beamerdarkthemes-2017.tar.xz mirror://gentoo/texlive-module-beamerposter-2017.tar.xz mirror://gentoo/texlive-module-beamersubframe-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-cuerna-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-detlevcm-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-epyt-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-metropolis-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-phnompenh-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-upenn-bc-2017.tar.xz mirror://gentoo/texlive-module-beamerthemejltree-2017.tar.xz mirror://gentoo/texlive-module-beamerthemenirma-2017.tar.xz mirror://gentoo/texlive-module-beton-2017.tar.xz mirror://gentoo/texlive-module-bewerbung-2017.tar.xz mirror://gentoo/texlive-module-bez123-2017.tar.xz mirror://gentoo/texlive-module-bezos-2017.tar.xz mirror://gentoo/texlive-module-bhcexam-2017.tar.xz mirror://gentoo/texlive-module-bibletext-2017.tar.xz mirror://gentoo/texlive-module-bigfoot-2017.tar.xz mirror://gentoo/texlive-module-bigints-2017.tar.xz mirror://gentoo/texlive-module-biochemistry-colors-2017.tar.xz mirror://gentoo/texlive-module-bizcard-2017.tar.xz mirror://gentoo/texlive-module-blindtext-2017.tar.xz mirror://gentoo/texlive-module-blkarray-2017.tar.xz mirror://gentoo/texlive-module-block-2017.tar.xz mirror://gentoo/texlive-module-bnumexpr-2017.tar.xz mirror://gentoo/texlive-module-boites-2017.tar.xz mirror://gentoo/texlive-module-bold-extra-2017.tar.xz mirror://gentoo/texlive-module-bookcover-2017.tar.xz mirror://gentoo/texlive-module-bookest-2017.tar.xz mirror://gentoo/texlive-module-booklet-2017.tar.xz mirror://gentoo/texlive-module-boolexpr-2017.tar.xz mirror://gentoo/texlive-module-bophook-2017.tar.xz mirror://gentoo/texlive-module-boxedminipage-2017.tar.xz mirror://gentoo/texlive-module-boxedminipage2e-2017.tar.xz mirror://gentoo/texlive-module-boxhandler-2017.tar.xz mirror://gentoo/texlive-module-bracketkey-2017.tar.xz mirror://gentoo/texlive-module-braket-2017.tar.xz mirror://gentoo/texlive-module-breakurl-2017.tar.xz mirror://gentoo/texlive-module-bullcntr-2017.tar.xz mirror://gentoo/texlive-module-bussproofs-2017.tar.xz mirror://gentoo/texlive-module-bxdpx-beamer-2017.tar.xz mirror://gentoo/texlive-module-bxdvidriver-2017.tar.xz mirror://gentoo/texlive-module-bxenclose-2017.tar.xz mirror://gentoo/texlive-module-bxnewfont-2017.tar.xz mirror://gentoo/texlive-module-bxpapersize-2017.tar.xz mirror://gentoo/texlive-module-bxpdfver-2017.tar.xz mirror://gentoo/texlive-module-calcage-2017.tar.xz mirror://gentoo/texlive-module-calctab-2017.tar.xz mirror://gentoo/texlive-module-calculator-2017.tar.xz mirror://gentoo/texlive-module-calrsfs-2017.tar.xz mirror://gentoo/texlive-module-cals-2017.tar.xz mirror://gentoo/texlive-module-calxxxx-yyyy-2017.tar.xz mirror://gentoo/texlive-module-cancel-2017.tar.xz mirror://gentoo/texlive-module-canoniclayout-2017.tar.xz mirror://gentoo/texlive-module-capt-of-2017.tar.xz mirror://gentoo/texlive-module-captcont-2017.tar.xz mirror://gentoo/texlive-module-captdef-2017.tar.xz mirror://gentoo/texlive-module-carbohydrates-2017.tar.xz mirror://gentoo/texlive-module-cases-2017.tar.xz mirror://gentoo/texlive-module-casyl-2017.tar.xz mirror://gentoo/texlive-module-catchfilebetweentags-2017.tar.xz mirror://gentoo/texlive-module-catechis-2017.tar.xz mirror://gentoo/texlive-module-catoptions-2017.tar.xz mirror://gentoo/texlive-module-cbcoptic-2017.tar.xz mirror://gentoo/texlive-module-ccaption-2017.tar.xz mirror://gentoo/texlive-module-cclicenses-2017.tar.xz mirror://gentoo/texlive-module-cd-2017.tar.xz mirror://gentoo/texlive-module-cd-cover-2017.tar.xz mirror://gentoo/texlive-module-cdpbundl-2017.tar.xz mirror://gentoo/texlive-module-cellspace-2017.tar.xz mirror://gentoo/texlive-module-censor-2017.tar.xz mirror://gentoo/texlive-module-changebar-2017.tar.xz mirror://gentoo/texlive-module-changelayout-2017.tar.xz mirror://gentoo/texlive-module-changepage-2017.tar.xz mirror://gentoo/texlive-module-changes-2017.tar.xz mirror://gentoo/texlive-module-chappg-2017.tar.xz mirror://gentoo/texlive-module-chapterfolder-2017.tar.xz mirror://gentoo/texlive-module-chet-2017.tar.xz mirror://gentoo/texlive-module-chextras-2017.tar.xz mirror://gentoo/texlive-module-childdoc-2017.tar.xz mirror://gentoo/texlive-module-chkfloat-2017.tar.xz mirror://gentoo/texlive-module-chletter-2017.tar.xz mirror://gentoo/texlive-module-chngcntr-2017.tar.xz mirror://gentoo/texlive-module-chronology-2017.tar.xz mirror://gentoo/texlive-module-circ-2017.tar.xz mirror://gentoo/texlive-module-classics-2017.tar.xz mirror://gentoo/texlive-module-classpack-2017.tar.xz mirror://gentoo/texlive-module-clefval-2017.tar.xz mirror://gentoo/texlive-module-cleveref-2017.tar.xz mirror://gentoo/texlive-module-clipboard-2017.tar.xz mirror://gentoo/texlive-module-clock-2017.tar.xz mirror://gentoo/texlive-module-cmdstring-2017.tar.xz mirror://gentoo/texlive-module-cmdtrack-2017.tar.xz mirror://gentoo/texlive-module-cmsd-2017.tar.xz mirror://gentoo/texlive-module-cnltx-2017.tar.xz mirror://gentoo/texlive-module-cntformats-2017.tar.xz mirror://gentoo/texlive-module-cntperchap-2017.tar.xz mirror://gentoo/texlive-module-codedoc-2017.tar.xz mirror://gentoo/texlive-module-codepage-2017.tar.xz mirror://gentoo/texlive-module-codesection-2017.tar.xz mirror://gentoo/texlive-module-collcell-2017.tar.xz mirror://gentoo/texlive-module-collectbox-2017.tar.xz mirror://gentoo/texlive-module-colordoc-2017.tar.xz mirror://gentoo/texlive-module-colorinfo-2017.tar.xz mirror://gentoo/texlive-module-coloring-2017.tar.xz mirror://gentoo/texlive-module-colorspace-2017.tar.xz mirror://gentoo/texlive-module-colortab-2017.tar.xz mirror://gentoo/texlive-module-colorwav-2017.tar.xz mirror://gentoo/texlive-module-colorweb-2017.tar.xz mirror://gentoo/texlive-module-colourchange-2017.tar.xz mirror://gentoo/texlive-module-combelow-2017.tar.xz mirror://gentoo/texlive-module-combine-2017.tar.xz mirror://gentoo/texlive-module-comma-2017.tar.xz mirror://gentoo/texlive-module-commado-2017.tar.xz mirror://gentoo/texlive-module-comment-2017.tar.xz mirror://gentoo/texlive-module-concepts-2017.tar.xz mirror://gentoo/texlive-module-concprog-2017.tar.xz mirror://gentoo/texlive-module-constants-2017.tar.xz mirror://gentoo/texlive-module-continue-2017.tar.xz mirror://gentoo/texlive-module-contour-2017.tar.xz mirror://gentoo/texlive-module-contracard-2017.tar.xz mirror://gentoo/texlive-module-conv-xkv-2017.tar.xz mirror://gentoo/texlive-module-cooking-2017.tar.xz mirror://gentoo/texlive-module-cooking-units-2017.tar.xz mirror://gentoo/texlive-module-cool-2017.tar.xz mirror://gentoo/texlive-module-coollist-2017.tar.xz mirror://gentoo/texlive-module-coolstr-2017.tar.xz mirror://gentoo/texlive-module-coolthms-2017.tar.xz mirror://gentoo/texlive-module-cooltooltips-2017.tar.xz mirror://gentoo/texlive-module-coordsys-2017.tar.xz mirror://gentoo/texlive-module-copyedit-2017.tar.xz mirror://gentoo/texlive-module-copyrightbox-2017.tar.xz mirror://gentoo/texlive-module-coseoul-2017.tar.xz mirror://gentoo/texlive-module-counttexruns-2017.tar.xz mirror://gentoo/texlive-module-courseoutline-2017.tar.xz mirror://gentoo/texlive-module-coursepaper-2017.tar.xz mirror://gentoo/texlive-module-coverpage-2017.tar.xz mirror://gentoo/texlive-module-cprotect-2017.tar.xz mirror://gentoo/texlive-module-crbox-2017.tar.xz mirror://gentoo/texlive-module-crossreference-2017.tar.xz mirror://gentoo/texlive-module-csquotes-2017.tar.xz mirror://gentoo/texlive-module-css-colors-2017.tar.xz mirror://gentoo/texlive-module-csvsimple-2017.tar.xz mirror://gentoo/texlive-module-cuisine-2017.tar.xz mirror://gentoo/texlive-module-currfile-2017.tar.xz mirror://gentoo/texlive-module-cutwin-2017.tar.xz mirror://gentoo/texlive-module-cv-2017.tar.xz mirror://gentoo/texlive-module-cv4tw-2017.tar.xz mirror://gentoo/texlive-module-cweb-latex-2017.tar.xz mirror://gentoo/texlive-module-cyber-2017.tar.xz mirror://gentoo/texlive-module-cybercic-2017.tar.xz mirror://gentoo/texlive-module-dashbox-2017.tar.xz mirror://gentoo/texlive-module-dashrule-2017.tar.xz mirror://gentoo/texlive-module-dashundergaps-2017.tar.xz mirror://gentoo/texlive-module-dataref-2017.tar.xz mirror://gentoo/texlive-module-datatool-2017.tar.xz mirror://gentoo/texlive-module-dateiliste-2017.tar.xz mirror://gentoo/texlive-module-datenumber-2017.tar.xz mirror://gentoo/texlive-module-datetime-2017.tar.xz mirror://gentoo/texlive-module-datetime2-2017.tar.xz mirror://gentoo/texlive-module-datetime2-bahasai-2017.tar.xz mirror://gentoo/texlive-module-datetime2-basque-2017.tar.xz mirror://gentoo/texlive-module-datetime2-breton-2017.tar.xz mirror://gentoo/texlive-module-datetime2-bulgarian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-catalan-2017.tar.xz mirror://gentoo/texlive-module-datetime2-croatian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-czech-2017.tar.xz mirror://gentoo/texlive-module-datetime2-danish-2017.tar.xz mirror://gentoo/texlive-module-datetime2-dutch-2017.tar.xz mirror://gentoo/texlive-module-datetime2-en-fulltext-2017.tar.xz mirror://gentoo/texlive-module-datetime2-english-2017.tar.xz mirror://gentoo/texlive-module-datetime2-esperanto-2017.tar.xz mirror://gentoo/texlive-module-datetime2-estonian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-finnish-2017.tar.xz mirror://gentoo/texlive-module-datetime2-french-2017.tar.xz mirror://gentoo/texlive-module-datetime2-galician-2017.tar.xz mirror://gentoo/texlive-module-datetime2-german-2017.tar.xz mirror://gentoo/texlive-module-datetime2-greek-2017.tar.xz mirror://gentoo/texlive-module-datetime2-hebrew-2017.tar.xz mirror://gentoo/texlive-module-datetime2-icelandic-2017.tar.xz mirror://gentoo/texlive-module-datetime2-irish-2017.tar.xz mirror://gentoo/texlive-module-datetime2-italian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-it-fulltext-2017.tar.xz mirror://gentoo/texlive-module-datetime2-latin-2017.tar.xz mirror://gentoo/texlive-module-datetime2-lsorbian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-magyar-2017.tar.xz mirror://gentoo/texlive-module-datetime2-norsk-2017.tar.xz mirror://gentoo/texlive-module-datetime2-polish-2017.tar.xz mirror://gentoo/texlive-module-datetime2-portuges-2017.tar.xz mirror://gentoo/texlive-module-datetime2-romanian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-russian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-samin-2017.tar.xz mirror://gentoo/texlive-module-datetime2-scottish-2017.tar.xz mirror://gentoo/texlive-module-datetime2-serbian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-slovak-2017.tar.xz mirror://gentoo/texlive-module-datetime2-slovene-2017.tar.xz mirror://gentoo/texlive-module-datetime2-spanish-2017.tar.xz mirror://gentoo/texlive-module-datetime2-swedish-2017.tar.xz mirror://gentoo/texlive-module-datetime2-turkish-2017.tar.xz mirror://gentoo/texlive-module-datetime2-ukrainian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-usorbian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-welsh-2017.tar.xz mirror://gentoo/texlive-module-dblfloatfix-2017.tar.xz mirror://gentoo/texlive-module-decimal-2017.tar.xz mirror://gentoo/texlive-module-decorule-2017.tar.xz mirror://gentoo/texlive-module-delimtxt-2017.tar.xz mirror://gentoo/texlive-module-denisbdoc-2017.tar.xz mirror://gentoo/texlive-module-diagbox-2017.tar.xz mirror://gentoo/texlive-module-diagnose-2017.tar.xz mirror://gentoo/texlive-module-dialogl-2017.tar.xz mirror://gentoo/texlive-module-dichokey-2017.tar.xz mirror://gentoo/texlive-module-dinbrief-2017.tar.xz mirror://gentoo/texlive-module-directory-2017.tar.xz mirror://gentoo/texlive-module-dirtytalk-2017.tar.xz mirror://gentoo/texlive-module-dlfltxb-2017.tar.xz mirror://gentoo/texlive-module-dnaseq-2017.tar.xz mirror://gentoo/texlive-module-doclicense-2017.tar.xz mirror://gentoo/texlive-module-docmfp-2017.tar.xz mirror://gentoo/texlive-module-docmute-2017.tar.xz mirror://gentoo/texlive-module-doctools-2017.tar.xz mirror://gentoo/texlive-module-documentation-2017.tar.xz mirror://gentoo/texlive-module-doi-2017.tar.xz mirror://gentoo/texlive-module-dotarrow-2017.tar.xz mirror://gentoo/texlive-module-dotseqn-2017.tar.xz mirror://gentoo/texlive-module-download-2017.tar.xz mirror://gentoo/texlive-module-dox-2017.tar.xz mirror://gentoo/texlive-module-dpfloat-2017.tar.xz mirror://gentoo/texlive-module-dprogress-2017.tar.xz mirror://gentoo/texlive-module-drac-2017.tar.xz mirror://gentoo/texlive-module-draftcopy-2017.tar.xz mirror://gentoo/texlive-module-draftfigure-2017.tar.xz mirror://gentoo/texlive-module-draftwatermark-2017.tar.xz mirror://gentoo/texlive-module-dtk-2017.tar.xz mirror://gentoo/texlive-module-dtxdescribe-2017.tar.xz mirror://gentoo/texlive-module-dtxgallery-2017.tar.xz mirror://gentoo/texlive-module-dvdcoll-2017.tar.xz mirror://gentoo/texlive-module-dynamicnumber-2017.tar.xz mirror://gentoo/texlive-module-dynblocks-2017.tar.xz mirror://gentoo/texlive-module-ean13isbn-2017.tar.xz mirror://gentoo/texlive-module-easy-2017.tar.xz mirror://gentoo/texlive-module-easy-todo-2017.tar.xz mirror://gentoo/texlive-module-easyfig-2017.tar.xz mirror://gentoo/texlive-module-easyformat-2017.tar.xz mirror://gentoo/texlive-module-easylist-2017.tar.xz mirror://gentoo/texlive-module-easyreview-2017.tar.xz mirror://gentoo/texlive-module-ebezier-2017.tar.xz mirror://gentoo/texlive-module-ecclesiastic-2017.tar.xz mirror://gentoo/texlive-module-ecv-2017.tar.xz mirror://gentoo/texlive-module-ed-2017.tar.xz mirror://gentoo/texlive-module-edmargin-2017.tar.xz mirror://gentoo/texlive-module-eemeir-2017.tar.xz mirror://gentoo/texlive-module-efbox-2017.tar.xz mirror://gentoo/texlive-module-egplot-2017.tar.xz mirror://gentoo/texlive-module-elements-2017.tar.xz mirror://gentoo/texlive-module-ellipsis-2017.tar.xz mirror://gentoo/texlive-module-elmath-2017.tar.xz mirror://gentoo/texlive-module-elocalloc-2017.tar.xz mirror://gentoo/texlive-module-elpres-2017.tar.xz mirror://gentoo/texlive-module-elzcards-2017.tar.xz mirror://gentoo/texlive-module-emarks-2017.tar.xz mirror://gentoo/texlive-module-embedall-2017.tar.xz mirror://gentoo/texlive-module-embrac-2017.tar.xz mirror://gentoo/texlive-module-emptypage-2017.tar.xz mirror://gentoo/texlive-module-emulateapj-2017.tar.xz mirror://gentoo/texlive-module-endfloat-2017.tar.xz mirror://gentoo/texlive-module-endheads-2017.tar.xz mirror://gentoo/texlive-module-endnotes-2017.tar.xz mirror://gentoo/texlive-module-engpron-2017.tar.xz mirror://gentoo/texlive-module-engrec-2017.tar.xz mirror://gentoo/texlive-module-enotez-2017.tar.xz mirror://gentoo/texlive-module-enumitem-2017.tar.xz mirror://gentoo/texlive-module-enumitem-zref-2017.tar.xz mirror://gentoo/texlive-module-envbig-2017.tar.xz mirror://gentoo/texlive-module-environ-2017.tar.xz mirror://gentoo/texlive-module-epigraph-2017.tar.xz mirror://gentoo/texlive-module-epiolmec-2017.tar.xz mirror://gentoo/texlive-module-eqell-2017.tar.xz mirror://gentoo/texlive-module-eqlist-2017.tar.xz mirror://gentoo/texlive-module-eqnalign-2017.tar.xz mirror://gentoo/texlive-module-eqname-2017.tar.xz mirror://gentoo/texlive-module-eqparbox-2017.tar.xz mirror://gentoo/texlive-module-errata-2017.tar.xz mirror://gentoo/texlive-module-esami-2017.tar.xz mirror://gentoo/texlive-module-esdiff-2017.tar.xz mirror://gentoo/texlive-module-esint-2017.tar.xz mirror://gentoo/texlive-module-esint-type1-2017.tar.xz mirror://gentoo/texlive-module-etaremune-2017.tar.xz mirror://gentoo/texlive-module-etextools-2017.tar.xz mirror://gentoo/texlive-module-etoc-2017.tar.xz mirror://gentoo/texlive-module-etoolbox-2017.tar.xz mirror://gentoo/texlive-module-eukdate-2017.tar.xz mirror://gentoo/texlive-module-eulerpx-2017.tar.xz mirror://gentoo/texlive-module-europasscv-2017.tar.xz mirror://gentoo/texlive-module-everyhook-2017.tar.xz mirror://gentoo/texlive-module-everypage-2017.tar.xz mirror://gentoo/texlive-module-exam-2017.tar.xz mirror://gentoo/texlive-module-exam-n-2017.tar.xz mirror://gentoo/texlive-module-examdesign-2017.tar.xz mirror://gentoo/texlive-module-example-2017.tar.xz mirror://gentoo/texlive-module-examplep-2017.tar.xz mirror://gentoo/texlive-module-exceltex-2017.tar.xz mirror://gentoo/texlive-module-excludeonly-2017.tar.xz mirror://gentoo/texlive-module-exercise-2017.tar.xz mirror://gentoo/texlive-module-exercises-2017.tar.xz mirror://gentoo/texlive-module-exp-testopt-2017.tar.xz mirror://gentoo/texlive-module-expdlist-2017.tar.xz mirror://gentoo/texlive-module-export-2017.tar.xz mirror://gentoo/texlive-module-exsheets-2017.tar.xz mirror://gentoo/texlive-module-exsol-2017.tar.xz mirror://gentoo/texlive-module-extract-2017.tar.xz mirror://gentoo/texlive-module-facsimile-2017.tar.xz mirror://gentoo/texlive-module-factura-2017.tar.xz mirror://gentoo/texlive-module-fancylabel-2017.tar.xz mirror://gentoo/texlive-module-fancynum-2017.tar.xz mirror://gentoo/texlive-module-fancypar-2017.tar.xz mirror://gentoo/texlive-module-fancyslides-2017.tar.xz mirror://gentoo/texlive-module-fancytabs-2017.tar.xz mirror://gentoo/texlive-module-fancytooltips-2017.tar.xz mirror://gentoo/texlive-module-fcolumn-2017.tar.xz mirror://gentoo/texlive-module-ffslides-2017.tar.xz mirror://gentoo/texlive-module-fgruler-2017.tar.xz mirror://gentoo/texlive-module-fibeamer-2017.tar.xz mirror://gentoo/texlive-module-fifo-stack-2017.tar.xz mirror://gentoo/texlive-module-figsize-2017.tar.xz mirror://gentoo/texlive-module-filecontents-2017.tar.xz mirror://gentoo/texlive-module-filecontentsdef-2017.tar.xz mirror://gentoo/texlive-module-filedate-2017.tar.xz mirror://gentoo/texlive-module-fileinfo-2017.tar.xz mirror://gentoo/texlive-module-filemod-2017.tar.xz mirror://gentoo/texlive-module-fink-2017.tar.xz mirror://gentoo/texlive-module-finstrut-2017.tar.xz mirror://gentoo/texlive-module-fithesis-2017.tar.xz mirror://gentoo/texlive-module-fixcmex-2017.tar.xz mirror://gentoo/texlive-module-fixfoot-2017.tar.xz mirror://gentoo/texlive-module-fixme-2017.tar.xz mirror://gentoo/texlive-module-fixmetodonotes-2017.tar.xz mirror://gentoo/texlive-module-fjodor-2017.tar.xz mirror://gentoo/texlive-module-flabels-2017.tar.xz mirror://gentoo/texlive-module-flacards-2017.tar.xz mirror://gentoo/texlive-module-flagderiv-2017.tar.xz mirror://gentoo/texlive-module-flashcards-2017.tar.xz mirror://gentoo/texlive-module-flashmovie-2017.tar.xz mirror://gentoo/texlive-module-flipbook-2017.tar.xz mirror://gentoo/texlive-module-flippdf-2017.tar.xz mirror://gentoo/texlive-module-floatflt-2017.tar.xz mirror://gentoo/texlive-module-floatrow-2017.tar.xz mirror://gentoo/texlive-module-flowfram-2017.tar.xz mirror://gentoo/texlive-module-fmp-2017.tar.xz mirror://gentoo/texlive-module-fmtcount-2017.tar.xz mirror://gentoo/texlive-module-fn2end-2017.tar.xz mirror://gentoo/texlive-module-fnbreak-2017.tar.xz mirror://gentoo/texlive-module-fncychap-2017.tar.xz mirror://gentoo/texlive-module-fncylab-2017.tar.xz mirror://gentoo/texlive-module-fnpara-2017.tar.xz mirror://gentoo/texlive-module-fnpct-2017.tar.xz mirror://gentoo/texlive-module-fnumprint-2017.tar.xz mirror://gentoo/texlive-module-foilhtml-2017.tar.xz mirror://gentoo/texlive-module-fontaxes-2017.tar.xz mirror://gentoo/texlive-module-fonttable-2017.tar.xz mirror://gentoo/texlive-module-footmisc-2017.tar.xz mirror://gentoo/texlive-module-footmisx-2017.tar.xz mirror://gentoo/texlive-module-footnotebackref-2017.tar.xz mirror://gentoo/texlive-module-footnotehyper-2017.tar.xz mirror://gentoo/texlive-module-footnoterange-2017.tar.xz mirror://gentoo/texlive-module-footnpag-2017.tar.xz mirror://gentoo/texlive-module-forarray-2017.tar.xz mirror://gentoo/texlive-module-foreign-2017.tar.xz mirror://gentoo/texlive-module-forloop-2017.tar.xz mirror://gentoo/texlive-module-formlett-2017.tar.xz mirror://gentoo/texlive-module-formular-2017.tar.xz mirror://gentoo/texlive-module-fragments-2017.tar.xz mirror://gentoo/texlive-module-frame-2017.tar.xz mirror://gentoo/texlive-module-framed-2017.tar.xz mirror://gentoo/texlive-module-frankenstein-2017.tar.xz mirror://gentoo/texlive-module-frege-2017.tar.xz mirror://gentoo/texlive-module-ftcap-2017.tar.xz mirror://gentoo/texlive-module-ftnxtra-2017.tar.xz mirror://gentoo/texlive-module-fullblck-2017.tar.xz mirror://gentoo/texlive-module-fullminipage-2017.tar.xz mirror://gentoo/texlive-module-fullwidth-2017.tar.xz mirror://gentoo/texlive-module-fundus-calligra-2017.tar.xz mirror://gentoo/texlive-module-fundus-cyr-2017.tar.xz mirror://gentoo/texlive-module-fundus-sueterlin-2017.tar.xz mirror://gentoo/texlive-module-fvextra-2017.tar.xz mirror://gentoo/texlive-module-fwlw-2017.tar.xz mirror://gentoo/texlive-module-gauss-2017.tar.xz mirror://gentoo/texlive-module-gcard-2017.tar.xz mirror://gentoo/texlive-module-gcite-2017.tar.xz mirror://gentoo/texlive-module-gender-2017.tar.xz mirror://gentoo/texlive-module-genmpage-2017.tar.xz mirror://gentoo/texlive-module-getfiledate-2017.tar.xz mirror://gentoo/texlive-module-getitems-2017.tar.xz mirror://gentoo/texlive-module-ginpenc-2017.tar.xz mirror://gentoo/texlive-module-gitfile-info-2017.tar.xz mirror://gentoo/texlive-module-gitinfo-2017.tar.xz mirror://gentoo/texlive-module-gitinfo2-2017.tar.xz mirror://gentoo/texlive-module-gitlog-2017.tar.xz mirror://gentoo/texlive-module-gloss-2017.tar.xz mirror://gentoo/texlive-module-glossaries-danish-2017.tar.xz mirror://gentoo/texlive-module-glossaries-dutch-2017.tar.xz mirror://gentoo/texlive-module-glossaries-english-2017.tar.xz mirror://gentoo/texlive-module-glossaries-extra-2017.tar.xz mirror://gentoo/texlive-module-glossaries-french-2017.tar.xz mirror://gentoo/texlive-module-glossaries-german-2017.tar.xz mirror://gentoo/texlive-module-glossaries-irish-2017.tar.xz mirror://gentoo/texlive-module-glossaries-italian-2017.tar.xz mirror://gentoo/texlive-module-glossaries-magyar-2017.tar.xz mirror://gentoo/texlive-module-glossaries-polish-2017.tar.xz mirror://gentoo/texlive-module-glossaries-portuges-2017.tar.xz mirror://gentoo/texlive-module-glossaries-serbian-2017.tar.xz mirror://gentoo/texlive-module-glossaries-spanish-2017.tar.xz mirror://gentoo/texlive-module-gmdoc-2017.tar.xz mirror://gentoo/texlive-module-gmdoc-enhance-2017.tar.xz mirror://gentoo/texlive-module-gmiflink-2017.tar.xz mirror://gentoo/texlive-module-gmutils-2017.tar.xz mirror://gentoo/texlive-module-gmverb-2017.tar.xz mirror://gentoo/texlive-module-graphbox-2017.tar.xz mirror://gentoo/texlive-module-graphicx-psmin-2017.tar.xz mirror://gentoo/texlive-module-graphicxbox-2017.tar.xz mirror://gentoo/texlive-module-grayhints-2017.tar.xz mirror://gentoo/texlive-module-grfpaste-2017.tar.xz mirror://gentoo/texlive-module-grid-2017.tar.xz mirror://gentoo/texlive-module-grid-system-2017.tar.xz mirror://gentoo/texlive-module-gridset-2017.tar.xz mirror://gentoo/texlive-module-guitlogo-2017.tar.xz mirror://gentoo/texlive-module-halloweenmath-2017.tar.xz mirror://gentoo/texlive-module-handout-2017.tar.xz mirror://gentoo/texlive-module-hang-2017.tar.xz mirror://gentoo/texlive-module-hanging-2017.tar.xz mirror://gentoo/texlive-module-hardwrap-2017.tar.xz mirror://gentoo/texlive-module-harnon-cv-2017.tar.xz mirror://gentoo/texlive-module-harpoon-2017.tar.xz mirror://gentoo/texlive-module-hc-2017.tar.xz mirror://gentoo/texlive-module-he-she-2017.tar.xz mirror://gentoo/texlive-module-hhtensor-2017.tar.xz mirror://gentoo/texlive-module-histogr-2017.tar.xz mirror://gentoo/texlive-module-hitec-2017.tar.xz mirror://gentoo/texlive-module-hletter-2017.tar.xz mirror://gentoo/texlive-module-hpsdiss-2017.tar.xz mirror://gentoo/texlive-module-hrefhide-2017.tar.xz mirror://gentoo/texlive-module-hvindex-2017.tar.xz mirror://gentoo/texlive-module-hypdvips-2017.tar.xz mirror://gentoo/texlive-module-hyper-2017.tar.xz mirror://gentoo/texlive-module-hypernat-2017.tar.xz mirror://gentoo/texlive-module-hyperref-docsrc-2017.tar.xz mirror://gentoo/texlive-module-hyperxmp-2017.tar.xz mirror://gentoo/texlive-module-hyphenat-2017.tar.xz mirror://gentoo/texlive-module-idxcmds-2017.tar.xz mirror://gentoo/texlive-module-idxlayout-2017.tar.xz mirror://gentoo/texlive-module-iffont-2017.tar.xz mirror://gentoo/texlive-module-ifmslide-2017.tar.xz mirror://gentoo/texlive-module-ifmtarg-2017.tar.xz mirror://gentoo/texlive-module-ifnextok-2017.tar.xz mirror://gentoo/texlive-module-ifoddpage-2017.tar.xz mirror://gentoo/texlive-module-ifplatform-2017.tar.xz mirror://gentoo/texlive-module-ifthenx-2017.tar.xz mirror://gentoo/texlive-module-iitem-2017.tar.xz mirror://gentoo/texlive-module-image-gallery-2017.tar.xz mirror://gentoo/texlive-module-imakeidx-2017.tar.xz mirror://gentoo/texlive-module-import-2017.tar.xz mirror://gentoo/texlive-module-incgraph-2017.tar.xz mirror://gentoo/texlive-module-indextools-2017.tar.xz mirror://gentoo/texlive-module-inlinedef-2017.tar.xz mirror://gentoo/texlive-module-inputtrc-2017.tar.xz mirror://gentoo/texlive-module-interactiveworkbook-2017.tar.xz mirror://gentoo/texlive-module-interfaces-2017.tar.xz mirror://gentoo/texlive-module-inversepath-2017.tar.xz mirror://gentoo/texlive-module-invoice-2017.tar.xz mirror://gentoo/texlive-module-iso-2017.tar.xz mirror://gentoo/texlive-module-iso10303-2017.tar.xz mirror://gentoo/texlive-module-isodate-2017.tar.xz mirror://gentoo/texlive-module-isodoc-2017.tar.xz mirror://gentoo/texlive-module-isonums-2017.tar.xz mirror://gentoo/texlive-module-isorot-2017.tar.xz mirror://gentoo/texlive-module-isotope-2017.tar.xz mirror://gentoo/texlive-module-issuulinks-2017.tar.xz mirror://gentoo/texlive-module-iwhdp-2017.tar.xz mirror://gentoo/texlive-module-jlabels-2017.tar.xz mirror://gentoo/texlive-module-jslectureplanner-2017.tar.xz mirror://gentoo/texlive-module-jumplines-2017.tar.xz mirror://gentoo/texlive-module-jvlisting-2017.tar.xz mirror://gentoo/texlive-module-kantlipsum-2017.tar.xz mirror://gentoo/texlive-module-kerntest-2017.tar.xz mirror://gentoo/texlive-module-keycommand-2017.tar.xz mirror://gentoo/texlive-module-keyfloat-2017.tar.xz mirror://gentoo/texlive-module-keyreader-2017.tar.xz mirror://gentoo/texlive-module-keystroke-2017.tar.xz mirror://gentoo/texlive-module-keyval2e-2017.tar.xz mirror://gentoo/texlive-module-keyvaltable-2017.tar.xz mirror://gentoo/texlive-module-kix-2017.tar.xz mirror://gentoo/texlive-module-koma-moderncvclassic-2017.tar.xz mirror://gentoo/texlive-module-koma-script-sfs-2017.tar.xz mirror://gentoo/texlive-module-komacv-2017.tar.xz mirror://gentoo/texlive-module-ktv-texdata-2017.tar.xz mirror://gentoo/texlive-module-l3build-2017.tar.xz mirror://gentoo/texlive-module-labbook-2017.tar.xz mirror://gentoo/texlive-module-labels-2017.tar.xz mirror://gentoo/texlive-module-lastpackage-2017.tar.xz mirror://gentoo/texlive-module-lastpage-2017.tar.xz mirror://gentoo/texlive-module-latex-tds-2017.tar.xz mirror://gentoo/texlive-module-latexdemo-2017.tar.xz mirror://gentoo/texlive-module-latexgit-2017.tar.xz mirror://gentoo/texlive-module-layouts-2017.tar.xz mirror://gentoo/texlive-module-lazylist-2017.tar.xz mirror://gentoo/texlive-module-lcd-2017.tar.xz mirror://gentoo/texlive-module-lcg-2017.tar.xz mirror://gentoo/texlive-module-leading-2017.tar.xz mirror://gentoo/texlive-module-leftidx-2017.tar.xz mirror://gentoo/texlive-module-lengthconvert-2017.tar.xz mirror://gentoo/texlive-module-lettre-2017.tar.xz mirror://gentoo/texlive-module-lettrine-2017.tar.xz mirror://gentoo/texlive-module-lewis-2017.tar.xz mirror://gentoo/texlive-module-lhelp-2017.tar.xz mirror://gentoo/texlive-module-libgreek-2017.tar.xz mirror://gentoo/texlive-module-limap-2017.tar.xz mirror://gentoo/texlive-module-linegoal-2017.tar.xz mirror://gentoo/texlive-module-linop-2017.tar.xz mirror://gentoo/texlive-module-lipsum-2017.tar.xz mirror://gentoo/texlive-module-lisp-on-tex-2017.tar.xz mirror://gentoo/texlive-module-listing-2017.tar.xz mirror://gentoo/texlive-module-listlbls-2017.tar.xz mirror://gentoo/texlive-module-listliketab-2017.tar.xz mirror://gentoo/texlive-module-listofsymbols-2017.tar.xz mirror://gentoo/texlive-module-lkproof-2017.tar.xz mirror://gentoo/texlive-module-lmake-2017.tar.xz mirror://gentoo/texlive-module-locality-2017.tar.xz mirror://gentoo/texlive-module-localloc-2017.tar.xz mirror://gentoo/texlive-module-logbox-2017.tar.xz mirror://gentoo/texlive-module-logical-markup-utils-2017.tar.xz mirror://gentoo/texlive-module-logpap-2017.tar.xz mirror://gentoo/texlive-module-longfbox-2017.tar.xz mirror://gentoo/texlive-module-longfigure-2017.tar.xz mirror://gentoo/texlive-module-longnamefilelist-2017.tar.xz mirror://gentoo/texlive-module-loops-2017.tar.xz mirror://gentoo/texlive-module-lsc-2017.tar.xz mirror://gentoo/texlive-module-lstaddons-2017.tar.xz mirror://gentoo/texlive-module-lt3graph-2017.tar.xz mirror://gentoo/texlive-module-ltablex-2017.tar.xz mirror://gentoo/texlive-module-ltabptch-2017.tar.xz mirror://gentoo/texlive-module-ltxdockit-2017.tar.xz mirror://gentoo/texlive-module-ltxindex-2017.tar.xz mirror://gentoo/texlive-module-ltxkeys-2017.tar.xz mirror://gentoo/texlive-module-ltxnew-2017.tar.xz mirror://gentoo/texlive-module-ltxtools-2017.tar.xz mirror://gentoo/texlive-module-macroswap-2017.tar.xz mirror://gentoo/texlive-module-magaz-2017.tar.xz mirror://gentoo/texlive-module-mailing-2017.tar.xz mirror://gentoo/texlive-module-mailmerge-2017.tar.xz mirror://gentoo/texlive-module-makebarcode-2017.tar.xz mirror://gentoo/texlive-module-makebase-2017.tar.xz mirror://gentoo/texlive-module-makebox-2017.tar.xz mirror://gentoo/texlive-module-makecell-2017.tar.xz mirror://gentoo/texlive-module-makecirc-2017.tar.xz mirror://gentoo/texlive-module-makecmds-2017.tar.xz mirror://gentoo/texlive-module-makedtx-2017.tar.xz mirror://gentoo/texlive-module-makeglos-2017.tar.xz mirror://gentoo/texlive-module-mandi-2017.tar.xz mirror://gentoo/texlive-module-manfnt-2017.tar.xz mirror://gentoo/texlive-module-manuscript-2017.tar.xz mirror://gentoo/texlive-module-marginfix-2017.tar.xz mirror://gentoo/texlive-module-marginnote-2017.tar.xz mirror://gentoo/texlive-module-markdown-2017.tar.xz mirror://gentoo/texlive-module-mathalfa-2017.tar.xz mirror://gentoo/texlive-module-mathastext-2017.tar.xz mirror://gentoo/texlive-module-mathexam-2017.tar.xz mirror://gentoo/texlive-module-maybemath-2017.tar.xz mirror://gentoo/texlive-module-mbenotes-2017.tar.xz mirror://gentoo/texlive-module-mcaption-2017.tar.xz mirror://gentoo/texlive-module-mceinleger-2017.tar.xz mirror://gentoo/texlive-module-mcexam-2017.tar.xz mirror://gentoo/texlive-module-mcite-2017.tar.xz mirror://gentoo/texlive-module-mciteplus-2017.tar.xz mirror://gentoo/texlive-module-mdframed-2017.tar.xz mirror://gentoo/texlive-module-media9-2017.tar.xz mirror://gentoo/texlive-module-medstarbeamer-2017.tar.xz mirror://gentoo/texlive-module-meetingmins-2017.tar.xz mirror://gentoo/texlive-module-memexsupp-2017.tar.xz mirror://gentoo/texlive-module-memory-2017.tar.xz mirror://gentoo/texlive-module-menu-2017.tar.xz mirror://gentoo/texlive-module-menukeys-2017.tar.xz mirror://gentoo/texlive-module-method-2017.tar.xz mirror://gentoo/texlive-module-metre-2017.tar.xz mirror://gentoo/texlive-module-mfirstuc-2017.tar.xz mirror://gentoo/texlive-module-mftinc-2017.tar.xz mirror://gentoo/texlive-module-midpage-2017.tar.xz mirror://gentoo/texlive-module-minibox-2017.tar.xz mirror://gentoo/texlive-module-minidocument-2017.tar.xz mirror://gentoo/texlive-module-minifp-2017.tar.xz mirror://gentoo/texlive-module-minipage-marginpar-2017.tar.xz mirror://gentoo/texlive-module-minitoc-2017.tar.xz mirror://gentoo/texlive-module-minorrevision-2017.tar.xz mirror://gentoo/texlive-module-minted-2017.tar.xz mirror://gentoo/texlive-module-minutes-2017.tar.xz mirror://gentoo/texlive-module-mla-paper-2017.tar.xz mirror://gentoo/texlive-module-mlist-2017.tar.xz mirror://gentoo/texlive-module-mmap-2017.tar.xz mirror://gentoo/texlive-module-mnotes-2017.tar.xz mirror://gentoo/texlive-module-moderncv-2017.tar.xz mirror://gentoo/texlive-module-moderntimeline-2017.tar.xz mirror://gentoo/texlive-module-modref-2017.tar.xz mirror://gentoo/texlive-module-modroman-2017.tar.xz mirror://gentoo/texlive-module-modular-2017.tar.xz mirror://gentoo/texlive-module-monofill-2017.tar.xz mirror://gentoo/texlive-module-moodle-2017.tar.xz mirror://gentoo/texlive-module-moreenum-2017.tar.xz mirror://gentoo/texlive-module-morefloats-2017.tar.xz mirror://gentoo/texlive-module-morehype-2017.tar.xz mirror://gentoo/texlive-module-moresize-2017.tar.xz mirror://gentoo/texlive-module-moreverb-2017.tar.xz mirror://gentoo/texlive-module-morewrites-2017.tar.xz mirror://gentoo/texlive-module-movie15-2017.tar.xz mirror://gentoo/texlive-module-mparhack-2017.tar.xz mirror://gentoo/texlive-module-mpostinl-2017.tar.xz mirror://gentoo/texlive-module-msc-2017.tar.xz mirror://gentoo/texlive-module-msg-2017.tar.xz mirror://gentoo/texlive-module-mslapa-2017.tar.xz mirror://gentoo/texlive-module-mtgreek-2017.tar.xz mirror://gentoo/texlive-module-multenum-2017.tar.xz mirror://gentoo/texlive-module-multiaudience-2017.tar.xz mirror://gentoo/texlive-module-multibbl-2017.tar.xz mirror://gentoo/texlive-module-multicap-2017.tar.xz mirror://gentoo/texlive-module-multidef-2017.tar.xz mirror://gentoo/texlive-module-multienv-2017.tar.xz mirror://gentoo/texlive-module-multiexpand-2017.tar.xz mirror://gentoo/texlive-module-multirow-2017.tar.xz mirror://gentoo/texlive-module-mversion-2017.tar.xz mirror://gentoo/texlive-module-mwe-2017.tar.xz mirror://gentoo/texlive-module-mycv-2017.tar.xz mirror://gentoo/texlive-module-mylatexformat-2017.tar.xz mirror://gentoo/texlive-module-nag-2017.tar.xz mirror://gentoo/texlive-module-nameauth-2017.tar.xz mirror://gentoo/texlive-module-namespc-2017.tar.xz mirror://gentoo/texlive-module-ncclatex-2017.tar.xz mirror://gentoo/texlive-module-ncctools-2017.tar.xz mirror://gentoo/texlive-module-needspace-2017.tar.xz mirror://gentoo/texlive-module-nestquot-2017.tar.xz mirror://gentoo/texlive-module-newcommand-2017.tar.xz mirror://gentoo/texlive-module-newenviron-2017.tar.xz mirror://gentoo/texlive-module-newfile-2017.tar.xz mirror://gentoo/texlive-module-newlfm-2017.tar.xz mirror://gentoo/texlive-module-newspaper-2017.tar.xz mirror://gentoo/texlive-module-newunicodechar-2017.tar.xz mirror://gentoo/texlive-module-newvbtm-2017.tar.xz mirror://gentoo/texlive-module-newverbs-2017.tar.xz mirror://gentoo/texlive-module-nextpage-2017.tar.xz mirror://gentoo/texlive-module-nfssext-cfr-2017.tar.xz mirror://gentoo/texlive-module-nicefilelist-2017.tar.xz mirror://gentoo/texlive-module-niceframe-2017.tar.xz mirror://gentoo/texlive-module-nicetext-2017.tar.xz mirror://gentoo/texlive-module-nlctdoc-2017.tar.xz mirror://gentoo/texlive-module-noconflict-2017.tar.xz mirror://gentoo/texlive-module-noindentafter-2017.tar.xz mirror://gentoo/texlive-module-noitcrul-2017.tar.xz mirror://gentoo/texlive-module-nolbreaks-2017.tar.xz mirror://gentoo/texlive-module-nomencl-2017.tar.xz mirror://gentoo/texlive-module-nomentbl-2017.tar.xz mirror://gentoo/texlive-module-nonfloat-2017.tar.xz mirror://gentoo/texlive-module-nonumonpart-2017.tar.xz mirror://gentoo/texlive-module-nopageno-2017.tar.xz mirror://gentoo/texlive-module-normalcolor-2017.tar.xz mirror://gentoo/texlive-module-notes-2017.tar.xz mirror://gentoo/texlive-module-notespages-2017.tar.xz mirror://gentoo/texlive-module-notoccite-2017.tar.xz mirror://gentoo/texlive-module-nowidow-2017.tar.xz mirror://gentoo/texlive-module-nox-2017.tar.xz mirror://gentoo/texlive-module-ntheorem-2017.tar.xz mirror://gentoo/texlive-module-numberedblock-2017.tar.xz mirror://gentoo/texlive-module-numname-2017.tar.xz mirror://gentoo/texlive-module-numprint-2017.tar.xz mirror://gentoo/texlive-module-numspell-2017.tar.xz mirror://gentoo/texlive-module-ocg-p-2017.tar.xz mirror://gentoo/texlive-module-ocgx-2017.tar.xz mirror://gentoo/texlive-module-ocgx2-2017.tar.xz mirror://gentoo/texlive-module-ocr-latex-2017.tar.xz mirror://gentoo/texlive-module-octavo-2017.tar.xz mirror://gentoo/texlive-module-oldstyle-2017.tar.xz mirror://gentoo/texlive-module-onlyamsmath-2017.tar.xz mirror://gentoo/texlive-module-opcit-2017.tar.xz mirror://gentoo/texlive-module-optidef-2017.tar.xz mirror://gentoo/texlive-module-optional-2017.tar.xz mirror://gentoo/texlive-module-options-2017.tar.xz mirror://gentoo/texlive-module-outline-2017.tar.xz mirror://gentoo/texlive-module-outliner-2017.tar.xz mirror://gentoo/texlive-module-outlines-2017.tar.xz mirror://gentoo/texlive-module-overlays-2017.tar.xz mirror://gentoo/texlive-module-overpic-2017.tar.xz mirror://gentoo/texlive-module-pagecolor-2017.tar.xz mirror://gentoo/texlive-module-pagecont-2017.tar.xz mirror://gentoo/texlive-module-pagenote-2017.tar.xz mirror://gentoo/texlive-module-pagerange-2017.tar.xz mirror://gentoo/texlive-module-pageslts-2017.tar.xz mirror://gentoo/texlive-module-paper-2017.tar.xz mirror://gentoo/texlive-module-papercdcase-2017.tar.xz mirror://gentoo/texlive-module-papermas-2017.tar.xz mirror://gentoo/texlive-module-papertex-2017.tar.xz mirror://gentoo/texlive-module-paracol-2017.tar.xz mirror://gentoo/texlive-module-parades-2017.tar.xz mirror://gentoo/texlive-module-paralist-2017.tar.xz mirror://gentoo/texlive-module-paresse-2017.tar.xz mirror://gentoo/texlive-module-parnotes-2017.tar.xz mirror://gentoo/texlive-module-parselines-2017.tar.xz mirror://gentoo/texlive-module-pas-cours-2017.tar.xz mirror://gentoo/texlive-module-pas-cv-2017.tar.xz mirror://gentoo/texlive-module-pas-tableur-2017.tar.xz mirror://gentoo/texlive-module-patch-2017.tar.xz mirror://gentoo/texlive-module-patchcmd-2017.tar.xz mirror://gentoo/texlive-module-pauldoc-2017.tar.xz mirror://gentoo/texlive-module-pawpict-2017.tar.xz mirror://gentoo/texlive-module-pbox-2017.tar.xz mirror://gentoo/texlive-module-pbsheet-2017.tar.xz mirror://gentoo/texlive-module-pdf14-2017.tar.xz mirror://gentoo/texlive-module-pdfcomment-2017.tar.xz mirror://gentoo/texlive-module-pdfcprot-2017.tar.xz mirror://gentoo/texlive-module-pdfmarginpar-2017.tar.xz mirror://gentoo/texlive-module-pdfpagediff-2017.tar.xz mirror://gentoo/texlive-module-pdfscreen-2017.tar.xz mirror://gentoo/texlive-module-pdfslide-2017.tar.xz mirror://gentoo/texlive-module-pdfsync-2017.tar.xz mirror://gentoo/texlive-module-pdfwin-2017.tar.xz mirror://gentoo/texlive-module-pdfx-2017.tar.xz mirror://gentoo/texlive-module-pecha-2017.tar.xz mirror://gentoo/texlive-module-perltex-2017.tar.xz mirror://gentoo/texlive-module-permute-2017.tar.xz mirror://gentoo/texlive-module-petiteannonce-2017.tar.xz mirror://gentoo/texlive-module-phffullpagefigure-2017.tar.xz mirror://gentoo/texlive-module-phfnote-2017.tar.xz mirror://gentoo/texlive-module-phfparen-2017.tar.xz mirror://gentoo/texlive-module-phfqit-2017.tar.xz mirror://gentoo/texlive-module-phfquotetext-2017.tar.xz mirror://gentoo/texlive-module-phfsvnwatermark-2017.tar.xz mirror://gentoo/texlive-module-phfthm-2017.tar.xz mirror://gentoo/texlive-module-philex-2017.tar.xz mirror://gentoo/texlive-module-phonenumbers-2017.tar.xz mirror://gentoo/texlive-module-photo-2017.tar.xz mirror://gentoo/texlive-module-piff-2017.tar.xz mirror://gentoo/texlive-module-pkgloader-2017.tar.xz mirror://gentoo/texlive-module-placeins-2017.tar.xz mirror://gentoo/texlive-module-plantslabels-2017.tar.xz mirror://gentoo/texlive-module-plates-2017.tar.xz mirror://gentoo/texlive-module-plweb-2017.tar.xz mirror://gentoo/texlive-module-polynom-2017.tar.xz mirror://gentoo/texlive-module-polynomial-2017.tar.xz mirror://gentoo/texlive-module-polytable-2017.tar.xz mirror://gentoo/texlive-module-postcards-2017.tar.xz mirror://gentoo/texlive-module-poster-mac-2017.tar.xz mirror://gentoo/texlive-module-ppr-prv-2017.tar.xz mirror://gentoo/texlive-module-preprint-2017.tar.xz mirror://gentoo/texlive-module-pressrelease-2017.tar.xz mirror://gentoo/texlive-module-prettyref-2017.tar.xz mirror://gentoo/texlive-module-preview-2017.tar.xz mirror://gentoo/texlive-module-printlen-2017.tar.xz mirror://gentoo/texlive-module-probsoln-2017.tar.xz mirror://gentoo/texlive-module-program-2017.tar.xz mirror://gentoo/texlive-module-progress-2017.tar.xz mirror://gentoo/texlive-module-progressbar-2017.tar.xz mirror://gentoo/texlive-module-proofread-2017.tar.xz mirror://gentoo/texlive-module-properties-2017.tar.xz mirror://gentoo/texlive-module-prosper-2017.tar.xz mirror://gentoo/texlive-module-protex-2017.tar.xz mirror://gentoo/texlive-module-protocol-2017.tar.xz mirror://gentoo/texlive-module-psfragx-2017.tar.xz mirror://gentoo/texlive-module-pst-pdf-2017.tar.xz mirror://gentoo/texlive-module-pstool-2017.tar.xz mirror://gentoo/texlive-module-pstring-2017.tar.xz mirror://gentoo/texlive-module-pxgreeks-2017.tar.xz mirror://gentoo/texlive-module-python-2017.tar.xz mirror://gentoo/texlive-module-qcm-2017.tar.xz mirror://gentoo/texlive-module-qstest-2017.tar.xz mirror://gentoo/texlive-module-qsymbols-2017.tar.xz mirror://gentoo/texlive-module-quicktype-2017.tar.xz mirror://gentoo/texlive-module-quotchap-2017.tar.xz mirror://gentoo/texlive-module-quoting-2017.tar.xz mirror://gentoo/texlive-module-quotmark-2017.tar.xz mirror://gentoo/texlive-module-ran_toks-2017.tar.xz mirror://gentoo/texlive-module-randtext-2017.tar.xz mirror://gentoo/texlive-module-rccol-2017.tar.xz mirror://gentoo/texlive-module-rcs-multi-2017.tar.xz mirror://gentoo/texlive-module-rcsinfo-2017.tar.xz mirror://gentoo/texlive-module-readarray-2017.tar.xz mirror://gentoo/texlive-module-realboxes-2017.tar.xz mirror://gentoo/texlive-module-recipe-2017.tar.xz mirror://gentoo/texlive-module-recipebook-2017.tar.xz mirror://gentoo/texlive-module-recipecard-2017.tar.xz mirror://gentoo/texlive-module-rectopma-2017.tar.xz mirror://gentoo/texlive-module-refcheck-2017.tar.xz mirror://gentoo/texlive-module-refenums-2017.tar.xz mirror://gentoo/texlive-module-reflectgraphics-2017.tar.xz mirror://gentoo/texlive-module-refman-2017.tar.xz mirror://gentoo/texlive-module-refstyle-2017.tar.xz mirror://gentoo/texlive-module-regcount-2017.tar.xz mirror://gentoo/texlive-module-regexpatch-2017.tar.xz mirror://gentoo/texlive-module-register-2017.tar.xz mirror://gentoo/texlive-module-regstats-2017.tar.xz mirror://gentoo/texlive-module-relenc-2017.tar.xz mirror://gentoo/texlive-module-relsize-2017.tar.xz mirror://gentoo/texlive-module-repeatindex-2017.tar.xz mirror://gentoo/texlive-module-repltext-2017.tar.xz mirror://gentoo/texlive-module-rjlparshap-2017.tar.xz mirror://gentoo/texlive-module-rlepsf-2017.tar.xz mirror://gentoo/texlive-module-rmpage-2017.tar.xz mirror://gentoo/texlive-module-robustcommand-2017.tar.xz mirror://gentoo/texlive-module-robustindex-2017.tar.xz mirror://gentoo/texlive-module-romanbar-2017.tar.xz mirror://gentoo/texlive-module-romanbarpagenumber-2017.tar.xz mirror://gentoo/texlive-module-romanneg-2017.tar.xz mirror://gentoo/texlive-module-romannum-2017.tar.xz mirror://gentoo/texlive-module-rotfloat-2017.tar.xz mirror://gentoo/texlive-module-rotpages-2017.tar.xz mirror://gentoo/texlive-module-roundbox-2017.tar.xz mirror://gentoo/texlive-module-rterface-2017.tar.xz mirror://gentoo/texlive-module-rtkinenc-2017.tar.xz mirror://gentoo/texlive-module-rulercompass-2017.tar.xz mirror://gentoo/texlive-module-rvwrite-2017.tar.xz mirror://gentoo/texlive-module-sanitize-umlaut-2017.tar.xz mirror://gentoo/texlive-module-sauerj-2017.tar.xz mirror://gentoo/texlive-module-savefnmark-2017.tar.xz mirror://gentoo/texlive-module-savesym-2017.tar.xz mirror://gentoo/texlive-module-savetrees-2017.tar.xz mirror://gentoo/texlive-module-scale-2017.tar.xz mirror://gentoo/texlive-module-scalebar-2017.tar.xz mirror://gentoo/texlive-module-scalerel-2017.tar.xz mirror://gentoo/texlive-module-scanpages-2017.tar.xz mirror://gentoo/texlive-module-scrlttr2copy-2017.tar.xz mirror://gentoo/texlive-module-sdrt-2017.tar.xz mirror://gentoo/texlive-module-secdot-2017.tar.xz mirror://gentoo/texlive-module-sectionbox-2017.tar.xz mirror://gentoo/texlive-module-sectsty-2017.tar.xz mirror://gentoo/texlive-module-seealso-2017.tar.xz mirror://gentoo/texlive-module-selectp-2017.tar.xz mirror://gentoo/texlive-module-semantic-2017.tar.xz mirror://gentoo/texlive-module-semantic-markup-2017.tar.xz mirror://gentoo/texlive-module-semioneside-2017.tar.xz mirror://gentoo/texlive-module-semproc-2017.tar.xz mirror://gentoo/texlive-module-sepfootnotes-2017.tar.xz mirror://gentoo/texlive-module-seqsplit-2017.tar.xz mirror://gentoo/texlive-module-sesstime-2017.tar.xz mirror://gentoo/texlive-module-sf298-2017.tar.xz mirror://gentoo/texlive-module-sffms-2017.tar.xz mirror://gentoo/texlive-module-sfmath-2017.tar.xz mirror://gentoo/texlive-module-shadethm-2017.tar.xz mirror://gentoo/texlive-module-shadow-2017.tar.xz mirror://gentoo/texlive-module-shadowtext-2017.tar.xz mirror://gentoo/texlive-module-shapepar-2017.tar.xz mirror://gentoo/texlive-module-shdoc-2017.tar.xz mirror://gentoo/texlive-module-shipunov-2017.tar.xz mirror://gentoo/texlive-module-shorttoc-2017.tar.xz mirror://gentoo/texlive-module-show2e-2017.tar.xz mirror://gentoo/texlive-module-showcharinbox-2017.tar.xz mirror://gentoo/texlive-module-showdim-2017.tar.xz mirror://gentoo/texlive-module-showexpl-2017.tar.xz mirror://gentoo/texlive-module-showlabels-2017.tar.xz mirror://gentoo/texlive-module-sidecap-2017.tar.xz mirror://gentoo/texlive-module-sidenotes-2017.tar.xz mirror://gentoo/texlive-module-silence-2017.tar.xz mirror://gentoo/texlive-module-simplecd-2017.tar.xz mirror://gentoo/texlive-module-simplecv-2017.tar.xz mirror://gentoo/texlive-module-sitem-2017.tar.xz mirror://gentoo/texlive-module-skb-2017.tar.xz mirror://gentoo/texlive-module-skdoc-2017.tar.xz mirror://gentoo/texlive-module-skeycommand-2017.tar.xz mirror://gentoo/texlive-module-skeyval-2017.tar.xz mirror://gentoo/texlive-module-skrapport-2017.tar.xz mirror://gentoo/texlive-module-slantsc-2017.tar.xz mirror://gentoo/texlive-module-smalltableof-2017.tar.xz mirror://gentoo/texlive-module-smartunits-2017.tar.xz mirror://gentoo/texlive-module-smartref-2017.tar.xz mirror://gentoo/texlive-module-snapshot-2017.tar.xz mirror://gentoo/texlive-module-snotez-2017.tar.xz mirror://gentoo/texlive-module-soul-2017.tar.xz mirror://gentoo/texlive-module-sparklines-2017.tar.xz mirror://gentoo/texlive-module-sphack-2017.tar.xz mirror://gentoo/texlive-module-splitindex-2017.tar.xz mirror://gentoo/texlive-module-spot-2017.tar.xz mirror://gentoo/texlive-module-spotcolor-2017.tar.xz mirror://gentoo/texlive-module-spreadtab-2017.tar.xz mirror://gentoo/texlive-module-spverbatim-2017.tar.xz mirror://gentoo/texlive-module-srbook-mem-2017.tar.xz mirror://gentoo/texlive-module-srcltx-2017.tar.xz mirror://gentoo/texlive-module-sseq-2017.tar.xz mirror://gentoo/texlive-module-sslides-2017.tar.xz mirror://gentoo/texlive-module-stack-2017.tar.xz mirror://gentoo/texlive-module-stackengine-2017.tar.xz mirror://gentoo/texlive-module-standalone-2017.tar.xz mirror://gentoo/texlive-module-statistik-2017.tar.xz mirror://gentoo/texlive-module-stdclsdv-2017.tar.xz mirror://gentoo/texlive-module-stdpage-2017.tar.xz mirror://gentoo/texlive-module-stex-2017.tar.xz mirror://gentoo/texlive-module-storebox-2017.tar.xz mirror://gentoo/texlive-module-storecmd-2017.tar.xz mirror://gentoo/texlive-module-stringstrings-2017.tar.xz mirror://gentoo/texlive-module-sttools-2017.tar.xz mirror://gentoo/texlive-module-stubs-2017.tar.xz mirror://gentoo/texlive-module-studenthandouts-2017.tar.xz mirror://gentoo/texlive-module-subdepth-2017.tar.xz mirror://gentoo/texlive-module-subeqn-2017.tar.xz mirror://gentoo/texlive-module-subeqnarray-2017.tar.xz mirror://gentoo/texlive-module-subfigmat-2017.tar.xz mirror://gentoo/texlive-module-subfigure-2017.tar.xz mirror://gentoo/texlive-module-subfiles-2017.tar.xz mirror://gentoo/texlive-module-subfloat-2017.tar.xz mirror://gentoo/texlive-module-substitutefont-2017.tar.xz mirror://gentoo/texlive-module-substr-2017.tar.xz mirror://gentoo/texlive-module-supertabular-2017.tar.xz mirror://gentoo/texlive-module-svg-2017.tar.xz mirror://gentoo/texlive-module-svgcolor-2017.tar.xz mirror://gentoo/texlive-module-svn-2017.tar.xz mirror://gentoo/texlive-module-svn-multi-2017.tar.xz mirror://gentoo/texlive-module-svn-prov-2017.tar.xz mirror://gentoo/texlive-module-syntax-2017.tar.xz mirror://gentoo/texlive-module-syntrace-2017.tar.xz mirror://gentoo/texlive-module-synttree-2017.tar.xz mirror://gentoo/texlive-module-tabfigures-2017.tar.xz mirror://gentoo/texlive-module-tableaux-2017.tar.xz mirror://gentoo/texlive-module-tablefootnote-2017.tar.xz mirror://gentoo/texlive-module-tableof-2017.tar.xz mirror://gentoo/texlive-module-tablestyles-2017.tar.xz mirror://gentoo/texlive-module-tablists-2017.tar.xz mirror://gentoo/texlive-module-tabls-2017.tar.xz mirror://gentoo/texlive-module-tabstackengine-2017.tar.xz mirror://gentoo/texlive-module-tabto-ltx-2017.tar.xz mirror://gentoo/texlive-module-tabu-2017.tar.xz mirror://gentoo/texlive-module-tabularborder-2017.tar.xz mirror://gentoo/texlive-module-tabularcalc-2017.tar.xz mirror://gentoo/texlive-module-tabularew-2017.tar.xz mirror://gentoo/texlive-module-tabulary-2017.tar.xz mirror://gentoo/texlive-module-tagging-2017.tar.xz mirror://gentoo/texlive-module-tagpair-2017.tar.xz mirror://gentoo/texlive-module-talk-2017.tar.xz mirror://gentoo/texlive-module-tamefloats-2017.tar.xz mirror://gentoo/texlive-module-tasks-2017.tar.xz mirror://gentoo/texlive-module-tcldoc-2017.tar.xz mirror://gentoo/texlive-module-tcolorbox-2017.tar.xz mirror://gentoo/texlive-module-tdclock-2017.tar.xz mirror://gentoo/texlive-module-technics-2017.tar.xz mirror://gentoo/texlive-module-ted-2017.tar.xz mirror://gentoo/texlive-module-templatetools-2017.tar.xz mirror://gentoo/texlive-module-termcal-2017.tar.xz mirror://gentoo/texlive-module-termlist-2017.tar.xz mirror://gentoo/texlive-module-testhyphens-2017.tar.xz mirror://gentoo/texlive-module-testidx-2017.tar.xz mirror://gentoo/texlive-module-tex-label-2017.tar.xz mirror://gentoo/texlive-module-texlogos-2017.tar.xz mirror://gentoo/texlive-module-texmate-2017.tar.xz mirror://gentoo/texlive-module-texments-2017.tar.xz mirror://gentoo/texlive-module-texpower-2017.tar.xz mirror://gentoo/texlive-module-texshade-2017.tar.xz mirror://gentoo/texlive-module-texvc-2017.tar.xz mirror://gentoo/texlive-module-textfit-2017.tar.xz mirror://gentoo/texlive-module-textmerg-2017.tar.xz mirror://gentoo/texlive-module-textpos-2017.tar.xz mirror://gentoo/texlive-module-theoremref-2017.tar.xz mirror://gentoo/texlive-module-thinsp-2017.tar.xz mirror://gentoo/texlive-module-thmtools-2017.tar.xz mirror://gentoo/texlive-module-threadcol-2017.tar.xz mirror://gentoo/texlive-module-threeparttable-2017.tar.xz mirror://gentoo/texlive-module-threeparttablex-2017.tar.xz mirror://gentoo/texlive-module-thumb-2017.tar.xz mirror://gentoo/texlive-module-thumbs-2017.tar.xz mirror://gentoo/texlive-module-thumby-2017.tar.xz mirror://gentoo/texlive-module-ticket-2017.tar.xz mirror://gentoo/texlive-module-titlecaps-2017.tar.xz mirror://gentoo/texlive-module-titlefoot-2017.tar.xz mirror://gentoo/texlive-module-titlepic-2017.tar.xz mirror://gentoo/texlive-module-titleref-2017.tar.xz mirror://gentoo/texlive-module-titlesec-2017.tar.xz mirror://gentoo/texlive-module-titling-2017.tar.xz mirror://gentoo/texlive-module-tocbibind-2017.tar.xz mirror://gentoo/texlive-module-tocdata-2017.tar.xz mirror://gentoo/texlive-module-tocloft-2017.tar.xz mirror://gentoo/texlive-module-tocvsec2-2017.tar.xz mirror://gentoo/texlive-module-todo-2017.tar.xz mirror://gentoo/texlive-module-todonotes-2017.tar.xz mirror://gentoo/texlive-module-tokenizer-2017.tar.xz mirror://gentoo/texlive-module-toolbox-2017.tar.xz mirror://gentoo/texlive-module-topfloat-2017.tar.xz mirror://gentoo/texlive-module-totcount-2017.tar.xz mirror://gentoo/texlive-module-totpages-2017.tar.xz mirror://gentoo/texlive-module-translations-2017.tar.xz mirror://gentoo/texlive-module-trfsigns-2017.tar.xz mirror://gentoo/texlive-module-trimspaces-2017.tar.xz mirror://gentoo/texlive-module-trivfloat-2017.tar.xz mirror://gentoo/texlive-module-trsym-2017.tar.xz mirror://gentoo/texlive-module-truncate-2017.tar.xz mirror://gentoo/texlive-module-tucv-2017.tar.xz mirror://gentoo/texlive-module-turnthepage-2017.tar.xz mirror://gentoo/texlive-module-twoinone-2017.tar.xz mirror://gentoo/texlive-module-twoup-2017.tar.xz mirror://gentoo/texlive-module-txgreeks-2017.tar.xz mirror://gentoo/texlive-module-type1cm-2017.tar.xz mirror://gentoo/texlive-module-typed-checklist-2017.tar.xz mirror://gentoo/texlive-module-typeface-2017.tar.xz mirror://gentoo/texlive-module-typoaid-2017.tar.xz mirror://gentoo/texlive-module-typogrid-2017.tar.xz mirror://gentoo/texlive-module-uassign-2017.tar.xz mirror://gentoo/texlive-module-ucs-2017.tar.xz mirror://gentoo/texlive-module-uebungsblatt-2017.tar.xz mirror://gentoo/texlive-module-umoline-2017.tar.xz mirror://gentoo/texlive-module-underlin-2017.tar.xz mirror://gentoo/texlive-module-underoverlap-2017.tar.xz mirror://gentoo/texlive-module-undolabl-2017.tar.xz mirror://gentoo/texlive-module-units-2017.tar.xz mirror://gentoo/texlive-module-unravel-2017.tar.xz mirror://gentoo/texlive-module-upmethodology-2017.tar.xz mirror://gentoo/texlive-module-upquote-2017.tar.xz mirror://gentoo/texlive-module-uri-2017.tar.xz mirror://gentoo/texlive-module-ushort-2017.tar.xz mirror://gentoo/texlive-module-uspace-2017.tar.xz mirror://gentoo/texlive-module-uwmslide-2017.tar.xz mirror://gentoo/texlive-module-variablelm-2017.tar.xz mirror://gentoo/texlive-module-varindex-2017.tar.xz mirror://gentoo/texlive-module-varsfromjobname-2017.tar.xz mirror://gentoo/texlive-module-varwidth-2017.tar.xz mirror://gentoo/texlive-module-vdmlisting-2017.tar.xz mirror://gentoo/texlive-module-verbasef-2017.tar.xz mirror://gentoo/texlive-module-verbatimbox-2017.tar.xz mirror://gentoo/texlive-module-verbatimcopy-2017.tar.xz mirror://gentoo/texlive-module-verbdef-2017.tar.xz mirror://gentoo/texlive-module-verbments-2017.tar.xz mirror://gentoo/texlive-module-version-2017.tar.xz mirror://gentoo/texlive-module-versions-2017.tar.xz mirror://gentoo/texlive-module-versonotes-2017.tar.xz mirror://gentoo/texlive-module-vertbars-2017.tar.xz mirror://gentoo/texlive-module-vgrid-2017.tar.xz mirror://gentoo/texlive-module-vhistory-2017.tar.xz mirror://gentoo/texlive-module-vmargin-2017.tar.xz mirror://gentoo/texlive-module-volumes-2017.tar.xz mirror://gentoo/texlive-module-vpe-2017.tar.xz mirror://gentoo/texlive-module-vruler-2017.tar.xz mirror://gentoo/texlive-module-vwcol-2017.tar.xz mirror://gentoo/texlive-module-wallpaper-2017.tar.xz mirror://gentoo/texlive-module-warning-2017.tar.xz mirror://gentoo/texlive-module-warpcol-2017.tar.xz mirror://gentoo/texlive-module-was-2017.tar.xz mirror://gentoo/texlive-module-widetable-2017.tar.xz mirror://gentoo/texlive-module-williams-2017.tar.xz mirror://gentoo/texlive-module-withargs-2017.tar.xz mirror://gentoo/texlive-module-wordcount-2017.tar.xz mirror://gentoo/texlive-module-wordlike-2017.tar.xz mirror://gentoo/texlive-module-wrapfig-2017.tar.xz mirror://gentoo/texlive-module-wtref-2017.tar.xz mirror://gentoo/texlive-module-xargs-2017.tar.xz mirror://gentoo/texlive-module-xassoccnt-2017.tar.xz mirror://gentoo/texlive-module-xcntperchap-2017.tar.xz mirror://gentoo/texlive-module-xcolor-material-2017.tar.xz mirror://gentoo/texlive-module-xcolor-solarized-2017.tar.xz mirror://gentoo/texlive-module-xcomment-2017.tar.xz mirror://gentoo/texlive-module-xdoc-2017.tar.xz mirror://gentoo/texlive-module-xellipsis-2017.tar.xz mirror://gentoo/texlive-module-xfor-2017.tar.xz mirror://gentoo/texlive-module-xhfill-2017.tar.xz mirror://gentoo/texlive-module-xifthen-2017.tar.xz mirror://gentoo/texlive-module-xint-2017.tar.xz mirror://gentoo/texlive-module-xmpincl-2017.tar.xz mirror://gentoo/texlive-module-xnewcommand-2017.tar.xz mirror://gentoo/texlive-module-xoptarg-2017.tar.xz mirror://gentoo/texlive-module-xpatch-2017.tar.xz mirror://gentoo/texlive-module-xpeek-2017.tar.xz mirror://gentoo/texlive-module-xprintlen-2017.tar.xz mirror://gentoo/texlive-module-xpunctuate-2017.tar.xz mirror://gentoo/texlive-module-xsavebox-2017.tar.xz mirror://gentoo/texlive-module-xsim-2017.tar.xz mirror://gentoo/texlive-module-xstring-2017.tar.xz mirror://gentoo/texlive-module-xtab-2017.tar.xz mirror://gentoo/texlive-module-xwatermark-2017.tar.xz mirror://gentoo/texlive-module-xytree-2017.tar.xz mirror://gentoo/texlive-module-yafoot-2017.tar.xz mirror://gentoo/texlive-module-yaletter-2017.tar.xz mirror://gentoo/texlive-module-yagusylo-2017.tar.xz mirror://gentoo/texlive-module-ycbook-2017.tar.xz mirror://gentoo/texlive-module-ydoc-2017.tar.xz mirror://gentoo/texlive-module-yplan-2017.tar.xz mirror://gentoo/texlive-module-zed-csp-2017.tar.xz mirror://gentoo/texlive-module-ziffer-2017.tar.xz mirror://gentoo/texlive-module-zwgetfdate-2017.tar.xz mirror://gentoo/texlive-module-zwpagelayout-2017.tar.xz mirror://gentoo/texlive-module-collection-latexextra-2017.tar.xz doc? ( mirror://gentoo/texlive-module-2up.doc-2017.tar.xz mirror://gentoo/texlive-module-ESIEEcv.doc-2017.tar.xz mirror://gentoo/texlive-module-GS1.doc-2017.tar.xz mirror://gentoo/texlive-module-HA-prosper.doc-2017.tar.xz mirror://gentoo/texlive-module-Tabbing.doc-2017.tar.xz mirror://gentoo/texlive-module-a0poster.doc-2017.tar.xz mirror://gentoo/texlive-module-a4wide.doc-2017.tar.xz mirror://gentoo/texlive-module-a5comb.doc-2017.tar.xz mirror://gentoo/texlive-module-abraces.doc-2017.tar.xz mirror://gentoo/texlive-module-abstract.doc-2017.tar.xz mirror://gentoo/texlive-module-achemso.doc-2017.tar.xz mirror://gentoo/texlive-module-acro.doc-2017.tar.xz mirror://gentoo/texlive-module-acronym.doc-2017.tar.xz mirror://gentoo/texlive-module-acroterm.doc-2017.tar.xz mirror://gentoo/texlive-module-actuarialangle.doc-2017.tar.xz mirror://gentoo/texlive-module-actuarialsymbol.doc-2017.tar.xz mirror://gentoo/texlive-module-addfont.doc-2017.tar.xz mirror://gentoo/texlive-module-addlines.doc-2017.tar.xz mirror://gentoo/texlive-module-adjmulticol.doc-2017.tar.xz mirror://gentoo/texlive-module-adjustbox.doc-2017.tar.xz mirror://gentoo/texlive-module-adrconv.doc-2017.tar.xz mirror://gentoo/texlive-module-advdate.doc-2017.tar.xz mirror://gentoo/texlive-module-akktex.doc-2017.tar.xz mirror://gentoo/texlive-module-akletter.doc-2017.tar.xz mirror://gentoo/texlive-module-alertmessage.doc-2017.tar.xz mirror://gentoo/texlive-module-alnumsec.doc-2017.tar.xz mirror://gentoo/texlive-module-alterqcm.doc-2017.tar.xz mirror://gentoo/texlive-module-altfont.doc-2017.tar.xz mirror://gentoo/texlive-module-amsaddr.doc-2017.tar.xz mirror://gentoo/texlive-module-animate.doc-2017.tar.xz mirror://gentoo/texlive-module-anonchap.doc-2017.tar.xz mirror://gentoo/texlive-module-answers.doc-2017.tar.xz mirror://gentoo/texlive-module-anyfontsize.doc-2017.tar.xz mirror://gentoo/texlive-module-appendix.doc-2017.tar.xz mirror://gentoo/texlive-module-appendixnumberbeamer.doc-2017.tar.xz mirror://gentoo/texlive-module-apptools.doc-2017.tar.xz mirror://gentoo/texlive-module-arcs.doc-2017.tar.xz mirror://gentoo/texlive-module-arrayjobx.doc-2017.tar.xz mirror://gentoo/texlive-module-arraysort.doc-2017.tar.xz mirror://gentoo/texlive-module-arydshln.doc-2017.tar.xz mirror://gentoo/texlive-module-asciilist.doc-2017.tar.xz mirror://gentoo/texlive-module-assignment.doc-2017.tar.xz mirror://gentoo/texlive-module-assoccnt.doc-2017.tar.xz mirror://gentoo/texlive-module-attachfile.doc-2017.tar.xz mirror://gentoo/texlive-module-aurl.doc-2017.tar.xz mirror://gentoo/texlive-module-authoraftertitle.doc-2017.tar.xz mirror://gentoo/texlive-module-authorindex.doc-2017.tar.xz mirror://gentoo/texlive-module-autonum.doc-2017.tar.xz mirror://gentoo/texlive-module-autopdf.doc-2017.tar.xz mirror://gentoo/texlive-module-avremu.doc-2017.tar.xz mirror://gentoo/texlive-module-background.doc-2017.tar.xz mirror://gentoo/texlive-module-bankstatement.doc-2017.tar.xz mirror://gentoo/texlive-module-bashful.doc-2017.tar.xz mirror://gentoo/texlive-module-basicarith.doc-2017.tar.xz mirror://gentoo/texlive-module-bchart.doc-2017.tar.xz mirror://gentoo/texlive-module-beamer2thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-beameraudience.doc-2017.tar.xz mirror://gentoo/texlive-module-beamercolorthemeowl.doc-2017.tar.xz mirror://gentoo/texlive-module-beamerdarkthemes.doc-2017.tar.xz mirror://gentoo/texlive-module-beamerposter.doc-2017.tar.xz mirror://gentoo/texlive-module-beamersubframe.doc-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-cuerna.doc-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-detlevcm.doc-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-epyt.doc-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-metropolis.doc-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-phnompenh.doc-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-upenn-bc.doc-2017.tar.xz mirror://gentoo/texlive-module-beamerthemenirma.doc-2017.tar.xz mirror://gentoo/texlive-module-beton.doc-2017.tar.xz mirror://gentoo/texlive-module-bewerbung.doc-2017.tar.xz mirror://gentoo/texlive-module-bez123.doc-2017.tar.xz mirror://gentoo/texlive-module-bezos.doc-2017.tar.xz mirror://gentoo/texlive-module-bhcexam.doc-2017.tar.xz mirror://gentoo/texlive-module-bibletext.doc-2017.tar.xz mirror://gentoo/texlive-module-bigfoot.doc-2017.tar.xz mirror://gentoo/texlive-module-bigints.doc-2017.tar.xz mirror://gentoo/texlive-module-biochemistry-colors.doc-2017.tar.xz mirror://gentoo/texlive-module-bizcard.doc-2017.tar.xz mirror://gentoo/texlive-module-blindtext.doc-2017.tar.xz mirror://gentoo/texlive-module-blkarray.doc-2017.tar.xz mirror://gentoo/texlive-module-block.doc-2017.tar.xz mirror://gentoo/texlive-module-bnumexpr.doc-2017.tar.xz mirror://gentoo/texlive-module-boites.doc-2017.tar.xz mirror://gentoo/texlive-module-bold-extra.doc-2017.tar.xz mirror://gentoo/texlive-module-bookcover.doc-2017.tar.xz mirror://gentoo/texlive-module-bookest.doc-2017.tar.xz mirror://gentoo/texlive-module-booklet.doc-2017.tar.xz mirror://gentoo/texlive-module-boolexpr.doc-2017.tar.xz mirror://gentoo/texlive-module-bophook.doc-2017.tar.xz mirror://gentoo/texlive-module-boxedminipage.doc-2017.tar.xz mirror://gentoo/texlive-module-boxedminipage2e.doc-2017.tar.xz mirror://gentoo/texlive-module-boxhandler.doc-2017.tar.xz mirror://gentoo/texlive-module-bracketkey.doc-2017.tar.xz mirror://gentoo/texlive-module-braket.doc-2017.tar.xz mirror://gentoo/texlive-module-breakurl.doc-2017.tar.xz mirror://gentoo/texlive-module-bullcntr.doc-2017.tar.xz mirror://gentoo/texlive-module-bussproofs.doc-2017.tar.xz mirror://gentoo/texlive-module-bxdpx-beamer.doc-2017.tar.xz mirror://gentoo/texlive-module-bxdvidriver.doc-2017.tar.xz mirror://gentoo/texlive-module-bxenclose.doc-2017.tar.xz mirror://gentoo/texlive-module-bxnewfont.doc-2017.tar.xz mirror://gentoo/texlive-module-bxpapersize.doc-2017.tar.xz mirror://gentoo/texlive-module-bxpdfver.doc-2017.tar.xz mirror://gentoo/texlive-module-calcage.doc-2017.tar.xz mirror://gentoo/texlive-module-calctab.doc-2017.tar.xz mirror://gentoo/texlive-module-calculator.doc-2017.tar.xz mirror://gentoo/texlive-module-calrsfs.doc-2017.tar.xz mirror://gentoo/texlive-module-cals.doc-2017.tar.xz mirror://gentoo/texlive-module-calxxxx-yyyy.doc-2017.tar.xz mirror://gentoo/texlive-module-cancel.doc-2017.tar.xz mirror://gentoo/texlive-module-canoniclayout.doc-2017.tar.xz mirror://gentoo/texlive-module-capt-of.doc-2017.tar.xz mirror://gentoo/texlive-module-captcont.doc-2017.tar.xz mirror://gentoo/texlive-module-captdef.doc-2017.tar.xz mirror://gentoo/texlive-module-carbohydrates.doc-2017.tar.xz mirror://gentoo/texlive-module-cases.doc-2017.tar.xz mirror://gentoo/texlive-module-casyl.doc-2017.tar.xz mirror://gentoo/texlive-module-catchfilebetweentags.doc-2017.tar.xz mirror://gentoo/texlive-module-catechis.doc-2017.tar.xz mirror://gentoo/texlive-module-catoptions.doc-2017.tar.xz mirror://gentoo/texlive-module-cbcoptic.doc-2017.tar.xz mirror://gentoo/texlive-module-ccaption.doc-2017.tar.xz mirror://gentoo/texlive-module-cclicenses.doc-2017.tar.xz mirror://gentoo/texlive-module-cd.doc-2017.tar.xz mirror://gentoo/texlive-module-cd-cover.doc-2017.tar.xz mirror://gentoo/texlive-module-cdpbundl.doc-2017.tar.xz mirror://gentoo/texlive-module-cellspace.doc-2017.tar.xz mirror://gentoo/texlive-module-censor.doc-2017.tar.xz mirror://gentoo/texlive-module-changebar.doc-2017.tar.xz mirror://gentoo/texlive-module-changelayout.doc-2017.tar.xz mirror://gentoo/texlive-module-changepage.doc-2017.tar.xz mirror://gentoo/texlive-module-changes.doc-2017.tar.xz mirror://gentoo/texlive-module-chappg.doc-2017.tar.xz mirror://gentoo/texlive-module-chapterfolder.doc-2017.tar.xz mirror://gentoo/texlive-module-chet.doc-2017.tar.xz mirror://gentoo/texlive-module-chextras.doc-2017.tar.xz mirror://gentoo/texlive-module-childdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-chkfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-chletter.doc-2017.tar.xz mirror://gentoo/texlive-module-chngcntr.doc-2017.tar.xz mirror://gentoo/texlive-module-chronology.doc-2017.tar.xz mirror://gentoo/texlive-module-circ.doc-2017.tar.xz mirror://gentoo/texlive-module-classics.doc-2017.tar.xz mirror://gentoo/texlive-module-classpack.doc-2017.tar.xz mirror://gentoo/texlive-module-clefval.doc-2017.tar.xz mirror://gentoo/texlive-module-cleveref.doc-2017.tar.xz mirror://gentoo/texlive-module-clipboard.doc-2017.tar.xz mirror://gentoo/texlive-module-clock.doc-2017.tar.xz mirror://gentoo/texlive-module-cmdstring.doc-2017.tar.xz mirror://gentoo/texlive-module-cmdtrack.doc-2017.tar.xz mirror://gentoo/texlive-module-cmsd.doc-2017.tar.xz mirror://gentoo/texlive-module-cnltx.doc-2017.tar.xz mirror://gentoo/texlive-module-cntformats.doc-2017.tar.xz mirror://gentoo/texlive-module-cntperchap.doc-2017.tar.xz mirror://gentoo/texlive-module-codedoc.doc-2017.tar.xz mirror://gentoo/texlive-module-codepage.doc-2017.tar.xz mirror://gentoo/texlive-module-codesection.doc-2017.tar.xz mirror://gentoo/texlive-module-collcell.doc-2017.tar.xz mirror://gentoo/texlive-module-collectbox.doc-2017.tar.xz mirror://gentoo/texlive-module-colordoc.doc-2017.tar.xz mirror://gentoo/texlive-module-colorinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-coloring.doc-2017.tar.xz mirror://gentoo/texlive-module-colorspace.doc-2017.tar.xz mirror://gentoo/texlive-module-colortab.doc-2017.tar.xz mirror://gentoo/texlive-module-colorwav.doc-2017.tar.xz mirror://gentoo/texlive-module-colorweb.doc-2017.tar.xz mirror://gentoo/texlive-module-colourchange.doc-2017.tar.xz mirror://gentoo/texlive-module-combelow.doc-2017.tar.xz mirror://gentoo/texlive-module-combine.doc-2017.tar.xz mirror://gentoo/texlive-module-comma.doc-2017.tar.xz mirror://gentoo/texlive-module-commado.doc-2017.tar.xz mirror://gentoo/texlive-module-comment.doc-2017.tar.xz mirror://gentoo/texlive-module-concepts.doc-2017.tar.xz mirror://gentoo/texlive-module-concprog.doc-2017.tar.xz mirror://gentoo/texlive-module-constants.doc-2017.tar.xz mirror://gentoo/texlive-module-continue.doc-2017.tar.xz mirror://gentoo/texlive-module-contour.doc-2017.tar.xz mirror://gentoo/texlive-module-contracard.doc-2017.tar.xz mirror://gentoo/texlive-module-conv-xkv.doc-2017.tar.xz mirror://gentoo/texlive-module-cooking.doc-2017.tar.xz mirror://gentoo/texlive-module-cooking-units.doc-2017.tar.xz mirror://gentoo/texlive-module-cool.doc-2017.tar.xz mirror://gentoo/texlive-module-coollist.doc-2017.tar.xz mirror://gentoo/texlive-module-coolstr.doc-2017.tar.xz mirror://gentoo/texlive-module-coolthms.doc-2017.tar.xz mirror://gentoo/texlive-module-cooltooltips.doc-2017.tar.xz mirror://gentoo/texlive-module-coordsys.doc-2017.tar.xz mirror://gentoo/texlive-module-copyedit.doc-2017.tar.xz mirror://gentoo/texlive-module-copyrightbox.doc-2017.tar.xz mirror://gentoo/texlive-module-coseoul.doc-2017.tar.xz mirror://gentoo/texlive-module-counttexruns.doc-2017.tar.xz mirror://gentoo/texlive-module-courseoutline.doc-2017.tar.xz mirror://gentoo/texlive-module-coursepaper.doc-2017.tar.xz mirror://gentoo/texlive-module-coverpage.doc-2017.tar.xz mirror://gentoo/texlive-module-cprotect.doc-2017.tar.xz mirror://gentoo/texlive-module-crbox.doc-2017.tar.xz mirror://gentoo/texlive-module-crossreference.doc-2017.tar.xz mirror://gentoo/texlive-module-csquotes.doc-2017.tar.xz mirror://gentoo/texlive-module-css-colors.doc-2017.tar.xz mirror://gentoo/texlive-module-csvsimple.doc-2017.tar.xz mirror://gentoo/texlive-module-cuisine.doc-2017.tar.xz mirror://gentoo/texlive-module-currfile.doc-2017.tar.xz mirror://gentoo/texlive-module-cutwin.doc-2017.tar.xz mirror://gentoo/texlive-module-cv.doc-2017.tar.xz mirror://gentoo/texlive-module-cv4tw.doc-2017.tar.xz mirror://gentoo/texlive-module-cweb-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-cyber.doc-2017.tar.xz mirror://gentoo/texlive-module-cybercic.doc-2017.tar.xz mirror://gentoo/texlive-module-dashbox.doc-2017.tar.xz mirror://gentoo/texlive-module-dashrule.doc-2017.tar.xz mirror://gentoo/texlive-module-dashundergaps.doc-2017.tar.xz mirror://gentoo/texlive-module-dataref.doc-2017.tar.xz mirror://gentoo/texlive-module-datatool.doc-2017.tar.xz mirror://gentoo/texlive-module-dateiliste.doc-2017.tar.xz mirror://gentoo/texlive-module-datenumber.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-bahasai.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-basque.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-breton.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-bulgarian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-catalan.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-croatian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-czech.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-danish.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-dutch.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-en-fulltext.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-english.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-esperanto.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-estonian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-finnish.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-french.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-galician.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-german.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-greek.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-hebrew.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-icelandic.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-irish.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-italian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-it-fulltext.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-latin.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-lsorbian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-magyar.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-norsk.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-polish.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-portuges.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-romanian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-russian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-samin.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-scottish.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-serbian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-slovak.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-slovene.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-spanish.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-swedish.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-turkish.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-ukrainian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-usorbian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-welsh.doc-2017.tar.xz mirror://gentoo/texlive-module-dblfloatfix.doc-2017.tar.xz mirror://gentoo/texlive-module-decimal.doc-2017.tar.xz mirror://gentoo/texlive-module-decorule.doc-2017.tar.xz mirror://gentoo/texlive-module-delimtxt.doc-2017.tar.xz mirror://gentoo/texlive-module-denisbdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-diagbox.doc-2017.tar.xz mirror://gentoo/texlive-module-diagnose.doc-2017.tar.xz mirror://gentoo/texlive-module-dialogl.doc-2017.tar.xz mirror://gentoo/texlive-module-dichokey.doc-2017.tar.xz mirror://gentoo/texlive-module-dinbrief.doc-2017.tar.xz mirror://gentoo/texlive-module-directory.doc-2017.tar.xz mirror://gentoo/texlive-module-dirtytalk.doc-2017.tar.xz mirror://gentoo/texlive-module-dlfltxb.doc-2017.tar.xz mirror://gentoo/texlive-module-dnaseq.doc-2017.tar.xz mirror://gentoo/texlive-module-doclicense.doc-2017.tar.xz mirror://gentoo/texlive-module-docmfp.doc-2017.tar.xz mirror://gentoo/texlive-module-docmute.doc-2017.tar.xz mirror://gentoo/texlive-module-doctools.doc-2017.tar.xz mirror://gentoo/texlive-module-documentation.doc-2017.tar.xz mirror://gentoo/texlive-module-doi.doc-2017.tar.xz mirror://gentoo/texlive-module-dotarrow.doc-2017.tar.xz mirror://gentoo/texlive-module-dotseqn.doc-2017.tar.xz mirror://gentoo/texlive-module-download.doc-2017.tar.xz mirror://gentoo/texlive-module-dox.doc-2017.tar.xz mirror://gentoo/texlive-module-dpfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-dprogress.doc-2017.tar.xz mirror://gentoo/texlive-module-drac.doc-2017.tar.xz mirror://gentoo/texlive-module-draftcopy.doc-2017.tar.xz mirror://gentoo/texlive-module-draftfigure.doc-2017.tar.xz mirror://gentoo/texlive-module-draftwatermark.doc-2017.tar.xz mirror://gentoo/texlive-module-dtk.doc-2017.tar.xz mirror://gentoo/texlive-module-dtxdescribe.doc-2017.tar.xz mirror://gentoo/texlive-module-dtxgallery.doc-2017.tar.xz mirror://gentoo/texlive-module-dvdcoll.doc-2017.tar.xz mirror://gentoo/texlive-module-dynamicnumber.doc-2017.tar.xz mirror://gentoo/texlive-module-dynblocks.doc-2017.tar.xz mirror://gentoo/texlive-module-ean13isbn.doc-2017.tar.xz mirror://gentoo/texlive-module-easy.doc-2017.tar.xz mirror://gentoo/texlive-module-easy-todo.doc-2017.tar.xz mirror://gentoo/texlive-module-easyfig.doc-2017.tar.xz mirror://gentoo/texlive-module-easyformat.doc-2017.tar.xz mirror://gentoo/texlive-module-easylist.doc-2017.tar.xz mirror://gentoo/texlive-module-easyreview.doc-2017.tar.xz mirror://gentoo/texlive-module-ebezier.doc-2017.tar.xz mirror://gentoo/texlive-module-ecclesiastic.doc-2017.tar.xz mirror://gentoo/texlive-module-ecv.doc-2017.tar.xz mirror://gentoo/texlive-module-ed.doc-2017.tar.xz mirror://gentoo/texlive-module-edmargin.doc-2017.tar.xz mirror://gentoo/texlive-module-eemeir.doc-2017.tar.xz mirror://gentoo/texlive-module-efbox.doc-2017.tar.xz mirror://gentoo/texlive-module-egplot.doc-2017.tar.xz mirror://gentoo/texlive-module-elements.doc-2017.tar.xz mirror://gentoo/texlive-module-ellipsis.doc-2017.tar.xz mirror://gentoo/texlive-module-elmath.doc-2017.tar.xz mirror://gentoo/texlive-module-elocalloc.doc-2017.tar.xz mirror://gentoo/texlive-module-elpres.doc-2017.tar.xz mirror://gentoo/texlive-module-elzcards.doc-2017.tar.xz mirror://gentoo/texlive-module-emarks.doc-2017.tar.xz mirror://gentoo/texlive-module-embedall.doc-2017.tar.xz mirror://gentoo/texlive-module-embrac.doc-2017.tar.xz mirror://gentoo/texlive-module-emptypage.doc-2017.tar.xz mirror://gentoo/texlive-module-emulateapj.doc-2017.tar.xz mirror://gentoo/texlive-module-endfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-endheads.doc-2017.tar.xz mirror://gentoo/texlive-module-endnotes.doc-2017.tar.xz mirror://gentoo/texlive-module-engpron.doc-2017.tar.xz mirror://gentoo/texlive-module-engrec.doc-2017.tar.xz mirror://gentoo/texlive-module-enotez.doc-2017.tar.xz mirror://gentoo/texlive-module-enumitem.doc-2017.tar.xz mirror://gentoo/texlive-module-enumitem-zref.doc-2017.tar.xz mirror://gentoo/texlive-module-envbig.doc-2017.tar.xz mirror://gentoo/texlive-module-environ.doc-2017.tar.xz mirror://gentoo/texlive-module-epigraph.doc-2017.tar.xz mirror://gentoo/texlive-module-epiolmec.doc-2017.tar.xz mirror://gentoo/texlive-module-eqell.doc-2017.tar.xz mirror://gentoo/texlive-module-eqlist.doc-2017.tar.xz mirror://gentoo/texlive-module-eqnalign.doc-2017.tar.xz mirror://gentoo/texlive-module-eqparbox.doc-2017.tar.xz mirror://gentoo/texlive-module-errata.doc-2017.tar.xz mirror://gentoo/texlive-module-esami.doc-2017.tar.xz mirror://gentoo/texlive-module-esdiff.doc-2017.tar.xz mirror://gentoo/texlive-module-esint.doc-2017.tar.xz mirror://gentoo/texlive-module-esint-type1.doc-2017.tar.xz mirror://gentoo/texlive-module-etaremune.doc-2017.tar.xz mirror://gentoo/texlive-module-etextools.doc-2017.tar.xz mirror://gentoo/texlive-module-etoc.doc-2017.tar.xz mirror://gentoo/texlive-module-etoolbox.doc-2017.tar.xz mirror://gentoo/texlive-module-eukdate.doc-2017.tar.xz mirror://gentoo/texlive-module-eulerpx.doc-2017.tar.xz mirror://gentoo/texlive-module-europasscv.doc-2017.tar.xz mirror://gentoo/texlive-module-everyhook.doc-2017.tar.xz mirror://gentoo/texlive-module-everypage.doc-2017.tar.xz mirror://gentoo/texlive-module-exam.doc-2017.tar.xz mirror://gentoo/texlive-module-exam-n.doc-2017.tar.xz mirror://gentoo/texlive-module-examdesign.doc-2017.tar.xz mirror://gentoo/texlive-module-examplep.doc-2017.tar.xz mirror://gentoo/texlive-module-exceltex.doc-2017.tar.xz mirror://gentoo/texlive-module-excludeonly.doc-2017.tar.xz mirror://gentoo/texlive-module-exercise.doc-2017.tar.xz mirror://gentoo/texlive-module-exercises.doc-2017.tar.xz mirror://gentoo/texlive-module-exp-testopt.doc-2017.tar.xz mirror://gentoo/texlive-module-expdlist.doc-2017.tar.xz mirror://gentoo/texlive-module-export.doc-2017.tar.xz mirror://gentoo/texlive-module-exsheets.doc-2017.tar.xz mirror://gentoo/texlive-module-exsol.doc-2017.tar.xz mirror://gentoo/texlive-module-extract.doc-2017.tar.xz mirror://gentoo/texlive-module-facsimile.doc-2017.tar.xz mirror://gentoo/texlive-module-factura.doc-2017.tar.xz mirror://gentoo/texlive-module-fancylabel.doc-2017.tar.xz mirror://gentoo/texlive-module-fancynum.doc-2017.tar.xz mirror://gentoo/texlive-module-fancypar.doc-2017.tar.xz mirror://gentoo/texlive-module-fancyslides.doc-2017.tar.xz mirror://gentoo/texlive-module-fancytabs.doc-2017.tar.xz mirror://gentoo/texlive-module-fancytooltips.doc-2017.tar.xz mirror://gentoo/texlive-module-fcolumn.doc-2017.tar.xz mirror://gentoo/texlive-module-ffslides.doc-2017.tar.xz mirror://gentoo/texlive-module-fgruler.doc-2017.tar.xz mirror://gentoo/texlive-module-fibeamer.doc-2017.tar.xz mirror://gentoo/texlive-module-fifo-stack.doc-2017.tar.xz mirror://gentoo/texlive-module-figsize.doc-2017.tar.xz mirror://gentoo/texlive-module-filecontents.doc-2017.tar.xz mirror://gentoo/texlive-module-filecontentsdef.doc-2017.tar.xz mirror://gentoo/texlive-module-filedate.doc-2017.tar.xz mirror://gentoo/texlive-module-fileinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-filemod.doc-2017.tar.xz mirror://gentoo/texlive-module-fink.doc-2017.tar.xz mirror://gentoo/texlive-module-finstrut.doc-2017.tar.xz mirror://gentoo/texlive-module-fithesis.doc-2017.tar.xz mirror://gentoo/texlive-module-fixcmex.doc-2017.tar.xz mirror://gentoo/texlive-module-fixfoot.doc-2017.tar.xz mirror://gentoo/texlive-module-fixme.doc-2017.tar.xz mirror://gentoo/texlive-module-fixmetodonotes.doc-2017.tar.xz mirror://gentoo/texlive-module-fjodor.doc-2017.tar.xz mirror://gentoo/texlive-module-flabels.doc-2017.tar.xz mirror://gentoo/texlive-module-flacards.doc-2017.tar.xz mirror://gentoo/texlive-module-flagderiv.doc-2017.tar.xz mirror://gentoo/texlive-module-flashcards.doc-2017.tar.xz mirror://gentoo/texlive-module-flashmovie.doc-2017.tar.xz mirror://gentoo/texlive-module-flipbook.doc-2017.tar.xz mirror://gentoo/texlive-module-flippdf.doc-2017.tar.xz mirror://gentoo/texlive-module-floatflt.doc-2017.tar.xz mirror://gentoo/texlive-module-floatrow.doc-2017.tar.xz mirror://gentoo/texlive-module-flowfram.doc-2017.tar.xz mirror://gentoo/texlive-module-fmp.doc-2017.tar.xz mirror://gentoo/texlive-module-fmtcount.doc-2017.tar.xz mirror://gentoo/texlive-module-fn2end.doc-2017.tar.xz mirror://gentoo/texlive-module-fnbreak.doc-2017.tar.xz mirror://gentoo/texlive-module-fncychap.doc-2017.tar.xz mirror://gentoo/texlive-module-fncylab.doc-2017.tar.xz mirror://gentoo/texlive-module-fnpara.doc-2017.tar.xz mirror://gentoo/texlive-module-fnpct.doc-2017.tar.xz mirror://gentoo/texlive-module-fnumprint.doc-2017.tar.xz mirror://gentoo/texlive-module-foilhtml.doc-2017.tar.xz mirror://gentoo/texlive-module-fontaxes.doc-2017.tar.xz mirror://gentoo/texlive-module-fonttable.doc-2017.tar.xz mirror://gentoo/texlive-module-footmisc.doc-2017.tar.xz mirror://gentoo/texlive-module-footmisx.doc-2017.tar.xz mirror://gentoo/texlive-module-footnotebackref.doc-2017.tar.xz mirror://gentoo/texlive-module-footnotehyper.doc-2017.tar.xz mirror://gentoo/texlive-module-footnoterange.doc-2017.tar.xz mirror://gentoo/texlive-module-footnpag.doc-2017.tar.xz mirror://gentoo/texlive-module-forarray.doc-2017.tar.xz mirror://gentoo/texlive-module-foreign.doc-2017.tar.xz mirror://gentoo/texlive-module-forloop.doc-2017.tar.xz mirror://gentoo/texlive-module-formlett.doc-2017.tar.xz mirror://gentoo/texlive-module-formular.doc-2017.tar.xz mirror://gentoo/texlive-module-fragments.doc-2017.tar.xz mirror://gentoo/texlive-module-frame.doc-2017.tar.xz mirror://gentoo/texlive-module-framed.doc-2017.tar.xz mirror://gentoo/texlive-module-frankenstein.doc-2017.tar.xz mirror://gentoo/texlive-module-frege.doc-2017.tar.xz mirror://gentoo/texlive-module-ftcap.doc-2017.tar.xz mirror://gentoo/texlive-module-ftnxtra.doc-2017.tar.xz mirror://gentoo/texlive-module-fullblck.doc-2017.tar.xz mirror://gentoo/texlive-module-fullminipage.doc-2017.tar.xz mirror://gentoo/texlive-module-fullwidth.doc-2017.tar.xz mirror://gentoo/texlive-module-fundus-calligra.doc-2017.tar.xz mirror://gentoo/texlive-module-fundus-sueterlin.doc-2017.tar.xz mirror://gentoo/texlive-module-fvextra.doc-2017.tar.xz mirror://gentoo/texlive-module-fwlw.doc-2017.tar.xz mirror://gentoo/texlive-module-gauss.doc-2017.tar.xz mirror://gentoo/texlive-module-gcard.doc-2017.tar.xz mirror://gentoo/texlive-module-gcite.doc-2017.tar.xz mirror://gentoo/texlive-module-gender.doc-2017.tar.xz mirror://gentoo/texlive-module-genmpage.doc-2017.tar.xz mirror://gentoo/texlive-module-getfiledate.doc-2017.tar.xz mirror://gentoo/texlive-module-getitems.doc-2017.tar.xz mirror://gentoo/texlive-module-ginpenc.doc-2017.tar.xz mirror://gentoo/texlive-module-gitfile-info.doc-2017.tar.xz mirror://gentoo/texlive-module-gitinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-gitinfo2.doc-2017.tar.xz mirror://gentoo/texlive-module-gitlog.doc-2017.tar.xz mirror://gentoo/texlive-module-gloss.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-danish.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-dutch.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-english.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-extra.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-french.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-german.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-irish.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-italian.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-magyar.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-polish.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-portuges.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-serbian.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-spanish.doc-2017.tar.xz mirror://gentoo/texlive-module-gmdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-gmdoc-enhance.doc-2017.tar.xz mirror://gentoo/texlive-module-gmiflink.doc-2017.tar.xz mirror://gentoo/texlive-module-gmutils.doc-2017.tar.xz mirror://gentoo/texlive-module-gmverb.doc-2017.tar.xz mirror://gentoo/texlive-module-graphbox.doc-2017.tar.xz mirror://gentoo/texlive-module-graphicx-psmin.doc-2017.tar.xz mirror://gentoo/texlive-module-graphicxbox.doc-2017.tar.xz mirror://gentoo/texlive-module-grayhints.doc-2017.tar.xz mirror://gentoo/texlive-module-grfpaste.doc-2017.tar.xz mirror://gentoo/texlive-module-grid.doc-2017.tar.xz mirror://gentoo/texlive-module-grid-system.doc-2017.tar.xz mirror://gentoo/texlive-module-gridset.doc-2017.tar.xz mirror://gentoo/texlive-module-guitlogo.doc-2017.tar.xz mirror://gentoo/texlive-module-halloweenmath.doc-2017.tar.xz mirror://gentoo/texlive-module-handout.doc-2017.tar.xz mirror://gentoo/texlive-module-hang.doc-2017.tar.xz mirror://gentoo/texlive-module-hanging.doc-2017.tar.xz mirror://gentoo/texlive-module-hardwrap.doc-2017.tar.xz mirror://gentoo/texlive-module-harnon-cv.doc-2017.tar.xz mirror://gentoo/texlive-module-harpoon.doc-2017.tar.xz mirror://gentoo/texlive-module-hc.doc-2017.tar.xz mirror://gentoo/texlive-module-he-she.doc-2017.tar.xz mirror://gentoo/texlive-module-hhtensor.doc-2017.tar.xz mirror://gentoo/texlive-module-histogr.doc-2017.tar.xz mirror://gentoo/texlive-module-hitec.doc-2017.tar.xz mirror://gentoo/texlive-module-hletter.doc-2017.tar.xz mirror://gentoo/texlive-module-hpsdiss.doc-2017.tar.xz mirror://gentoo/texlive-module-hrefhide.doc-2017.tar.xz mirror://gentoo/texlive-module-hvindex.doc-2017.tar.xz mirror://gentoo/texlive-module-hypdvips.doc-2017.tar.xz mirror://gentoo/texlive-module-hyper.doc-2017.tar.xz mirror://gentoo/texlive-module-hypernat.doc-2017.tar.xz mirror://gentoo/texlive-module-hyperref-docsrc.doc-2017.tar.xz mirror://gentoo/texlive-module-hyperxmp.doc-2017.tar.xz mirror://gentoo/texlive-module-hyphenat.doc-2017.tar.xz mirror://gentoo/texlive-module-idxcmds.doc-2017.tar.xz mirror://gentoo/texlive-module-idxlayout.doc-2017.tar.xz mirror://gentoo/texlive-module-iffont.doc-2017.tar.xz mirror://gentoo/texlive-module-ifmslide.doc-2017.tar.xz mirror://gentoo/texlive-module-ifmtarg.doc-2017.tar.xz mirror://gentoo/texlive-module-ifnextok.doc-2017.tar.xz mirror://gentoo/texlive-module-ifoddpage.doc-2017.tar.xz mirror://gentoo/texlive-module-ifplatform.doc-2017.tar.xz mirror://gentoo/texlive-module-ifthenx.doc-2017.tar.xz mirror://gentoo/texlive-module-iitem.doc-2017.tar.xz mirror://gentoo/texlive-module-image-gallery.doc-2017.tar.xz mirror://gentoo/texlive-module-imakeidx.doc-2017.tar.xz mirror://gentoo/texlive-module-import.doc-2017.tar.xz mirror://gentoo/texlive-module-incgraph.doc-2017.tar.xz mirror://gentoo/texlive-module-indextools.doc-2017.tar.xz mirror://gentoo/texlive-module-inlinedef.doc-2017.tar.xz mirror://gentoo/texlive-module-inputtrc.doc-2017.tar.xz mirror://gentoo/texlive-module-interactiveworkbook.doc-2017.tar.xz mirror://gentoo/texlive-module-interfaces.doc-2017.tar.xz mirror://gentoo/texlive-module-inversepath.doc-2017.tar.xz mirror://gentoo/texlive-module-invoice.doc-2017.tar.xz mirror://gentoo/texlive-module-iso.doc-2017.tar.xz mirror://gentoo/texlive-module-iso10303.doc-2017.tar.xz mirror://gentoo/texlive-module-isodate.doc-2017.tar.xz mirror://gentoo/texlive-module-isodoc.doc-2017.tar.xz mirror://gentoo/texlive-module-isonums.doc-2017.tar.xz mirror://gentoo/texlive-module-isorot.doc-2017.tar.xz mirror://gentoo/texlive-module-isotope.doc-2017.tar.xz mirror://gentoo/texlive-module-issuulinks.doc-2017.tar.xz mirror://gentoo/texlive-module-iwhdp.doc-2017.tar.xz mirror://gentoo/texlive-module-jlabels.doc-2017.tar.xz mirror://gentoo/texlive-module-jslectureplanner.doc-2017.tar.xz mirror://gentoo/texlive-module-jumplines.doc-2017.tar.xz mirror://gentoo/texlive-module-jvlisting.doc-2017.tar.xz mirror://gentoo/texlive-module-kantlipsum.doc-2017.tar.xz mirror://gentoo/texlive-module-kerntest.doc-2017.tar.xz mirror://gentoo/texlive-module-keycommand.doc-2017.tar.xz mirror://gentoo/texlive-module-keyfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-keyreader.doc-2017.tar.xz mirror://gentoo/texlive-module-keystroke.doc-2017.tar.xz mirror://gentoo/texlive-module-keyval2e.doc-2017.tar.xz mirror://gentoo/texlive-module-keyvaltable.doc-2017.tar.xz mirror://gentoo/texlive-module-kix.doc-2017.tar.xz mirror://gentoo/texlive-module-koma-moderncvclassic.doc-2017.tar.xz mirror://gentoo/texlive-module-koma-script-sfs.doc-2017.tar.xz mirror://gentoo/texlive-module-komacv.doc-2017.tar.xz mirror://gentoo/texlive-module-ktv-texdata.doc-2017.tar.xz mirror://gentoo/texlive-module-l3build.doc-2017.tar.xz mirror://gentoo/texlive-module-labbook.doc-2017.tar.xz mirror://gentoo/texlive-module-labels.doc-2017.tar.xz mirror://gentoo/texlive-module-lastpackage.doc-2017.tar.xz mirror://gentoo/texlive-module-lastpage.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-tds.doc-2017.tar.xz mirror://gentoo/texlive-module-latexdemo.doc-2017.tar.xz mirror://gentoo/texlive-module-latexgit.doc-2017.tar.xz mirror://gentoo/texlive-module-layouts.doc-2017.tar.xz mirror://gentoo/texlive-module-lazylist.doc-2017.tar.xz mirror://gentoo/texlive-module-lcd.doc-2017.tar.xz mirror://gentoo/texlive-module-lcg.doc-2017.tar.xz mirror://gentoo/texlive-module-leading.doc-2017.tar.xz mirror://gentoo/texlive-module-leftidx.doc-2017.tar.xz mirror://gentoo/texlive-module-lengthconvert.doc-2017.tar.xz mirror://gentoo/texlive-module-lettre.doc-2017.tar.xz mirror://gentoo/texlive-module-lettrine.doc-2017.tar.xz mirror://gentoo/texlive-module-lewis.doc-2017.tar.xz mirror://gentoo/texlive-module-lhelp.doc-2017.tar.xz mirror://gentoo/texlive-module-libgreek.doc-2017.tar.xz mirror://gentoo/texlive-module-limap.doc-2017.tar.xz mirror://gentoo/texlive-module-linegoal.doc-2017.tar.xz mirror://gentoo/texlive-module-linop.doc-2017.tar.xz mirror://gentoo/texlive-module-lipsum.doc-2017.tar.xz mirror://gentoo/texlive-module-lisp-on-tex.doc-2017.tar.xz mirror://gentoo/texlive-module-listing.doc-2017.tar.xz mirror://gentoo/texlive-module-listlbls.doc-2017.tar.xz mirror://gentoo/texlive-module-listliketab.doc-2017.tar.xz mirror://gentoo/texlive-module-listofsymbols.doc-2017.tar.xz mirror://gentoo/texlive-module-lkproof.doc-2017.tar.xz mirror://gentoo/texlive-module-lmake.doc-2017.tar.xz mirror://gentoo/texlive-module-locality.doc-2017.tar.xz mirror://gentoo/texlive-module-localloc.doc-2017.tar.xz mirror://gentoo/texlive-module-logbox.doc-2017.tar.xz mirror://gentoo/texlive-module-logical-markup-utils.doc-2017.tar.xz mirror://gentoo/texlive-module-logpap.doc-2017.tar.xz mirror://gentoo/texlive-module-longfbox.doc-2017.tar.xz mirror://gentoo/texlive-module-longfigure.doc-2017.tar.xz mirror://gentoo/texlive-module-longnamefilelist.doc-2017.tar.xz mirror://gentoo/texlive-module-loops.doc-2017.tar.xz mirror://gentoo/texlive-module-lsc.doc-2017.tar.xz mirror://gentoo/texlive-module-lstaddons.doc-2017.tar.xz mirror://gentoo/texlive-module-lt3graph.doc-2017.tar.xz mirror://gentoo/texlive-module-ltablex.doc-2017.tar.xz mirror://gentoo/texlive-module-ltabptch.doc-2017.tar.xz mirror://gentoo/texlive-module-ltxdockit.doc-2017.tar.xz mirror://gentoo/texlive-module-ltxindex.doc-2017.tar.xz mirror://gentoo/texlive-module-ltxkeys.doc-2017.tar.xz mirror://gentoo/texlive-module-ltxnew.doc-2017.tar.xz mirror://gentoo/texlive-module-ltxtools.doc-2017.tar.xz mirror://gentoo/texlive-module-macroswap.doc-2017.tar.xz mirror://gentoo/texlive-module-magaz.doc-2017.tar.xz mirror://gentoo/texlive-module-mailing.doc-2017.tar.xz mirror://gentoo/texlive-module-mailmerge.doc-2017.tar.xz mirror://gentoo/texlive-module-makebarcode.doc-2017.tar.xz mirror://gentoo/texlive-module-makebase.doc-2017.tar.xz mirror://gentoo/texlive-module-makebox.doc-2017.tar.xz mirror://gentoo/texlive-module-makecell.doc-2017.tar.xz mirror://gentoo/texlive-module-makecirc.doc-2017.tar.xz mirror://gentoo/texlive-module-makecmds.doc-2017.tar.xz mirror://gentoo/texlive-module-makedtx.doc-2017.tar.xz mirror://gentoo/texlive-module-makeglos.doc-2017.tar.xz mirror://gentoo/texlive-module-mandi.doc-2017.tar.xz mirror://gentoo/texlive-module-manuscript.doc-2017.tar.xz mirror://gentoo/texlive-module-marginfix.doc-2017.tar.xz mirror://gentoo/texlive-module-marginnote.doc-2017.tar.xz mirror://gentoo/texlive-module-markdown.doc-2017.tar.xz mirror://gentoo/texlive-module-mathalfa.doc-2017.tar.xz mirror://gentoo/texlive-module-mathastext.doc-2017.tar.xz mirror://gentoo/texlive-module-mathexam.doc-2017.tar.xz mirror://gentoo/texlive-module-maybemath.doc-2017.tar.xz mirror://gentoo/texlive-module-mbenotes.doc-2017.tar.xz mirror://gentoo/texlive-module-mcaption.doc-2017.tar.xz mirror://gentoo/texlive-module-mceinleger.doc-2017.tar.xz mirror://gentoo/texlive-module-mcexam.doc-2017.tar.xz mirror://gentoo/texlive-module-mcite.doc-2017.tar.xz mirror://gentoo/texlive-module-mciteplus.doc-2017.tar.xz mirror://gentoo/texlive-module-mdframed.doc-2017.tar.xz mirror://gentoo/texlive-module-media9.doc-2017.tar.xz mirror://gentoo/texlive-module-medstarbeamer.doc-2017.tar.xz mirror://gentoo/texlive-module-meetingmins.doc-2017.tar.xz mirror://gentoo/texlive-module-memexsupp.doc-2017.tar.xz mirror://gentoo/texlive-module-memory.doc-2017.tar.xz mirror://gentoo/texlive-module-menu.doc-2017.tar.xz mirror://gentoo/texlive-module-menukeys.doc-2017.tar.xz mirror://gentoo/texlive-module-method.doc-2017.tar.xz mirror://gentoo/texlive-module-metre.doc-2017.tar.xz mirror://gentoo/texlive-module-mfirstuc.doc-2017.tar.xz mirror://gentoo/texlive-module-mftinc.doc-2017.tar.xz mirror://gentoo/texlive-module-midpage.doc-2017.tar.xz mirror://gentoo/texlive-module-minibox.doc-2017.tar.xz mirror://gentoo/texlive-module-minidocument.doc-2017.tar.xz mirror://gentoo/texlive-module-minifp.doc-2017.tar.xz mirror://gentoo/texlive-module-minipage-marginpar.doc-2017.tar.xz mirror://gentoo/texlive-module-minitoc.doc-2017.tar.xz mirror://gentoo/texlive-module-minorrevision.doc-2017.tar.xz mirror://gentoo/texlive-module-minted.doc-2017.tar.xz mirror://gentoo/texlive-module-minutes.doc-2017.tar.xz mirror://gentoo/texlive-module-mla-paper.doc-2017.tar.xz mirror://gentoo/texlive-module-mlist.doc-2017.tar.xz mirror://gentoo/texlive-module-mmap.doc-2017.tar.xz mirror://gentoo/texlive-module-mnotes.doc-2017.tar.xz mirror://gentoo/texlive-module-moderncv.doc-2017.tar.xz mirror://gentoo/texlive-module-moderntimeline.doc-2017.tar.xz mirror://gentoo/texlive-module-modref.doc-2017.tar.xz mirror://gentoo/texlive-module-modroman.doc-2017.tar.xz mirror://gentoo/texlive-module-modular.doc-2017.tar.xz mirror://gentoo/texlive-module-monofill.doc-2017.tar.xz mirror://gentoo/texlive-module-moodle.doc-2017.tar.xz mirror://gentoo/texlive-module-moreenum.doc-2017.tar.xz mirror://gentoo/texlive-module-morefloats.doc-2017.tar.xz mirror://gentoo/texlive-module-morehype.doc-2017.tar.xz mirror://gentoo/texlive-module-moresize.doc-2017.tar.xz mirror://gentoo/texlive-module-moreverb.doc-2017.tar.xz mirror://gentoo/texlive-module-morewrites.doc-2017.tar.xz mirror://gentoo/texlive-module-movie15.doc-2017.tar.xz mirror://gentoo/texlive-module-mparhack.doc-2017.tar.xz mirror://gentoo/texlive-module-mpostinl.doc-2017.tar.xz mirror://gentoo/texlive-module-msc.doc-2017.tar.xz mirror://gentoo/texlive-module-msg.doc-2017.tar.xz mirror://gentoo/texlive-module-mslapa.doc-2017.tar.xz mirror://gentoo/texlive-module-mtgreek.doc-2017.tar.xz mirror://gentoo/texlive-module-multenum.doc-2017.tar.xz mirror://gentoo/texlive-module-multiaudience.doc-2017.tar.xz mirror://gentoo/texlive-module-multibbl.doc-2017.tar.xz mirror://gentoo/texlive-module-multicap.doc-2017.tar.xz mirror://gentoo/texlive-module-multidef.doc-2017.tar.xz mirror://gentoo/texlive-module-multienv.doc-2017.tar.xz mirror://gentoo/texlive-module-multiexpand.doc-2017.tar.xz mirror://gentoo/texlive-module-multirow.doc-2017.tar.xz mirror://gentoo/texlive-module-mversion.doc-2017.tar.xz mirror://gentoo/texlive-module-mwe.doc-2017.tar.xz mirror://gentoo/texlive-module-mycv.doc-2017.tar.xz mirror://gentoo/texlive-module-mylatexformat.doc-2017.tar.xz mirror://gentoo/texlive-module-nag.doc-2017.tar.xz mirror://gentoo/texlive-module-nameauth.doc-2017.tar.xz mirror://gentoo/texlive-module-namespc.doc-2017.tar.xz mirror://gentoo/texlive-module-ncclatex.doc-2017.tar.xz mirror://gentoo/texlive-module-ncctools.doc-2017.tar.xz mirror://gentoo/texlive-module-needspace.doc-2017.tar.xz mirror://gentoo/texlive-module-newcommand.doc-2017.tar.xz mirror://gentoo/texlive-module-newenviron.doc-2017.tar.xz mirror://gentoo/texlive-module-newfile.doc-2017.tar.xz mirror://gentoo/texlive-module-newlfm.doc-2017.tar.xz mirror://gentoo/texlive-module-newspaper.doc-2017.tar.xz mirror://gentoo/texlive-module-newunicodechar.doc-2017.tar.xz mirror://gentoo/texlive-module-newvbtm.doc-2017.tar.xz mirror://gentoo/texlive-module-newverbs.doc-2017.tar.xz mirror://gentoo/texlive-module-nfssext-cfr.doc-2017.tar.xz mirror://gentoo/texlive-module-nicefilelist.doc-2017.tar.xz mirror://gentoo/texlive-module-niceframe.doc-2017.tar.xz mirror://gentoo/texlive-module-nicetext.doc-2017.tar.xz mirror://gentoo/texlive-module-nlctdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-noconflict.doc-2017.tar.xz mirror://gentoo/texlive-module-noindentafter.doc-2017.tar.xz mirror://gentoo/texlive-module-noitcrul.doc-2017.tar.xz mirror://gentoo/texlive-module-nolbreaks.doc-2017.tar.xz mirror://gentoo/texlive-module-nomencl.doc-2017.tar.xz mirror://gentoo/texlive-module-nomentbl.doc-2017.tar.xz mirror://gentoo/texlive-module-nonfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-nonumonpart.doc-2017.tar.xz mirror://gentoo/texlive-module-nopageno.doc-2017.tar.xz mirror://gentoo/texlive-module-normalcolor.doc-2017.tar.xz mirror://gentoo/texlive-module-notes.doc-2017.tar.xz mirror://gentoo/texlive-module-notespages.doc-2017.tar.xz mirror://gentoo/texlive-module-notoccite.doc-2017.tar.xz mirror://gentoo/texlive-module-nowidow.doc-2017.tar.xz mirror://gentoo/texlive-module-nox.doc-2017.tar.xz mirror://gentoo/texlive-module-ntheorem.doc-2017.tar.xz mirror://gentoo/texlive-module-numberedblock.doc-2017.tar.xz mirror://gentoo/texlive-module-numname.doc-2017.tar.xz mirror://gentoo/texlive-module-numprint.doc-2017.tar.xz mirror://gentoo/texlive-module-numspell.doc-2017.tar.xz mirror://gentoo/texlive-module-ocg-p.doc-2017.tar.xz mirror://gentoo/texlive-module-ocgx.doc-2017.tar.xz mirror://gentoo/texlive-module-ocgx2.doc-2017.tar.xz mirror://gentoo/texlive-module-ocr-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-octavo.doc-2017.tar.xz mirror://gentoo/texlive-module-oldstyle.doc-2017.tar.xz mirror://gentoo/texlive-module-onlyamsmath.doc-2017.tar.xz mirror://gentoo/texlive-module-opcit.doc-2017.tar.xz mirror://gentoo/texlive-module-optidef.doc-2017.tar.xz mirror://gentoo/texlive-module-optional.doc-2017.tar.xz mirror://gentoo/texlive-module-options.doc-2017.tar.xz mirror://gentoo/texlive-module-outline.doc-2017.tar.xz mirror://gentoo/texlive-module-outliner.doc-2017.tar.xz mirror://gentoo/texlive-module-outlines.doc-2017.tar.xz mirror://gentoo/texlive-module-overlays.doc-2017.tar.xz mirror://gentoo/texlive-module-overpic.doc-2017.tar.xz mirror://gentoo/texlive-module-pagecolor.doc-2017.tar.xz mirror://gentoo/texlive-module-pagecont.doc-2017.tar.xz mirror://gentoo/texlive-module-pagenote.doc-2017.tar.xz mirror://gentoo/texlive-module-pagerange.doc-2017.tar.xz mirror://gentoo/texlive-module-pageslts.doc-2017.tar.xz mirror://gentoo/texlive-module-paper.doc-2017.tar.xz mirror://gentoo/texlive-module-papercdcase.doc-2017.tar.xz mirror://gentoo/texlive-module-papermas.doc-2017.tar.xz mirror://gentoo/texlive-module-papertex.doc-2017.tar.xz mirror://gentoo/texlive-module-paracol.doc-2017.tar.xz mirror://gentoo/texlive-module-parades.doc-2017.tar.xz mirror://gentoo/texlive-module-paralist.doc-2017.tar.xz mirror://gentoo/texlive-module-paresse.doc-2017.tar.xz mirror://gentoo/texlive-module-parnotes.doc-2017.tar.xz mirror://gentoo/texlive-module-parselines.doc-2017.tar.xz mirror://gentoo/texlive-module-pas-cours.doc-2017.tar.xz mirror://gentoo/texlive-module-pas-cv.doc-2017.tar.xz mirror://gentoo/texlive-module-pas-tableur.doc-2017.tar.xz mirror://gentoo/texlive-module-patchcmd.doc-2017.tar.xz mirror://gentoo/texlive-module-pauldoc.doc-2017.tar.xz mirror://gentoo/texlive-module-pawpict.doc-2017.tar.xz mirror://gentoo/texlive-module-pbox.doc-2017.tar.xz mirror://gentoo/texlive-module-pbsheet.doc-2017.tar.xz mirror://gentoo/texlive-module-pdf14.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfcomment.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfcprot.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfmarginpar.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfpagediff.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfscreen.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfslide.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfsync.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfwin.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfx.doc-2017.tar.xz mirror://gentoo/texlive-module-pecha.doc-2017.tar.xz mirror://gentoo/texlive-module-perltex.doc-2017.tar.xz mirror://gentoo/texlive-module-permute.doc-2017.tar.xz mirror://gentoo/texlive-module-petiteannonce.doc-2017.tar.xz mirror://gentoo/texlive-module-phffullpagefigure.doc-2017.tar.xz mirror://gentoo/texlive-module-phfnote.doc-2017.tar.xz mirror://gentoo/texlive-module-phfparen.doc-2017.tar.xz mirror://gentoo/texlive-module-phfqit.doc-2017.tar.xz mirror://gentoo/texlive-module-phfquotetext.doc-2017.tar.xz mirror://gentoo/texlive-module-phfsvnwatermark.doc-2017.tar.xz mirror://gentoo/texlive-module-phfthm.doc-2017.tar.xz mirror://gentoo/texlive-module-philex.doc-2017.tar.xz mirror://gentoo/texlive-module-phonenumbers.doc-2017.tar.xz mirror://gentoo/texlive-module-photo.doc-2017.tar.xz mirror://gentoo/texlive-module-piff.doc-2017.tar.xz mirror://gentoo/texlive-module-pkgloader.doc-2017.tar.xz mirror://gentoo/texlive-module-placeins.doc-2017.tar.xz mirror://gentoo/texlive-module-plantslabels.doc-2017.tar.xz mirror://gentoo/texlive-module-plates.doc-2017.tar.xz mirror://gentoo/texlive-module-plweb.doc-2017.tar.xz mirror://gentoo/texlive-module-polynom.doc-2017.tar.xz mirror://gentoo/texlive-module-polynomial.doc-2017.tar.xz mirror://gentoo/texlive-module-polytable.doc-2017.tar.xz mirror://gentoo/texlive-module-postcards.doc-2017.tar.xz mirror://gentoo/texlive-module-poster-mac.doc-2017.tar.xz mirror://gentoo/texlive-module-ppr-prv.doc-2017.tar.xz mirror://gentoo/texlive-module-preprint.doc-2017.tar.xz mirror://gentoo/texlive-module-pressrelease.doc-2017.tar.xz mirror://gentoo/texlive-module-prettyref.doc-2017.tar.xz mirror://gentoo/texlive-module-preview.doc-2017.tar.xz mirror://gentoo/texlive-module-printlen.doc-2017.tar.xz mirror://gentoo/texlive-module-probsoln.doc-2017.tar.xz mirror://gentoo/texlive-module-program.doc-2017.tar.xz mirror://gentoo/texlive-module-progress.doc-2017.tar.xz mirror://gentoo/texlive-module-progressbar.doc-2017.tar.xz mirror://gentoo/texlive-module-proofread.doc-2017.tar.xz mirror://gentoo/texlive-module-properties.doc-2017.tar.xz mirror://gentoo/texlive-module-prosper.doc-2017.tar.xz mirror://gentoo/texlive-module-protex.doc-2017.tar.xz mirror://gentoo/texlive-module-protocol.doc-2017.tar.xz mirror://gentoo/texlive-module-psfragx.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-pdf.doc-2017.tar.xz mirror://gentoo/texlive-module-pstool.doc-2017.tar.xz mirror://gentoo/texlive-module-pstring.doc-2017.tar.xz mirror://gentoo/texlive-module-pxgreeks.doc-2017.tar.xz mirror://gentoo/texlive-module-python.doc-2017.tar.xz mirror://gentoo/texlive-module-qcm.doc-2017.tar.xz mirror://gentoo/texlive-module-qstest.doc-2017.tar.xz mirror://gentoo/texlive-module-qsymbols.doc-2017.tar.xz mirror://gentoo/texlive-module-quicktype.doc-2017.tar.xz mirror://gentoo/texlive-module-quotchap.doc-2017.tar.xz mirror://gentoo/texlive-module-quoting.doc-2017.tar.xz mirror://gentoo/texlive-module-quotmark.doc-2017.tar.xz mirror://gentoo/texlive-module-ran_toks.doc-2017.tar.xz mirror://gentoo/texlive-module-randtext.doc-2017.tar.xz mirror://gentoo/texlive-module-rccol.doc-2017.tar.xz mirror://gentoo/texlive-module-rcs-multi.doc-2017.tar.xz mirror://gentoo/texlive-module-rcsinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-readarray.doc-2017.tar.xz mirror://gentoo/texlive-module-realboxes.doc-2017.tar.xz mirror://gentoo/texlive-module-recipe.doc-2017.tar.xz mirror://gentoo/texlive-module-recipebook.doc-2017.tar.xz mirror://gentoo/texlive-module-recipecard.doc-2017.tar.xz mirror://gentoo/texlive-module-rectopma.doc-2017.tar.xz mirror://gentoo/texlive-module-refcheck.doc-2017.tar.xz mirror://gentoo/texlive-module-refenums.doc-2017.tar.xz mirror://gentoo/texlive-module-reflectgraphics.doc-2017.tar.xz mirror://gentoo/texlive-module-refman.doc-2017.tar.xz mirror://gentoo/texlive-module-refstyle.doc-2017.tar.xz mirror://gentoo/texlive-module-regcount.doc-2017.tar.xz mirror://gentoo/texlive-module-regexpatch.doc-2017.tar.xz mirror://gentoo/texlive-module-register.doc-2017.tar.xz mirror://gentoo/texlive-module-regstats.doc-2017.tar.xz mirror://gentoo/texlive-module-relenc.doc-2017.tar.xz mirror://gentoo/texlive-module-relsize.doc-2017.tar.xz mirror://gentoo/texlive-module-repeatindex.doc-2017.tar.xz mirror://gentoo/texlive-module-repltext.doc-2017.tar.xz mirror://gentoo/texlive-module-rjlparshap.doc-2017.tar.xz mirror://gentoo/texlive-module-rlepsf.doc-2017.tar.xz mirror://gentoo/texlive-module-rmpage.doc-2017.tar.xz mirror://gentoo/texlive-module-robustcommand.doc-2017.tar.xz mirror://gentoo/texlive-module-robustindex.doc-2017.tar.xz mirror://gentoo/texlive-module-romanbar.doc-2017.tar.xz mirror://gentoo/texlive-module-romanbarpagenumber.doc-2017.tar.xz mirror://gentoo/texlive-module-romanneg.doc-2017.tar.xz mirror://gentoo/texlive-module-romannum.doc-2017.tar.xz mirror://gentoo/texlive-module-rotfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-rotpages.doc-2017.tar.xz mirror://gentoo/texlive-module-roundbox.doc-2017.tar.xz mirror://gentoo/texlive-module-rterface.doc-2017.tar.xz mirror://gentoo/texlive-module-rtkinenc.doc-2017.tar.xz mirror://gentoo/texlive-module-rulercompass.doc-2017.tar.xz mirror://gentoo/texlive-module-rvwrite.doc-2017.tar.xz mirror://gentoo/texlive-module-sanitize-umlaut.doc-2017.tar.xz mirror://gentoo/texlive-module-sauerj.doc-2017.tar.xz mirror://gentoo/texlive-module-savefnmark.doc-2017.tar.xz mirror://gentoo/texlive-module-savetrees.doc-2017.tar.xz mirror://gentoo/texlive-module-scale.doc-2017.tar.xz mirror://gentoo/texlive-module-scalebar.doc-2017.tar.xz mirror://gentoo/texlive-module-scalerel.doc-2017.tar.xz mirror://gentoo/texlive-module-scanpages.doc-2017.tar.xz mirror://gentoo/texlive-module-scrlttr2copy.doc-2017.tar.xz mirror://gentoo/texlive-module-sdrt.doc-2017.tar.xz mirror://gentoo/texlive-module-secdot.doc-2017.tar.xz mirror://gentoo/texlive-module-sectionbox.doc-2017.tar.xz mirror://gentoo/texlive-module-sectsty.doc-2017.tar.xz mirror://gentoo/texlive-module-seealso.doc-2017.tar.xz mirror://gentoo/texlive-module-selectp.doc-2017.tar.xz mirror://gentoo/texlive-module-semantic.doc-2017.tar.xz mirror://gentoo/texlive-module-semantic-markup.doc-2017.tar.xz mirror://gentoo/texlive-module-semioneside.doc-2017.tar.xz mirror://gentoo/texlive-module-semproc.doc-2017.tar.xz mirror://gentoo/texlive-module-sepfootnotes.doc-2017.tar.xz mirror://gentoo/texlive-module-seqsplit.doc-2017.tar.xz mirror://gentoo/texlive-module-sesstime.doc-2017.tar.xz mirror://gentoo/texlive-module-sf298.doc-2017.tar.xz mirror://gentoo/texlive-module-sffms.doc-2017.tar.xz mirror://gentoo/texlive-module-shadethm.doc-2017.tar.xz mirror://gentoo/texlive-module-shadow.doc-2017.tar.xz mirror://gentoo/texlive-module-shadowtext.doc-2017.tar.xz mirror://gentoo/texlive-module-shapepar.doc-2017.tar.xz mirror://gentoo/texlive-module-shdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-shipunov.doc-2017.tar.xz mirror://gentoo/texlive-module-shorttoc.doc-2017.tar.xz mirror://gentoo/texlive-module-show2e.doc-2017.tar.xz mirror://gentoo/texlive-module-showcharinbox.doc-2017.tar.xz mirror://gentoo/texlive-module-showdim.doc-2017.tar.xz mirror://gentoo/texlive-module-showexpl.doc-2017.tar.xz mirror://gentoo/texlive-module-showlabels.doc-2017.tar.xz mirror://gentoo/texlive-module-sidecap.doc-2017.tar.xz mirror://gentoo/texlive-module-sidenotes.doc-2017.tar.xz mirror://gentoo/texlive-module-silence.doc-2017.tar.xz mirror://gentoo/texlive-module-simplecd.doc-2017.tar.xz mirror://gentoo/texlive-module-simplecv.doc-2017.tar.xz mirror://gentoo/texlive-module-sitem.doc-2017.tar.xz mirror://gentoo/texlive-module-skb.doc-2017.tar.xz mirror://gentoo/texlive-module-skdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-skeycommand.doc-2017.tar.xz mirror://gentoo/texlive-module-skeyval.doc-2017.tar.xz mirror://gentoo/texlive-module-skrapport.doc-2017.tar.xz mirror://gentoo/texlive-module-slantsc.doc-2017.tar.xz mirror://gentoo/texlive-module-smalltableof.doc-2017.tar.xz mirror://gentoo/texlive-module-smartunits.doc-2017.tar.xz mirror://gentoo/texlive-module-smartref.doc-2017.tar.xz mirror://gentoo/texlive-module-snapshot.doc-2017.tar.xz mirror://gentoo/texlive-module-snotez.doc-2017.tar.xz mirror://gentoo/texlive-module-soul.doc-2017.tar.xz mirror://gentoo/texlive-module-sparklines.doc-2017.tar.xz mirror://gentoo/texlive-module-sphack.doc-2017.tar.xz mirror://gentoo/texlive-module-splitindex.doc-2017.tar.xz mirror://gentoo/texlive-module-spot.doc-2017.tar.xz mirror://gentoo/texlive-module-spotcolor.doc-2017.tar.xz mirror://gentoo/texlive-module-spreadtab.doc-2017.tar.xz mirror://gentoo/texlive-module-spverbatim.doc-2017.tar.xz mirror://gentoo/texlive-module-srbook-mem.doc-2017.tar.xz mirror://gentoo/texlive-module-srcltx.doc-2017.tar.xz mirror://gentoo/texlive-module-sseq.doc-2017.tar.xz mirror://gentoo/texlive-module-sslides.doc-2017.tar.xz mirror://gentoo/texlive-module-stackengine.doc-2017.tar.xz mirror://gentoo/texlive-module-standalone.doc-2017.tar.xz mirror://gentoo/texlive-module-statistik.doc-2017.tar.xz mirror://gentoo/texlive-module-stdclsdv.doc-2017.tar.xz mirror://gentoo/texlive-module-stdpage.doc-2017.tar.xz mirror://gentoo/texlive-module-stex.doc-2017.tar.xz mirror://gentoo/texlive-module-storebox.doc-2017.tar.xz mirror://gentoo/texlive-module-storecmd.doc-2017.tar.xz mirror://gentoo/texlive-module-stringstrings.doc-2017.tar.xz mirror://gentoo/texlive-module-sttools.doc-2017.tar.xz mirror://gentoo/texlive-module-stubs.doc-2017.tar.xz mirror://gentoo/texlive-module-studenthandouts.doc-2017.tar.xz mirror://gentoo/texlive-module-subdepth.doc-2017.tar.xz mirror://gentoo/texlive-module-subeqn.doc-2017.tar.xz mirror://gentoo/texlive-module-subeqnarray.doc-2017.tar.xz mirror://gentoo/texlive-module-subfigmat.doc-2017.tar.xz mirror://gentoo/texlive-module-subfigure.doc-2017.tar.xz mirror://gentoo/texlive-module-subfiles.doc-2017.tar.xz mirror://gentoo/texlive-module-subfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-substitutefont.doc-2017.tar.xz mirror://gentoo/texlive-module-substr.doc-2017.tar.xz mirror://gentoo/texlive-module-supertabular.doc-2017.tar.xz mirror://gentoo/texlive-module-svg.doc-2017.tar.xz mirror://gentoo/texlive-module-svgcolor.doc-2017.tar.xz mirror://gentoo/texlive-module-svn.doc-2017.tar.xz mirror://gentoo/texlive-module-svn-multi.doc-2017.tar.xz mirror://gentoo/texlive-module-svn-prov.doc-2017.tar.xz mirror://gentoo/texlive-module-syntax.doc-2017.tar.xz mirror://gentoo/texlive-module-syntrace.doc-2017.tar.xz mirror://gentoo/texlive-module-synttree.doc-2017.tar.xz mirror://gentoo/texlive-module-tabfigures.doc-2017.tar.xz mirror://gentoo/texlive-module-tableaux.doc-2017.tar.xz mirror://gentoo/texlive-module-tablefootnote.doc-2017.tar.xz mirror://gentoo/texlive-module-tableof.doc-2017.tar.xz mirror://gentoo/texlive-module-tablestyles.doc-2017.tar.xz mirror://gentoo/texlive-module-tablists.doc-2017.tar.xz mirror://gentoo/texlive-module-tabls.doc-2017.tar.xz mirror://gentoo/texlive-module-tabstackengine.doc-2017.tar.xz mirror://gentoo/texlive-module-tabto-ltx.doc-2017.tar.xz mirror://gentoo/texlive-module-tabu.doc-2017.tar.xz mirror://gentoo/texlive-module-tabularborder.doc-2017.tar.xz mirror://gentoo/texlive-module-tabularcalc.doc-2017.tar.xz mirror://gentoo/texlive-module-tabularew.doc-2017.tar.xz mirror://gentoo/texlive-module-tabulary.doc-2017.tar.xz mirror://gentoo/texlive-module-tagging.doc-2017.tar.xz mirror://gentoo/texlive-module-tagpair.doc-2017.tar.xz mirror://gentoo/texlive-module-talk.doc-2017.tar.xz mirror://gentoo/texlive-module-tamefloats.doc-2017.tar.xz mirror://gentoo/texlive-module-tasks.doc-2017.tar.xz mirror://gentoo/texlive-module-tcldoc.doc-2017.tar.xz mirror://gentoo/texlive-module-tcolorbox.doc-2017.tar.xz mirror://gentoo/texlive-module-tdclock.doc-2017.tar.xz mirror://gentoo/texlive-module-technics.doc-2017.tar.xz mirror://gentoo/texlive-module-ted.doc-2017.tar.xz mirror://gentoo/texlive-module-templatetools.doc-2017.tar.xz mirror://gentoo/texlive-module-termcal.doc-2017.tar.xz mirror://gentoo/texlive-module-termlist.doc-2017.tar.xz mirror://gentoo/texlive-module-testhyphens.doc-2017.tar.xz mirror://gentoo/texlive-module-testidx.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-label.doc-2017.tar.xz mirror://gentoo/texlive-module-texmate.doc-2017.tar.xz mirror://gentoo/texlive-module-texments.doc-2017.tar.xz mirror://gentoo/texlive-module-texpower.doc-2017.tar.xz mirror://gentoo/texlive-module-texshade.doc-2017.tar.xz mirror://gentoo/texlive-module-texvc.doc-2017.tar.xz mirror://gentoo/texlive-module-textfit.doc-2017.tar.xz mirror://gentoo/texlive-module-textmerg.doc-2017.tar.xz mirror://gentoo/texlive-module-textpos.doc-2017.tar.xz mirror://gentoo/texlive-module-theoremref.doc-2017.tar.xz mirror://gentoo/texlive-module-thinsp.doc-2017.tar.xz mirror://gentoo/texlive-module-thmtools.doc-2017.tar.xz mirror://gentoo/texlive-module-threadcol.doc-2017.tar.xz mirror://gentoo/texlive-module-threeparttable.doc-2017.tar.xz mirror://gentoo/texlive-module-threeparttablex.doc-2017.tar.xz mirror://gentoo/texlive-module-thumb.doc-2017.tar.xz mirror://gentoo/texlive-module-thumbs.doc-2017.tar.xz mirror://gentoo/texlive-module-thumby.doc-2017.tar.xz mirror://gentoo/texlive-module-ticket.doc-2017.tar.xz mirror://gentoo/texlive-module-titlecaps.doc-2017.tar.xz mirror://gentoo/texlive-module-titlepic.doc-2017.tar.xz mirror://gentoo/texlive-module-titleref.doc-2017.tar.xz mirror://gentoo/texlive-module-titlesec.doc-2017.tar.xz mirror://gentoo/texlive-module-titling.doc-2017.tar.xz mirror://gentoo/texlive-module-tocbibind.doc-2017.tar.xz mirror://gentoo/texlive-module-tocdata.doc-2017.tar.xz mirror://gentoo/texlive-module-tocloft.doc-2017.tar.xz mirror://gentoo/texlive-module-tocvsec2.doc-2017.tar.xz mirror://gentoo/texlive-module-todo.doc-2017.tar.xz mirror://gentoo/texlive-module-todonotes.doc-2017.tar.xz mirror://gentoo/texlive-module-tokenizer.doc-2017.tar.xz mirror://gentoo/texlive-module-toolbox.doc-2017.tar.xz mirror://gentoo/texlive-module-topfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-totcount.doc-2017.tar.xz mirror://gentoo/texlive-module-totpages.doc-2017.tar.xz mirror://gentoo/texlive-module-translations.doc-2017.tar.xz mirror://gentoo/texlive-module-trfsigns.doc-2017.tar.xz mirror://gentoo/texlive-module-trimspaces.doc-2017.tar.xz mirror://gentoo/texlive-module-trivfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-trsym.doc-2017.tar.xz mirror://gentoo/texlive-module-truncate.doc-2017.tar.xz mirror://gentoo/texlive-module-tucv.doc-2017.tar.xz mirror://gentoo/texlive-module-turnthepage.doc-2017.tar.xz mirror://gentoo/texlive-module-twoinone.doc-2017.tar.xz mirror://gentoo/texlive-module-twoup.doc-2017.tar.xz mirror://gentoo/texlive-module-txgreeks.doc-2017.tar.xz mirror://gentoo/texlive-module-type1cm.doc-2017.tar.xz mirror://gentoo/texlive-module-typed-checklist.doc-2017.tar.xz mirror://gentoo/texlive-module-typeface.doc-2017.tar.xz mirror://gentoo/texlive-module-typoaid.doc-2017.tar.xz mirror://gentoo/texlive-module-typogrid.doc-2017.tar.xz mirror://gentoo/texlive-module-uassign.doc-2017.tar.xz mirror://gentoo/texlive-module-ucs.doc-2017.tar.xz mirror://gentoo/texlive-module-uebungsblatt.doc-2017.tar.xz mirror://gentoo/texlive-module-umoline.doc-2017.tar.xz mirror://gentoo/texlive-module-underlin.doc-2017.tar.xz mirror://gentoo/texlive-module-underoverlap.doc-2017.tar.xz mirror://gentoo/texlive-module-undolabl.doc-2017.tar.xz mirror://gentoo/texlive-module-units.doc-2017.tar.xz mirror://gentoo/texlive-module-unravel.doc-2017.tar.xz mirror://gentoo/texlive-module-upmethodology.doc-2017.tar.xz mirror://gentoo/texlive-module-upquote.doc-2017.tar.xz mirror://gentoo/texlive-module-uri.doc-2017.tar.xz mirror://gentoo/texlive-module-ushort.doc-2017.tar.xz mirror://gentoo/texlive-module-uspace.doc-2017.tar.xz mirror://gentoo/texlive-module-uwmslide.doc-2017.tar.xz mirror://gentoo/texlive-module-variablelm.doc-2017.tar.xz mirror://gentoo/texlive-module-varindex.doc-2017.tar.xz mirror://gentoo/texlive-module-varsfromjobname.doc-2017.tar.xz mirror://gentoo/texlive-module-varwidth.doc-2017.tar.xz mirror://gentoo/texlive-module-vdmlisting.doc-2017.tar.xz mirror://gentoo/texlive-module-verbasef.doc-2017.tar.xz mirror://gentoo/texlive-module-verbatimbox.doc-2017.tar.xz mirror://gentoo/texlive-module-verbatimcopy.doc-2017.tar.xz mirror://gentoo/texlive-module-verbdef.doc-2017.tar.xz mirror://gentoo/texlive-module-verbments.doc-2017.tar.xz mirror://gentoo/texlive-module-version.doc-2017.tar.xz mirror://gentoo/texlive-module-versions.doc-2017.tar.xz mirror://gentoo/texlive-module-versonotes.doc-2017.tar.xz mirror://gentoo/texlive-module-vertbars.doc-2017.tar.xz mirror://gentoo/texlive-module-vgrid.doc-2017.tar.xz mirror://gentoo/texlive-module-vhistory.doc-2017.tar.xz mirror://gentoo/texlive-module-vmargin.doc-2017.tar.xz mirror://gentoo/texlive-module-volumes.doc-2017.tar.xz mirror://gentoo/texlive-module-vpe.doc-2017.tar.xz mirror://gentoo/texlive-module-vruler.doc-2017.tar.xz mirror://gentoo/texlive-module-vwcol.doc-2017.tar.xz mirror://gentoo/texlive-module-wallpaper.doc-2017.tar.xz mirror://gentoo/texlive-module-warning.doc-2017.tar.xz mirror://gentoo/texlive-module-warpcol.doc-2017.tar.xz mirror://gentoo/texlive-module-was.doc-2017.tar.xz mirror://gentoo/texlive-module-widetable.doc-2017.tar.xz mirror://gentoo/texlive-module-williams.doc-2017.tar.xz mirror://gentoo/texlive-module-withargs.doc-2017.tar.xz mirror://gentoo/texlive-module-wordcount.doc-2017.tar.xz mirror://gentoo/texlive-module-wordlike.doc-2017.tar.xz mirror://gentoo/texlive-module-wrapfig.doc-2017.tar.xz mirror://gentoo/texlive-module-wtref.doc-2017.tar.xz mirror://gentoo/texlive-module-xargs.doc-2017.tar.xz mirror://gentoo/texlive-module-xassoccnt.doc-2017.tar.xz mirror://gentoo/texlive-module-xcntperchap.doc-2017.tar.xz mirror://gentoo/texlive-module-xcolor-material.doc-2017.tar.xz mirror://gentoo/texlive-module-xcolor-solarized.doc-2017.tar.xz mirror://gentoo/texlive-module-xcomment.doc-2017.tar.xz mirror://gentoo/texlive-module-xdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-xellipsis.doc-2017.tar.xz mirror://gentoo/texlive-module-xfor.doc-2017.tar.xz mirror://gentoo/texlive-module-xhfill.doc-2017.tar.xz mirror://gentoo/texlive-module-xifthen.doc-2017.tar.xz mirror://gentoo/texlive-module-xint.doc-2017.tar.xz mirror://gentoo/texlive-module-xmpincl.doc-2017.tar.xz mirror://gentoo/texlive-module-xnewcommand.doc-2017.tar.xz mirror://gentoo/texlive-module-xoptarg.doc-2017.tar.xz mirror://gentoo/texlive-module-xpatch.doc-2017.tar.xz mirror://gentoo/texlive-module-xpeek.doc-2017.tar.xz mirror://gentoo/texlive-module-xprintlen.doc-2017.tar.xz mirror://gentoo/texlive-module-xpunctuate.doc-2017.tar.xz mirror://gentoo/texlive-module-xsavebox.doc-2017.tar.xz mirror://gentoo/texlive-module-xsim.doc-2017.tar.xz mirror://gentoo/texlive-module-xstring.doc-2017.tar.xz mirror://gentoo/texlive-module-xtab.doc-2017.tar.xz mirror://gentoo/texlive-module-xwatermark.doc-2017.tar.xz mirror://gentoo/texlive-module-xytree.doc-2017.tar.xz mirror://gentoo/texlive-module-yafoot.doc-2017.tar.xz mirror://gentoo/texlive-module-yaletter.doc-2017.tar.xz mirror://gentoo/texlive-module-yagusylo.doc-2017.tar.xz mirror://gentoo/texlive-module-ycbook.doc-2017.tar.xz mirror://gentoo/texlive-module-ydoc.doc-2017.tar.xz mirror://gentoo/texlive-module-yplan.doc-2017.tar.xz mirror://gentoo/texlive-module-zed-csp.doc-2017.tar.xz mirror://gentoo/texlive-module-ziffer.doc-2017.tar.xz mirror://gentoo/texlive-module-zwgetfdate.doc-2017.tar.xz mirror://gentoo/texlive-module-zwpagelayout.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-ESIEEcv.source-2017.tar.xz mirror://gentoo/texlive-module-GS1.source-2017.tar.xz mirror://gentoo/texlive-module-HA-prosper.source-2017.tar.xz mirror://gentoo/texlive-module-Tabbing.source-2017.tar.xz mirror://gentoo/texlive-module-abstract.source-2017.tar.xz mirror://gentoo/texlive-module-achemso.source-2017.tar.xz mirror://gentoo/texlive-module-acronym.source-2017.tar.xz mirror://gentoo/texlive-module-acroterm.source-2017.tar.xz mirror://gentoo/texlive-module-actuarialangle.source-2017.tar.xz mirror://gentoo/texlive-module-actuarialsymbol.source-2017.tar.xz mirror://gentoo/texlive-module-addlines.source-2017.tar.xz mirror://gentoo/texlive-module-adjmulticol.source-2017.tar.xz mirror://gentoo/texlive-module-adjustbox.source-2017.tar.xz mirror://gentoo/texlive-module-adrconv.source-2017.tar.xz mirror://gentoo/texlive-module-alertmessage.source-2017.tar.xz mirror://gentoo/texlive-module-alnumsec.source-2017.tar.xz mirror://gentoo/texlive-module-altfont.source-2017.tar.xz mirror://gentoo/texlive-module-amsaddr.source-2017.tar.xz mirror://gentoo/texlive-module-animate.source-2017.tar.xz mirror://gentoo/texlive-module-answers.source-2017.tar.xz mirror://gentoo/texlive-module-appendix.source-2017.tar.xz mirror://gentoo/texlive-module-apptools.source-2017.tar.xz mirror://gentoo/texlive-module-arcs.source-2017.tar.xz mirror://gentoo/texlive-module-arraysort.source-2017.tar.xz mirror://gentoo/texlive-module-arydshln.source-2017.tar.xz mirror://gentoo/texlive-module-asciilist.source-2017.tar.xz mirror://gentoo/texlive-module-attachfile.source-2017.tar.xz mirror://gentoo/texlive-module-autonum.source-2017.tar.xz mirror://gentoo/texlive-module-autopdf.source-2017.tar.xz mirror://gentoo/texlive-module-avremu.source-2017.tar.xz mirror://gentoo/texlive-module-background.source-2017.tar.xz mirror://gentoo/texlive-module-basicarith.source-2017.tar.xz mirror://gentoo/texlive-module-beamercolorthemeowl.source-2017.tar.xz mirror://gentoo/texlive-module-beamersubframe.source-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-cuerna.source-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-metropolis.source-2017.tar.xz mirror://gentoo/texlive-module-beton.source-2017.tar.xz mirror://gentoo/texlive-module-bewerbung.source-2017.tar.xz mirror://gentoo/texlive-module-bez123.source-2017.tar.xz mirror://gentoo/texlive-module-bhcexam.source-2017.tar.xz mirror://gentoo/texlive-module-bigfoot.source-2017.tar.xz mirror://gentoo/texlive-module-bizcard.source-2017.tar.xz mirror://gentoo/texlive-module-blindtext.source-2017.tar.xz mirror://gentoo/texlive-module-bnumexpr.source-2017.tar.xz mirror://gentoo/texlive-module-boites.source-2017.tar.xz mirror://gentoo/texlive-module-bookcover.source-2017.tar.xz mirror://gentoo/texlive-module-booklet.source-2017.tar.xz mirror://gentoo/texlive-module-boolexpr.source-2017.tar.xz mirror://gentoo/texlive-module-bophook.source-2017.tar.xz mirror://gentoo/texlive-module-boxedminipage2e.source-2017.tar.xz mirror://gentoo/texlive-module-boxhandler.source-2017.tar.xz mirror://gentoo/texlive-module-breakurl.source-2017.tar.xz mirror://gentoo/texlive-module-bullcntr.source-2017.tar.xz mirror://gentoo/texlive-module-calcage.source-2017.tar.xz mirror://gentoo/texlive-module-calculator.source-2017.tar.xz mirror://gentoo/texlive-module-cals.source-2017.tar.xz mirror://gentoo/texlive-module-canoniclayout.source-2017.tar.xz mirror://gentoo/texlive-module-capt-of.source-2017.tar.xz mirror://gentoo/texlive-module-captcont.source-2017.tar.xz mirror://gentoo/texlive-module-catchfilebetweentags.source-2017.tar.xz mirror://gentoo/texlive-module-catechis.source-2017.tar.xz mirror://gentoo/texlive-module-ccaption.source-2017.tar.xz mirror://gentoo/texlive-module-cclicenses.source-2017.tar.xz mirror://gentoo/texlive-module-cd.source-2017.tar.xz mirror://gentoo/texlive-module-cd-cover.source-2017.tar.xz mirror://gentoo/texlive-module-cdpbundl.source-2017.tar.xz mirror://gentoo/texlive-module-changebar.source-2017.tar.xz mirror://gentoo/texlive-module-changepage.source-2017.tar.xz mirror://gentoo/texlive-module-changes.source-2017.tar.xz mirror://gentoo/texlive-module-chappg.source-2017.tar.xz mirror://gentoo/texlive-module-chapterfolder.source-2017.tar.xz mirror://gentoo/texlive-module-chextras.source-2017.tar.xz mirror://gentoo/texlive-module-childdoc.source-2017.tar.xz mirror://gentoo/texlive-module-chletter.source-2017.tar.xz mirror://gentoo/texlive-module-circ.source-2017.tar.xz mirror://gentoo/texlive-module-classpack.source-2017.tar.xz mirror://gentoo/texlive-module-clefval.source-2017.tar.xz mirror://gentoo/texlive-module-cleveref.source-2017.tar.xz mirror://gentoo/texlive-module-cmdtrack.source-2017.tar.xz mirror://gentoo/texlive-module-codepage.source-2017.tar.xz mirror://gentoo/texlive-module-codesection.source-2017.tar.xz mirror://gentoo/texlive-module-collcell.source-2017.tar.xz mirror://gentoo/texlive-module-collectbox.source-2017.tar.xz mirror://gentoo/texlive-module-colordoc.source-2017.tar.xz mirror://gentoo/texlive-module-colorwav.source-2017.tar.xz mirror://gentoo/texlive-module-colorweb.source-2017.tar.xz mirror://gentoo/texlive-module-combine.source-2017.tar.xz mirror://gentoo/texlive-module-commado.source-2017.tar.xz mirror://gentoo/texlive-module-constants.source-2017.tar.xz mirror://gentoo/texlive-module-continue.source-2017.tar.xz mirror://gentoo/texlive-module-contour.source-2017.tar.xz mirror://gentoo/texlive-module-contracard.source-2017.tar.xz mirror://gentoo/texlive-module-conv-xkv.source-2017.tar.xz mirror://gentoo/texlive-module-cooking.source-2017.tar.xz mirror://gentoo/texlive-module-cooking-units.source-2017.tar.xz mirror://gentoo/texlive-module-cool.source-2017.tar.xz mirror://gentoo/texlive-module-coollist.source-2017.tar.xz mirror://gentoo/texlive-module-coolstr.source-2017.tar.xz mirror://gentoo/texlive-module-coolthms.source-2017.tar.xz mirror://gentoo/texlive-module-cooltooltips.source-2017.tar.xz mirror://gentoo/texlive-module-coordsys.source-2017.tar.xz mirror://gentoo/texlive-module-copyedit.source-2017.tar.xz mirror://gentoo/texlive-module-counttexruns.source-2017.tar.xz mirror://gentoo/texlive-module-coverpage.source-2017.tar.xz mirror://gentoo/texlive-module-cprotect.source-2017.tar.xz mirror://gentoo/texlive-module-crossreference.source-2017.tar.xz mirror://gentoo/texlive-module-cuisine.source-2017.tar.xz mirror://gentoo/texlive-module-currfile.source-2017.tar.xz mirror://gentoo/texlive-module-cutwin.source-2017.tar.xz mirror://gentoo/texlive-module-cyber.source-2017.tar.xz mirror://gentoo/texlive-module-cybercic.source-2017.tar.xz mirror://gentoo/texlive-module-dashbox.source-2017.tar.xz mirror://gentoo/texlive-module-dashrule.source-2017.tar.xz mirror://gentoo/texlive-module-datatool.source-2017.tar.xz mirror://gentoo/texlive-module-dateiliste.source-2017.tar.xz mirror://gentoo/texlive-module-datenumber.source-2017.tar.xz mirror://gentoo/texlive-module-datetime.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-bahasai.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-basque.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-breton.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-bulgarian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-catalan.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-croatian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-czech.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-danish.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-dutch.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-en-fulltext.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-english.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-esperanto.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-estonian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-finnish.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-french.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-galician.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-german.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-greek.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-hebrew.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-icelandic.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-irish.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-italian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-it-fulltext.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-latin.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-lsorbian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-magyar.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-norsk.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-polish.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-portuges.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-romanian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-russian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-samin.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-scottish.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-serbian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-slovak.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-slovene.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-spanish.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-swedish.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-turkish.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-ukrainian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-usorbian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-welsh.source-2017.tar.xz mirror://gentoo/texlive-module-decimal.source-2017.tar.xz mirror://gentoo/texlive-module-decorule.source-2017.tar.xz mirror://gentoo/texlive-module-delimtxt.source-2017.tar.xz mirror://gentoo/texlive-module-denisbdoc.source-2017.tar.xz mirror://gentoo/texlive-module-diagbox.source-2017.tar.xz mirror://gentoo/texlive-module-dialogl.source-2017.tar.xz mirror://gentoo/texlive-module-dinbrief.source-2017.tar.xz mirror://gentoo/texlive-module-dirtytalk.source-2017.tar.xz mirror://gentoo/texlive-module-dnaseq.source-2017.tar.xz mirror://gentoo/texlive-module-doclicense.source-2017.tar.xz mirror://gentoo/texlive-module-docmfp.source-2017.tar.xz mirror://gentoo/texlive-module-docmute.source-2017.tar.xz mirror://gentoo/texlive-module-doctools.source-2017.tar.xz mirror://gentoo/texlive-module-documentation.source-2017.tar.xz mirror://gentoo/texlive-module-dotarrow.source-2017.tar.xz mirror://gentoo/texlive-module-dotseqn.source-2017.tar.xz mirror://gentoo/texlive-module-download.source-2017.tar.xz mirror://gentoo/texlive-module-dox.source-2017.tar.xz mirror://gentoo/texlive-module-dprogress.source-2017.tar.xz mirror://gentoo/texlive-module-drac.source-2017.tar.xz mirror://gentoo/texlive-module-draftcopy.source-2017.tar.xz mirror://gentoo/texlive-module-draftwatermark.source-2017.tar.xz mirror://gentoo/texlive-module-dtxdescribe.source-2017.tar.xz mirror://gentoo/texlive-module-dtxgallery.source-2017.tar.xz mirror://gentoo/texlive-module-dynamicnumber.source-2017.tar.xz mirror://gentoo/texlive-module-easyfig.source-2017.tar.xz mirror://gentoo/texlive-module-easyreview.source-2017.tar.xz mirror://gentoo/texlive-module-ebezier.source-2017.tar.xz mirror://gentoo/texlive-module-ecclesiastic.source-2017.tar.xz mirror://gentoo/texlive-module-ecv.source-2017.tar.xz mirror://gentoo/texlive-module-ed.source-2017.tar.xz mirror://gentoo/texlive-module-edmargin.source-2017.tar.xz mirror://gentoo/texlive-module-eemeir.source-2017.tar.xz mirror://gentoo/texlive-module-efbox.source-2017.tar.xz mirror://gentoo/texlive-module-egplot.source-2017.tar.xz mirror://gentoo/texlive-module-ellipsis.source-2017.tar.xz mirror://gentoo/texlive-module-elmath.source-2017.tar.xz mirror://gentoo/texlive-module-elocalloc.source-2017.tar.xz mirror://gentoo/texlive-module-elzcards.source-2017.tar.xz mirror://gentoo/texlive-module-emarks.source-2017.tar.xz mirror://gentoo/texlive-module-embedall.source-2017.tar.xz mirror://gentoo/texlive-module-emptypage.source-2017.tar.xz mirror://gentoo/texlive-module-endfloat.source-2017.tar.xz mirror://gentoo/texlive-module-endheads.source-2017.tar.xz mirror://gentoo/texlive-module-engpron.source-2017.tar.xz mirror://gentoo/texlive-module-engrec.source-2017.tar.xz mirror://gentoo/texlive-module-enumitem-zref.source-2017.tar.xz mirror://gentoo/texlive-module-environ.source-2017.tar.xz mirror://gentoo/texlive-module-epigraph.source-2017.tar.xz mirror://gentoo/texlive-module-epiolmec.source-2017.tar.xz mirror://gentoo/texlive-module-eqlist.source-2017.tar.xz mirror://gentoo/texlive-module-eqnalign.source-2017.tar.xz mirror://gentoo/texlive-module-eqparbox.source-2017.tar.xz mirror://gentoo/texlive-module-errata.source-2017.tar.xz mirror://gentoo/texlive-module-esdiff.source-2017.tar.xz mirror://gentoo/texlive-module-esint.source-2017.tar.xz mirror://gentoo/texlive-module-etaremune.source-2017.tar.xz mirror://gentoo/texlive-module-etextools.source-2017.tar.xz mirror://gentoo/texlive-module-etoc.source-2017.tar.xz mirror://gentoo/texlive-module-eukdate.source-2017.tar.xz mirror://gentoo/texlive-module-everyhook.source-2017.tar.xz mirror://gentoo/texlive-module-everypage.source-2017.tar.xz mirror://gentoo/texlive-module-exam-n.source-2017.tar.xz mirror://gentoo/texlive-module-examdesign.source-2017.tar.xz mirror://gentoo/texlive-module-exercise.source-2017.tar.xz mirror://gentoo/texlive-module-exercises.source-2017.tar.xz mirror://gentoo/texlive-module-exp-testopt.source-2017.tar.xz mirror://gentoo/texlive-module-expdlist.source-2017.tar.xz mirror://gentoo/texlive-module-export.source-2017.tar.xz mirror://gentoo/texlive-module-exsol.source-2017.tar.xz mirror://gentoo/texlive-module-extract.source-2017.tar.xz mirror://gentoo/texlive-module-facsimile.source-2017.tar.xz mirror://gentoo/texlive-module-factura.source-2017.tar.xz mirror://gentoo/texlive-module-fancylabel.source-2017.tar.xz mirror://gentoo/texlive-module-fancynum.source-2017.tar.xz mirror://gentoo/texlive-module-fancypar.source-2017.tar.xz mirror://gentoo/texlive-module-fancytabs.source-2017.tar.xz mirror://gentoo/texlive-module-fancytooltips.source-2017.tar.xz mirror://gentoo/texlive-module-fcolumn.source-2017.tar.xz mirror://gentoo/texlive-module-fgruler.source-2017.tar.xz mirror://gentoo/texlive-module-fibeamer.source-2017.tar.xz mirror://gentoo/texlive-module-fifo-stack.source-2017.tar.xz mirror://gentoo/texlive-module-filecontents.source-2017.tar.xz mirror://gentoo/texlive-module-filecontentsdef.source-2017.tar.xz mirror://gentoo/texlive-module-filedate.source-2017.tar.xz mirror://gentoo/texlive-module-fileinfo.source-2017.tar.xz mirror://gentoo/texlive-module-fink.source-2017.tar.xz mirror://gentoo/texlive-module-finstrut.source-2017.tar.xz mirror://gentoo/texlive-module-fithesis.source-2017.tar.xz mirror://gentoo/texlive-module-fixcmex.source-2017.tar.xz mirror://gentoo/texlive-module-fixme.source-2017.tar.xz mirror://gentoo/texlive-module-fixmetodonotes.source-2017.tar.xz mirror://gentoo/texlive-module-flabels.source-2017.tar.xz mirror://gentoo/texlive-module-flagderiv.source-2017.tar.xz mirror://gentoo/texlive-module-flashcards.source-2017.tar.xz mirror://gentoo/texlive-module-flippdf.source-2017.tar.xz mirror://gentoo/texlive-module-floatflt.source-2017.tar.xz mirror://gentoo/texlive-module-floatrow.source-2017.tar.xz mirror://gentoo/texlive-module-flowfram.source-2017.tar.xz mirror://gentoo/texlive-module-fmp.source-2017.tar.xz mirror://gentoo/texlive-module-fmtcount.source-2017.tar.xz mirror://gentoo/texlive-module-fnbreak.source-2017.tar.xz mirror://gentoo/texlive-module-fnumprint.source-2017.tar.xz mirror://gentoo/texlive-module-foilhtml.source-2017.tar.xz mirror://gentoo/texlive-module-fontaxes.source-2017.tar.xz mirror://gentoo/texlive-module-fonttable.source-2017.tar.xz mirror://gentoo/texlive-module-footmisc.source-2017.tar.xz mirror://gentoo/texlive-module-footmisx.source-2017.tar.xz mirror://gentoo/texlive-module-footnotehyper.source-2017.tar.xz mirror://gentoo/texlive-module-footnoterange.source-2017.tar.xz mirror://gentoo/texlive-module-footnpag.source-2017.tar.xz mirror://gentoo/texlive-module-forarray.source-2017.tar.xz mirror://gentoo/texlive-module-foreign.source-2017.tar.xz mirror://gentoo/texlive-module-forloop.source-2017.tar.xz mirror://gentoo/texlive-module-formular.source-2017.tar.xz mirror://gentoo/texlive-module-frankenstein.source-2017.tar.xz mirror://gentoo/texlive-module-ftnxtra.source-2017.tar.xz mirror://gentoo/texlive-module-fullblck.source-2017.tar.xz mirror://gentoo/texlive-module-fullminipage.source-2017.tar.xz mirror://gentoo/texlive-module-fundus-calligra.source-2017.tar.xz mirror://gentoo/texlive-module-fundus-sueterlin.source-2017.tar.xz mirror://gentoo/texlive-module-fvextra.source-2017.tar.xz mirror://gentoo/texlive-module-gcite.source-2017.tar.xz mirror://gentoo/texlive-module-gender.source-2017.tar.xz mirror://gentoo/texlive-module-genmpage.source-2017.tar.xz mirror://gentoo/texlive-module-getitems.source-2017.tar.xz mirror://gentoo/texlive-module-ginpenc.source-2017.tar.xz mirror://gentoo/texlive-module-gitfile-info.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-danish.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-dutch.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-english.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-extra.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-french.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-german.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-irish.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-italian.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-magyar.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-polish.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-portuges.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-serbian.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-spanish.source-2017.tar.xz mirror://gentoo/texlive-module-gmdoc-enhance.source-2017.tar.xz mirror://gentoo/texlive-module-graphbox.source-2017.tar.xz mirror://gentoo/texlive-module-graphicx-psmin.source-2017.tar.xz mirror://gentoo/texlive-module-graphicxbox.source-2017.tar.xz mirror://gentoo/texlive-module-grayhints.source-2017.tar.xz mirror://gentoo/texlive-module-grid.source-2017.tar.xz mirror://gentoo/texlive-module-gridset.source-2017.tar.xz mirror://gentoo/texlive-module-guitlogo.source-2017.tar.xz mirror://gentoo/texlive-module-halloweenmath.source-2017.tar.xz mirror://gentoo/texlive-module-hanging.source-2017.tar.xz mirror://gentoo/texlive-module-hardwrap.source-2017.tar.xz mirror://gentoo/texlive-module-hc.source-2017.tar.xz mirror://gentoo/texlive-module-hhtensor.source-2017.tar.xz mirror://gentoo/texlive-module-histogr.source-2017.tar.xz mirror://gentoo/texlive-module-hpsdiss.source-2017.tar.xz mirror://gentoo/texlive-module-hrefhide.source-2017.tar.xz mirror://gentoo/texlive-module-hyper.source-2017.tar.xz mirror://gentoo/texlive-module-hyperxmp.source-2017.tar.xz mirror://gentoo/texlive-module-hyphenat.source-2017.tar.xz mirror://gentoo/texlive-module-idxlayout.source-2017.tar.xz mirror://gentoo/texlive-module-iffont.source-2017.tar.xz mirror://gentoo/texlive-module-ifmtarg.source-2017.tar.xz mirror://gentoo/texlive-module-ifnextok.source-2017.tar.xz mirror://gentoo/texlive-module-ifoddpage.source-2017.tar.xz mirror://gentoo/texlive-module-ifplatform.source-2017.tar.xz mirror://gentoo/texlive-module-iitem.source-2017.tar.xz mirror://gentoo/texlive-module-imakeidx.source-2017.tar.xz mirror://gentoo/texlive-module-indextools.source-2017.tar.xz mirror://gentoo/texlive-module-inlinedef.source-2017.tar.xz mirror://gentoo/texlive-module-inputtrc.source-2017.tar.xz mirror://gentoo/texlive-module-interfaces.source-2017.tar.xz mirror://gentoo/texlive-module-inversepath.source-2017.tar.xz mirror://gentoo/texlive-module-iso.source-2017.tar.xz mirror://gentoo/texlive-module-iso10303.source-2017.tar.xz mirror://gentoo/texlive-module-isodate.source-2017.tar.xz mirror://gentoo/texlive-module-isodoc.source-2017.tar.xz mirror://gentoo/texlive-module-isorot.source-2017.tar.xz mirror://gentoo/texlive-module-isotope.source-2017.tar.xz mirror://gentoo/texlive-module-issuulinks.source-2017.tar.xz mirror://gentoo/texlive-module-jvlisting.source-2017.tar.xz mirror://gentoo/texlive-module-kantlipsum.source-2017.tar.xz mirror://gentoo/texlive-module-kerntest.source-2017.tar.xz mirror://gentoo/texlive-module-keycommand.source-2017.tar.xz mirror://gentoo/texlive-module-keyfloat.source-2017.tar.xz mirror://gentoo/texlive-module-keyvaltable.source-2017.tar.xz mirror://gentoo/texlive-module-komacv.source-2017.tar.xz mirror://gentoo/texlive-module-ktv-texdata.source-2017.tar.xz mirror://gentoo/texlive-module-l3build.source-2017.tar.xz mirror://gentoo/texlive-module-labbook.source-2017.tar.xz mirror://gentoo/texlive-module-labels.source-2017.tar.xz mirror://gentoo/texlive-module-lastpackage.source-2017.tar.xz mirror://gentoo/texlive-module-lastpage.source-2017.tar.xz mirror://gentoo/texlive-module-latex-tds.source-2017.tar.xz mirror://gentoo/texlive-module-latexdemo.source-2017.tar.xz mirror://gentoo/texlive-module-latexgit.source-2017.tar.xz mirror://gentoo/texlive-module-layouts.source-2017.tar.xz mirror://gentoo/texlive-module-lcd.source-2017.tar.xz mirror://gentoo/texlive-module-lcg.source-2017.tar.xz mirror://gentoo/texlive-module-leading.source-2017.tar.xz mirror://gentoo/texlive-module-leftidx.source-2017.tar.xz mirror://gentoo/texlive-module-lengthconvert.source-2017.tar.xz mirror://gentoo/texlive-module-lettrine.source-2017.tar.xz mirror://gentoo/texlive-module-lhelp.source-2017.tar.xz mirror://gentoo/texlive-module-libgreek.source-2017.tar.xz mirror://gentoo/texlive-module-limap.source-2017.tar.xz mirror://gentoo/texlive-module-linegoal.source-2017.tar.xz mirror://gentoo/texlive-module-lipsum.source-2017.tar.xz mirror://gentoo/texlive-module-listlbls.source-2017.tar.xz mirror://gentoo/texlive-module-listliketab.source-2017.tar.xz mirror://gentoo/texlive-module-listofsymbols.source-2017.tar.xz mirror://gentoo/texlive-module-lmake.source-2017.tar.xz mirror://gentoo/texlive-module-locality.source-2017.tar.xz mirror://gentoo/texlive-module-localloc.source-2017.tar.xz mirror://gentoo/texlive-module-logbox.source-2017.tar.xz mirror://gentoo/texlive-module-logpap.source-2017.tar.xz mirror://gentoo/texlive-module-longfigure.source-2017.tar.xz mirror://gentoo/texlive-module-longnamefilelist.source-2017.tar.xz mirror://gentoo/texlive-module-lstaddons.source-2017.tar.xz mirror://gentoo/texlive-module-ltxindex.source-2017.tar.xz mirror://gentoo/texlive-module-ltxnew.source-2017.tar.xz mirror://gentoo/texlive-module-macroswap.source-2017.tar.xz mirror://gentoo/texlive-module-mailing.source-2017.tar.xz mirror://gentoo/texlive-module-mailmerge.source-2017.tar.xz mirror://gentoo/texlive-module-makebase.source-2017.tar.xz mirror://gentoo/texlive-module-makebox.source-2017.tar.xz mirror://gentoo/texlive-module-makecell.source-2017.tar.xz mirror://gentoo/texlive-module-makecmds.source-2017.tar.xz mirror://gentoo/texlive-module-makedtx.source-2017.tar.xz mirror://gentoo/texlive-module-mandi.source-2017.tar.xz mirror://gentoo/texlive-module-manfnt.source-2017.tar.xz mirror://gentoo/texlive-module-manuscript.source-2017.tar.xz mirror://gentoo/texlive-module-marginfix.source-2017.tar.xz mirror://gentoo/texlive-module-marginnote.source-2017.tar.xz mirror://gentoo/texlive-module-markdown.source-2017.tar.xz mirror://gentoo/texlive-module-mathastext.source-2017.tar.xz mirror://gentoo/texlive-module-mathexam.source-2017.tar.xz mirror://gentoo/texlive-module-mcaption.source-2017.tar.xz mirror://gentoo/texlive-module-mcite.source-2017.tar.xz mirror://gentoo/texlive-module-mdframed.source-2017.tar.xz mirror://gentoo/texlive-module-media9.source-2017.tar.xz mirror://gentoo/texlive-module-meetingmins.source-2017.tar.xz mirror://gentoo/texlive-module-memory.source-2017.tar.xz mirror://gentoo/texlive-module-menu.source-2017.tar.xz mirror://gentoo/texlive-module-menukeys.source-2017.tar.xz mirror://gentoo/texlive-module-method.source-2017.tar.xz mirror://gentoo/texlive-module-metre.source-2017.tar.xz mirror://gentoo/texlive-module-mfirstuc.source-2017.tar.xz mirror://gentoo/texlive-module-mftinc.source-2017.tar.xz mirror://gentoo/texlive-module-minibox.source-2017.tar.xz mirror://gentoo/texlive-module-minidocument.source-2017.tar.xz mirror://gentoo/texlive-module-minifp.source-2017.tar.xz mirror://gentoo/texlive-module-minipage-marginpar.source-2017.tar.xz mirror://gentoo/texlive-module-minted.source-2017.tar.xz mirror://gentoo/texlive-module-minutes.source-2017.tar.xz mirror://gentoo/texlive-module-mlist.source-2017.tar.xz mirror://gentoo/texlive-module-mnotes.source-2017.tar.xz mirror://gentoo/texlive-module-moderntimeline.source-2017.tar.xz mirror://gentoo/texlive-module-modref.source-2017.tar.xz mirror://gentoo/texlive-module-modroman.source-2017.tar.xz mirror://gentoo/texlive-module-monofill.source-2017.tar.xz mirror://gentoo/texlive-module-moodle.source-2017.tar.xz mirror://gentoo/texlive-module-morefloats.source-2017.tar.xz mirror://gentoo/texlive-module-morehype.source-2017.tar.xz mirror://gentoo/texlive-module-moresize.source-2017.tar.xz mirror://gentoo/texlive-module-moreverb.source-2017.tar.xz mirror://gentoo/texlive-module-morewrites.source-2017.tar.xz mirror://gentoo/texlive-module-mparhack.source-2017.tar.xz mirror://gentoo/texlive-module-mpostinl.source-2017.tar.xz mirror://gentoo/texlive-module-msg.source-2017.tar.xz mirror://gentoo/texlive-module-mtgreek.source-2017.tar.xz mirror://gentoo/texlive-module-multiaudience.source-2017.tar.xz mirror://gentoo/texlive-module-multibbl.source-2017.tar.xz mirror://gentoo/texlive-module-multicap.source-2017.tar.xz mirror://gentoo/texlive-module-multidef.source-2017.tar.xz mirror://gentoo/texlive-module-multienv.source-2017.tar.xz mirror://gentoo/texlive-module-multiexpand.source-2017.tar.xz mirror://gentoo/texlive-module-multirow.source-2017.tar.xz mirror://gentoo/texlive-module-mversion.source-2017.tar.xz mirror://gentoo/texlive-module-mwe.source-2017.tar.xz mirror://gentoo/texlive-module-mycv.source-2017.tar.xz mirror://gentoo/texlive-module-mylatexformat.source-2017.tar.xz mirror://gentoo/texlive-module-nag.source-2017.tar.xz mirror://gentoo/texlive-module-nameauth.source-2017.tar.xz mirror://gentoo/texlive-module-namespc.source-2017.tar.xz mirror://gentoo/texlive-module-ncctools.source-2017.tar.xz mirror://gentoo/texlive-module-needspace.source-2017.tar.xz mirror://gentoo/texlive-module-newfile.source-2017.tar.xz mirror://gentoo/texlive-module-newlfm.source-2017.tar.xz mirror://gentoo/texlive-module-newspaper.source-2017.tar.xz mirror://gentoo/texlive-module-newunicodechar.source-2017.tar.xz mirror://gentoo/texlive-module-newvbtm.source-2017.tar.xz mirror://gentoo/texlive-module-newverbs.source-2017.tar.xz mirror://gentoo/texlive-module-nicefilelist.source-2017.tar.xz mirror://gentoo/texlive-module-niceframe.source-2017.tar.xz mirror://gentoo/texlive-module-nicetext.source-2017.tar.xz mirror://gentoo/texlive-module-noitcrul.source-2017.tar.xz mirror://gentoo/texlive-module-nomencl.source-2017.tar.xz mirror://gentoo/texlive-module-nomentbl.source-2017.tar.xz mirror://gentoo/texlive-module-nonfloat.source-2017.tar.xz mirror://gentoo/texlive-module-nonumonpart.source-2017.tar.xz mirror://gentoo/texlive-module-normalcolor.source-2017.tar.xz mirror://gentoo/texlive-module-notes.source-2017.tar.xz mirror://gentoo/texlive-module-notespages.source-2017.tar.xz mirror://gentoo/texlive-module-nowidow.source-2017.tar.xz mirror://gentoo/texlive-module-ntheorem.source-2017.tar.xz mirror://gentoo/texlive-module-numprint.source-2017.tar.xz mirror://gentoo/texlive-module-ocgx.source-2017.tar.xz mirror://gentoo/texlive-module-octavo.source-2017.tar.xz mirror://gentoo/texlive-module-oldstyle.source-2017.tar.xz mirror://gentoo/texlive-module-onlyamsmath.source-2017.tar.xz mirror://gentoo/texlive-module-opcit.source-2017.tar.xz mirror://gentoo/texlive-module-pagecolor.source-2017.tar.xz mirror://gentoo/texlive-module-pagecont.source-2017.tar.xz mirror://gentoo/texlive-module-pagenote.source-2017.tar.xz mirror://gentoo/texlive-module-pageslts.source-2017.tar.xz mirror://gentoo/texlive-module-paper.source-2017.tar.xz mirror://gentoo/texlive-module-papercdcase.source-2017.tar.xz mirror://gentoo/texlive-module-papermas.source-2017.tar.xz mirror://gentoo/texlive-module-papertex.source-2017.tar.xz mirror://gentoo/texlive-module-paracol.source-2017.tar.xz mirror://gentoo/texlive-module-paralist.source-2017.tar.xz mirror://gentoo/texlive-module-paresse.source-2017.tar.xz mirror://gentoo/texlive-module-parselines.source-2017.tar.xz mirror://gentoo/texlive-module-patch.source-2017.tar.xz mirror://gentoo/texlive-module-patchcmd.source-2017.tar.xz mirror://gentoo/texlive-module-pauldoc.source-2017.tar.xz mirror://gentoo/texlive-module-pawpict.source-2017.tar.xz mirror://gentoo/texlive-module-pbox.source-2017.tar.xz mirror://gentoo/texlive-module-pbsheet.source-2017.tar.xz mirror://gentoo/texlive-module-pdf14.source-2017.tar.xz mirror://gentoo/texlive-module-pdfcprot.source-2017.tar.xz mirror://gentoo/texlive-module-pdfx.source-2017.tar.xz mirror://gentoo/texlive-module-perltex.source-2017.tar.xz mirror://gentoo/texlive-module-permute.source-2017.tar.xz mirror://gentoo/texlive-module-phffullpagefigure.source-2017.tar.xz mirror://gentoo/texlive-module-phfnote.source-2017.tar.xz mirror://gentoo/texlive-module-phfparen.source-2017.tar.xz mirror://gentoo/texlive-module-phfqit.source-2017.tar.xz mirror://gentoo/texlive-module-phfquotetext.source-2017.tar.xz mirror://gentoo/texlive-module-phfsvnwatermark.source-2017.tar.xz mirror://gentoo/texlive-module-phfthm.source-2017.tar.xz mirror://gentoo/texlive-module-photo.source-2017.tar.xz mirror://gentoo/texlive-module-plweb.source-2017.tar.xz mirror://gentoo/texlive-module-polynom.source-2017.tar.xz mirror://gentoo/texlive-module-polynomial.source-2017.tar.xz mirror://gentoo/texlive-module-polytable.source-2017.tar.xz mirror://gentoo/texlive-module-ppr-prv.source-2017.tar.xz mirror://gentoo/texlive-module-preprint.source-2017.tar.xz mirror://gentoo/texlive-module-pressrelease.source-2017.tar.xz mirror://gentoo/texlive-module-prettyref.source-2017.tar.xz mirror://gentoo/texlive-module-preview.source-2017.tar.xz mirror://gentoo/texlive-module-probsoln.source-2017.tar.xz mirror://gentoo/texlive-module-proofread.source-2017.tar.xz mirror://gentoo/texlive-module-protocol.source-2017.tar.xz mirror://gentoo/texlive-module-psfragx.source-2017.tar.xz mirror://gentoo/texlive-module-pst-pdf.source-2017.tar.xz mirror://gentoo/texlive-module-pstool.source-2017.tar.xz mirror://gentoo/texlive-module-pxgreeks.source-2017.tar.xz mirror://gentoo/texlive-module-qcm.source-2017.tar.xz mirror://gentoo/texlive-module-qstest.source-2017.tar.xz mirror://gentoo/texlive-module-qsymbols.source-2017.tar.xz mirror://gentoo/texlive-module-quotchap.source-2017.tar.xz mirror://gentoo/texlive-module-quoting.source-2017.tar.xz mirror://gentoo/texlive-module-quotmark.source-2017.tar.xz mirror://gentoo/texlive-module-ran_toks.source-2017.tar.xz mirror://gentoo/texlive-module-rccol.source-2017.tar.xz mirror://gentoo/texlive-module-rcs-multi.source-2017.tar.xz mirror://gentoo/texlive-module-rcsinfo.source-2017.tar.xz mirror://gentoo/texlive-module-realboxes.source-2017.tar.xz mirror://gentoo/texlive-module-recipecard.source-2017.tar.xz mirror://gentoo/texlive-module-reflectgraphics.source-2017.tar.xz mirror://gentoo/texlive-module-refman.source-2017.tar.xz mirror://gentoo/texlive-module-refstyle.source-2017.tar.xz mirror://gentoo/texlive-module-regcount.source-2017.tar.xz mirror://gentoo/texlive-module-regexpatch.source-2017.tar.xz mirror://gentoo/texlive-module-register.source-2017.tar.xz mirror://gentoo/texlive-module-regstats.source-2017.tar.xz mirror://gentoo/texlive-module-relenc.source-2017.tar.xz mirror://gentoo/texlive-module-repltext.source-2017.tar.xz mirror://gentoo/texlive-module-rjlparshap.source-2017.tar.xz mirror://gentoo/texlive-module-robustcommand.source-2017.tar.xz mirror://gentoo/texlive-module-romanbar.source-2017.tar.xz mirror://gentoo/texlive-module-romanbarpagenumber.source-2017.tar.xz mirror://gentoo/texlive-module-romannum.source-2017.tar.xz mirror://gentoo/texlive-module-rotfloat.source-2017.tar.xz mirror://gentoo/texlive-module-rtkinenc.source-2017.tar.xz mirror://gentoo/texlive-module-rulercompass.source-2017.tar.xz mirror://gentoo/texlive-module-sauerj.source-2017.tar.xz mirror://gentoo/texlive-module-savefnmark.source-2017.tar.xz mirror://gentoo/texlive-module-savetrees.source-2017.tar.xz mirror://gentoo/texlive-module-scale.source-2017.tar.xz mirror://gentoo/texlive-module-scalebar.source-2017.tar.xz mirror://gentoo/texlive-module-sectsty.source-2017.tar.xz mirror://gentoo/texlive-module-seealso.source-2017.tar.xz mirror://gentoo/texlive-module-semantic.source-2017.tar.xz mirror://gentoo/texlive-module-semioneside.source-2017.tar.xz mirror://gentoo/texlive-module-semproc.source-2017.tar.xz mirror://gentoo/texlive-module-seqsplit.source-2017.tar.xz mirror://gentoo/texlive-module-sesstime.source-2017.tar.xz mirror://gentoo/texlive-module-sf298.source-2017.tar.xz mirror://gentoo/texlive-module-sffms.source-2017.tar.xz mirror://gentoo/texlive-module-shdoc.source-2017.tar.xz mirror://gentoo/texlive-module-shorttoc.source-2017.tar.xz mirror://gentoo/texlive-module-show2e.source-2017.tar.xz mirror://gentoo/texlive-module-showcharinbox.source-2017.tar.xz mirror://gentoo/texlive-module-showexpl.source-2017.tar.xz mirror://gentoo/texlive-module-showlabels.source-2017.tar.xz mirror://gentoo/texlive-module-sidecap.source-2017.tar.xz mirror://gentoo/texlive-module-sidenotes.source-2017.tar.xz mirror://gentoo/texlive-module-silence.source-2017.tar.xz mirror://gentoo/texlive-module-simplecd.source-2017.tar.xz mirror://gentoo/texlive-module-simplecv.source-2017.tar.xz mirror://gentoo/texlive-module-sitem.source-2017.tar.xz mirror://gentoo/texlive-module-skb.source-2017.tar.xz mirror://gentoo/texlive-module-skdoc.source-2017.tar.xz mirror://gentoo/texlive-module-skrapport.source-2017.tar.xz mirror://gentoo/texlive-module-slantsc.source-2017.tar.xz mirror://gentoo/texlive-module-snapshot.source-2017.tar.xz mirror://gentoo/texlive-module-soul.source-2017.tar.xz mirror://gentoo/texlive-module-splitindex.source-2017.tar.xz mirror://gentoo/texlive-module-spot.source-2017.tar.xz mirror://gentoo/texlive-module-spverbatim.source-2017.tar.xz mirror://gentoo/texlive-module-srcltx.source-2017.tar.xz mirror://gentoo/texlive-module-sseq.source-2017.tar.xz mirror://gentoo/texlive-module-stack.source-2017.tar.xz mirror://gentoo/texlive-module-standalone.source-2017.tar.xz mirror://gentoo/texlive-module-statistik.source-2017.tar.xz mirror://gentoo/texlive-module-stdclsdv.source-2017.tar.xz mirror://gentoo/texlive-module-stdpage.source-2017.tar.xz mirror://gentoo/texlive-module-stex.source-2017.tar.xz mirror://gentoo/texlive-module-storebox.source-2017.tar.xz mirror://gentoo/texlive-module-stringstrings.source-2017.tar.xz mirror://gentoo/texlive-module-sttools.source-2017.tar.xz mirror://gentoo/texlive-module-subdepth.source-2017.tar.xz mirror://gentoo/texlive-module-subeqn.source-2017.tar.xz mirror://gentoo/texlive-module-subeqnarray.source-2017.tar.xz mirror://gentoo/texlive-module-subfigure.source-2017.tar.xz mirror://gentoo/texlive-module-subfiles.source-2017.tar.xz mirror://gentoo/texlive-module-subfloat.source-2017.tar.xz mirror://gentoo/texlive-module-supertabular.source-2017.tar.xz mirror://gentoo/texlive-module-svg.source-2017.tar.xz mirror://gentoo/texlive-module-svn.source-2017.tar.xz mirror://gentoo/texlive-module-svn-multi.source-2017.tar.xz mirror://gentoo/texlive-module-svn-prov.source-2017.tar.xz mirror://gentoo/texlive-module-syntrace.source-2017.tar.xz mirror://gentoo/texlive-module-synttree.source-2017.tar.xz mirror://gentoo/texlive-module-tabfigures.source-2017.tar.xz mirror://gentoo/texlive-module-tablefootnote.source-2017.tar.xz mirror://gentoo/texlive-module-tableof.source-2017.tar.xz mirror://gentoo/texlive-module-tablestyles.source-2017.tar.xz mirror://gentoo/texlive-module-tablists.source-2017.tar.xz mirror://gentoo/texlive-module-tabu.source-2017.tar.xz mirror://gentoo/texlive-module-tabularborder.source-2017.tar.xz mirror://gentoo/texlive-module-tabularew.source-2017.tar.xz mirror://gentoo/texlive-module-tabulary.source-2017.tar.xz mirror://gentoo/texlive-module-talk.source-2017.tar.xz mirror://gentoo/texlive-module-tcldoc.source-2017.tar.xz mirror://gentoo/texlive-module-ted.source-2017.tar.xz mirror://gentoo/texlive-module-templatetools.source-2017.tar.xz mirror://gentoo/texlive-module-termcal.source-2017.tar.xz mirror://gentoo/texlive-module-termlist.source-2017.tar.xz mirror://gentoo/texlive-module-testhyphens.source-2017.tar.xz mirror://gentoo/texlive-module-testidx.source-2017.tar.xz mirror://gentoo/texlive-module-tex-label.source-2017.tar.xz mirror://gentoo/texlive-module-texmate.source-2017.tar.xz mirror://gentoo/texlive-module-texments.source-2017.tar.xz mirror://gentoo/texlive-module-texpower.source-2017.tar.xz mirror://gentoo/texlive-module-texshade.source-2017.tar.xz mirror://gentoo/texlive-module-texvc.source-2017.tar.xz mirror://gentoo/texlive-module-textfit.source-2017.tar.xz mirror://gentoo/texlive-module-textmerg.source-2017.tar.xz mirror://gentoo/texlive-module-textpos.source-2017.tar.xz mirror://gentoo/texlive-module-thmtools.source-2017.tar.xz mirror://gentoo/texlive-module-threadcol.source-2017.tar.xz mirror://gentoo/texlive-module-thumb.source-2017.tar.xz mirror://gentoo/texlive-module-thumbs.source-2017.tar.xz mirror://gentoo/texlive-module-titling.source-2017.tar.xz mirror://gentoo/texlive-module-tocbibind.source-2017.tar.xz mirror://gentoo/texlive-module-tocdata.source-2017.tar.xz mirror://gentoo/texlive-module-tocloft.source-2017.tar.xz mirror://gentoo/texlive-module-tocvsec2.source-2017.tar.xz mirror://gentoo/texlive-module-todo.source-2017.tar.xz mirror://gentoo/texlive-module-todonotes.source-2017.tar.xz mirror://gentoo/texlive-module-toolbox.source-2017.tar.xz mirror://gentoo/texlive-module-totcount.source-2017.tar.xz mirror://gentoo/texlive-module-totpages.source-2017.tar.xz mirror://gentoo/texlive-module-trfsigns.source-2017.tar.xz mirror://gentoo/texlive-module-trimspaces.source-2017.tar.xz mirror://gentoo/texlive-module-trivfloat.source-2017.tar.xz mirror://gentoo/texlive-module-trsym.source-2017.tar.xz mirror://gentoo/texlive-module-tucv.source-2017.tar.xz mirror://gentoo/texlive-module-twoup.source-2017.tar.xz mirror://gentoo/texlive-module-txgreeks.source-2017.tar.xz mirror://gentoo/texlive-module-type1cm.source-2017.tar.xz mirror://gentoo/texlive-module-typed-checklist.source-2017.tar.xz mirror://gentoo/texlive-module-typeface.source-2017.tar.xz mirror://gentoo/texlive-module-typogrid.source-2017.tar.xz mirror://gentoo/texlive-module-umoline.source-2017.tar.xz mirror://gentoo/texlive-module-underlin.source-2017.tar.xz mirror://gentoo/texlive-module-undolabl.source-2017.tar.xz mirror://gentoo/texlive-module-units.source-2017.tar.xz mirror://gentoo/texlive-module-unravel.source-2017.tar.xz mirror://gentoo/texlive-module-upquote.source-2017.tar.xz mirror://gentoo/texlive-module-uri.source-2017.tar.xz mirror://gentoo/texlive-module-ushort.source-2017.tar.xz mirror://gentoo/texlive-module-varindex.source-2017.tar.xz mirror://gentoo/texlive-module-versonotes.source-2017.tar.xz mirror://gentoo/texlive-module-vertbars.source-2017.tar.xz mirror://gentoo/texlive-module-vgrid.source-2017.tar.xz mirror://gentoo/texlive-module-vmargin.source-2017.tar.xz mirror://gentoo/texlive-module-volumes.source-2017.tar.xz mirror://gentoo/texlive-module-vwcol.source-2017.tar.xz mirror://gentoo/texlive-module-warpcol.source-2017.tar.xz mirror://gentoo/texlive-module-was.source-2017.tar.xz mirror://gentoo/texlive-module-widetable.source-2017.tar.xz mirror://gentoo/texlive-module-wordlike.source-2017.tar.xz mirror://gentoo/texlive-module-xargs.source-2017.tar.xz mirror://gentoo/texlive-module-xcolor-material.source-2017.tar.xz mirror://gentoo/texlive-module-xcolor-solarized.source-2017.tar.xz mirror://gentoo/texlive-module-xdoc.source-2017.tar.xz mirror://gentoo/texlive-module-xellipsis.source-2017.tar.xz mirror://gentoo/texlive-module-xfor.source-2017.tar.xz mirror://gentoo/texlive-module-xint.source-2017.tar.xz mirror://gentoo/texlive-module-xmpincl.source-2017.tar.xz mirror://gentoo/texlive-module-xpatch.source-2017.tar.xz mirror://gentoo/texlive-module-xpeek.source-2017.tar.xz mirror://gentoo/texlive-module-xpunctuate.source-2017.tar.xz mirror://gentoo/texlive-module-xsavebox.source-2017.tar.xz mirror://gentoo/texlive-module-xtab.source-2017.tar.xz mirror://gentoo/texlive-module-yafoot.source-2017.tar.xz mirror://gentoo/texlive-module-yaletter.source-2017.tar.xz mirror://gentoo/texlive-module-yagusylo.source-2017.tar.xz mirror://gentoo/texlive-module-ydoc.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=44292be1055af97b0fb85b4bcd0cca9a
+_md5_=3f90047c6f9f5059299db7848cddd0b6
diff --git a/metadata/md5-cache/dev-texlive/texlive-latexrecommended-2017 b/metadata/md5-cache/dev-texlive/texlive-latexrecommended-2017
index 0c2320079bf7..bc4488ab0fe0 100644
--- a/metadata/md5-cache/dev-texlive/texlive-latexrecommended-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-latexrecommended-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive LaTeX recommended packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-latex-2017 !dev-tex/xkeyval !dev-tex/memoir !dev-tex/listings !<dev-texlive/texlive-latexextra-2017 !=app-text/texlive-core-2007* !<dev-texlive/texlive-xetex-2016 !dev-texlive/texlive-latex3 !<dev-texlive/texlive-humanities-2014 !dev-texlive/texlive-mathextra >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-anysize-2017.tar.xz mirror://gentoo/texlive-module-booktabs-2017.tar.xz mirror://gentoo/texlive-module-breqn-2017.tar.xz mirror://gentoo/texlive-module-caption-2017.tar.xz mirror://gentoo/texlive-module-cite-2017.tar.xz mirror://gentoo/texlive-module-cmap-2017.tar.xz mirror://gentoo/texlive-module-crop-2017.tar.xz mirror://gentoo/texlive-module-ctable-2017.tar.xz mirror://gentoo/texlive-module-eso-pic-2017.tar.xz mirror://gentoo/texlive-module-euenc-2017.tar.xz mirror://gentoo/texlive-module-euler-2017.tar.xz mirror://gentoo/texlive-module-extsizes-2017.tar.xz mirror://gentoo/texlive-module-fancybox-2017.tar.xz mirror://gentoo/texlive-module-fancyref-2017.tar.xz mirror://gentoo/texlive-module-fancyvrb-2017.tar.xz mirror://gentoo/texlive-module-filehook-2017.tar.xz mirror://gentoo/texlive-module-float-2017.tar.xz mirror://gentoo/texlive-module-fontspec-2017.tar.xz mirror://gentoo/texlive-module-fp-2017.tar.xz mirror://gentoo/texlive-module-index-2017.tar.xz mirror://gentoo/texlive-module-jknapltx-2017.tar.xz mirror://gentoo/texlive-module-koma-script-2017.tar.xz mirror://gentoo/texlive-module-latexbug-2017.tar.xz mirror://gentoo/texlive-module-l3experimental-2017.tar.xz mirror://gentoo/texlive-module-l3kernel-2017.tar.xz mirror://gentoo/texlive-module-l3packages-2017.tar.xz mirror://gentoo/texlive-module-lineno-2017.tar.xz mirror://gentoo/texlive-module-listings-2017.tar.xz mirror://gentoo/texlive-module-lwarp-2017.tar.xz mirror://gentoo/texlive-module-mathspec-2017.tar.xz mirror://gentoo/texlive-module-mathtools-2017.tar.xz mirror://gentoo/texlive-module-mdwtools-2017.tar.xz mirror://gentoo/texlive-module-memoir-2017.tar.xz mirror://gentoo/texlive-module-metalogo-2017.tar.xz mirror://gentoo/texlive-module-microtype-2017.tar.xz mirror://gentoo/texlive-module-ms-2017.tar.xz mirror://gentoo/texlive-module-ntgclass-2017.tar.xz mirror://gentoo/texlive-module-parskip-2017.tar.xz mirror://gentoo/texlive-module-pdfpages-2017.tar.xz mirror://gentoo/texlive-module-polyglossia-2017.tar.xz mirror://gentoo/texlive-module-powerdot-2017.tar.xz mirror://gentoo/texlive-module-psfrag-2017.tar.xz mirror://gentoo/texlive-module-rcs-2017.tar.xz mirror://gentoo/texlive-module-sansmath-2017.tar.xz mirror://gentoo/texlive-module-section-2017.tar.xz mirror://gentoo/texlive-module-seminar-2017.tar.xz mirror://gentoo/texlive-module-sepnum-2017.tar.xz mirror://gentoo/texlive-module-setspace-2017.tar.xz mirror://gentoo/texlive-module-subfig-2017.tar.xz mirror://gentoo/texlive-module-textcase-2017.tar.xz mirror://gentoo/texlive-module-thumbpdf-2017.tar.xz mirror://gentoo/texlive-module-typehtml-2017.tar.xz mirror://gentoo/texlive-module-underscore-2017.tar.xz mirror://gentoo/texlive-module-unicode-math-2017.tar.xz mirror://gentoo/texlive-module-xkeyval-2017.tar.xz mirror://gentoo/texlive-module-xltxtra-2017.tar.xz mirror://gentoo/texlive-module-xunicode-2017.tar.xz mirror://gentoo/texlive-module-collection-latexrecommended-2017.tar.xz doc? ( mirror://gentoo/texlive-module-anysize.doc-2017.tar.xz mirror://gentoo/texlive-module-booktabs.doc-2017.tar.xz mirror://gentoo/texlive-module-breqn.doc-2017.tar.xz mirror://gentoo/texlive-module-caption.doc-2017.tar.xz mirror://gentoo/texlive-module-cite.doc-2017.tar.xz mirror://gentoo/texlive-module-cmap.doc-2017.tar.xz mirror://gentoo/texlive-module-crop.doc-2017.tar.xz mirror://gentoo/texlive-module-ctable.doc-2017.tar.xz mirror://gentoo/texlive-module-eso-pic.doc-2017.tar.xz mirror://gentoo/texlive-module-euenc.doc-2017.tar.xz mirror://gentoo/texlive-module-euler.doc-2017.tar.xz mirror://gentoo/texlive-module-extsizes.doc-2017.tar.xz mirror://gentoo/texlive-module-fancybox.doc-2017.tar.xz mirror://gentoo/texlive-module-fancyref.doc-2017.tar.xz mirror://gentoo/texlive-module-fancyvrb.doc-2017.tar.xz mirror://gentoo/texlive-module-filehook.doc-2017.tar.xz mirror://gentoo/texlive-module-float.doc-2017.tar.xz mirror://gentoo/texlive-module-fontspec.doc-2017.tar.xz mirror://gentoo/texlive-module-fp.doc-2017.tar.xz mirror://gentoo/texlive-module-index.doc-2017.tar.xz mirror://gentoo/texlive-module-jknapltx.doc-2017.tar.xz mirror://gentoo/texlive-module-latexbug.doc-2017.tar.xz mirror://gentoo/texlive-module-l3experimental.doc-2017.tar.xz mirror://gentoo/texlive-module-l3kernel.doc-2017.tar.xz mirror://gentoo/texlive-module-l3packages.doc-2017.tar.xz mirror://gentoo/texlive-module-lineno.doc-2017.tar.xz mirror://gentoo/texlive-module-listings.doc-2017.tar.xz mirror://gentoo/texlive-module-lwarp.doc-2017.tar.xz mirror://gentoo/texlive-module-mathspec.doc-2017.tar.xz mirror://gentoo/texlive-module-mathtools.doc-2017.tar.xz mirror://gentoo/texlive-module-mdwtools.doc-2017.tar.xz mirror://gentoo/texlive-module-memoir.doc-2017.tar.xz mirror://gentoo/texlive-module-metalogo.doc-2017.tar.xz mirror://gentoo/texlive-module-microtype.doc-2017.tar.xz mirror://gentoo/texlive-module-ms.doc-2017.tar.xz mirror://gentoo/texlive-module-ntgclass.doc-2017.tar.xz mirror://gentoo/texlive-module-parskip.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfpages.doc-2017.tar.xz mirror://gentoo/texlive-module-polyglossia.doc-2017.tar.xz mirror://gentoo/texlive-module-powerdot.doc-2017.tar.xz mirror://gentoo/texlive-module-psfrag.doc-2017.tar.xz mirror://gentoo/texlive-module-rcs.doc-2017.tar.xz mirror://gentoo/texlive-module-sansmath.doc-2017.tar.xz mirror://gentoo/texlive-module-section.doc-2017.tar.xz mirror://gentoo/texlive-module-seminar.doc-2017.tar.xz mirror://gentoo/texlive-module-sepnum.doc-2017.tar.xz mirror://gentoo/texlive-module-setspace.doc-2017.tar.xz mirror://gentoo/texlive-module-subfig.doc-2017.tar.xz mirror://gentoo/texlive-module-textcase.doc-2017.tar.xz mirror://gentoo/texlive-module-thumbpdf.doc-2017.tar.xz mirror://gentoo/texlive-module-typehtml.doc-2017.tar.xz mirror://gentoo/texlive-module-underscore.doc-2017.tar.xz mirror://gentoo/texlive-module-unicode-math.doc-2017.tar.xz mirror://gentoo/texlive-module-xkeyval.doc-2017.tar.xz mirror://gentoo/texlive-module-xltxtra.doc-2017.tar.xz mirror://gentoo/texlive-module-xunicode.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-booktabs.source-2017.tar.xz mirror://gentoo/texlive-module-breqn.source-2017.tar.xz mirror://gentoo/texlive-module-caption.source-2017.tar.xz mirror://gentoo/texlive-module-crop.source-2017.tar.xz mirror://gentoo/texlive-module-ctable.source-2017.tar.xz mirror://gentoo/texlive-module-eso-pic.source-2017.tar.xz mirror://gentoo/texlive-module-euenc.source-2017.tar.xz mirror://gentoo/texlive-module-euler.source-2017.tar.xz mirror://gentoo/texlive-module-fancyref.source-2017.tar.xz mirror://gentoo/texlive-module-fancyvrb.source-2017.tar.xz mirror://gentoo/texlive-module-filehook.source-2017.tar.xz mirror://gentoo/texlive-module-float.source-2017.tar.xz mirror://gentoo/texlive-module-fontspec.source-2017.tar.xz mirror://gentoo/texlive-module-index.source-2017.tar.xz mirror://gentoo/texlive-module-latexbug.source-2017.tar.xz mirror://gentoo/texlive-module-l3experimental.source-2017.tar.xz mirror://gentoo/texlive-module-l3kernel.source-2017.tar.xz mirror://gentoo/texlive-module-l3packages.source-2017.tar.xz mirror://gentoo/texlive-module-lineno.source-2017.tar.xz mirror://gentoo/texlive-module-listings.source-2017.tar.xz mirror://gentoo/texlive-module-lwarp.source-2017.tar.xz mirror://gentoo/texlive-module-mathtools.source-2017.tar.xz mirror://gentoo/texlive-module-mdwtools.source-2017.tar.xz mirror://gentoo/texlive-module-memoir.source-2017.tar.xz mirror://gentoo/texlive-module-metalogo.source-2017.tar.xz mirror://gentoo/texlive-module-microtype.source-2017.tar.xz mirror://gentoo/texlive-module-ms.source-2017.tar.xz mirror://gentoo/texlive-module-ntgclass.source-2017.tar.xz mirror://gentoo/texlive-module-pdfpages.source-2017.tar.xz mirror://gentoo/texlive-module-polyglossia.source-2017.tar.xz mirror://gentoo/texlive-module-powerdot.source-2017.tar.xz mirror://gentoo/texlive-module-psfrag.source-2017.tar.xz mirror://gentoo/texlive-module-rcs.source-2017.tar.xz mirror://gentoo/texlive-module-subfig.source-2017.tar.xz mirror://gentoo/texlive-module-textcase.source-2017.tar.xz mirror://gentoo/texlive-module-typehtml.source-2017.tar.xz mirror://gentoo/texlive-module-unicode-math.source-2017.tar.xz mirror://gentoo/texlive-module-xkeyval.source-2017.tar.xz mirror://gentoo/texlive-module-xltxtra.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=21dd70c0590d41cf5ca470498baf8a88
+_md5_=e5d57f524b73c37c7a277c61f29badb5
diff --git a/metadata/md5-cache/dev-texlive/texlive-luatex-2017 b/metadata/md5-cache/dev-texlive/texlive-luatex-2017
index 0c1467119e6b..8e3ce86bb052 100644
--- a/metadata/md5-cache/dev-texlive/texlive-luatex-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-luatex-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive LuaTeX packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=BSD FDL-1.1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 dev-texlive/texlive-latexrecommended >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-checkcites-2017.tar.xz mirror://gentoo/texlive-module-chickenize-2017.tar.xz mirror://gentoo/texlive-module-cloze-2017.tar.xz mirror://gentoo/texlive-module-cstypo-2017.tar.xz mirror://gentoo/texlive-module-ctablestack-2017.tar.xz mirror://gentoo/texlive-module-enigma-2017.tar.xz mirror://gentoo/texlive-module-interpreter-2017.tar.xz mirror://gentoo/texlive-module-lua-check-hyphen-2017.tar.xz mirror://gentoo/texlive-module-lua-visual-debug-2017.tar.xz mirror://gentoo/texlive-module-lua2dox-2017.tar.xz mirror://gentoo/texlive-module-luabibentry-2017.tar.xz mirror://gentoo/texlive-module-luabidi-2017.tar.xz mirror://gentoo/texlive-module-luacode-2017.tar.xz mirror://gentoo/texlive-module-luahyphenrules-2017.tar.xz mirror://gentoo/texlive-module-luaindex-2017.tar.xz mirror://gentoo/texlive-module-luainputenc-2017.tar.xz mirror://gentoo/texlive-module-luaintro-2017.tar.xz mirror://gentoo/texlive-module-lualatex-doc-2017.tar.xz mirror://gentoo/texlive-module-lualatex-math-2017.tar.xz mirror://gentoo/texlive-module-lualibs-2017.tar.xz mirror://gentoo/texlive-module-luamplib-2017.tar.xz mirror://gentoo/texlive-module-luaotfload-2017.tar.xz mirror://gentoo/texlive-module-luasseq-2017.tar.xz mirror://gentoo/texlive-module-luatex85-2017.tar.xz mirror://gentoo/texlive-module-luatexbase-2017.tar.xz mirror://gentoo/texlive-module-luatexko-2017.tar.xz mirror://gentoo/texlive-module-luatextra-2017.tar.xz mirror://gentoo/texlive-module-luatodonotes-2017.tar.xz mirror://gentoo/texlive-module-luaxml-2017.tar.xz mirror://gentoo/texlive-module-nodetree-2017.tar.xz mirror://gentoo/texlive-module-odsfile-2017.tar.xz mirror://gentoo/texlive-module-placeat-2017.tar.xz mirror://gentoo/texlive-module-selnolig-2017.tar.xz mirror://gentoo/texlive-module-showhyphens-2017.tar.xz mirror://gentoo/texlive-module-spelling-2017.tar.xz mirror://gentoo/texlive-module-ucharcat-2017.tar.xz mirror://gentoo/texlive-module-collection-luatex-2017.tar.xz doc? ( mirror://gentoo/texlive-module-checkcites.doc-2017.tar.xz mirror://gentoo/texlive-module-chickenize.doc-2017.tar.xz mirror://gentoo/texlive-module-cloze.doc-2017.tar.xz mirror://gentoo/texlive-module-cstypo.doc-2017.tar.xz mirror://gentoo/texlive-module-ctablestack.doc-2017.tar.xz mirror://gentoo/texlive-module-enigma.doc-2017.tar.xz mirror://gentoo/texlive-module-interpreter.doc-2017.tar.xz mirror://gentoo/texlive-module-lua-check-hyphen.doc-2017.tar.xz mirror://gentoo/texlive-module-lua-visual-debug.doc-2017.tar.xz mirror://gentoo/texlive-module-lua2dox.doc-2017.tar.xz mirror://gentoo/texlive-module-luabibentry.doc-2017.tar.xz mirror://gentoo/texlive-module-luabidi.doc-2017.tar.xz mirror://gentoo/texlive-module-luacode.doc-2017.tar.xz mirror://gentoo/texlive-module-luahyphenrules.doc-2017.tar.xz mirror://gentoo/texlive-module-luaindex.doc-2017.tar.xz mirror://gentoo/texlive-module-luainputenc.doc-2017.tar.xz mirror://gentoo/texlive-module-luaintro.doc-2017.tar.xz mirror://gentoo/texlive-module-lualatex-doc.doc-2017.tar.xz mirror://gentoo/texlive-module-lualatex-math.doc-2017.tar.xz mirror://gentoo/texlive-module-lualibs.doc-2017.tar.xz mirror://gentoo/texlive-module-luamplib.doc-2017.tar.xz mirror://gentoo/texlive-module-luaotfload.doc-2017.tar.xz mirror://gentoo/texlive-module-luasseq.doc-2017.tar.xz mirror://gentoo/texlive-module-luatex85.doc-2017.tar.xz mirror://gentoo/texlive-module-luatexbase.doc-2017.tar.xz mirror://gentoo/texlive-module-luatexko.doc-2017.tar.xz mirror://gentoo/texlive-module-luatextra.doc-2017.tar.xz mirror://gentoo/texlive-module-luatodonotes.doc-2017.tar.xz mirror://gentoo/texlive-module-luaxml.doc-2017.tar.xz mirror://gentoo/texlive-module-nodetree.doc-2017.tar.xz mirror://gentoo/texlive-module-odsfile.doc-2017.tar.xz mirror://gentoo/texlive-module-placeat.doc-2017.tar.xz mirror://gentoo/texlive-module-selnolig.doc-2017.tar.xz mirror://gentoo/texlive-module-showhyphens.doc-2017.tar.xz mirror://gentoo/texlive-module-spelling.doc-2017.tar.xz mirror://gentoo/texlive-module-ucharcat.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-chickenize.source-2017.tar.xz mirror://gentoo/texlive-module-cloze.source-2017.tar.xz mirror://gentoo/texlive-module-ctablestack.source-2017.tar.xz mirror://gentoo/texlive-module-luabibentry.source-2017.tar.xz mirror://gentoo/texlive-module-luacode.source-2017.tar.xz mirror://gentoo/texlive-module-luaindex.source-2017.tar.xz mirror://gentoo/texlive-module-luainputenc.source-2017.tar.xz mirror://gentoo/texlive-module-lualatex-doc.source-2017.tar.xz mirror://gentoo/texlive-module-lualatex-math.source-2017.tar.xz mirror://gentoo/texlive-module-lualibs.source-2017.tar.xz mirror://gentoo/texlive-module-luamplib.source-2017.tar.xz mirror://gentoo/texlive-module-luaotfload.source-2017.tar.xz mirror://gentoo/texlive-module-luasseq.source-2017.tar.xz mirror://gentoo/texlive-module-luatex85.source-2017.tar.xz mirror://gentoo/texlive-module-luatexbase.source-2017.tar.xz mirror://gentoo/texlive-module-luatextra.source-2017.tar.xz mirror://gentoo/texlive-module-luatodonotes.source-2017.tar.xz mirror://gentoo/texlive-module-nodetree.source-2017.tar.xz mirror://gentoo/texlive-module-placeat.source-2017.tar.xz mirror://gentoo/texlive-module-ucharcat.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=543343b7b6c6b1c7dd2ed5d8cd4b010a
+_md5_=726e9bf1e464094f710af12577d3b3e7
diff --git a/metadata/md5-cache/dev-texlive/texlive-mathscience-2017 b/metadata/md5-cache/dev-texlive/texlive-mathscience-2017
index 7a2fc9f33d7a..9f594ccac125 100644
--- a/metadata/md5-cache/dev-texlive/texlive-mathscience-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-mathscience-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Mathematics and science packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=BSD BSD-2 GPL-1 GPL-2 GPL-3 LGPL-2 LPPL-1.2 LPPL-1.3 MIT public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-fontsrecommended-2017 >=dev-texlive/texlive-latex-2017 !<dev-texlive/texlive-latexextra-2017 !dev-tex/SIunits !dev-texlive/texlive-mathextra !dev-texlive/texlive-science dev-texlive/texlive-pstricks >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-12many-2017.tar.xz mirror://gentoo/texlive-module-SIstyle-2017.tar.xz mirror://gentoo/texlive-module-SIunits-2017.tar.xz mirror://gentoo/texlive-module-alg-2017.tar.xz mirror://gentoo/texlive-module-algorithm2e-2017.tar.xz mirror://gentoo/texlive-module-algorithmicx-2017.tar.xz mirror://gentoo/texlive-module-algorithms-2017.tar.xz mirror://gentoo/texlive-module-amstex-2017.tar.xz mirror://gentoo/texlive-module-apxproof-2017.tar.xz mirror://gentoo/texlive-module-autobreak-2017.tar.xz mirror://gentoo/texlive-module-axodraw2-2017.tar.xz mirror://gentoo/texlive-module-backnaur-2017.tar.xz mirror://gentoo/texlive-module-begriff-2017.tar.xz mirror://gentoo/texlive-module-binomexp-2017.tar.xz mirror://gentoo/texlive-module-biocon-2017.tar.xz mirror://gentoo/texlive-module-bitpattern-2017.tar.xz mirror://gentoo/texlive-module-bohr-2017.tar.xz mirror://gentoo/texlive-module-boldtensors-2017.tar.xz mirror://gentoo/texlive-module-bosisio-2017.tar.xz mirror://gentoo/texlive-module-bpchem-2017.tar.xz mirror://gentoo/texlive-module-bropd-2017.tar.xz mirror://gentoo/texlive-module-bytefield-2017.tar.xz mirror://gentoo/texlive-module-calculation-2017.tar.xz mirror://gentoo/texlive-module-ccfonts-2017.tar.xz mirror://gentoo/texlive-module-chemarrow-2017.tar.xz mirror://gentoo/texlive-module-chemcompounds-2017.tar.xz mirror://gentoo/texlive-module-chemcono-2017.tar.xz mirror://gentoo/texlive-module-chemexec-2017.tar.xz mirror://gentoo/texlive-module-chemformula-2017.tar.xz mirror://gentoo/texlive-module-chemgreek-2017.tar.xz mirror://gentoo/texlive-module-chemmacros-2017.tar.xz mirror://gentoo/texlive-module-chemnum-2017.tar.xz mirror://gentoo/texlive-module-chemschemex-2017.tar.xz mirror://gentoo/texlive-module-chemstyle-2017.tar.xz mirror://gentoo/texlive-module-clrscode-2017.tar.xz mirror://gentoo/texlive-module-clrscode3e-2017.tar.xz mirror://gentoo/texlive-module-commath-2017.tar.xz mirror://gentoo/texlive-module-complexity-2017.tar.xz mirror://gentoo/texlive-module-computational-complexity-2017.tar.xz mirror://gentoo/texlive-module-concmath-2017.tar.xz mirror://gentoo/texlive-module-concrete-2017.tar.xz mirror://gentoo/texlive-module-conteq-2017.tar.xz mirror://gentoo/texlive-module-correctmathalign-2017.tar.xz mirror://gentoo/texlive-module-cryptocode-2017.tar.xz mirror://gentoo/texlive-module-delim-2017.tar.xz mirror://gentoo/texlive-module-delimset-2017.tar.xz mirror://gentoo/texlive-module-delimseasy-2017.tar.xz mirror://gentoo/texlive-module-diffcoeff-2017.tar.xz mirror://gentoo/texlive-module-digiconfigs-2017.tar.xz mirror://gentoo/texlive-module-drawmatrix-2017.tar.xz mirror://gentoo/texlive-module-drawstack-2017.tar.xz mirror://gentoo/texlive-module-dyntree-2017.tar.xz mirror://gentoo/texlive-module-ebproof-2017.tar.xz mirror://gentoo/texlive-module-econometrics-2017.tar.xz mirror://gentoo/texlive-module-eltex-2017.tar.xz mirror://gentoo/texlive-module-emf-2017.tar.xz mirror://gentoo/texlive-module-endiagram-2017.tar.xz mirror://gentoo/texlive-module-engtlc-2017.tar.xz mirror://gentoo/texlive-module-eqnarray-2017.tar.xz mirror://gentoo/texlive-module-extarrows-2017.tar.xz mirror://gentoo/texlive-module-extpfeil-2017.tar.xz mirror://gentoo/texlive-module-faktor-2017.tar.xz mirror://gentoo/texlive-module-fnspe-2017.tar.xz mirror://gentoo/texlive-module-fouridx-2017.tar.xz mirror://gentoo/texlive-module-functan-2017.tar.xz mirror://gentoo/texlive-module-galois-2017.tar.xz mirror://gentoo/texlive-module-gastex-2017.tar.xz mirror://gentoo/texlive-module-gene-logic-2017.tar.xz mirror://gentoo/texlive-module-ghsystem-2017.tar.xz mirror://gentoo/texlive-module-gotoh-2017.tar.xz mirror://gentoo/texlive-module-grundgesetze-2017.tar.xz mirror://gentoo/texlive-module-gu-2017.tar.xz mirror://gentoo/texlive-module-hep-2017.tar.xz mirror://gentoo/texlive-module-hepnames-2017.tar.xz mirror://gentoo/texlive-module-hepparticles-2017.tar.xz mirror://gentoo/texlive-module-hepthesis-2017.tar.xz mirror://gentoo/texlive-module-hepunits-2017.tar.xz mirror://gentoo/texlive-module-interval-2017.tar.xz mirror://gentoo/texlive-module-ionumbers-2017.tar.xz mirror://gentoo/texlive-module-isomath-2017.tar.xz mirror://gentoo/texlive-module-karnaugh-2017.tar.xz mirror://gentoo/texlive-module-karnaugh-map-2017.tar.xz mirror://gentoo/texlive-module-karnaughmap-2017.tar.xz mirror://gentoo/texlive-module-logicproof-2017.tar.xz mirror://gentoo/texlive-module-longdivision-2017.tar.xz mirror://gentoo/texlive-module-lpform-2017.tar.xz mirror://gentoo/texlive-module-lplfitch-2017.tar.xz mirror://gentoo/texlive-module-lstbayes-2017.tar.xz mirror://gentoo/texlive-module-mathcomp-2017.tar.xz mirror://gentoo/texlive-module-mathpartir-2017.tar.xz mirror://gentoo/texlive-module-mathpunctspace-2017.tar.xz mirror://gentoo/texlive-module-matlab-prettifier-2017.tar.xz mirror://gentoo/texlive-module-mattens-2017.tar.xz mirror://gentoo/texlive-module-mgltex-2017.tar.xz mirror://gentoo/texlive-module-mhchem-2017.tar.xz mirror://gentoo/texlive-module-mhequ-2017.tar.xz mirror://gentoo/texlive-module-miller-2017.tar.xz mirror://gentoo/texlive-module-multiobjective-2017.tar.xz mirror://gentoo/texlive-module-mychemistry-2017.tar.xz mirror://gentoo/texlive-module-natded-2017.tar.xz mirror://gentoo/texlive-module-nath-2017.tar.xz mirror://gentoo/texlive-module-nuc-2017.tar.xz mirror://gentoo/texlive-module-nucleardata-2017.tar.xz mirror://gentoo/texlive-module-objectz-2017.tar.xz mirror://gentoo/texlive-module-oplotsymbl-2017.tar.xz mirror://gentoo/texlive-module-ot-tableau-2017.tar.xz mirror://gentoo/texlive-module-oubraces-2017.tar.xz mirror://gentoo/texlive-module-perfectcut-2017.tar.xz mirror://gentoo/texlive-module-physics-2017.tar.xz mirror://gentoo/texlive-module-prftree-2017.tar.xz mirror://gentoo/texlive-module-proba-2017.tar.xz mirror://gentoo/texlive-module-prooftrees-2017.tar.xz mirror://gentoo/texlive-module-pseudocode-2017.tar.xz mirror://gentoo/texlive-module-pygmentex-2017.tar.xz mirror://gentoo/texlive-module-pythonhighlight-2017.tar.xz mirror://gentoo/texlive-module-rec-thy-2017.tar.xz mirror://gentoo/texlive-module-revquantum-2017.tar.xz mirror://gentoo/texlive-module-ribbonproofs-2017.tar.xz mirror://gentoo/texlive-module-rmathbr-2017.tar.xz mirror://gentoo/texlive-module-sasnrdisplay-2017.tar.xz mirror://gentoo/texlive-module-sciposter-2017.tar.xz mirror://gentoo/texlive-module-sclang-prettifier-2017.tar.xz mirror://gentoo/texlive-module-sesamanuel-2017.tar.xz mirror://gentoo/texlive-module-sfg-2017.tar.xz mirror://gentoo/texlive-module-shuffle-2017.tar.xz mirror://gentoo/texlive-module-simpler-wick-2017.tar.xz mirror://gentoo/texlive-module-simplewick-2017.tar.xz mirror://gentoo/texlive-module-siunitx-2017.tar.xz mirror://gentoo/texlive-module-skmath-2017.tar.xz mirror://gentoo/texlive-module-spalign-2017.tar.xz mirror://gentoo/texlive-module-stanli-2017.tar.xz mirror://gentoo/texlive-module-statex-2017.tar.xz mirror://gentoo/texlive-module-statex2-2017.tar.xz mirror://gentoo/texlive-module-steinmetz-2017.tar.xz mirror://gentoo/texlive-module-stmaryrd-2017.tar.xz mirror://gentoo/texlive-module-struktex-2017.tar.xz mirror://gentoo/texlive-module-substances-2017.tar.xz mirror://gentoo/texlive-module-subsupscripts-2017.tar.xz mirror://gentoo/texlive-module-susy-2017.tar.xz mirror://gentoo/texlive-module-syllogism-2017.tar.xz mirror://gentoo/texlive-module-sympytexpackage-2017.tar.xz mirror://gentoo/texlive-module-synproof-2017.tar.xz mirror://gentoo/texlive-module-t-angles-2017.tar.xz mirror://gentoo/texlive-module-tablor-2017.tar.xz mirror://gentoo/texlive-module-tensor-2017.tar.xz mirror://gentoo/texlive-module-tex-ewd-2017.tar.xz mirror://gentoo/texlive-module-textgreek-2017.tar.xz mirror://gentoo/texlive-module-textopo-2017.tar.xz mirror://gentoo/texlive-module-thmbox-2017.tar.xz mirror://gentoo/texlive-module-turnstile-2017.tar.xz mirror://gentoo/texlive-module-ulqda-2017.tar.xz mirror://gentoo/texlive-module-unitsdef-2017.tar.xz mirror://gentoo/texlive-module-venn-2017.tar.xz mirror://gentoo/texlive-module-xymtex-2017.tar.xz mirror://gentoo/texlive-module-yhmath-2017.tar.xz mirror://gentoo/texlive-module-youngtab-2017.tar.xz mirror://gentoo/texlive-module-ytableau-2017.tar.xz mirror://gentoo/texlive-module-collection-mathscience-2017.tar.xz doc? ( mirror://gentoo/texlive-module-12many.doc-2017.tar.xz mirror://gentoo/texlive-module-SIstyle.doc-2017.tar.xz mirror://gentoo/texlive-module-SIunits.doc-2017.tar.xz mirror://gentoo/texlive-module-alg.doc-2017.tar.xz mirror://gentoo/texlive-module-algorithm2e.doc-2017.tar.xz mirror://gentoo/texlive-module-algorithmicx.doc-2017.tar.xz mirror://gentoo/texlive-module-algorithms.doc-2017.tar.xz mirror://gentoo/texlive-module-amstex.doc-2017.tar.xz mirror://gentoo/texlive-module-apxproof.doc-2017.tar.xz mirror://gentoo/texlive-module-autobreak.doc-2017.tar.xz mirror://gentoo/texlive-module-axodraw2.doc-2017.tar.xz mirror://gentoo/texlive-module-backnaur.doc-2017.tar.xz mirror://gentoo/texlive-module-begriff.doc-2017.tar.xz mirror://gentoo/texlive-module-binomexp.doc-2017.tar.xz mirror://gentoo/texlive-module-biocon.doc-2017.tar.xz mirror://gentoo/texlive-module-bitpattern.doc-2017.tar.xz mirror://gentoo/texlive-module-bohr.doc-2017.tar.xz mirror://gentoo/texlive-module-boldtensors.doc-2017.tar.xz mirror://gentoo/texlive-module-bosisio.doc-2017.tar.xz mirror://gentoo/texlive-module-bpchem.doc-2017.tar.xz mirror://gentoo/texlive-module-bropd.doc-2017.tar.xz mirror://gentoo/texlive-module-bytefield.doc-2017.tar.xz mirror://gentoo/texlive-module-calculation.doc-2017.tar.xz mirror://gentoo/texlive-module-ccfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-chemarrow.doc-2017.tar.xz mirror://gentoo/texlive-module-chemcompounds.doc-2017.tar.xz mirror://gentoo/texlive-module-chemcono.doc-2017.tar.xz mirror://gentoo/texlive-module-chemexec.doc-2017.tar.xz mirror://gentoo/texlive-module-chemformula.doc-2017.tar.xz mirror://gentoo/texlive-module-chemgreek.doc-2017.tar.xz mirror://gentoo/texlive-module-chemmacros.doc-2017.tar.xz mirror://gentoo/texlive-module-chemnum.doc-2017.tar.xz mirror://gentoo/texlive-module-chemschemex.doc-2017.tar.xz mirror://gentoo/texlive-module-chemstyle.doc-2017.tar.xz mirror://gentoo/texlive-module-clrscode.doc-2017.tar.xz mirror://gentoo/texlive-module-clrscode3e.doc-2017.tar.xz mirror://gentoo/texlive-module-commath.doc-2017.tar.xz mirror://gentoo/texlive-module-complexity.doc-2017.tar.xz mirror://gentoo/texlive-module-computational-complexity.doc-2017.tar.xz mirror://gentoo/texlive-module-concmath.doc-2017.tar.xz mirror://gentoo/texlive-module-concrete.doc-2017.tar.xz mirror://gentoo/texlive-module-conteq.doc-2017.tar.xz mirror://gentoo/texlive-module-correctmathalign.doc-2017.tar.xz mirror://gentoo/texlive-module-cryptocode.doc-2017.tar.xz mirror://gentoo/texlive-module-delim.doc-2017.tar.xz mirror://gentoo/texlive-module-delimset.doc-2017.tar.xz mirror://gentoo/texlive-module-delimseasy.doc-2017.tar.xz mirror://gentoo/texlive-module-diffcoeff.doc-2017.tar.xz mirror://gentoo/texlive-module-digiconfigs.doc-2017.tar.xz mirror://gentoo/texlive-module-drawmatrix.doc-2017.tar.xz mirror://gentoo/texlive-module-drawstack.doc-2017.tar.xz mirror://gentoo/texlive-module-dyntree.doc-2017.tar.xz mirror://gentoo/texlive-module-ebproof.doc-2017.tar.xz mirror://gentoo/texlive-module-econometrics.doc-2017.tar.xz mirror://gentoo/texlive-module-eltex.doc-2017.tar.xz mirror://gentoo/texlive-module-emf.doc-2017.tar.xz mirror://gentoo/texlive-module-endiagram.doc-2017.tar.xz mirror://gentoo/texlive-module-engtlc.doc-2017.tar.xz mirror://gentoo/texlive-module-eqnarray.doc-2017.tar.xz mirror://gentoo/texlive-module-extarrows.doc-2017.tar.xz mirror://gentoo/texlive-module-extpfeil.doc-2017.tar.xz mirror://gentoo/texlive-module-faktor.doc-2017.tar.xz mirror://gentoo/texlive-module-fnspe.doc-2017.tar.xz mirror://gentoo/texlive-module-fouridx.doc-2017.tar.xz mirror://gentoo/texlive-module-functan.doc-2017.tar.xz mirror://gentoo/texlive-module-galois.doc-2017.tar.xz mirror://gentoo/texlive-module-gastex.doc-2017.tar.xz mirror://gentoo/texlive-module-gene-logic.doc-2017.tar.xz mirror://gentoo/texlive-module-ghsystem.doc-2017.tar.xz mirror://gentoo/texlive-module-gotoh.doc-2017.tar.xz mirror://gentoo/texlive-module-grundgesetze.doc-2017.tar.xz mirror://gentoo/texlive-module-gu.doc-2017.tar.xz mirror://gentoo/texlive-module-hep.doc-2017.tar.xz mirror://gentoo/texlive-module-hepnames.doc-2017.tar.xz mirror://gentoo/texlive-module-hepparticles.doc-2017.tar.xz mirror://gentoo/texlive-module-hepthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-hepunits.doc-2017.tar.xz mirror://gentoo/texlive-module-interval.doc-2017.tar.xz mirror://gentoo/texlive-module-ionumbers.doc-2017.tar.xz mirror://gentoo/texlive-module-isomath.doc-2017.tar.xz mirror://gentoo/texlive-module-karnaugh.doc-2017.tar.xz mirror://gentoo/texlive-module-karnaugh-map.doc-2017.tar.xz mirror://gentoo/texlive-module-karnaughmap.doc-2017.tar.xz mirror://gentoo/texlive-module-logicproof.doc-2017.tar.xz mirror://gentoo/texlive-module-longdivision.doc-2017.tar.xz mirror://gentoo/texlive-module-lpform.doc-2017.tar.xz mirror://gentoo/texlive-module-lplfitch.doc-2017.tar.xz mirror://gentoo/texlive-module-lstbayes.doc-2017.tar.xz mirror://gentoo/texlive-module-mathcomp.doc-2017.tar.xz mirror://gentoo/texlive-module-mathpartir.doc-2017.tar.xz mirror://gentoo/texlive-module-mathpunctspace.doc-2017.tar.xz mirror://gentoo/texlive-module-matlab-prettifier.doc-2017.tar.xz mirror://gentoo/texlive-module-mattens.doc-2017.tar.xz mirror://gentoo/texlive-module-mgltex.doc-2017.tar.xz mirror://gentoo/texlive-module-mhchem.doc-2017.tar.xz mirror://gentoo/texlive-module-mhequ.doc-2017.tar.xz mirror://gentoo/texlive-module-miller.doc-2017.tar.xz mirror://gentoo/texlive-module-multiobjective.doc-2017.tar.xz mirror://gentoo/texlive-module-mychemistry.doc-2017.tar.xz mirror://gentoo/texlive-module-natded.doc-2017.tar.xz mirror://gentoo/texlive-module-nath.doc-2017.tar.xz mirror://gentoo/texlive-module-nuc.doc-2017.tar.xz mirror://gentoo/texlive-module-nucleardata.doc-2017.tar.xz mirror://gentoo/texlive-module-objectz.doc-2017.tar.xz mirror://gentoo/texlive-module-oplotsymbl.doc-2017.tar.xz mirror://gentoo/texlive-module-ot-tableau.doc-2017.tar.xz mirror://gentoo/texlive-module-oubraces.doc-2017.tar.xz mirror://gentoo/texlive-module-perfectcut.doc-2017.tar.xz mirror://gentoo/texlive-module-physics.doc-2017.tar.xz mirror://gentoo/texlive-module-prftree.doc-2017.tar.xz mirror://gentoo/texlive-module-proba.doc-2017.tar.xz mirror://gentoo/texlive-module-prooftrees.doc-2017.tar.xz mirror://gentoo/texlive-module-pseudocode.doc-2017.tar.xz mirror://gentoo/texlive-module-pygmentex.doc-2017.tar.xz mirror://gentoo/texlive-module-pythonhighlight.doc-2017.tar.xz mirror://gentoo/texlive-module-rec-thy.doc-2017.tar.xz mirror://gentoo/texlive-module-revquantum.doc-2017.tar.xz mirror://gentoo/texlive-module-ribbonproofs.doc-2017.tar.xz mirror://gentoo/texlive-module-rmathbr.doc-2017.tar.xz mirror://gentoo/texlive-module-sasnrdisplay.doc-2017.tar.xz mirror://gentoo/texlive-module-sciposter.doc-2017.tar.xz mirror://gentoo/texlive-module-sclang-prettifier.doc-2017.tar.xz mirror://gentoo/texlive-module-sesamanuel.doc-2017.tar.xz mirror://gentoo/texlive-module-sfg.doc-2017.tar.xz mirror://gentoo/texlive-module-shuffle.doc-2017.tar.xz mirror://gentoo/texlive-module-simpler-wick.doc-2017.tar.xz mirror://gentoo/texlive-module-simplewick.doc-2017.tar.xz mirror://gentoo/texlive-module-siunitx.doc-2017.tar.xz mirror://gentoo/texlive-module-skmath.doc-2017.tar.xz mirror://gentoo/texlive-module-spalign.doc-2017.tar.xz mirror://gentoo/texlive-module-stanli.doc-2017.tar.xz mirror://gentoo/texlive-module-statex.doc-2017.tar.xz mirror://gentoo/texlive-module-statex2.doc-2017.tar.xz mirror://gentoo/texlive-module-steinmetz.doc-2017.tar.xz mirror://gentoo/texlive-module-stmaryrd.doc-2017.tar.xz mirror://gentoo/texlive-module-struktex.doc-2017.tar.xz mirror://gentoo/texlive-module-substances.doc-2017.tar.xz mirror://gentoo/texlive-module-subsupscripts.doc-2017.tar.xz mirror://gentoo/texlive-module-susy.doc-2017.tar.xz mirror://gentoo/texlive-module-syllogism.doc-2017.tar.xz mirror://gentoo/texlive-module-sympytexpackage.doc-2017.tar.xz mirror://gentoo/texlive-module-synproof.doc-2017.tar.xz mirror://gentoo/texlive-module-t-angles.doc-2017.tar.xz mirror://gentoo/texlive-module-tablor.doc-2017.tar.xz mirror://gentoo/texlive-module-tensor.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-ewd.doc-2017.tar.xz mirror://gentoo/texlive-module-textgreek.doc-2017.tar.xz mirror://gentoo/texlive-module-textopo.doc-2017.tar.xz mirror://gentoo/texlive-module-thmbox.doc-2017.tar.xz mirror://gentoo/texlive-module-turnstile.doc-2017.tar.xz mirror://gentoo/texlive-module-ulqda.doc-2017.tar.xz mirror://gentoo/texlive-module-unitsdef.doc-2017.tar.xz mirror://gentoo/texlive-module-venn.doc-2017.tar.xz mirror://gentoo/texlive-module-xymtex.doc-2017.tar.xz mirror://gentoo/texlive-module-yhmath.doc-2017.tar.xz mirror://gentoo/texlive-module-youngtab.doc-2017.tar.xz mirror://gentoo/texlive-module-ytableau.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-12many.source-2017.tar.xz mirror://gentoo/texlive-module-SIstyle.source-2017.tar.xz mirror://gentoo/texlive-module-SIunits.source-2017.tar.xz mirror://gentoo/texlive-module-alg.source-2017.tar.xz mirror://gentoo/texlive-module-algorithms.source-2017.tar.xz mirror://gentoo/texlive-module-apxproof.source-2017.tar.xz mirror://gentoo/texlive-module-autobreak.source-2017.tar.xz mirror://gentoo/texlive-module-axodraw2.source-2017.tar.xz mirror://gentoo/texlive-module-backnaur.source-2017.tar.xz mirror://gentoo/texlive-module-binomexp.source-2017.tar.xz mirror://gentoo/texlive-module-bitpattern.source-2017.tar.xz mirror://gentoo/texlive-module-bosisio.source-2017.tar.xz mirror://gentoo/texlive-module-bpchem.source-2017.tar.xz mirror://gentoo/texlive-module-bropd.source-2017.tar.xz mirror://gentoo/texlive-module-bytefield.source-2017.tar.xz mirror://gentoo/texlive-module-calculation.source-2017.tar.xz mirror://gentoo/texlive-module-ccfonts.source-2017.tar.xz mirror://gentoo/texlive-module-chemarrow.source-2017.tar.xz mirror://gentoo/texlive-module-chemcompounds.source-2017.tar.xz mirror://gentoo/texlive-module-chemschemex.source-2017.tar.xz mirror://gentoo/texlive-module-chemstyle.source-2017.tar.xz mirror://gentoo/texlive-module-computational-complexity.source-2017.tar.xz mirror://gentoo/texlive-module-concmath.source-2017.tar.xz mirror://gentoo/texlive-module-conteq.source-2017.tar.xz mirror://gentoo/texlive-module-delim.source-2017.tar.xz mirror://gentoo/texlive-module-delimset.source-2017.tar.xz mirror://gentoo/texlive-module-drawmatrix.source-2017.tar.xz mirror://gentoo/texlive-module-dyntree.source-2017.tar.xz mirror://gentoo/texlive-module-eqnarray.source-2017.tar.xz mirror://gentoo/texlive-module-extpfeil.source-2017.tar.xz mirror://gentoo/texlive-module-faktor.source-2017.tar.xz mirror://gentoo/texlive-module-fouridx.source-2017.tar.xz mirror://gentoo/texlive-module-functan.source-2017.tar.xz mirror://gentoo/texlive-module-galois.source-2017.tar.xz mirror://gentoo/texlive-module-gotoh.source-2017.tar.xz mirror://gentoo/texlive-module-grundgesetze.source-2017.tar.xz mirror://gentoo/texlive-module-ionumbers.source-2017.tar.xz mirror://gentoo/texlive-module-karnaugh-map.source-2017.tar.xz mirror://gentoo/texlive-module-karnaughmap.source-2017.tar.xz mirror://gentoo/texlive-module-logicproof.source-2017.tar.xz mirror://gentoo/texlive-module-lplfitch.source-2017.tar.xz mirror://gentoo/texlive-module-lstbayes.source-2017.tar.xz mirror://gentoo/texlive-module-mathcomp.source-2017.tar.xz mirror://gentoo/texlive-module-mathpartir.source-2017.tar.xz mirror://gentoo/texlive-module-matlab-prettifier.source-2017.tar.xz mirror://gentoo/texlive-module-mattens.source-2017.tar.xz mirror://gentoo/texlive-module-mgltex.source-2017.tar.xz mirror://gentoo/texlive-module-miller.source-2017.tar.xz mirror://gentoo/texlive-module-multiobjective.source-2017.tar.xz mirror://gentoo/texlive-module-nucleardata.source-2017.tar.xz mirror://gentoo/texlive-module-objectz.source-2017.tar.xz mirror://gentoo/texlive-module-proba.source-2017.tar.xz mirror://gentoo/texlive-module-revquantum.source-2017.tar.xz mirror://gentoo/texlive-module-rmathbr.source-2017.tar.xz mirror://gentoo/texlive-module-sclang-prettifier.source-2017.tar.xz mirror://gentoo/texlive-module-sesamanuel.source-2017.tar.xz mirror://gentoo/texlive-module-shuffle.source-2017.tar.xz mirror://gentoo/texlive-module-simplewick.source-2017.tar.xz mirror://gentoo/texlive-module-siunitx.source-2017.tar.xz mirror://gentoo/texlive-module-skmath.source-2017.tar.xz mirror://gentoo/texlive-module-spalign.source-2017.tar.xz mirror://gentoo/texlive-module-steinmetz.source-2017.tar.xz mirror://gentoo/texlive-module-stmaryrd.source-2017.tar.xz mirror://gentoo/texlive-module-struktex.source-2017.tar.xz mirror://gentoo/texlive-module-sympytexpackage.source-2017.tar.xz mirror://gentoo/texlive-module-tensor.source-2017.tar.xz mirror://gentoo/texlive-module-textgreek.source-2017.tar.xz mirror://gentoo/texlive-module-textopo.source-2017.tar.xz mirror://gentoo/texlive-module-thmbox.source-2017.tar.xz mirror://gentoo/texlive-module-turnstile.source-2017.tar.xz mirror://gentoo/texlive-module-ulqda.source-2017.tar.xz mirror://gentoo/texlive-module-unitsdef.source-2017.tar.xz mirror://gentoo/texlive-module-xymtex.source-2017.tar.xz mirror://gentoo/texlive-module-yhmath.source-2017.tar.xz mirror://gentoo/texlive-module-youngtab.source-2017.tar.xz mirror://gentoo/texlive-module-ytableau.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=200640c9d35ff0decd6c7208f3dde364
+_md5_=5de56ccb5fb5b22f60501e58c176f978
diff --git a/metadata/md5-cache/dev-texlive/texlive-metapost-2017 b/metadata/md5-cache/dev-texlive/texlive-metapost-2017
index 0fc631a02306..5f6d8160659d 100644
--- a/metadata/md5-cache/dev-texlive/texlive-metapost-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-metapost-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive MetaPost and Metafont packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=BSD GPL-1 GPL-2 LGPL-2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-automata-2017.tar.xz mirror://gentoo/texlive-module-bbcard-2017.tar.xz mirror://gentoo/texlive-module-blockdraw_mp-2017.tar.xz mirror://gentoo/texlive-module-bpolynomial-2017.tar.xz mirror://gentoo/texlive-module-cmarrows-2017.tar.xz mirror://gentoo/texlive-module-drv-2017.tar.xz mirror://gentoo/texlive-module-dviincl-2017.tar.xz mirror://gentoo/texlive-module-emp-2017.tar.xz mirror://gentoo/texlive-module-epsincl-2017.tar.xz mirror://gentoo/texlive-module-expressg-2017.tar.xz mirror://gentoo/texlive-module-exteps-2017.tar.xz mirror://gentoo/texlive-module-featpost-2017.tar.xz mirror://gentoo/texlive-module-feynmp-auto-2017.tar.xz mirror://gentoo/texlive-module-garrigues-2017.tar.xz mirror://gentoo/texlive-module-gmp-2017.tar.xz mirror://gentoo/texlive-module-hatching-2017.tar.xz mirror://gentoo/texlive-module-latexmp-2017.tar.xz mirror://gentoo/texlive-module-mcf2graph-2017.tar.xz mirror://gentoo/texlive-module-metago-2017.tar.xz mirror://gentoo/texlive-module-metaobj-2017.tar.xz mirror://gentoo/texlive-module-metaplot-2017.tar.xz mirror://gentoo/texlive-module-metapost-2017.tar.xz mirror://gentoo/texlive-module-metauml-2017.tar.xz mirror://gentoo/texlive-module-mfpic-2017.tar.xz mirror://gentoo/texlive-module-mfpic4ode-2017.tar.xz mirror://gentoo/texlive-module-mp3d-2017.tar.xz mirror://gentoo/texlive-module-mparrows-2017.tar.xz mirror://gentoo/texlive-module-mpattern-2017.tar.xz mirror://gentoo/texlive-module-mpcolornames-2017.tar.xz mirror://gentoo/texlive-module-mpgraphics-2017.tar.xz mirror://gentoo/texlive-module-mptrees-2017.tar.xz mirror://gentoo/texlive-module-piechartmp-2017.tar.xz mirror://gentoo/texlive-module-repere-2017.tar.xz mirror://gentoo/texlive-module-roex-2017.tar.xz mirror://gentoo/texlive-module-roundrect-2017.tar.xz mirror://gentoo/texlive-module-shapes-2017.tar.xz mirror://gentoo/texlive-module-slideshow-2017.tar.xz mirror://gentoo/texlive-module-splines-2017.tar.xz mirror://gentoo/texlive-module-suanpan-2017.tar.xz mirror://gentoo/texlive-module-textpath-2017.tar.xz mirror://gentoo/texlive-module-threeddice-2017.tar.xz mirror://gentoo/texlive-module-collection-metapost-2017.tar.xz doc? ( mirror://gentoo/texlive-module-automata.doc-2017.tar.xz mirror://gentoo/texlive-module-bbcard.doc-2017.tar.xz mirror://gentoo/texlive-module-blockdraw_mp.doc-2017.tar.xz mirror://gentoo/texlive-module-bpolynomial.doc-2017.tar.xz mirror://gentoo/texlive-module-cmarrows.doc-2017.tar.xz mirror://gentoo/texlive-module-drv.doc-2017.tar.xz mirror://gentoo/texlive-module-dviincl.doc-2017.tar.xz mirror://gentoo/texlive-module-emp.doc-2017.tar.xz mirror://gentoo/texlive-module-epsincl.doc-2017.tar.xz mirror://gentoo/texlive-module-expressg.doc-2017.tar.xz mirror://gentoo/texlive-module-exteps.doc-2017.tar.xz mirror://gentoo/texlive-module-featpost.doc-2017.tar.xz mirror://gentoo/texlive-module-feynmp-auto.doc-2017.tar.xz mirror://gentoo/texlive-module-garrigues.doc-2017.tar.xz mirror://gentoo/texlive-module-gmp.doc-2017.tar.xz mirror://gentoo/texlive-module-hatching.doc-2017.tar.xz mirror://gentoo/texlive-module-latexmp.doc-2017.tar.xz mirror://gentoo/texlive-module-mcf2graph.doc-2017.tar.xz mirror://gentoo/texlive-module-metago.doc-2017.tar.xz mirror://gentoo/texlive-module-metaobj.doc-2017.tar.xz mirror://gentoo/texlive-module-metaplot.doc-2017.tar.xz mirror://gentoo/texlive-module-metapost.doc-2017.tar.xz mirror://gentoo/texlive-module-metauml.doc-2017.tar.xz mirror://gentoo/texlive-module-mfpic.doc-2017.tar.xz mirror://gentoo/texlive-module-mfpic4ode.doc-2017.tar.xz mirror://gentoo/texlive-module-mp3d.doc-2017.tar.xz mirror://gentoo/texlive-module-mparrows.doc-2017.tar.xz mirror://gentoo/texlive-module-mpattern.doc-2017.tar.xz mirror://gentoo/texlive-module-mpcolornames.doc-2017.tar.xz mirror://gentoo/texlive-module-mpgraphics.doc-2017.tar.xz mirror://gentoo/texlive-module-mptrees.doc-2017.tar.xz mirror://gentoo/texlive-module-piechartmp.doc-2017.tar.xz mirror://gentoo/texlive-module-repere.doc-2017.tar.xz mirror://gentoo/texlive-module-roundrect.doc-2017.tar.xz mirror://gentoo/texlive-module-shapes.doc-2017.tar.xz mirror://gentoo/texlive-module-slideshow.doc-2017.tar.xz mirror://gentoo/texlive-module-splines.doc-2017.tar.xz mirror://gentoo/texlive-module-suanpan.doc-2017.tar.xz mirror://gentoo/texlive-module-textpath.doc-2017.tar.xz mirror://gentoo/texlive-module-threeddice.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-emp.source-2017.tar.xz mirror://gentoo/texlive-module-expressg.source-2017.tar.xz mirror://gentoo/texlive-module-feynmp-auto.source-2017.tar.xz mirror://gentoo/texlive-module-gmp.source-2017.tar.xz mirror://gentoo/texlive-module-mfpic.source-2017.tar.xz mirror://gentoo/texlive-module-mfpic4ode.source-2017.tar.xz mirror://gentoo/texlive-module-mpcolornames.source-2017.tar.xz mirror://gentoo/texlive-module-mpgraphics.source-2017.tar.xz mirror://gentoo/texlive-module-roex.source-2017.tar.xz mirror://gentoo/texlive-module-roundrect.source-2017.tar.xz mirror://gentoo/texlive-module-shapes.source-2017.tar.xz mirror://gentoo/texlive-module-splines.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=14641041ef1372d7bb83ba8fa2c07707
+_md5_=966db0e3b01f8ca6c37c1e9f1d738d91
diff --git a/metadata/md5-cache/dev-texlive/texlive-music-2017 b/metadata/md5-cache/dev-texlive/texlive-music-2017
index 694c0be4ad02..10963a39ff38 100644
--- a/metadata/md5-cache/dev-texlive/texlive-music-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-music-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Music packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 GPL-3 LGPL-2.1 LPPL-1.2 LPPL-1.3 MIT
 RDEPEND=>=dev-texlive/texlive-latex-2017 !<app-text/texlive-core-2011 !<dev-texlive/texlive-pictures-2015 !<dev-texlive/texlive-genericextra-2015 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-abc-2017.tar.xz mirror://gentoo/texlive-module-autosp-2017.tar.xz mirror://gentoo/texlive-module-bagpipe-2017.tar.xz mirror://gentoo/texlive-module-figbas-2017.tar.xz mirror://gentoo/texlive-module-gchords-2017.tar.xz mirror://gentoo/texlive-module-gregoriotex-2017.tar.xz mirror://gentoo/texlive-module-gtrcrd-2017.tar.xz mirror://gentoo/texlive-module-guitar-2017.tar.xz mirror://gentoo/texlive-module-guitarchordschemes-2017.tar.xz mirror://gentoo/texlive-module-harmony-2017.tar.xz mirror://gentoo/texlive-module-leadsheets-2017.tar.xz mirror://gentoo/texlive-module-lilyglyphs-2017.tar.xz mirror://gentoo/texlive-module-m-tx-2017.tar.xz mirror://gentoo/texlive-module-musixguit-2017.tar.xz mirror://gentoo/texlive-module-musixtex-2017.tar.xz mirror://gentoo/texlive-module-musixtex-fonts-2017.tar.xz mirror://gentoo/texlive-module-musixtnt-2017.tar.xz mirror://gentoo/texlive-module-piano-2017.tar.xz mirror://gentoo/texlive-module-pmx-2017.tar.xz mirror://gentoo/texlive-module-pmxchords-2017.tar.xz mirror://gentoo/texlive-module-songbook-2017.tar.xz mirror://gentoo/texlive-module-songs-2017.tar.xz mirror://gentoo/texlive-module-xpiano-2017.tar.xz mirror://gentoo/texlive-module-collection-music-2017.tar.xz doc? ( mirror://gentoo/texlive-module-abc.doc-2017.tar.xz mirror://gentoo/texlive-module-autosp.doc-2017.tar.xz mirror://gentoo/texlive-module-bagpipe.doc-2017.tar.xz mirror://gentoo/texlive-module-figbas.doc-2017.tar.xz mirror://gentoo/texlive-module-gchords.doc-2017.tar.xz mirror://gentoo/texlive-module-gregoriotex.doc-2017.tar.xz mirror://gentoo/texlive-module-gtrcrd.doc-2017.tar.xz mirror://gentoo/texlive-module-guitar.doc-2017.tar.xz mirror://gentoo/texlive-module-guitarchordschemes.doc-2017.tar.xz mirror://gentoo/texlive-module-harmony.doc-2017.tar.xz mirror://gentoo/texlive-module-leadsheets.doc-2017.tar.xz mirror://gentoo/texlive-module-lilyglyphs.doc-2017.tar.xz mirror://gentoo/texlive-module-m-tx.doc-2017.tar.xz mirror://gentoo/texlive-module-musixguit.doc-2017.tar.xz mirror://gentoo/texlive-module-musixtex.doc-2017.tar.xz mirror://gentoo/texlive-module-musixtex-fonts.doc-2017.tar.xz mirror://gentoo/texlive-module-musixtnt.doc-2017.tar.xz mirror://gentoo/texlive-module-piano.doc-2017.tar.xz mirror://gentoo/texlive-module-pmx.doc-2017.tar.xz mirror://gentoo/texlive-module-pmxchords.doc-2017.tar.xz mirror://gentoo/texlive-module-songbook.doc-2017.tar.xz mirror://gentoo/texlive-module-songs.doc-2017.tar.xz mirror://gentoo/texlive-module-xpiano.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-abc.source-2017.tar.xz mirror://gentoo/texlive-module-guitar.source-2017.tar.xz mirror://gentoo/texlive-module-lilyglyphs.source-2017.tar.xz mirror://gentoo/texlive-module-musixtex.source-2017.tar.xz mirror://gentoo/texlive-module-songbook.source-2017.tar.xz mirror://gentoo/texlive-module-songs.source-2017.tar.xz mirror://gentoo/texlive-module-xpiano.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d2d998f74d5eee9af860d34487d7e956
+_md5_=5881ec49918051c53eca7c147aab1506
diff --git a/metadata/md5-cache/dev-texlive/texlive-pictures-2017 b/metadata/md5-cache/dev-texlive/texlive-pictures-2017
index 58a14e98853a..ec9a1943d736 100644
--- a/metadata/md5-cache/dev-texlive/texlive-pictures-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-pictures-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Graphics, pictures, diagrams
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD-2 GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !<dev-texlive/texlive-latexextra-2009 !<dev-texlive/texlive-texinfo-2009 >=dev-tex/pgf-3.0.1 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-aobs-tikz-2017.tar.xz mirror://gentoo/texlive-module-askmaps-2017.tar.xz mirror://gentoo/texlive-module-asyfig-2017.tar.xz mirror://gentoo/texlive-module-asypictureb-2017.tar.xz mirror://gentoo/texlive-module-autoarea-2017.tar.xz mirror://gentoo/texlive-module-bardiag-2017.tar.xz mirror://gentoo/texlive-module-beamerswitch-2017.tar.xz mirror://gentoo/texlive-module-binarytree-2017.tar.xz mirror://gentoo/texlive-module-blochsphere-2017.tar.xz mirror://gentoo/texlive-module-bloques-2017.tar.xz mirror://gentoo/texlive-module-blox-2017.tar.xz mirror://gentoo/texlive-module-bodegraph-2017.tar.xz mirror://gentoo/texlive-module-bondgraph-2017.tar.xz mirror://gentoo/texlive-module-bondgraphs-2017.tar.xz mirror://gentoo/texlive-module-braids-2017.tar.xz mirror://gentoo/texlive-module-bxeepic-2017.tar.xz mirror://gentoo/texlive-module-cachepic-2017.tar.xz mirror://gentoo/texlive-module-callouts-2017.tar.xz mirror://gentoo/texlive-module-celtic-2017.tar.xz mirror://gentoo/texlive-module-chemfig-2017.tar.xz mirror://gentoo/texlive-module-combinedgraphics-2017.tar.xz mirror://gentoo/texlive-module-circuitikz-2017.tar.xz mirror://gentoo/texlive-module-curve-2017.tar.xz mirror://gentoo/texlive-module-curve2e-2017.tar.xz mirror://gentoo/texlive-module-curves-2017.tar.xz mirror://gentoo/texlive-module-dcpic-2017.tar.xz mirror://gentoo/texlive-module-diagmac2-2017.tar.xz mirror://gentoo/texlive-module-doc-pictex-2017.tar.xz mirror://gentoo/texlive-module-dottex-2017.tar.xz mirror://gentoo/texlive-module-dratex-2017.tar.xz mirror://gentoo/texlive-module-drs-2017.tar.xz mirror://gentoo/texlive-module-duotenzor-2017.tar.xz mirror://gentoo/texlive-module-ecgdraw-2017.tar.xz mirror://gentoo/texlive-module-eepic-2017.tar.xz mirror://gentoo/texlive-module-ellipse-2017.tar.xz mirror://gentoo/texlive-module-epspdfconversion-2017.tar.xz mirror://gentoo/texlive-module-esk-2017.tar.xz mirror://gentoo/texlive-module-fast-diagram-2017.tar.xz mirror://gentoo/texlive-module-fig4latex-2017.tar.xz mirror://gentoo/texlive-module-fitbox-2017.tar.xz mirror://gentoo/texlive-module-flowchart-2017.tar.xz mirror://gentoo/texlive-module-forest-2017.tar.xz mirror://gentoo/texlive-module-genealogytree-2017.tar.xz mirror://gentoo/texlive-module-getmap-2017.tar.xz mirror://gentoo/texlive-module-gincltex-2017.tar.xz mirror://gentoo/texlive-module-gnuplottex-2017.tar.xz mirror://gentoo/texlive-module-gradientframe-2017.tar.xz mirror://gentoo/texlive-module-grafcet-2017.tar.xz mirror://gentoo/texlive-module-graphviz-2017.tar.xz mirror://gentoo/texlive-module-gtrlib-largetrees-2017.tar.xz mirror://gentoo/texlive-module-harveyballs-2017.tar.xz mirror://gentoo/texlive-module-here-2017.tar.xz mirror://gentoo/texlive-module-hf-tikz-2017.tar.xz mirror://gentoo/texlive-module-hobby-2017.tar.xz mirror://gentoo/texlive-module-hvfloat-2017.tar.xz mirror://gentoo/texlive-module-knitting-2017.tar.xz mirror://gentoo/texlive-module-knittingpattern-2017.tar.xz mirror://gentoo/texlive-module-ladder-2017.tar.xz mirror://gentoo/texlive-module-lapdf-2017.tar.xz mirror://gentoo/texlive-module-latex-make-2017.tar.xz mirror://gentoo/texlive-module-lpic-2017.tar.xz mirror://gentoo/texlive-module-lroundrect-2017.tar.xz mirror://gentoo/texlive-module-luamesh-2017.tar.xz mirror://gentoo/texlive-module-makeshape-2017.tar.xz mirror://gentoo/texlive-module-mathspic-2017.tar.xz mirror://gentoo/texlive-module-miniplot-2017.tar.xz mirror://gentoo/texlive-module-mkpic-2017.tar.xz mirror://gentoo/texlive-module-modiagram-2017.tar.xz mirror://gentoo/texlive-module-neuralnetwork-2017.tar.xz mirror://gentoo/texlive-module-numericplots-2017.tar.xz mirror://gentoo/texlive-module-pb-diagram-2017.tar.xz mirror://gentoo/texlive-module-petri-nets-2017.tar.xz mirror://gentoo/texlive-module-pgf-blur-2017.tar.xz mirror://gentoo/texlive-module-pgf-soroban-2017.tar.xz mirror://gentoo/texlive-module-pgf-spectra-2017.tar.xz mirror://gentoo/texlive-module-pgf-umlcd-2017.tar.xz mirror://gentoo/texlive-module-pgf-umlsd-2017.tar.xz mirror://gentoo/texlive-module-pgfgantt-2017.tar.xz mirror://gentoo/texlive-module-pgfkeyx-2017.tar.xz mirror://gentoo/texlive-module-pgfmolbio-2017.tar.xz mirror://gentoo/texlive-module-pgfopts-2017.tar.xz mirror://gentoo/texlive-module-pgfornament-2017.tar.xz mirror://gentoo/texlive-module-pgfplots-2017.tar.xz mirror://gentoo/texlive-module-picinpar-2017.tar.xz mirror://gentoo/texlive-module-pict2e-2017.tar.xz mirror://gentoo/texlive-module-pictex-2017.tar.xz mirror://gentoo/texlive-module-pictex2-2017.tar.xz mirror://gentoo/texlive-module-pinlabel-2017.tar.xz mirror://gentoo/texlive-module-pmgraph-2017.tar.xz mirror://gentoo/texlive-module-prerex-2017.tar.xz mirror://gentoo/texlive-module-productbox-2017.tar.xz mirror://gentoo/texlive-module-pxpgfmark-2017.tar.xz mirror://gentoo/texlive-module-qcircuit-2017.tar.xz mirror://gentoo/texlive-module-qrcode-2017.tar.xz mirror://gentoo/texlive-module-randbild-2017.tar.xz mirror://gentoo/texlive-module-randomwalk-2017.tar.xz mirror://gentoo/texlive-module-reotex-2017.tar.xz mirror://gentoo/texlive-module-rviewport-2017.tar.xz mirror://gentoo/texlive-module-sa-tikz-2017.tar.xz mirror://gentoo/texlive-module-schemabloc-2017.tar.xz mirror://gentoo/texlive-module-scsnowman-2017.tar.xz mirror://gentoo/texlive-module-scratch-2017.tar.xz mirror://gentoo/texlive-module-setdeck-2017.tar.xz mirror://gentoo/texlive-module-signchart-2017.tar.xz mirror://gentoo/texlive-module-smartdiagram-2017.tar.xz mirror://gentoo/texlive-module-spath3-2017.tar.xz mirror://gentoo/texlive-module-swimgraf-2017.tar.xz mirror://gentoo/texlive-module-table-fct-2017.tar.xz mirror://gentoo/texlive-module-texdraw-2017.tar.xz mirror://gentoo/texlive-module-ticollege-2017.tar.xz mirror://gentoo/texlive-module-tipfr-2017.tar.xz mirror://gentoo/texlive-module-tikz-3dplot-2017.tar.xz mirror://gentoo/texlive-module-tikz-bayesnet-2017.tar.xz mirror://gentoo/texlive-module-tikz-cd-2017.tar.xz mirror://gentoo/texlive-module-tikz-dependency-2017.tar.xz mirror://gentoo/texlive-module-tikz-dimline-2017.tar.xz mirror://gentoo/texlive-module-tikz-feynman-2017.tar.xz mirror://gentoo/texlive-module-tikz-inet-2017.tar.xz mirror://gentoo/texlive-module-tikz-kalender-2017.tar.xz mirror://gentoo/texlive-module-tikz-opm-2017.tar.xz mirror://gentoo/texlive-module-tikz-optics-2017.tar.xz mirror://gentoo/texlive-module-tikz-page-2017.tar.xz mirror://gentoo/texlive-module-tikz-palattice-2017.tar.xz mirror://gentoo/texlive-module-tikz-qtree-2017.tar.xz mirror://gentoo/texlive-module-tikz-timing-2017.tar.xz mirror://gentoo/texlive-module-tikzinclude-2017.tar.xz mirror://gentoo/texlive-module-tikzmark-2017.tar.xz mirror://gentoo/texlive-module-tikzorbital-2017.tar.xz mirror://gentoo/texlive-module-tikzpagenodes-2017.tar.xz mirror://gentoo/texlive-module-tikzpfeile-2017.tar.xz mirror://gentoo/texlive-module-tikzpeople-2017.tar.xz mirror://gentoo/texlive-module-tikzposter-2017.tar.xz mirror://gentoo/texlive-module-tikzscale-2017.tar.xz mirror://gentoo/texlive-module-tikzsymbols-2017.tar.xz mirror://gentoo/texlive-module-timing-diagrams-2017.tar.xz mirror://gentoo/texlive-module-tqft-2017.tar.xz mirror://gentoo/texlive-module-tkz-base-2017.tar.xz mirror://gentoo/texlive-module-tkz-berge-2017.tar.xz mirror://gentoo/texlive-module-tkz-doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-euclide-2017.tar.xz mirror://gentoo/texlive-module-tkz-fct-2017.tar.xz mirror://gentoo/texlive-module-tkz-graph-2017.tar.xz mirror://gentoo/texlive-module-tkz-kiviat-2017.tar.xz mirror://gentoo/texlive-module-tkz-linknodes-2017.tar.xz mirror://gentoo/texlive-module-tkz-orm-2017.tar.xz mirror://gentoo/texlive-module-tkz-tab-2017.tar.xz mirror://gentoo/texlive-module-tsemlines-2017.tar.xz mirror://gentoo/texlive-module-tufte-latex-2017.tar.xz mirror://gentoo/texlive-module-venndiagram-2017.tar.xz mirror://gentoo/texlive-module-visualpstricks-2017.tar.xz mirror://gentoo/texlive-module-xpicture-2017.tar.xz mirror://gentoo/texlive-module-xypic-2017.tar.xz mirror://gentoo/texlive-module-collection-pictures-2017.tar.xz doc? ( mirror://gentoo/texlive-module-aobs-tikz.doc-2017.tar.xz mirror://gentoo/texlive-module-askmaps.doc-2017.tar.xz mirror://gentoo/texlive-module-asyfig.doc-2017.tar.xz mirror://gentoo/texlive-module-asypictureb.doc-2017.tar.xz mirror://gentoo/texlive-module-autoarea.doc-2017.tar.xz mirror://gentoo/texlive-module-bardiag.doc-2017.tar.xz mirror://gentoo/texlive-module-beamerswitch.doc-2017.tar.xz mirror://gentoo/texlive-module-binarytree.doc-2017.tar.xz mirror://gentoo/texlive-module-blochsphere.doc-2017.tar.xz mirror://gentoo/texlive-module-bloques.doc-2017.tar.xz mirror://gentoo/texlive-module-blox.doc-2017.tar.xz mirror://gentoo/texlive-module-bodegraph.doc-2017.tar.xz mirror://gentoo/texlive-module-bondgraph.doc-2017.tar.xz mirror://gentoo/texlive-module-bondgraphs.doc-2017.tar.xz mirror://gentoo/texlive-module-braids.doc-2017.tar.xz mirror://gentoo/texlive-module-bxeepic.doc-2017.tar.xz mirror://gentoo/texlive-module-cachepic.doc-2017.tar.xz mirror://gentoo/texlive-module-callouts.doc-2017.tar.xz mirror://gentoo/texlive-module-celtic.doc-2017.tar.xz mirror://gentoo/texlive-module-chemfig.doc-2017.tar.xz mirror://gentoo/texlive-module-combinedgraphics.doc-2017.tar.xz mirror://gentoo/texlive-module-circuitikz.doc-2017.tar.xz mirror://gentoo/texlive-module-curve.doc-2017.tar.xz mirror://gentoo/texlive-module-curve2e.doc-2017.tar.xz mirror://gentoo/texlive-module-curves.doc-2017.tar.xz mirror://gentoo/texlive-module-dcpic.doc-2017.tar.xz mirror://gentoo/texlive-module-diagmac2.doc-2017.tar.xz mirror://gentoo/texlive-module-doc-pictex.doc-2017.tar.xz mirror://gentoo/texlive-module-dottex.doc-2017.tar.xz mirror://gentoo/texlive-module-dratex.doc-2017.tar.xz mirror://gentoo/texlive-module-drs.doc-2017.tar.xz mirror://gentoo/texlive-module-duotenzor.doc-2017.tar.xz mirror://gentoo/texlive-module-ecgdraw.doc-2017.tar.xz mirror://gentoo/texlive-module-eepic.doc-2017.tar.xz mirror://gentoo/texlive-module-ellipse.doc-2017.tar.xz mirror://gentoo/texlive-module-epspdfconversion.doc-2017.tar.xz mirror://gentoo/texlive-module-esk.doc-2017.tar.xz mirror://gentoo/texlive-module-fast-diagram.doc-2017.tar.xz mirror://gentoo/texlive-module-fig4latex.doc-2017.tar.xz mirror://gentoo/texlive-module-fitbox.doc-2017.tar.xz mirror://gentoo/texlive-module-flowchart.doc-2017.tar.xz mirror://gentoo/texlive-module-forest.doc-2017.tar.xz mirror://gentoo/texlive-module-genealogytree.doc-2017.tar.xz mirror://gentoo/texlive-module-getmap.doc-2017.tar.xz mirror://gentoo/texlive-module-gincltex.doc-2017.tar.xz mirror://gentoo/texlive-module-gnuplottex.doc-2017.tar.xz mirror://gentoo/texlive-module-gradientframe.doc-2017.tar.xz mirror://gentoo/texlive-module-grafcet.doc-2017.tar.xz mirror://gentoo/texlive-module-graphviz.doc-2017.tar.xz mirror://gentoo/texlive-module-gtrlib-largetrees.doc-2017.tar.xz mirror://gentoo/texlive-module-harveyballs.doc-2017.tar.xz mirror://gentoo/texlive-module-here.doc-2017.tar.xz mirror://gentoo/texlive-module-hf-tikz.doc-2017.tar.xz mirror://gentoo/texlive-module-hobby.doc-2017.tar.xz mirror://gentoo/texlive-module-hvfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-knitting.doc-2017.tar.xz mirror://gentoo/texlive-module-knittingpattern.doc-2017.tar.xz mirror://gentoo/texlive-module-ladder.doc-2017.tar.xz mirror://gentoo/texlive-module-lapdf.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-make.doc-2017.tar.xz mirror://gentoo/texlive-module-lpic.doc-2017.tar.xz mirror://gentoo/texlive-module-lroundrect.doc-2017.tar.xz mirror://gentoo/texlive-module-luamesh.doc-2017.tar.xz mirror://gentoo/texlive-module-makeshape.doc-2017.tar.xz mirror://gentoo/texlive-module-mathspic.doc-2017.tar.xz mirror://gentoo/texlive-module-miniplot.doc-2017.tar.xz mirror://gentoo/texlive-module-mkpic.doc-2017.tar.xz mirror://gentoo/texlive-module-modiagram.doc-2017.tar.xz mirror://gentoo/texlive-module-neuralnetwork.doc-2017.tar.xz mirror://gentoo/texlive-module-numericplots.doc-2017.tar.xz mirror://gentoo/texlive-module-pb-diagram.doc-2017.tar.xz mirror://gentoo/texlive-module-petri-nets.doc-2017.tar.xz mirror://gentoo/texlive-module-pgf-blur.doc-2017.tar.xz mirror://gentoo/texlive-module-pgf-soroban.doc-2017.tar.xz mirror://gentoo/texlive-module-pgf-spectra.doc-2017.tar.xz mirror://gentoo/texlive-module-pgf-umlcd.doc-2017.tar.xz mirror://gentoo/texlive-module-pgf-umlsd.doc-2017.tar.xz mirror://gentoo/texlive-module-pgfgantt.doc-2017.tar.xz mirror://gentoo/texlive-module-pgfkeyx.doc-2017.tar.xz mirror://gentoo/texlive-module-pgfmolbio.doc-2017.tar.xz mirror://gentoo/texlive-module-pgfopts.doc-2017.tar.xz mirror://gentoo/texlive-module-pgfornament.doc-2017.tar.xz mirror://gentoo/texlive-module-pgfplots.doc-2017.tar.xz mirror://gentoo/texlive-module-picinpar.doc-2017.tar.xz mirror://gentoo/texlive-module-pict2e.doc-2017.tar.xz mirror://gentoo/texlive-module-pictex.doc-2017.tar.xz mirror://gentoo/texlive-module-pinlabel.doc-2017.tar.xz mirror://gentoo/texlive-module-pmgraph.doc-2017.tar.xz mirror://gentoo/texlive-module-prerex.doc-2017.tar.xz mirror://gentoo/texlive-module-productbox.doc-2017.tar.xz mirror://gentoo/texlive-module-pxpgfmark.doc-2017.tar.xz mirror://gentoo/texlive-module-qcircuit.doc-2017.tar.xz mirror://gentoo/texlive-module-qrcode.doc-2017.tar.xz mirror://gentoo/texlive-module-randbild.doc-2017.tar.xz mirror://gentoo/texlive-module-randomwalk.doc-2017.tar.xz mirror://gentoo/texlive-module-reotex.doc-2017.tar.xz mirror://gentoo/texlive-module-rviewport.doc-2017.tar.xz mirror://gentoo/texlive-module-sa-tikz.doc-2017.tar.xz mirror://gentoo/texlive-module-schemabloc.doc-2017.tar.xz mirror://gentoo/texlive-module-scsnowman.doc-2017.tar.xz mirror://gentoo/texlive-module-scratch.doc-2017.tar.xz mirror://gentoo/texlive-module-setdeck.doc-2017.tar.xz mirror://gentoo/texlive-module-signchart.doc-2017.tar.xz mirror://gentoo/texlive-module-smartdiagram.doc-2017.tar.xz mirror://gentoo/texlive-module-spath3.doc-2017.tar.xz mirror://gentoo/texlive-module-swimgraf.doc-2017.tar.xz mirror://gentoo/texlive-module-table-fct.doc-2017.tar.xz mirror://gentoo/texlive-module-texdraw.doc-2017.tar.xz mirror://gentoo/texlive-module-ticollege.doc-2017.tar.xz mirror://gentoo/texlive-module-tipfr.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-3dplot.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-bayesnet.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-cd.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-dependency.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-dimline.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-feynman.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-inet.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-kalender.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-opm.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-optics.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-page.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-palattice.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-qtree.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-timing.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzinclude.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzmark.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzorbital.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzpagenodes.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzpfeile.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzpeople.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzposter.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzscale.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzsymbols.doc-2017.tar.xz mirror://gentoo/texlive-module-timing-diagrams.doc-2017.tar.xz mirror://gentoo/texlive-module-tqft.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-base.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-berge.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-doc.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-euclide.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-fct.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-graph.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-kiviat.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-linknodes.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-orm.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-tab.doc-2017.tar.xz mirror://gentoo/texlive-module-tufte-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-venndiagram.doc-2017.tar.xz mirror://gentoo/texlive-module-visualpstricks.doc-2017.tar.xz mirror://gentoo/texlive-module-xpicture.doc-2017.tar.xz mirror://gentoo/texlive-module-xypic.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-aobs-tikz.source-2017.tar.xz mirror://gentoo/texlive-module-asyfig.source-2017.tar.xz mirror://gentoo/texlive-module-asypictureb.source-2017.tar.xz mirror://gentoo/texlive-module-beamerswitch.source-2017.tar.xz mirror://gentoo/texlive-module-binarytree.source-2017.tar.xz mirror://gentoo/texlive-module-blochsphere.source-2017.tar.xz mirror://gentoo/texlive-module-blox.source-2017.tar.xz mirror://gentoo/texlive-module-bondgraphs.source-2017.tar.xz mirror://gentoo/texlive-module-braids.source-2017.tar.xz mirror://gentoo/texlive-module-celtic.source-2017.tar.xz mirror://gentoo/texlive-module-combinedgraphics.source-2017.tar.xz mirror://gentoo/texlive-module-curve.source-2017.tar.xz mirror://gentoo/texlive-module-curve2e.source-2017.tar.xz mirror://gentoo/texlive-module-curves.source-2017.tar.xz mirror://gentoo/texlive-module-dottex.source-2017.tar.xz mirror://gentoo/texlive-module-ecgdraw.source-2017.tar.xz mirror://gentoo/texlive-module-ellipse.source-2017.tar.xz mirror://gentoo/texlive-module-esk.source-2017.tar.xz mirror://gentoo/texlive-module-fitbox.source-2017.tar.xz mirror://gentoo/texlive-module-flowchart.source-2017.tar.xz mirror://gentoo/texlive-module-forest.source-2017.tar.xz mirror://gentoo/texlive-module-gincltex.source-2017.tar.xz mirror://gentoo/texlive-module-gnuplottex.source-2017.tar.xz mirror://gentoo/texlive-module-gradientframe.source-2017.tar.xz mirror://gentoo/texlive-module-graphviz.source-2017.tar.xz mirror://gentoo/texlive-module-gtrlib-largetrees.source-2017.tar.xz mirror://gentoo/texlive-module-hf-tikz.source-2017.tar.xz mirror://gentoo/texlive-module-hobby.source-2017.tar.xz mirror://gentoo/texlive-module-latex-make.source-2017.tar.xz mirror://gentoo/texlive-module-lroundrect.source-2017.tar.xz mirror://gentoo/texlive-module-makeshape.source-2017.tar.xz mirror://gentoo/texlive-module-pgf-blur.source-2017.tar.xz mirror://gentoo/texlive-module-pgfgantt.source-2017.tar.xz mirror://gentoo/texlive-module-pgfmolbio.source-2017.tar.xz mirror://gentoo/texlive-module-pgfopts.source-2017.tar.xz mirror://gentoo/texlive-module-pgfplots.source-2017.tar.xz mirror://gentoo/texlive-module-pict2e.source-2017.tar.xz mirror://gentoo/texlive-module-productbox.source-2017.tar.xz mirror://gentoo/texlive-module-qrcode.source-2017.tar.xz mirror://gentoo/texlive-module-randbild.source-2017.tar.xz mirror://gentoo/texlive-module-randomwalk.source-2017.tar.xz mirror://gentoo/texlive-module-rviewport.source-2017.tar.xz mirror://gentoo/texlive-module-signchart.source-2017.tar.xz mirror://gentoo/texlive-module-smartdiagram.source-2017.tar.xz mirror://gentoo/texlive-module-spath3.source-2017.tar.xz mirror://gentoo/texlive-module-tikz-page.source-2017.tar.xz mirror://gentoo/texlive-module-tikz-timing.source-2017.tar.xz mirror://gentoo/texlive-module-tikzinclude.source-2017.tar.xz mirror://gentoo/texlive-module-tikzmark.source-2017.tar.xz mirror://gentoo/texlive-module-tikzpagenodes.source-2017.tar.xz mirror://gentoo/texlive-module-tikzpfeile.source-2017.tar.xz mirror://gentoo/texlive-module-tikzposter.source-2017.tar.xz mirror://gentoo/texlive-module-tikzscale.source-2017.tar.xz mirror://gentoo/texlive-module-tikzsymbols.source-2017.tar.xz mirror://gentoo/texlive-module-tqft.source-2017.tar.xz mirror://gentoo/texlive-module-venndiagram.source-2017.tar.xz mirror://gentoo/texlive-module-xpicture.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=88ca5a8873fdcee23211ff0f7347a059
+_md5_=4a7a9108c8eb183330d375f7b868489c
diff --git a/metadata/md5-cache/dev-texlive/texlive-plaingeneric-2017 b/metadata/md5-cache/dev-texlive/texlive-plaingeneric-2017
index 6d9734dde72a..4a597497704c 100644
--- a/metadata/md5-cache/dev-texlive/texlive-plaingeneric-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-plaingeneric-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Plain (La)TeX packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 GPL-3 LPPL-1.3 LPPL-1.3c public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !<dev-texlive/texlive-langvietnamese-2009 !dev-texlive/texlive-texinfo !=dev-texlive/texlive-basic-2007* !<dev-texlive/texlive-texinfo-2009 !<dev-texlive/texlive-latexextra-2010 !dev-texlive/texlive-genericextra !dev-texlive/texlive-genericrecommended !dev-texlive/texlive-plainextra >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-abbr-2017.tar.xz mirror://gentoo/texlive-module-abstyles-2017.tar.xz mirror://gentoo/texlive-module-apnum-2017.tar.xz mirror://gentoo/texlive-module-autoaligne-2017.tar.xz mirror://gentoo/texlive-module-barr-2017.tar.xz mirror://gentoo/texlive-module-bitelist-2017.tar.xz mirror://gentoo/texlive-module-borceux-2017.tar.xz mirror://gentoo/texlive-module-c-pascal-2017.tar.xz mirror://gentoo/texlive-module-catcodes-2017.tar.xz mirror://gentoo/texlive-module-chronosys-2017.tar.xz mirror://gentoo/texlive-module-colorsep-2017.tar.xz mirror://gentoo/texlive-module-dinat-2017.tar.xz mirror://gentoo/texlive-module-dirtree-2017.tar.xz mirror://gentoo/texlive-module-docbytex-2017.tar.xz mirror://gentoo/texlive-module-dowith-2017.tar.xz mirror://gentoo/texlive-module-eijkhout-2017.tar.xz mirror://gentoo/texlive-module-encxvlna-2017.tar.xz mirror://gentoo/texlive-module-epigram-2017.tar.xz mirror://gentoo/texlive-module-epsf-2017.tar.xz mirror://gentoo/texlive-module-epsf-dvipdfmx-2017.tar.xz mirror://gentoo/texlive-module-fenixpar-2017.tar.xz mirror://gentoo/texlive-module-figflow-2017.tar.xz mirror://gentoo/texlive-module-fixpdfmag-2017.tar.xz mirror://gentoo/texlive-module-fltpoint-2017.tar.xz mirror://gentoo/texlive-module-fntproof-2017.tar.xz mirror://gentoo/texlive-module-font-change-2017.tar.xz mirror://gentoo/texlive-module-fontch-2017.tar.xz mirror://gentoo/texlive-module-fontname-2017.tar.xz mirror://gentoo/texlive-module-gates-2017.tar.xz mirror://gentoo/texlive-module-genmisc-2017.tar.xz mirror://gentoo/texlive-module-getoptk-2017.tar.xz mirror://gentoo/texlive-module-gfnotation-2017.tar.xz mirror://gentoo/texlive-module-gobble-2017.tar.xz mirror://gentoo/texlive-module-graphics-pln-2017.tar.xz mirror://gentoo/texlive-module-gtl-2017.tar.xz mirror://gentoo/texlive-module-hlist-2017.tar.xz mirror://gentoo/texlive-module-hyplain-2017.tar.xz mirror://gentoo/texlive-module-ifetex-2017.tar.xz mirror://gentoo/texlive-module-iftex-2017.tar.xz mirror://gentoo/texlive-module-insbox-2017.tar.xz mirror://gentoo/texlive-module-js-misc-2017.tar.xz mirror://gentoo/texlive-module-kastrup-2017.tar.xz mirror://gentoo/texlive-module-lambda-lists-2017.tar.xz mirror://gentoo/texlive-module-langcode-2017.tar.xz mirror://gentoo/texlive-module-lecturer-2017.tar.xz mirror://gentoo/texlive-module-librarian-2017.tar.xz mirror://gentoo/texlive-module-listofitems-2017.tar.xz mirror://gentoo/texlive-module-mathdots-2017.tar.xz mirror://gentoo/texlive-module-metatex-2017.tar.xz mirror://gentoo/texlive-module-midnight-2017.tar.xz mirror://gentoo/texlive-module-mkpattern-2017.tar.xz mirror://gentoo/texlive-module-multido-2017.tar.xz mirror://gentoo/texlive-module-navigator-2017.tar.xz mirror://gentoo/texlive-module-newsletr-2017.tar.xz mirror://gentoo/texlive-module-ofs-2017.tar.xz mirror://gentoo/texlive-module-olsak-misc-2017.tar.xz mirror://gentoo/texlive-module-path-2017.tar.xz mirror://gentoo/texlive-module-pdf-trans-2017.tar.xz mirror://gentoo/texlive-module-pitex-2017.tar.xz mirror://gentoo/texlive-module-placeins-plain-2017.tar.xz mirror://gentoo/texlive-module-plainpkg-2017.tar.xz mirror://gentoo/texlive-module-plipsum-2017.tar.xz mirror://gentoo/texlive-module-plnfss-2017.tar.xz mirror://gentoo/texlive-module-plstmary-2017.tar.xz mirror://gentoo/texlive-module-present-2017.tar.xz mirror://gentoo/texlive-module-randomlist-2017.tar.xz mirror://gentoo/texlive-module-resumemac-2017.tar.xz mirror://gentoo/texlive-module-schemata-2017.tar.xz mirror://gentoo/texlive-module-shade-2017.tar.xz mirror://gentoo/texlive-module-systeme-2017.tar.xz mirror://gentoo/texlive-module-tabto-generic-2017.tar.xz mirror://gentoo/texlive-module-termmenu-2017.tar.xz mirror://gentoo/texlive-module-tex-ps-2017.tar.xz mirror://gentoo/texlive-module-tex4ht-2017.tar.xz mirror://gentoo/texlive-module-texapi-2017.tar.xz mirror://gentoo/texlive-module-texinfo-2017.tar.xz mirror://gentoo/texlive-module-timetable-2017.tar.xz mirror://gentoo/texlive-module-tracklang-2017.tar.xz mirror://gentoo/texlive-module-treetex-2017.tar.xz mirror://gentoo/texlive-module-trigonometry-2017.tar.xz mirror://gentoo/texlive-module-ulem-2017.tar.xz mirror://gentoo/texlive-module-upca-2017.tar.xz mirror://gentoo/texlive-module-varisize-2017.tar.xz mirror://gentoo/texlive-module-xii-2017.tar.xz mirror://gentoo/texlive-module-xlop-2017.tar.xz mirror://gentoo/texlive-module-yax-2017.tar.xz mirror://gentoo/texlive-module-collection-plaingeneric-2017.tar.xz doc? ( mirror://gentoo/texlive-module-abbr.doc-2017.tar.xz mirror://gentoo/texlive-module-abstyles.doc-2017.tar.xz mirror://gentoo/texlive-module-apnum.doc-2017.tar.xz mirror://gentoo/texlive-module-autoaligne.doc-2017.tar.xz mirror://gentoo/texlive-module-barr.doc-2017.tar.xz mirror://gentoo/texlive-module-bitelist.doc-2017.tar.xz mirror://gentoo/texlive-module-borceux.doc-2017.tar.xz mirror://gentoo/texlive-module-c-pascal.doc-2017.tar.xz mirror://gentoo/texlive-module-catcodes.doc-2017.tar.xz mirror://gentoo/texlive-module-chronosys.doc-2017.tar.xz mirror://gentoo/texlive-module-dinat.doc-2017.tar.xz mirror://gentoo/texlive-module-dirtree.doc-2017.tar.xz mirror://gentoo/texlive-module-docbytex.doc-2017.tar.xz mirror://gentoo/texlive-module-dowith.doc-2017.tar.xz mirror://gentoo/texlive-module-encxvlna.doc-2017.tar.xz mirror://gentoo/texlive-module-epsf.doc-2017.tar.xz mirror://gentoo/texlive-module-epsf-dvipdfmx.doc-2017.tar.xz mirror://gentoo/texlive-module-fenixpar.doc-2017.tar.xz mirror://gentoo/texlive-module-figflow.doc-2017.tar.xz mirror://gentoo/texlive-module-fltpoint.doc-2017.tar.xz mirror://gentoo/texlive-module-fntproof.doc-2017.tar.xz mirror://gentoo/texlive-module-font-change.doc-2017.tar.xz mirror://gentoo/texlive-module-fontch.doc-2017.tar.xz mirror://gentoo/texlive-module-fontname.doc-2017.tar.xz mirror://gentoo/texlive-module-gates.doc-2017.tar.xz mirror://gentoo/texlive-module-getoptk.doc-2017.tar.xz mirror://gentoo/texlive-module-gfnotation.doc-2017.tar.xz mirror://gentoo/texlive-module-gobble.doc-2017.tar.xz mirror://gentoo/texlive-module-graphics-pln.doc-2017.tar.xz mirror://gentoo/texlive-module-gtl.doc-2017.tar.xz mirror://gentoo/texlive-module-hlist.doc-2017.tar.xz mirror://gentoo/texlive-module-hyplain.doc-2017.tar.xz mirror://gentoo/texlive-module-ifetex.doc-2017.tar.xz mirror://gentoo/texlive-module-iftex.doc-2017.tar.xz mirror://gentoo/texlive-module-insbox.doc-2017.tar.xz mirror://gentoo/texlive-module-js-misc.doc-2017.tar.xz mirror://gentoo/texlive-module-kastrup.doc-2017.tar.xz mirror://gentoo/texlive-module-lambda-lists.doc-2017.tar.xz mirror://gentoo/texlive-module-langcode.doc-2017.tar.xz mirror://gentoo/texlive-module-lecturer.doc-2017.tar.xz mirror://gentoo/texlive-module-librarian.doc-2017.tar.xz mirror://gentoo/texlive-module-listofitems.doc-2017.tar.xz mirror://gentoo/texlive-module-mathdots.doc-2017.tar.xz mirror://gentoo/texlive-module-metatex.doc-2017.tar.xz mirror://gentoo/texlive-module-midnight.doc-2017.tar.xz mirror://gentoo/texlive-module-mkpattern.doc-2017.tar.xz mirror://gentoo/texlive-module-multido.doc-2017.tar.xz mirror://gentoo/texlive-module-navigator.doc-2017.tar.xz mirror://gentoo/texlive-module-newsletr.doc-2017.tar.xz mirror://gentoo/texlive-module-ofs.doc-2017.tar.xz mirror://gentoo/texlive-module-olsak-misc.doc-2017.tar.xz mirror://gentoo/texlive-module-path.doc-2017.tar.xz mirror://gentoo/texlive-module-pdf-trans.doc-2017.tar.xz mirror://gentoo/texlive-module-pitex.doc-2017.tar.xz mirror://gentoo/texlive-module-plainpkg.doc-2017.tar.xz mirror://gentoo/texlive-module-plipsum.doc-2017.tar.xz mirror://gentoo/texlive-module-plnfss.doc-2017.tar.xz mirror://gentoo/texlive-module-plstmary.doc-2017.tar.xz mirror://gentoo/texlive-module-present.doc-2017.tar.xz mirror://gentoo/texlive-module-randomlist.doc-2017.tar.xz mirror://gentoo/texlive-module-resumemac.doc-2017.tar.xz mirror://gentoo/texlive-module-schemata.doc-2017.tar.xz mirror://gentoo/texlive-module-shade.doc-2017.tar.xz mirror://gentoo/texlive-module-systeme.doc-2017.tar.xz mirror://gentoo/texlive-module-termmenu.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-ps.doc-2017.tar.xz mirror://gentoo/texlive-module-tex4ht.doc-2017.tar.xz mirror://gentoo/texlive-module-texapi.doc-2017.tar.xz mirror://gentoo/texlive-module-tracklang.doc-2017.tar.xz mirror://gentoo/texlive-module-treetex.doc-2017.tar.xz mirror://gentoo/texlive-module-trigonometry.doc-2017.tar.xz mirror://gentoo/texlive-module-ulem.doc-2017.tar.xz mirror://gentoo/texlive-module-upca.doc-2017.tar.xz mirror://gentoo/texlive-module-varisize.doc-2017.tar.xz mirror://gentoo/texlive-module-xii.doc-2017.tar.xz mirror://gentoo/texlive-module-xlop.doc-2017.tar.xz mirror://gentoo/texlive-module-yax.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-bitelist.source-2017.tar.xz mirror://gentoo/texlive-module-catcodes.source-2017.tar.xz mirror://gentoo/texlive-module-dirtree.source-2017.tar.xz mirror://gentoo/texlive-module-dowith.source-2017.tar.xz mirror://gentoo/texlive-module-fltpoint.source-2017.tar.xz mirror://gentoo/texlive-module-gobble.source-2017.tar.xz mirror://gentoo/texlive-module-graphics-pln.source-2017.tar.xz mirror://gentoo/texlive-module-gtl.source-2017.tar.xz mirror://gentoo/texlive-module-ifetex.source-2017.tar.xz mirror://gentoo/texlive-module-kastrup.source-2017.tar.xz mirror://gentoo/texlive-module-langcode.source-2017.tar.xz mirror://gentoo/texlive-module-mathdots.source-2017.tar.xz mirror://gentoo/texlive-module-multido.source-2017.tar.xz mirror://gentoo/texlive-module-plainpkg.source-2017.tar.xz mirror://gentoo/texlive-module-randomlist.source-2017.tar.xz mirror://gentoo/texlive-module-schemata.source-2017.tar.xz mirror://gentoo/texlive-module-termmenu.source-2017.tar.xz mirror://gentoo/texlive-module-tracklang.source-2017.tar.xz mirror://gentoo/texlive-module-xlop.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=54e352fb1aeb8d99c8fe80c6c6a07433
+_md5_=75e7de5a92bf826a4bdbd567fc9e33e8
diff --git a/metadata/md5-cache/dev-texlive/texlive-pstricks-2017 b/metadata/md5-cache/dev-texlive/texlive-pstricks-2017
index 61b88b4ccc38..a3ef488fde7b 100644
--- a/metadata/md5-cache/dev-texlive/texlive-pstricks-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-pstricks-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive PSTricks
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LGPL-2 LPPL-1.3
 RDEPEND=>=dev-texlive/texlive-basic-2017 >=dev-texlive/texlive-plaingeneric-2017 dev-tex/pgf >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-auto-pst-pdf-2017.tar.xz mirror://gentoo/texlive-module-bclogo-2017.tar.xz mirror://gentoo/texlive-module-dsptricks-2017.tar.xz mirror://gentoo/texlive-module-makeplot-2017.tar.xz mirror://gentoo/texlive-module-pdftricks-2017.tar.xz mirror://gentoo/texlive-module-pdftricks2-2017.tar.xz mirror://gentoo/texlive-module-pedigree-perl-2017.tar.xz mirror://gentoo/texlive-module-psbao-2017.tar.xz mirror://gentoo/texlive-module-pst-2dplot-2017.tar.xz mirror://gentoo/texlive-module-pst-3d-2017.tar.xz mirror://gentoo/texlive-module-pst-3dplot-2017.tar.xz mirror://gentoo/texlive-module-pst-abspos-2017.tar.xz mirror://gentoo/texlive-module-pst-arrow-2017.tar.xz mirror://gentoo/texlive-module-pst-am-2017.tar.xz mirror://gentoo/texlive-module-pst-asr-2017.tar.xz mirror://gentoo/texlive-module-pst-bar-2017.tar.xz mirror://gentoo/texlive-module-pst-barcode-2017.tar.xz mirror://gentoo/texlive-module-pst-bezier-2017.tar.xz mirror://gentoo/texlive-module-pst-blur-2017.tar.xz mirror://gentoo/texlive-module-pst-bspline-2017.tar.xz mirror://gentoo/texlive-module-pst-calendar-2017.tar.xz mirror://gentoo/texlive-module-pst-cie-2017.tar.xz mirror://gentoo/texlive-module-pst-circ-2017.tar.xz mirror://gentoo/texlive-module-pst-coil-2017.tar.xz mirror://gentoo/texlive-module-pst-cox-2017.tar.xz mirror://gentoo/texlive-module-pst-dbicons-2017.tar.xz mirror://gentoo/texlive-module-pst-diffraction-2017.tar.xz mirror://gentoo/texlive-module-pst-electricfield-2017.tar.xz mirror://gentoo/texlive-module-pst-eps-2017.tar.xz mirror://gentoo/texlive-module-pst-eucl-2017.tar.xz mirror://gentoo/texlive-module-pst-exa-2017.tar.xz mirror://gentoo/texlive-module-pst-fill-2017.tar.xz mirror://gentoo/texlive-module-pst-fit-2017.tar.xz mirror://gentoo/texlive-module-pst-fr3d-2017.tar.xz mirror://gentoo/texlive-module-pst-fractal-2017.tar.xz mirror://gentoo/texlive-module-pst-fun-2017.tar.xz mirror://gentoo/texlive-module-pst-func-2017.tar.xz mirror://gentoo/texlive-module-pst-gantt-2017.tar.xz mirror://gentoo/texlive-module-pst-geo-2017.tar.xz mirror://gentoo/texlive-module-pst-ghsb-2017.tar.xz mirror://gentoo/texlive-module-pst-gr3d-2017.tar.xz mirror://gentoo/texlive-module-pst-grad-2017.tar.xz mirror://gentoo/texlive-module-pst-graphicx-2017.tar.xz mirror://gentoo/texlive-module-pst-infixplot-2017.tar.xz mirror://gentoo/texlive-module-pst-intersect-2017.tar.xz mirror://gentoo/texlive-module-pst-jtree-2017.tar.xz mirror://gentoo/texlive-module-pst-knot-2017.tar.xz mirror://gentoo/texlive-module-pst-labo-2017.tar.xz mirror://gentoo/texlive-module-pst-layout-2017.tar.xz mirror://gentoo/texlive-module-pst-lens-2017.tar.xz mirror://gentoo/texlive-module-pst-light3d-2017.tar.xz mirror://gentoo/texlive-module-pst-magneticfield-2017.tar.xz mirror://gentoo/texlive-module-pst-math-2017.tar.xz mirror://gentoo/texlive-module-pst-mirror-2017.tar.xz mirror://gentoo/texlive-module-pst-node-2017.tar.xz mirror://gentoo/texlive-module-pst-ob3d-2017.tar.xz mirror://gentoo/texlive-module-pst-ode-2017.tar.xz mirror://gentoo/texlive-module-pst-optexp-2017.tar.xz mirror://gentoo/texlive-module-pst-optic-2017.tar.xz mirror://gentoo/texlive-module-pst-osci-2017.tar.xz mirror://gentoo/texlive-module-pst-ovl-2017.tar.xz mirror://gentoo/texlive-module-pst-pad-2017.tar.xz mirror://gentoo/texlive-module-pst-pdgr-2017.tar.xz mirror://gentoo/texlive-module-pst-perspective-2017.tar.xz mirror://gentoo/texlive-module-pst-platon-2017.tar.xz mirror://gentoo/texlive-module-pst-plot-2017.tar.xz mirror://gentoo/texlive-module-pst-poly-2017.tar.xz mirror://gentoo/texlive-module-pst-pulley-2017.tar.xz mirror://gentoo/texlive-module-pst-qtree-2017.tar.xz mirror://gentoo/texlive-module-pst-rubans-2017.tar.xz mirror://gentoo/texlive-module-pst-shell-2017.tar.xz mirror://gentoo/texlive-module-pst-sigsys-2017.tar.xz mirror://gentoo/texlive-module-pst-slpe-2017.tar.xz mirror://gentoo/texlive-module-pst-solarsystem-2017.tar.xz mirror://gentoo/texlive-module-pst-solides3d-2017.tar.xz mirror://gentoo/texlive-module-pst-soroban-2017.tar.xz mirror://gentoo/texlive-module-pst-spectra-2017.tar.xz mirror://gentoo/texlive-module-pst-spinner-2017.tar.xz mirror://gentoo/texlive-module-pst-spirograph-2017.tar.xz mirror://gentoo/texlive-module-pst-stru-2017.tar.xz mirror://gentoo/texlive-module-pst-support-2017.tar.xz mirror://gentoo/texlive-module-pst-text-2017.tar.xz mirror://gentoo/texlive-module-pst-thick-2017.tar.xz mirror://gentoo/texlive-module-pst-tools-2017.tar.xz mirror://gentoo/texlive-module-pst-tree-2017.tar.xz mirror://gentoo/texlive-module-pst-tvz-2017.tar.xz mirror://gentoo/texlive-module-pst-uml-2017.tar.xz mirror://gentoo/texlive-module-pst-vectorian-2017.tar.xz mirror://gentoo/texlive-module-pst-vowel-2017.tar.xz mirror://gentoo/texlive-module-pst-vue3d-2017.tar.xz mirror://gentoo/texlive-module-pst2pdf-2017.tar.xz mirror://gentoo/texlive-module-pstricks-2017.tar.xz mirror://gentoo/texlive-module-pstricks-add-2017.tar.xz mirror://gentoo/texlive-module-pstricks_calcnotes-2017.tar.xz mirror://gentoo/texlive-module-rputover-2017.tar.xz mirror://gentoo/texlive-module-uml-2017.tar.xz mirror://gentoo/texlive-module-vaucanson-g-2017.tar.xz mirror://gentoo/texlive-module-vocaltract-2017.tar.xz mirror://gentoo/texlive-module-collection-pstricks-2017.tar.xz doc? ( mirror://gentoo/texlive-module-auto-pst-pdf.doc-2017.tar.xz mirror://gentoo/texlive-module-bclogo.doc-2017.tar.xz mirror://gentoo/texlive-module-dsptricks.doc-2017.tar.xz mirror://gentoo/texlive-module-makeplot.doc-2017.tar.xz mirror://gentoo/texlive-module-pdftricks.doc-2017.tar.xz mirror://gentoo/texlive-module-pdftricks2.doc-2017.tar.xz mirror://gentoo/texlive-module-pedigree-perl.doc-2017.tar.xz mirror://gentoo/texlive-module-psbao.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-2dplot.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-3d.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-3dplot.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-abspos.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-arrow.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-am.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-asr.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-bar.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-barcode.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-bezier.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-blur.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-bspline.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-calendar.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-cie.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-circ.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-coil.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-cox.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-dbicons.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-diffraction.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-electricfield.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-eps.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-eucl.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-exa.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-fill.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-fit.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-fr3d.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-fractal.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-fun.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-func.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-gantt.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-geo.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-ghsb.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-gr3d.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-grad.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-graphicx.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-infixplot.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-intersect.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-jtree.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-knot.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-labo.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-layout.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-lens.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-light3d.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-magneticfield.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-math.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-mirror.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-node.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-ob3d.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-ode.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-optexp.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-optic.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-osci.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-ovl.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-pad.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-pdgr.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-perspective.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-platon.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-plot.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-poly.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-pulley.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-qtree.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-rubans.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-shell.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-sigsys.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-slpe.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-solarsystem.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-solides3d.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-soroban.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-spectra.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-spinner.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-spirograph.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-stru.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-support.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-text.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-thick.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-tools.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-tree.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-tvz.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-uml.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-vectorian.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-vowel.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-vue3d.doc-2017.tar.xz mirror://gentoo/texlive-module-pst2pdf.doc-2017.tar.xz mirror://gentoo/texlive-module-pstricks.doc-2017.tar.xz mirror://gentoo/texlive-module-pstricks-add.doc-2017.tar.xz mirror://gentoo/texlive-module-pstricks_calcnotes.doc-2017.tar.xz mirror://gentoo/texlive-module-rputover.doc-2017.tar.xz mirror://gentoo/texlive-module-uml.doc-2017.tar.xz mirror://gentoo/texlive-module-vaucanson-g.doc-2017.tar.xz mirror://gentoo/texlive-module-vocaltract.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-auto-pst-pdf.source-2017.tar.xz mirror://gentoo/texlive-module-makeplot.source-2017.tar.xz mirror://gentoo/texlive-module-pst-3d.source-2017.tar.xz mirror://gentoo/texlive-module-pst-abspos.source-2017.tar.xz mirror://gentoo/texlive-module-pst-am.source-2017.tar.xz mirror://gentoo/texlive-module-pst-bar.source-2017.tar.xz mirror://gentoo/texlive-module-pst-blur.source-2017.tar.xz mirror://gentoo/texlive-module-pst-dbicons.source-2017.tar.xz mirror://gentoo/texlive-module-pst-diffraction.source-2017.tar.xz mirror://gentoo/texlive-module-pst-electricfield.source-2017.tar.xz mirror://gentoo/texlive-module-pst-eps.source-2017.tar.xz mirror://gentoo/texlive-module-pst-fill.source-2017.tar.xz mirror://gentoo/texlive-module-pst-fit.source-2017.tar.xz mirror://gentoo/texlive-module-pst-fr3d.source-2017.tar.xz mirror://gentoo/texlive-module-pst-fun.source-2017.tar.xz mirror://gentoo/texlive-module-pst-gr3d.source-2017.tar.xz mirror://gentoo/texlive-module-pst-intersect.source-2017.tar.xz mirror://gentoo/texlive-module-pst-lens.source-2017.tar.xz mirror://gentoo/texlive-module-pst-light3d.source-2017.tar.xz mirror://gentoo/texlive-module-pst-magneticfield.source-2017.tar.xz mirror://gentoo/texlive-module-pst-ob3d.source-2017.tar.xz mirror://gentoo/texlive-module-pst-optexp.source-2017.tar.xz mirror://gentoo/texlive-module-pst-pad.source-2017.tar.xz mirror://gentoo/texlive-module-pst-pdgr.source-2017.tar.xz mirror://gentoo/texlive-module-pst-platon.source-2017.tar.xz mirror://gentoo/texlive-module-pst-pulley.source-2017.tar.xz mirror://gentoo/texlive-module-pst-rubans.source-2017.tar.xz mirror://gentoo/texlive-module-pst-shell.source-2017.tar.xz mirror://gentoo/texlive-module-pst-slpe.source-2017.tar.xz mirror://gentoo/texlive-module-pst-solarsystem.source-2017.tar.xz mirror://gentoo/texlive-module-pst-soroban.source-2017.tar.xz mirror://gentoo/texlive-module-pst-text.source-2017.tar.xz mirror://gentoo/texlive-module-pst-thick.source-2017.tar.xz mirror://gentoo/texlive-module-pst-tvz.source-2017.tar.xz mirror://gentoo/texlive-module-pst-uml.source-2017.tar.xz mirror://gentoo/texlive-module-pst-vue3d.source-2017.tar.xz mirror://gentoo/texlive-module-uml.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7a33f6d684e4ba1f82903b972405365a
+_md5_=56561f1e974e7912d64566eb53d1572b
diff --git a/metadata/md5-cache/dev-texlive/texlive-publishers-2017 b/metadata/md5-cache/dev-texlive/texlive-publishers-2017
index e7624b177c85..7003246aed27 100644
--- a/metadata/md5-cache/dev-texlive/texlive-publishers-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-publishers-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Publisher styles, theses, etc.
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 LPPL-1.3c OFL public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-latex-2017 !<dev-texlive/texlive-latexextra-2014 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-IEEEconf-2017.tar.xz mirror://gentoo/texlive-module-IEEEtran-2017.tar.xz mirror://gentoo/texlive-module-aastex-2017.tar.xz mirror://gentoo/texlive-module-abntex2-2017.tar.xz mirror://gentoo/texlive-module-acmart-2017.tar.xz mirror://gentoo/texlive-module-acmconf-2017.tar.xz mirror://gentoo/texlive-module-active-conf-2017.tar.xz mirror://gentoo/texlive-module-adfathesis-2017.tar.xz mirror://gentoo/texlive-module-afparticle-2017.tar.xz mirror://gentoo/texlive-module-afthesis-2017.tar.xz mirror://gentoo/texlive-module-aguplus-2017.tar.xz mirror://gentoo/texlive-module-aiaa-2017.tar.xz mirror://gentoo/texlive-module-ametsoc-2017.tar.xz mirror://gentoo/texlive-module-anufinalexam-2017.tar.xz mirror://gentoo/texlive-module-aomart-2017.tar.xz mirror://gentoo/texlive-module-apa-2017.tar.xz mirror://gentoo/texlive-module-apa6-2017.tar.xz mirror://gentoo/texlive-module-apa6e-2017.tar.xz mirror://gentoo/texlive-module-arsclassica-2017.tar.xz mirror://gentoo/texlive-module-articleingud-2017.tar.xz mirror://gentoo/texlive-module-asaetr-2017.tar.xz mirror://gentoo/texlive-module-ascelike-2017.tar.xz mirror://gentoo/texlive-module-aucklandthesis-2017.tar.xz mirror://gentoo/texlive-module-bangorcsthesis-2017.tar.xz mirror://gentoo/texlive-module-bangorexam-2017.tar.xz mirror://gentoo/texlive-module-beamer-FUBerlin-2017.tar.xz mirror://gentoo/texlive-module-beamer-verona-2017.tar.xz mirror://gentoo/texlive-module-bgteubner-2017.tar.xz mirror://gentoo/texlive-module-br-lex-2017.tar.xz mirror://gentoo/texlive-module-brandeis-dissertation-2017.tar.xz mirror://gentoo/texlive-module-cascadilla-2017.tar.xz mirror://gentoo/texlive-module-chem-journal-2017.tar.xz mirror://gentoo/texlive-module-classicthesis-2017.tar.xz mirror://gentoo/texlive-module-cleanthesis-2017.tar.xz mirror://gentoo/texlive-module-cmpj-2017.tar.xz mirror://gentoo/texlive-module-confproc-2017.tar.xz mirror://gentoo/texlive-module-cquthesis-2017.tar.xz mirror://gentoo/texlive-module-dccpaper-2017.tar.xz mirror://gentoo/texlive-module-dithesis-2017.tar.xz mirror://gentoo/texlive-module-ebook-2017.tar.xz mirror://gentoo/texlive-module-ebsthesis-2017.tar.xz mirror://gentoo/texlive-module-ejpecp-2017.tar.xz mirror://gentoo/texlive-module-ekaia-2017.tar.xz mirror://gentoo/texlive-module-elbioimp-2017.tar.xz mirror://gentoo/texlive-module-elsarticle-2017.tar.xz mirror://gentoo/texlive-module-elteikthesis-2017.tar.xz mirror://gentoo/texlive-module-emisa-2017.tar.xz mirror://gentoo/texlive-module-erdc-2017.tar.xz mirror://gentoo/texlive-module-estcpmm-2017.tar.xz mirror://gentoo/texlive-module-fbithesis-2017.tar.xz mirror://gentoo/texlive-module-fcavtex-2017.tar.xz mirror://gentoo/texlive-module-fcltxdoc-2017.tar.xz mirror://gentoo/texlive-module-fei-2017.tar.xz mirror://gentoo/texlive-module-gaceta-2017.tar.xz mirror://gentoo/texlive-module-gatech-thesis-2017.tar.xz mirror://gentoo/texlive-module-gradstudentresume-2017.tar.xz mirror://gentoo/texlive-module-grant-2017.tar.xz mirror://gentoo/texlive-module-gsemthesis-2017.tar.xz mirror://gentoo/texlive-module-gzt-2017.tar.xz mirror://gentoo/texlive-module-h2020proposal-2017.tar.xz mirror://gentoo/texlive-module-har2nat-2017.tar.xz mirror://gentoo/texlive-module-hobete-2017.tar.xz mirror://gentoo/texlive-module-hustthesis-2017.tar.xz mirror://gentoo/texlive-module-icsv-2017.tar.xz mirror://gentoo/texlive-module-ieeepes-2017.tar.xz mirror://gentoo/texlive-module-ijmart-2017.tar.xz mirror://gentoo/texlive-module-ijsra-2017.tar.xz mirror://gentoo/texlive-module-imac-2017.tar.xz mirror://gentoo/texlive-module-imtekda-2017.tar.xz mirror://gentoo/texlive-module-iscram-2017.tar.xz mirror://gentoo/texlive-module-jacow-2017.tar.xz mirror://gentoo/texlive-module-jmlr-2017.tar.xz mirror://gentoo/texlive-module-jpsj-2017.tar.xz mirror://gentoo/texlive-module-kdgdocs-2017.tar.xz mirror://gentoo/texlive-module-kluwer-2017.tar.xz mirror://gentoo/texlive-module-ksp-thesis-2017.tar.xz mirror://gentoo/texlive-module-langsci-2017.tar.xz mirror://gentoo/texlive-module-lion-msc-2017.tar.xz mirror://gentoo/texlive-module-lni-2017.tar.xz mirror://gentoo/texlive-module-lps-2017.tar.xz mirror://gentoo/texlive-module-matc3-2017.tar.xz mirror://gentoo/texlive-module-matc3mem-2017.tar.xz mirror://gentoo/texlive-module-mcmthesis-2017.tar.xz mirror://gentoo/texlive-module-mentis-2017.tar.xz mirror://gentoo/texlive-module-mnras-2017.tar.xz mirror://gentoo/texlive-module-msu-thesis-2017.tar.xz mirror://gentoo/texlive-module-mucproc-2017.tar.xz mirror://gentoo/texlive-module-mugsthesis-2017.tar.xz mirror://gentoo/texlive-module-musuos-2017.tar.xz mirror://gentoo/texlive-module-muthesis-2017.tar.xz mirror://gentoo/texlive-module-mynsfc-2017.tar.xz mirror://gentoo/texlive-module-nature-2017.tar.xz mirror://gentoo/texlive-module-navydocs-2017.tar.xz mirror://gentoo/texlive-module-nddiss-2017.tar.xz mirror://gentoo/texlive-module-ndsu-thesis-2017.tar.xz mirror://gentoo/texlive-module-novel-2017.tar.xz mirror://gentoo/texlive-module-nwejm-2017.tar.xz mirror://gentoo/texlive-module-nih-2017.tar.xz mirror://gentoo/texlive-module-nihbiosketch-2017.tar.xz mirror://gentoo/texlive-module-nostarch-2017.tar.xz mirror://gentoo/texlive-module-nrc-2017.tar.xz mirror://gentoo/texlive-module-onrannual-2017.tar.xz mirror://gentoo/texlive-module-opteng-2017.tar.xz mirror://gentoo/texlive-module-philosophersimprint-2017.tar.xz mirror://gentoo/texlive-module-pittetd-2017.tar.xz mirror://gentoo/texlive-module-pkuthss-2017.tar.xz mirror://gentoo/texlive-module-powerdot-FUBerlin-2017.tar.xz mirror://gentoo/texlive-module-pracjourn-2017.tar.xz mirror://gentoo/texlive-module-procIAGssymp-2017.tar.xz mirror://gentoo/texlive-module-proposal-2017.tar.xz mirror://gentoo/texlive-module-ptptex-2017.tar.xz mirror://gentoo/texlive-module-psu-thesis-2017.tar.xz mirror://gentoo/texlive-module-resphilosophica-2017.tar.xz mirror://gentoo/texlive-module-resumecls-2017.tar.xz mirror://gentoo/texlive-module-revtex-2017.tar.xz mirror://gentoo/texlive-module-revtex4-2017.tar.xz mirror://gentoo/texlive-module-ryethesis-2017.tar.xz mirror://gentoo/texlive-module-sageep-2017.tar.xz mirror://gentoo/texlive-module-sapthesis-2017.tar.xz mirror://gentoo/texlive-module-scrjrnl-2017.tar.xz mirror://gentoo/texlive-module-schule-2017.tar.xz mirror://gentoo/texlive-module-sduthesis-2017.tar.xz mirror://gentoo/texlive-module-seuthesis-2017.tar.xz mirror://gentoo/texlive-module-seuthesix-2017.tar.xz mirror://gentoo/texlive-module-soton-2017.tar.xz mirror://gentoo/texlive-module-sphdthesis-2017.tar.xz mirror://gentoo/texlive-module-spie-2017.tar.xz mirror://gentoo/texlive-module-sr-vorl-2017.tar.xz mirror://gentoo/texlive-module-stellenbosch-2017.tar.xz mirror://gentoo/texlive-module-suftesi-2017.tar.xz mirror://gentoo/texlive-module-sugconf-2017.tar.xz mirror://gentoo/texlive-module-tabriz-thesis-2017.tar.xz mirror://gentoo/texlive-module-texilikechaps-2017.tar.xz mirror://gentoo/texlive-module-texilikecover-2017.tar.xz mirror://gentoo/texlive-module-thesis-ekf-2017.tar.xz mirror://gentoo/texlive-module-thesis-titlepage-fhac-2017.tar.xz mirror://gentoo/texlive-module-thuthesis-2017.tar.xz mirror://gentoo/texlive-module-toptesi-2017.tar.xz mirror://gentoo/texlive-module-tudscr-2017.tar.xz mirror://gentoo/texlive-module-tugboat-2017.tar.xz mirror://gentoo/texlive-module-tugboat-plain-2017.tar.xz mirror://gentoo/texlive-module-turabian-2017.tar.xz mirror://gentoo/texlive-module-tui-2017.tar.xz mirror://gentoo/texlive-module-uaclasses-2017.tar.xz mirror://gentoo/texlive-module-uafthesis-2017.tar.xz mirror://gentoo/texlive-module-uantwerpendocs-2017.tar.xz mirror://gentoo/texlive-module-ucbthesis-2017.tar.xz mirror://gentoo/texlive-module-ucdavisthesis-2017.tar.xz mirror://gentoo/texlive-module-ucthesis-2017.tar.xz mirror://gentoo/texlive-module-uestcthesis-2017.tar.xz mirror://gentoo/texlive-module-uhhassignment-2017.tar.xz mirror://gentoo/texlive-module-uiucredborder-2017.tar.xz mirror://gentoo/texlive-module-uiucthesis-2017.tar.xz mirror://gentoo/texlive-module-ulthese-2017.tar.xz mirror://gentoo/texlive-module-umbclegislation-2017.tar.xz mirror://gentoo/texlive-module-umthesis-2017.tar.xz mirror://gentoo/texlive-module-umich-thesis-2017.tar.xz mirror://gentoo/texlive-module-unamth-template-2017.tar.xz mirror://gentoo/texlive-module-unamthesis-2017.tar.xz mirror://gentoo/texlive-module-unswcover-2017.tar.xz mirror://gentoo/texlive-module-uothesis-2017.tar.xz mirror://gentoo/texlive-module-urcls-2017.tar.xz mirror://gentoo/texlive-module-uowthesis-2017.tar.xz mirror://gentoo/texlive-module-uowthesistitlepage-2017.tar.xz mirror://gentoo/texlive-module-uspatent-2017.tar.xz mirror://gentoo/texlive-module-ut-thesis-2017.tar.xz mirror://gentoo/texlive-module-uwthesis-2017.tar.xz mirror://gentoo/texlive-module-vancouver-2017.tar.xz mirror://gentoo/texlive-module-xduthesis-2017.tar.xz mirror://gentoo/texlive-module-wsemclassic-2017.tar.xz mirror://gentoo/texlive-module-xcookybooky-2017.tar.xz mirror://gentoo/texlive-module-yathesis-2017.tar.xz mirror://gentoo/texlive-module-york-thesis-2017.tar.xz mirror://gentoo/texlive-module-collection-publishers-2017.tar.xz doc? ( mirror://gentoo/texlive-module-IEEEconf.doc-2017.tar.xz mirror://gentoo/texlive-module-IEEEtran.doc-2017.tar.xz mirror://gentoo/texlive-module-aastex.doc-2017.tar.xz mirror://gentoo/texlive-module-abntex2.doc-2017.tar.xz mirror://gentoo/texlive-module-acmart.doc-2017.tar.xz mirror://gentoo/texlive-module-acmconf.doc-2017.tar.xz mirror://gentoo/texlive-module-active-conf.doc-2017.tar.xz mirror://gentoo/texlive-module-adfathesis.doc-2017.tar.xz mirror://gentoo/texlive-module-afparticle.doc-2017.tar.xz mirror://gentoo/texlive-module-afthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-aguplus.doc-2017.tar.xz mirror://gentoo/texlive-module-aiaa.doc-2017.tar.xz mirror://gentoo/texlive-module-ametsoc.doc-2017.tar.xz mirror://gentoo/texlive-module-anufinalexam.doc-2017.tar.xz mirror://gentoo/texlive-module-aomart.doc-2017.tar.xz mirror://gentoo/texlive-module-apa.doc-2017.tar.xz mirror://gentoo/texlive-module-apa6.doc-2017.tar.xz mirror://gentoo/texlive-module-apa6e.doc-2017.tar.xz mirror://gentoo/texlive-module-arsclassica.doc-2017.tar.xz mirror://gentoo/texlive-module-articleingud.doc-2017.tar.xz mirror://gentoo/texlive-module-asaetr.doc-2017.tar.xz mirror://gentoo/texlive-module-ascelike.doc-2017.tar.xz mirror://gentoo/texlive-module-aucklandthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-bangorcsthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-bangorexam.doc-2017.tar.xz mirror://gentoo/texlive-module-beamer-FUBerlin.doc-2017.tar.xz mirror://gentoo/texlive-module-beamer-verona.doc-2017.tar.xz mirror://gentoo/texlive-module-bgteubner.doc-2017.tar.xz mirror://gentoo/texlive-module-br-lex.doc-2017.tar.xz mirror://gentoo/texlive-module-brandeis-dissertation.doc-2017.tar.xz mirror://gentoo/texlive-module-cascadilla.doc-2017.tar.xz mirror://gentoo/texlive-module-classicthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-cleanthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-cmpj.doc-2017.tar.xz mirror://gentoo/texlive-module-confproc.doc-2017.tar.xz mirror://gentoo/texlive-module-cquthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-dccpaper.doc-2017.tar.xz mirror://gentoo/texlive-module-dithesis.doc-2017.tar.xz mirror://gentoo/texlive-module-ebook.doc-2017.tar.xz mirror://gentoo/texlive-module-ebsthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-ejpecp.doc-2017.tar.xz mirror://gentoo/texlive-module-ekaia.doc-2017.tar.xz mirror://gentoo/texlive-module-elbioimp.doc-2017.tar.xz mirror://gentoo/texlive-module-elsarticle.doc-2017.tar.xz mirror://gentoo/texlive-module-elteikthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-emisa.doc-2017.tar.xz mirror://gentoo/texlive-module-erdc.doc-2017.tar.xz mirror://gentoo/texlive-module-estcpmm.doc-2017.tar.xz mirror://gentoo/texlive-module-fbithesis.doc-2017.tar.xz mirror://gentoo/texlive-module-fcavtex.doc-2017.tar.xz mirror://gentoo/texlive-module-fcltxdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-fei.doc-2017.tar.xz mirror://gentoo/texlive-module-gaceta.doc-2017.tar.xz mirror://gentoo/texlive-module-gatech-thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-gradstudentresume.doc-2017.tar.xz mirror://gentoo/texlive-module-grant.doc-2017.tar.xz mirror://gentoo/texlive-module-gsemthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-gzt.doc-2017.tar.xz mirror://gentoo/texlive-module-h2020proposal.doc-2017.tar.xz mirror://gentoo/texlive-module-har2nat.doc-2017.tar.xz mirror://gentoo/texlive-module-hobete.doc-2017.tar.xz mirror://gentoo/texlive-module-hustthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-icsv.doc-2017.tar.xz mirror://gentoo/texlive-module-ieeepes.doc-2017.tar.xz mirror://gentoo/texlive-module-ijmart.doc-2017.tar.xz mirror://gentoo/texlive-module-ijsra.doc-2017.tar.xz mirror://gentoo/texlive-module-imac.doc-2017.tar.xz mirror://gentoo/texlive-module-imtekda.doc-2017.tar.xz mirror://gentoo/texlive-module-iscram.doc-2017.tar.xz mirror://gentoo/texlive-module-jacow.doc-2017.tar.xz mirror://gentoo/texlive-module-jmlr.doc-2017.tar.xz mirror://gentoo/texlive-module-jpsj.doc-2017.tar.xz mirror://gentoo/texlive-module-kdgdocs.doc-2017.tar.xz mirror://gentoo/texlive-module-kluwer.doc-2017.tar.xz mirror://gentoo/texlive-module-ksp-thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-langsci.doc-2017.tar.xz mirror://gentoo/texlive-module-lion-msc.doc-2017.tar.xz mirror://gentoo/texlive-module-lni.doc-2017.tar.xz mirror://gentoo/texlive-module-lps.doc-2017.tar.xz mirror://gentoo/texlive-module-matc3.doc-2017.tar.xz mirror://gentoo/texlive-module-matc3mem.doc-2017.tar.xz mirror://gentoo/texlive-module-mcmthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-mentis.doc-2017.tar.xz mirror://gentoo/texlive-module-mnras.doc-2017.tar.xz mirror://gentoo/texlive-module-msu-thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-mucproc.doc-2017.tar.xz mirror://gentoo/texlive-module-mugsthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-musuos.doc-2017.tar.xz mirror://gentoo/texlive-module-muthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-mynsfc.doc-2017.tar.xz mirror://gentoo/texlive-module-nature.doc-2017.tar.xz mirror://gentoo/texlive-module-navydocs.doc-2017.tar.xz mirror://gentoo/texlive-module-nddiss.doc-2017.tar.xz mirror://gentoo/texlive-module-ndsu-thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-novel.doc-2017.tar.xz mirror://gentoo/texlive-module-nwejm.doc-2017.tar.xz mirror://gentoo/texlive-module-nih.doc-2017.tar.xz mirror://gentoo/texlive-module-nihbiosketch.doc-2017.tar.xz mirror://gentoo/texlive-module-nostarch.doc-2017.tar.xz mirror://gentoo/texlive-module-nrc.doc-2017.tar.xz mirror://gentoo/texlive-module-onrannual.doc-2017.tar.xz mirror://gentoo/texlive-module-opteng.doc-2017.tar.xz mirror://gentoo/texlive-module-philosophersimprint.doc-2017.tar.xz mirror://gentoo/texlive-module-pittetd.doc-2017.tar.xz mirror://gentoo/texlive-module-pkuthss.doc-2017.tar.xz mirror://gentoo/texlive-module-powerdot-FUBerlin.doc-2017.tar.xz mirror://gentoo/texlive-module-pracjourn.doc-2017.tar.xz mirror://gentoo/texlive-module-procIAGssymp.doc-2017.tar.xz mirror://gentoo/texlive-module-proposal.doc-2017.tar.xz mirror://gentoo/texlive-module-ptptex.doc-2017.tar.xz mirror://gentoo/texlive-module-psu-thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-resphilosophica.doc-2017.tar.xz mirror://gentoo/texlive-module-resumecls.doc-2017.tar.xz mirror://gentoo/texlive-module-revtex.doc-2017.tar.xz mirror://gentoo/texlive-module-revtex4.doc-2017.tar.xz mirror://gentoo/texlive-module-ryethesis.doc-2017.tar.xz mirror://gentoo/texlive-module-sageep.doc-2017.tar.xz mirror://gentoo/texlive-module-sapthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-scrjrnl.doc-2017.tar.xz mirror://gentoo/texlive-module-schule.doc-2017.tar.xz mirror://gentoo/texlive-module-sduthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-seuthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-seuthesix.doc-2017.tar.xz mirror://gentoo/texlive-module-soton.doc-2017.tar.xz mirror://gentoo/texlive-module-sphdthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-spie.doc-2017.tar.xz mirror://gentoo/texlive-module-sr-vorl.doc-2017.tar.xz mirror://gentoo/texlive-module-stellenbosch.doc-2017.tar.xz mirror://gentoo/texlive-module-suftesi.doc-2017.tar.xz mirror://gentoo/texlive-module-sugconf.doc-2017.tar.xz mirror://gentoo/texlive-module-tabriz-thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-thesis-ekf.doc-2017.tar.xz mirror://gentoo/texlive-module-thesis-titlepage-fhac.doc-2017.tar.xz mirror://gentoo/texlive-module-thuthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-toptesi.doc-2017.tar.xz mirror://gentoo/texlive-module-tudscr.doc-2017.tar.xz mirror://gentoo/texlive-module-tugboat.doc-2017.tar.xz mirror://gentoo/texlive-module-tugboat-plain.doc-2017.tar.xz mirror://gentoo/texlive-module-turabian.doc-2017.tar.xz mirror://gentoo/texlive-module-tui.doc-2017.tar.xz mirror://gentoo/texlive-module-uaclasses.doc-2017.tar.xz mirror://gentoo/texlive-module-uafthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-uantwerpendocs.doc-2017.tar.xz mirror://gentoo/texlive-module-ucbthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-ucdavisthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-ucthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-uestcthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-uhhassignment.doc-2017.tar.xz mirror://gentoo/texlive-module-uiucredborder.doc-2017.tar.xz mirror://gentoo/texlive-module-uiucthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-ulthese.doc-2017.tar.xz mirror://gentoo/texlive-module-umbclegislation.doc-2017.tar.xz mirror://gentoo/texlive-module-umthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-umich-thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-unamth-template.doc-2017.tar.xz mirror://gentoo/texlive-module-unamthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-unswcover.doc-2017.tar.xz mirror://gentoo/texlive-module-uothesis.doc-2017.tar.xz mirror://gentoo/texlive-module-urcls.doc-2017.tar.xz mirror://gentoo/texlive-module-uowthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-uowthesistitlepage.doc-2017.tar.xz mirror://gentoo/texlive-module-uspatent.doc-2017.tar.xz mirror://gentoo/texlive-module-ut-thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-uwthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-vancouver.doc-2017.tar.xz mirror://gentoo/texlive-module-xduthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-wsemclassic.doc-2017.tar.xz mirror://gentoo/texlive-module-xcookybooky.doc-2017.tar.xz mirror://gentoo/texlive-module-yathesis.doc-2017.tar.xz mirror://gentoo/texlive-module-york-thesis.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-IEEEconf.source-2017.tar.xz mirror://gentoo/texlive-module-acmart.source-2017.tar.xz mirror://gentoo/texlive-module-acmconf.source-2017.tar.xz mirror://gentoo/texlive-module-active-conf.source-2017.tar.xz mirror://gentoo/texlive-module-adfathesis.source-2017.tar.xz mirror://gentoo/texlive-module-afparticle.source-2017.tar.xz mirror://gentoo/texlive-module-aiaa.source-2017.tar.xz mirror://gentoo/texlive-module-aomart.source-2017.tar.xz mirror://gentoo/texlive-module-apa6.source-2017.tar.xz mirror://gentoo/texlive-module-apa6e.source-2017.tar.xz mirror://gentoo/texlive-module-articleingud.source-2017.tar.xz mirror://gentoo/texlive-module-bangorcsthesis.source-2017.tar.xz mirror://gentoo/texlive-module-bangorexam.source-2017.tar.xz mirror://gentoo/texlive-module-bgteubner.source-2017.tar.xz mirror://gentoo/texlive-module-brandeis-dissertation.source-2017.tar.xz mirror://gentoo/texlive-module-confproc.source-2017.tar.xz mirror://gentoo/texlive-module-cquthesis.source-2017.tar.xz mirror://gentoo/texlive-module-dccpaper.source-2017.tar.xz mirror://gentoo/texlive-module-ebsthesis.source-2017.tar.xz mirror://gentoo/texlive-module-ejpecp.source-2017.tar.xz mirror://gentoo/texlive-module-ekaia.source-2017.tar.xz mirror://gentoo/texlive-module-elbioimp.source-2017.tar.xz mirror://gentoo/texlive-module-elsarticle.source-2017.tar.xz mirror://gentoo/texlive-module-elteikthesis.source-2017.tar.xz mirror://gentoo/texlive-module-emisa.source-2017.tar.xz mirror://gentoo/texlive-module-erdc.source-2017.tar.xz mirror://gentoo/texlive-module-estcpmm.source-2017.tar.xz mirror://gentoo/texlive-module-fbithesis.source-2017.tar.xz mirror://gentoo/texlive-module-fcltxdoc.source-2017.tar.xz mirror://gentoo/texlive-module-fei.source-2017.tar.xz mirror://gentoo/texlive-module-grant.source-2017.tar.xz mirror://gentoo/texlive-module-gsemthesis.source-2017.tar.xz mirror://gentoo/texlive-module-gzt.source-2017.tar.xz mirror://gentoo/texlive-module-hustthesis.source-2017.tar.xz mirror://gentoo/texlive-module-icsv.source-2017.tar.xz mirror://gentoo/texlive-module-ijmart.source-2017.tar.xz mirror://gentoo/texlive-module-imtekda.source-2017.tar.xz mirror://gentoo/texlive-module-jmlr.source-2017.tar.xz mirror://gentoo/texlive-module-kdgdocs.source-2017.tar.xz mirror://gentoo/texlive-module-kluwer.source-2017.tar.xz mirror://gentoo/texlive-module-lni.source-2017.tar.xz mirror://gentoo/texlive-module-lps.source-2017.tar.xz mirror://gentoo/texlive-module-matc3.source-2017.tar.xz mirror://gentoo/texlive-module-matc3mem.source-2017.tar.xz mirror://gentoo/texlive-module-mcmthesis.source-2017.tar.xz mirror://gentoo/texlive-module-mentis.source-2017.tar.xz mirror://gentoo/texlive-module-mucproc.source-2017.tar.xz mirror://gentoo/texlive-module-mugsthesis.source-2017.tar.xz mirror://gentoo/texlive-module-musuos.source-2017.tar.xz mirror://gentoo/texlive-module-mynsfc.source-2017.tar.xz mirror://gentoo/texlive-module-navydocs.source-2017.tar.xz mirror://gentoo/texlive-module-nddiss.source-2017.tar.xz mirror://gentoo/texlive-module-nwejm.source-2017.tar.xz mirror://gentoo/texlive-module-nostarch.source-2017.tar.xz mirror://gentoo/texlive-module-nrc.source-2017.tar.xz mirror://gentoo/texlive-module-philosophersimprint.source-2017.tar.xz mirror://gentoo/texlive-module-pittetd.source-2017.tar.xz mirror://gentoo/texlive-module-pracjourn.source-2017.tar.xz mirror://gentoo/texlive-module-proposal.source-2017.tar.xz mirror://gentoo/texlive-module-resphilosophica.source-2017.tar.xz mirror://gentoo/texlive-module-resumecls.source-2017.tar.xz mirror://gentoo/texlive-module-revtex.source-2017.tar.xz mirror://gentoo/texlive-module-revtex4.source-2017.tar.xz mirror://gentoo/texlive-module-ryethesis.source-2017.tar.xz mirror://gentoo/texlive-module-sageep.source-2017.tar.xz mirror://gentoo/texlive-module-scrjrnl.source-2017.tar.xz mirror://gentoo/texlive-module-schule.source-2017.tar.xz mirror://gentoo/texlive-module-sduthesis.source-2017.tar.xz mirror://gentoo/texlive-module-seuthesis.source-2017.tar.xz mirror://gentoo/texlive-module-seuthesix.source-2017.tar.xz mirror://gentoo/texlive-module-sr-vorl.source-2017.tar.xz mirror://gentoo/texlive-module-stellenbosch.source-2017.tar.xz mirror://gentoo/texlive-module-suftesi.source-2017.tar.xz mirror://gentoo/texlive-module-thesis-ekf.source-2017.tar.xz mirror://gentoo/texlive-module-thesis-titlepage-fhac.source-2017.tar.xz mirror://gentoo/texlive-module-thuthesis.source-2017.tar.xz mirror://gentoo/texlive-module-toptesi.source-2017.tar.xz mirror://gentoo/texlive-module-tudscr.source-2017.tar.xz mirror://gentoo/texlive-module-tugboat.source-2017.tar.xz mirror://gentoo/texlive-module-uaclasses.source-2017.tar.xz mirror://gentoo/texlive-module-uantwerpendocs.source-2017.tar.xz mirror://gentoo/texlive-module-ucdavisthesis.source-2017.tar.xz mirror://gentoo/texlive-module-uhhassignment.source-2017.tar.xz mirror://gentoo/texlive-module-uiucredborder.source-2017.tar.xz mirror://gentoo/texlive-module-uiucthesis.source-2017.tar.xz mirror://gentoo/texlive-module-ulthese.source-2017.tar.xz mirror://gentoo/texlive-module-uothesis.source-2017.tar.xz mirror://gentoo/texlive-module-xduthesis.source-2017.tar.xz mirror://gentoo/texlive-module-wsemclassic.source-2017.tar.xz mirror://gentoo/texlive-module-xcookybooky.source-2017.tar.xz mirror://gentoo/texlive-module-yathesis.source-2017.tar.xz mirror://gentoo/texlive-module-york-thesis.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=028352c150b37f7c4ef88edd8e22d319
+_md5_=e4443258439c7299608d490b699b6c50
diff --git a/metadata/md5-cache/dev-texlive/texlive-xetex-2017 b/metadata/md5-cache/dev-texlive/texlive-xetex-2017
index 70c66954e9f3..142c6aa35b65 100644
--- a/metadata/md5-cache/dev-texlive/texlive-xetex-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-xetex-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive XeTeX and packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=X source doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c OFL public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !=app-text/texlive-core-2007* >=dev-texlive/texlive-latexextra-2010 >=app-text/texlive-core-2010[xetex] dev-texlive/texlive-mathscience !<dev-texlive/texlive-mathextra-2012 dev-texlive/texlive-luatex >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-arabxetex-2017.tar.xz mirror://gentoo/texlive-module-awesomebox-2017.tar.xz mirror://gentoo/texlive-module-bidi-atbegshi-2017.tar.xz mirror://gentoo/texlive-module-bidicontour-2017.tar.xz mirror://gentoo/texlive-module-bidipagegrid-2017.tar.xz mirror://gentoo/texlive-module-bidishadowtext-2017.tar.xz mirror://gentoo/texlive-module-bidipresentation-2017.tar.xz mirror://gentoo/texlive-module-fixlatvian-2017.tar.xz mirror://gentoo/texlive-module-font-change-xetex-2017.tar.xz mirror://gentoo/texlive-module-fontbook-2017.tar.xz mirror://gentoo/texlive-module-fontwrap-2017.tar.xz mirror://gentoo/texlive-module-interchar-2017.tar.xz mirror://gentoo/texlive-module-philokalia-2017.tar.xz mirror://gentoo/texlive-module-ptext-2017.tar.xz mirror://gentoo/texlive-module-quran-2017.tar.xz mirror://gentoo/texlive-module-realscripts-2017.tar.xz mirror://gentoo/texlive-module-simple-resume-cv-2017.tar.xz mirror://gentoo/texlive-module-simple-thesis-dissertation-2017.tar.xz mirror://gentoo/texlive-module-ucharclasses-2017.tar.xz mirror://gentoo/texlive-module-unicode-bidi-2017.tar.xz mirror://gentoo/texlive-module-unisugar-2017.tar.xz mirror://gentoo/texlive-module-xebaposter-2017.tar.xz mirror://gentoo/texlive-module-xecjk-2017.tar.xz mirror://gentoo/texlive-module-xecolor-2017.tar.xz mirror://gentoo/texlive-module-xecyr-2017.tar.xz mirror://gentoo/texlive-module-xeindex-2017.tar.xz mirror://gentoo/texlive-module-xesearch-2017.tar.xz mirror://gentoo/texlive-module-xespotcolor-2017.tar.xz mirror://gentoo/texlive-module-xetex-2017.tar.xz mirror://gentoo/texlive-module-xetex-itrans-2017.tar.xz mirror://gentoo/texlive-module-xetex-pstricks-2017.tar.xz mirror://gentoo/texlive-module-xetex-tibetan-2017.tar.xz mirror://gentoo/texlive-module-xetexconfig-2017.tar.xz mirror://gentoo/texlive-module-xetexfontinfo-2017.tar.xz mirror://gentoo/texlive-module-xetexko-2017.tar.xz mirror://gentoo/texlive-module-xevlna-2017.tar.xz mirror://gentoo/texlive-module-collection-xetex-2017.tar.xz doc? ( mirror://gentoo/texlive-module-arabxetex.doc-2017.tar.xz mirror://gentoo/texlive-module-awesomebox.doc-2017.tar.xz mirror://gentoo/texlive-module-bidi-atbegshi.doc-2017.tar.xz mirror://gentoo/texlive-module-bidicontour.doc-2017.tar.xz mirror://gentoo/texlive-module-bidipagegrid.doc-2017.tar.xz mirror://gentoo/texlive-module-bidishadowtext.doc-2017.tar.xz mirror://gentoo/texlive-module-bidipresentation.doc-2017.tar.xz mirror://gentoo/texlive-module-fixlatvian.doc-2017.tar.xz mirror://gentoo/texlive-module-font-change-xetex.doc-2017.tar.xz mirror://gentoo/texlive-module-fontbook.doc-2017.tar.xz mirror://gentoo/texlive-module-fontwrap.doc-2017.tar.xz mirror://gentoo/texlive-module-interchar.doc-2017.tar.xz mirror://gentoo/texlive-module-philokalia.doc-2017.tar.xz mirror://gentoo/texlive-module-ptext.doc-2017.tar.xz mirror://gentoo/texlive-module-quran.doc-2017.tar.xz mirror://gentoo/texlive-module-realscripts.doc-2017.tar.xz mirror://gentoo/texlive-module-simple-resume-cv.doc-2017.tar.xz mirror://gentoo/texlive-module-simple-thesis-dissertation.doc-2017.tar.xz mirror://gentoo/texlive-module-ucharclasses.doc-2017.tar.xz mirror://gentoo/texlive-module-unicode-bidi.doc-2017.tar.xz mirror://gentoo/texlive-module-unisugar.doc-2017.tar.xz mirror://gentoo/texlive-module-xebaposter.doc-2017.tar.xz mirror://gentoo/texlive-module-xecjk.doc-2017.tar.xz mirror://gentoo/texlive-module-xecolor.doc-2017.tar.xz mirror://gentoo/texlive-module-xecyr.doc-2017.tar.xz mirror://gentoo/texlive-module-xeindex.doc-2017.tar.xz mirror://gentoo/texlive-module-xesearch.doc-2017.tar.xz mirror://gentoo/texlive-module-xespotcolor.doc-2017.tar.xz mirror://gentoo/texlive-module-xetex.doc-2017.tar.xz mirror://gentoo/texlive-module-xetex-itrans.doc-2017.tar.xz mirror://gentoo/texlive-module-xetex-pstricks.doc-2017.tar.xz mirror://gentoo/texlive-module-xetex-tibetan.doc-2017.tar.xz mirror://gentoo/texlive-module-xetexfontinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-xetexko.doc-2017.tar.xz mirror://gentoo/texlive-module-xevlna.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-arabxetex.source-2017.tar.xz mirror://gentoo/texlive-module-fixlatvian.source-2017.tar.xz mirror://gentoo/texlive-module-fontbook.source-2017.tar.xz mirror://gentoo/texlive-module-philokalia.source-2017.tar.xz mirror://gentoo/texlive-module-realscripts.source-2017.tar.xz mirror://gentoo/texlive-module-xecjk.source-2017.tar.xz mirror://gentoo/texlive-module-xespotcolor.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	font	82836641e7d4639329d8c195234ad0e3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=846a6c7923d54efe78cd356ca3325298
+_md5_=6fda326016c77991ccd3e689c9c4cf7b
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index e42db5c7b338..5e8b520689b9 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/cmdtest-0.30 b/metadata/md5-cache/dev-util/cmdtest-0.30
index 6345bbd83d3a..d6959e6a41d9 100644
--- a/metadata/md5-cache/dev-util/cmdtest-0.30
+++ b/metadata/md5-cache/dev-util/cmdtest-0.30
@@ -4,11 +4,11 @@ DESCRIPTION=black box tests Unix command line tools
 EAPI=6
 HOMEPAGE=http://liw.fi/cmdtest/
 IUSE=python_targets_python2_7
-KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 ~arm arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd
 LICENSE=GPL-3
 RDEPEND=dev-python/cliapp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ttystatus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] 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_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://code.liw.fi/debian/pool/main/c/cmdtest/cmdtest_0.30.orig.tar.xz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=233c7e983e688920e8e5ba1bd8f8e3b0
+_md5_=6650abdf404cb04f62c08519d5d62964
diff --git a/metadata/md5-cache/dev-util/cppunit-1.14.0 b/metadata/md5-cache/dev-util/cppunit-1.14.0
index 69eb995d361e..8d6fe912cf0d 100644
--- a/metadata/md5-cache/dev-util/cppunit-1.14.0
+++ b/metadata/md5-cache/dev-util/cppunit-1.14.0
@@ -4,9 +4,9 @@ DESCRIPTION=C++ port of the famous JUnit framework for unit testing
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/cppunit
 IUSE=doc examples 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 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0b13655b484b60ead8370c5d305cf431
+_md5_=3fc575da0d53b324025d440e2f7e6b03
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.52.3 b/metadata/md5-cache/dev-util/gdbus-codegen-2.52.3
index 9e4189adfb8f..52163400d953 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.52.3
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.52.3
@@ -4,7 +4,7 @@ DESCRIPTION=GDBus code and documentation generator
 EAPI=5
 HOMEPAGE=https://www.gtk.org/
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2+
 PDEPEND=>=dev-libs/glib-2.52.3:2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=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(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.52/glib-2.52.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=48674b6b5596cb8760070837e024a769
+_md5_=edb3386c3388d7c5a2232429ad60eedf
diff --git a/metadata/md5-cache/dev-util/geany-1.31 b/metadata/md5-cache/dev-util/geany-1.33
similarity index 61%
rename from metadata/md5-cache/dev-util/geany-1.31
rename to metadata/md5-cache/dev-util/geany-1.33
index 2440f216e8ec..9589cd81298d 100644
--- a/metadata/md5-cache/dev-util/geany-1.31
+++ b/metadata/md5-cache/dev-util/geany-1.33
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux
 LICENSE=GPL-2+ HPND
 RDEPEND=>=dev-libs/glib-2.32:2 !gtk3? ( >=x11-libs/gtk+-2.24:2 vte? ( x11-libs/vte:0 ) ) gtk3? ( >=x11-libs/gtk+-3.0:3 vte? ( x11-libs/vte:2.91 ) )
 SLOT=0
-SRC_URI=http://download.geany.org/geany-1.31.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1d9e48525b3ecddaadcd8e1c8957755f
+SRC_URI=http://download.geany.org/geany-1.33.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=83c5a148be0d5d07451e3e34549b5d1f
diff --git a/metadata/md5-cache/dev-util/geany-9999 b/metadata/md5-cache/dev-util/geany-9999
index a40151630739..f1a021a970eb 100644
--- a/metadata/md5-cache/dev-util/geany-9999
+++ b/metadata/md5-cache/dev-util/geany-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2+ HPND
 RDEPEND=>=dev-libs/glib-2.32:2 !gtk3? ( >=x11-libs/gtk+-2.24:2 vte? ( x11-libs/vte:0 ) ) gtk3? ( >=x11-libs/gtk+-3.0:3 vte? ( x11-libs/vte:2.91 ) )
 SLOT=0
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7a4c6557f5aa865fdc737c53c1cb29a3
+_md5_=83c5a148be0d5d07451e3e34549b5d1f
diff --git a/metadata/md5-cache/dev-util/geany-plugins-1.31 b/metadata/md5-cache/dev-util/geany-plugins-1.31
deleted file mode 100644
index f04a8612eaec..000000000000
--- a/metadata/md5-cache/dev-util/geany-plugins-1.31
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=>=dev-util/geany-1.26[gtk3=] dev-libs/glib:2 dev-libs/libxml2:2 autoclose? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) commander? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:0 ) defineformat? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) enchant? ( app-text/enchant ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( gtk3? ( app-text/gtkspell:3= ) !gtk3? ( app-text/gtkspell:2 ) ) keyrecord? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) lua? ( dev-lang/lua:0= ) multiterm? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) x11-libs/gtk+:2 >=x11-libs/vte-0.28:0 ) python? ( dev-python/pygtk[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(+)] 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(+)] ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup:2.4 ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=A collection of different plugins for Geany
-EAPI=6
-HOMEPAGE=https://plugins.geany.org
-IUSE=gtk3 +autoclose +automark +commander ctags debugger +defineformat enchant git gpg gtkspell keyrecord lua multiterm nls +overview python scope soup python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-util/geany-1.26[gtk3=] dev-libs/glib:2 dev-libs/libxml2:2 autoclose? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) commander? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:0 ) defineformat? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) enchant? ( app-text/enchant ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( gtk3? ( app-text/gtkspell:3= ) !gtk3? ( app-text/gtkspell:2 ) ) keyrecord? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) lua? ( dev-lang/lua:0= ) multiterm? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) x11-libs/gtk+:2 >=x11-libs/vte-0.28:0 ) python? ( dev-python/pygtk[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(+)] 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(+)] ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup:2.4 ) scope? ( sys-devel/gdb )
-REQUIRED_USE=gtk3? ( !debugger !multiterm !python !scope ) python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://plugins.geany.org/geany-plugins/geany-plugins-1.31.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cb259a8cf06210d5b64d8672d362420a
diff --git a/metadata/md5-cache/dev-util/geany-plugins-1.33 b/metadata/md5-cache/dev-util/geany-plugins-1.33
new file mode 100644
index 000000000000..0913bd768c45
--- /dev/null
+++ b/metadata/md5-cache/dev-util/geany-plugins-1.33
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=>=dev-util/geany-1.32[gtk3=] dev-libs/glib:2 gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:0 ) enchant? ( app-text/enchant ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( gtk3? ( app-text/gtkspell:3= ) !gtk3? ( app-text/gtkspell:2 ) ) lua? ( dev-lang/lua:0= ) multiterm? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) >=x11-libs/vte-0.28:0 ) pretty-printer? ( dev-libs/libxml2:2 ) python? ( dev-python/pygtk[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(+)] 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(+)] ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup:2.4 ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DESCRIPTION=A collection of different plugins for Geany
+EAPI=6
+HOMEPAGE=https://plugins.geany.org
+IUSE=gtk3 ctags debugger enchant git gpg gtkspell lua multiterm nls pretty-printer python scope soup python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-util/geany-1.32[gtk3=] dev-libs/glib:2 gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:0 ) enchant? ( app-text/enchant ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( gtk3? ( app-text/gtkspell:3= ) !gtk3? ( app-text/gtkspell:2 ) ) lua? ( dev-lang/lua:0= ) multiterm? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) >=x11-libs/vte-0.28:0 ) pretty-printer? ( dev-libs/libxml2:2 ) python? ( dev-python/pygtk[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(+)] 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(+)] ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup:2.4 ) scope? ( sys-devel/gdb )
+REQUIRED_USE=gtk3? ( !debugger !multiterm !python !scope ) python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://plugins.geany.org/geany-plugins/geany-plugins-1.33.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=377e06aa9802d8b358b7835b8b822a7a
diff --git a/metadata/md5-cache/dev-util/glade-3.20.2 b/metadata/md5-cache/dev-util/glade-3.20.2
index 57128b9908df..e95da099dfa1 100644
--- a/metadata/md5-cache/dev-util/glade-3.20.2
+++ b/metadata/md5-cache/dev-util/glade-3.20.2
@@ -4,11 +4,11 @@ DESCRIPTION=A user interface designer for GTK+ and GNOME
 EAPI=6
 HOMEPAGE=https://glade.gnome.org/
 IUSE=debug +introspection python python_targets_python2_7 test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=dev-libs/atk[introspection?] >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2.4.0:2 x11-libs/cairo:= x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.20.0:3[introspection?] x11-libs/pango[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.32:= ) python? ( 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(+)] >=dev-python/pygobject-3.8:3[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(+)] )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=3.10/6
 SRC_URI=mirror://gnome/sources/glade/3.20/glade-3.20.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e9853694e731be97838cfc117142bc7e
+_md5_=2f583401cd8e1460c34a5692cd2d2116
diff --git a/metadata/md5-cache/dev-util/meson-0.44.1 b/metadata/md5-cache/dev-util/meson-0.44.1
index b3a58a4f2732..2bc9790d526a 100644
--- a/metadata/md5-cache/dev-util/meson-0.44.1
+++ b/metadata/md5-cache/dev-util/meson-0.44.1
@@ -4,7 +4,7 @@ DESCRIPTION=Open source build system
 EAPI=6
 HOMEPAGE=http://mesonbuild.com/
 IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=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(-)]
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/m/meson/meson-0.44.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eca86b19fe4256b31d3949ef60bac358
+_md5_=1c890fc05a3c13dd4d81a205c1b5f976
diff --git a/metadata/md5-cache/dev-util/ninja-1.8.2 b/metadata/md5-cache/dev-util/ninja-1.8.2
index fe685dcb2da6..2a219478f390 100644
--- a/metadata/md5-cache/dev-util/ninja-1.8.2
+++ b/metadata/md5-cache/dev-util/ninja-1.8.2
@@ -4,10 +4,10 @@ DESCRIPTION=A small build system similar to make
 EAPI=6
 HOMEPAGE=https://ninja-build.org/
 IUSE=doc emacs test vim-syntax zsh-completion
-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
+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 ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) zsh-completion? ( app-shells/zsh ) !<net-irc/ninja-1.5.9_pre14-r1
 SLOT=0
 SRC_URI=https://github.com/ninja-build/ninja/archive/v1.8.2.tar.gz -> ninja-1.8.2.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ab878f7b63d1c5ccdafc739bab21bf92
+_md5_=5c6177af3b74da18ad9f951e7d46c05e
diff --git a/metadata/md5-cache/dev-util/re2c-1.0.3 b/metadata/md5-cache/dev-util/re2c-1.0.3
index e73f7c2f891c..55c6f8cbfa73 100644
--- a/metadata/md5-cache/dev-util/re2c-1.0.3
+++ b/metadata/md5-cache/dev-util/re2c-1.0.3
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=tool for generating C-based recognizers from regular expressions
 EAPI=6
 HOMEPAGE=http://re2c.org/
-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 ~x86-solaris
+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 ~x64-solaris ~x86-solaris
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://github.com/skvadrik/re2c/releases/download/1.0.3/re2c-1.0.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=13883fa74d5820bd595a1414abed5cf7
+_md5_=8a3b0b32ae7b7171ff1931ef9e787161
diff --git a/metadata/md5-cache/dev-util/sasm-2.2 b/metadata/md5-cache/dev-util/sasm-2.2
deleted file mode 100644
index c0269ddc3eb2..000000000000
--- a/metadata/md5-cache/dev-util/sasm-2.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4
-DESCRIPTION=Simple crossplatform IDE for NASM assembly language
-EAPI=5
-HOMEPAGE=http://dman95.github.io/SASM/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://github.com/Dman95/SASM/archive/v2.2.tar.gz -> sasm-2.2.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3f293fb1b5c818bcc17c334234da57df
diff --git a/metadata/md5-cache/dev-util/sasm-2.2-r1 b/metadata/md5-cache/dev-util/sasm-2.2-r1
new file mode 100644
index 000000000000..03bcff183d00
--- /dev/null
+++ b/metadata/md5-cache/dev-util/sasm-2.2-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
+DESCRIPTION=Simple crossplatform IDE for NASM assembly language
+EAPI=6
+HOMEPAGE=http://dman95.github.io/SASM/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=https://github.com/Dman95/SASM/archive/v2.2.tar.gz -> sasm-2.2.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=8351851d9f58820fd5291315f1a535b4
diff --git a/metadata/md5-cache/dev-util/sasm-9999 b/metadata/md5-cache/dev-util/sasm-9999
index a683b653813e..9102febe260a 100644
--- a/metadata/md5-cache/dev-util/sasm-9999
+++ b/metadata/md5-cache/dev-util/sasm-9999
@@ -1,9 +1,9 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 >=dev-vcs/git-1.8.2.1
+DEFINED_PHASES=configure install unpack
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Simple crossplatform IDE for NASM assembly language
-EAPI=5
-HOMEPAGE=http://dman95.github.io/SASM/
+EAPI=6
+HOMEPAGE=https://dman95.github.io/SASM/
 LICENSE=GPL-3
 SLOT=0
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3f293fb1b5c818bcc17c334234da57df
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=7f3e9a407beb29ddb021ccca780fa15f
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 7c32bed950ab..038627a335fd 100644
Binary files a/metadata/md5-cache/dev-vcs/Manifest.gz and b/metadata/md5-cache/dev-vcs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-vcs/bzr-2.7.0 b/metadata/md5-cache/dev-vcs/bzr-2.7.0
index 2a99ca63b15b..84a3d1055c2b 100644
--- a/metadata/md5-cache/dev-vcs/bzr-2.7.0
+++ b/metadata/md5-cache/dev-vcs/bzr-2.7.0
@@ -4,7 +4,7 @@ DESCRIPTION=Bazaar is a next generation distributed version control system
 EAPI=6
 HOMEPAGE=http://bazaar-vcs.org/
 IUSE=curl doc +sftp test python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris
 LICENSE=GPL-2
 RDEPEND=curl? ( dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sftp? ( dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,ssl,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/bzr/2.7/2.7.0/+download/bzr-2.7.0.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8a8dc62263cc216b1a847c4e729e9f12
+_md5_=426f5a2de95e2e250cf0a6627bc85a0e
diff --git a/metadata/md5-cache/dev-vcs/git-2.16.1 b/metadata/md5-cache/dev-vcs/git-2.16.1
index a6a7f9f70827..49e00db603bd 100644
--- a/metadata/md5-cache/dev-vcs/git-2.16.1
+++ b/metadata/md5-cache/dev-vcs/git-2.16.1
@@ -4,11 +4,11 @@ DESCRIPTION=stupid content tracker: distributed VCS designed for speed and effic
 EAPI=6
 HOMEPAGE=https://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( 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(+)] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-2.16.1.tar.xz mirror://kernel/software/scm/git/git-manpages-2.16.1.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.16.1.tar.xz )
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0458a7fd08e13f2698dba581586ea8f6
+_md5_=80b7a1131b511e7594a4502048360e18
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.9.7-r1 b/metadata/md5-cache/dev-vcs/subversion-1.9.7-r1
index 3eca92813bec..0dfe37a5f095 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.9.7-r1
+++ b/metadata/md5-cache/dev-vcs/subversion-1.9.7-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Advanced version control system
 EAPI=6
 HOMEPAGE=https://subversion.apache.org/
 IUSE=apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax apache2 python_targets_python2_7 elibc_FreeBSD java
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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=Subversion GPL-2
 RDEPEND=app-arch/bzip2 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( 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_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( 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_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.9.7.tar.bz2 https://dev.gentoo.org/~mgorny/dist/subversion-1.8.18-patchset.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	db-use	582140d1a711279e50ce284fc7b609f5	depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ca7f0877a09ba9d44eb3964fadee7bc7
+_md5_=43d80ecea98d3c2a6576c955209bb444
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index 8f7aa73f1d4f..f030b7ea34c3 100644
Binary files a/metadata/md5-cache/games-util/Manifest.gz and b/metadata/md5-cache/games-util/Manifest.gz differ
diff --git a/metadata/md5-cache/games-util/pyfa-1.35.1 b/metadata/md5-cache/games-util/pyfa-1.35.1
new file mode 100644
index 000000000000..107ce3c9b815
--- /dev/null
+++ b/metadata/md5-cache/games-util/pyfa-1.35.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=app-arch/zip >=sys-apps/sed-4
+DESCRIPTION=Python Fitting Assistant - a ship fitting application for EVE Online
+EAPI=6
+HOMEPAGE=https://github.com/pyfa-org/Pyfa
+IUSE=+graph python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm
+RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-1.0.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/logbook-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] graph? ( dev-python/matplotlib[wxwidgets,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/pyfa-org/Pyfa/archive/v1.35.1.tar.gz -> pyfa-1.35.1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a8bb210125c6b341cb4b0d5ce8dcfa2d
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 3cd2e1209119..81569f5dbae6 100644
Binary files a/metadata/md5-cache/gnome-base/Manifest.gz and b/metadata/md5-cache/gnome-base/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-3.24.3 b/metadata/md5-cache/gnome-base/gnome-shell-3.24.3
index 8e86c71c3d5d..f593ab432ae6 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-3.24.3
+++ b/metadata/md5-cache/gnome-base/gnome-shell-3.24.3
@@ -7,9 +7,9 @@ IUSE=+bluetooth +browser-extension +ibus +networkmanager nsplugin -openrc-force
 KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2+
 PDEPEND=>=gnome-base/gdm-3.5[introspection] >=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?,networkmanager(+)?] browser-extension? ( gnome-extra/chrome-gnome-shell )
-RDEPEND=>=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.45.3:2[dbus] >=dev-libs/gjs-1.47.0 >=dev-libs/gobject-introspection-1.49.1:= dev-libs/libical:= >=x11-libs/gtk+-3.15.0:3[introspection] >=dev-libs/libcroco-0.6.8:0.6 >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=gnome-base/gsettings-desktop-schemas-3.21.3 >=gnome-extra/evolution-data-server-3.17.2:= >=media-libs/gstreamer-0.11.92:1.0 >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-libs/libXfixes-5.0 x11-libs/libXtst >=x11-wm/mutter-3.24.0:0/0[introspection] >=x11-libs/startup-notification-0.11 python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/dbus-glib dev-libs/libxml2:2 media-libs/libcanberra[gtk3] media-libs/mesa >=media-sound/pulseaudio-2 >=net-libs/libsoup-2.40:2.4[introspection] x11-libs/libX11 x11-libs/gdk-pixbuf:2[introspection] x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) networkmanager? ( app-crypt/libsecret >=gnome-extra/nm-applet-0.9.8 >=net-misc/networkmanager-0.9.8:=[introspection] ) nsplugin? ( >=dev-libs/json-glib-0.13.2 ) app-accessibility/at-spi2-core:2[introspection] >=app-accessibility/caribou-0.4.8 dev-libs/libgweather:2[introspection] >=sys-apps/accountsservice-0.6.14[introspection] >=sys-power/upower-0.99:=[introspection] x11-libs/pango[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 !openrc-force? ( >=sys-apps/systemd-31 ) x11-misc/xdg-utils media-fonts/dejavu >=x11-themes/adwaita-icon-theme-3.19.90 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
+RDEPEND=>=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.45.3:2[dbus] >=dev-libs/gjs-1.47.0 >=dev-libs/gobject-introspection-1.49.1:= dev-libs/libical:= >=x11-libs/gtk+-3.15.0:3[introspection] >=dev-libs/libcroco-0.6.8:0.6 >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=gnome-base/gsettings-desktop-schemas-3.21.3 >=gnome-extra/evolution-data-server-3.17.2:= >=media-libs/gstreamer-0.11.92:1.0 >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-libs/libXfixes-5.0 x11-libs/libXtst >=x11-wm/mutter-3.24.0:0/0[introspection] >=x11-libs/startup-notification-0.11 python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/dbus-glib dev-libs/libxml2:2 media-libs/libcanberra[gtk3] media-libs/mesa >=media-sound/pulseaudio-2 >=net-libs/libsoup-2.40:2.4[introspection] x11-libs/libX11 x11-libs/gdk-pixbuf:2[introspection] x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) networkmanager? ( app-crypt/libsecret >=gnome-extra/nm-applet-0.9.8 >=net-misc/networkmanager-0.9.8:=[introspection] ) nsplugin? ( >=dev-libs/json-glib-0.13.2 ) app-accessibility/at-spi2-core:2[introspection] >=app-accessibility/caribou-0.4.8 dev-libs/libgweather:2[introspection] >=sys-apps/accountsservice-0.6.14[introspection] >=sys-power/upower-0.99:=[introspection] x11-libs/pango[introspection] gnome-base/librsvg:2[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 !openrc-force? ( >=sys-apps/systemd-31 ) x11-misc/xdg-utils media-fonts/dejavu >=x11-themes/adwaita-icon-theme-3.19.90 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell/3.24/gnome-shell-3.24.3.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=80d4f58b738883a9d43a0b276141cd15
+_md5_=e451a27fd503163da6596dcfc80b594a
diff --git a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.24.1 b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.24.1
index ff535e5a5c7a..b00d6c4bb52a 100644
--- a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.24.1
+++ b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.24.1
@@ -4,10 +4,10 @@ DESCRIPTION=Collection of GSettings schemas for GNOME desktop
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gsettings-desktop-schemas
 IUSE=+introspection
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.31:2 introspection? ( >=dev-libs/gobject-introspection-1.31.0:= ) !<gnome-base/gdm-3.8
 SLOT=0
 SRC_URI=mirror://gnome/sources/gsettings-desktop-schemas/3.24/gsettings-desktop-schemas-3.24.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7fc243e592bedaf4c5c6f984c9ae5c16
+_md5_=c84bfe083c2d0242c7fddf67142c2016
diff --git a/metadata/md5-cache/gnome-base/gvfs-1.32.1-r1 b/metadata/md5-cache/gnome-base/gvfs-1.32.1-r1
index bbcd725102c4..aa2417053523 100644
--- a/metadata/md5-cache/gnome-base/gvfs-1.32.1-r1
+++ b/metadata/md5-cache/gnome-base/gvfs-1.32.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Virtual filesystem implementation for gio
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/gvfs
 IUSE=afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf
-KEYWORDS=~alpha amd64 ~arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=app-crypt/gcr:= >=dev-libs/glib-2.51:2 dev-libs/libxml2:2 net-misc/openssh afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray:= ) elogind? ( >=sys-auth/elogind-229:0= ) fuse? ( >=sys-fs/fuse-2.8.0:0 ) gnome-keyring? ( app-crypt/libsecret ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1:= ) google? ( >=dev-libs/libgdata-0.17.7:=[crypt,gnome-online-accounts] >=net-libs/gnome-online-accounts-3.17.1:= ) gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) gtk? ( >=x11-libs/gtk+-3.0:3 ) http? ( >=net-libs/libsoup-2.42:2.4 ) ios? ( >=app-pda/libimobiledevice-1.2:= >=app-pda/libplist-1:= ) mtp? ( >=dev-libs/libusb-1.0.21 >=media-libs/libmtp-1.1.12 ) nfs? ( >=net-fs/libnfs-1.9.8 ) policykit? ( sys-auth/polkit sys-libs/libcap ) samba? ( >=net-fs/samba-4[client] ) systemd? ( >=sys-apps/systemd-206:0= ) udev? ( cdda? ( dev-libs/libcdio-paranoia ) >=virtual/libgudev-147:= virtual/libudev:= ) udisks? ( >=sys-fs/udisks-1.97:2 ) zeroconf? ( >=net-dns/avahi-0.6 )
 REQUIRED_USE=cdda? ( udev ) elogind? ( !systemd udisks ) google? ( gnome-online-accounts ) mtp? ( udev ) udisks? ( udev ) systemd? ( !elogind udisks )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gvfs/1.32/gvfs-1.32.1.tar.xz https://dev.gentoo.org/~leio/distfiles/gvfs-1.32.1-patches.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ea0835914b59f8d50055076cf297a386
+_md5_=e0de80464e157db1ab813b4e37b6b84b
diff --git a/metadata/md5-cache/gnome-base/libgtop-2.36.0 b/metadata/md5-cache/gnome-base/libgtop-2.36.0
index 4ba2cb4a0583..49e37e38a852 100644
--- a/metadata/md5-cache/gnome-base/libgtop-2.36.0
+++ b/metadata/md5-cache/gnome-base/libgtop-2.36.0
@@ -4,10 +4,10 @@ DESCRIPTION=A library that provides top functionality to applications
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/libgtop
 IUSE=+introspection
-KEYWORDS=~alpha amd64 ~arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.26:2 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 SLOT=2/10
 SRC_URI=mirror://gnome/sources/libgtop/2.36/libgtop-2.36.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=be245218e17706afb586e3e2818165fe
+_md5_=2d1fb842735c62833a3aa7c8b37126d4
diff --git a/metadata/md5-cache/lxde-base/Manifest.gz b/metadata/md5-cache/lxde-base/Manifest.gz
index 4924dd8a964e..511b9a6a48fc 100644
Binary files a/metadata/md5-cache/lxde-base/Manifest.gz and b/metadata/md5-cache/lxde-base/Manifest.gz differ
diff --git a/metadata/md5-cache/lxde-base/lxterminal-0.3.1 b/metadata/md5-cache/lxde-base/lxterminal-0.3.1
new file mode 100644
index 000000000000..d877b3b7560b
--- /dev/null
+++ b/metadata/md5-cache/lxde-base/lxterminal-0.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=dev-libs/glib:2 !gtk3? ( x11-libs/gtk+:2 x11-libs/vte:0 ) gtk3? ( x11-libs/gtk+:3 x11-libs/vte:2.91 ) virtual/pkgconfig sys-devel/gettext >=dev-util/intltool-0.40.0 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Lightweight vte-based tabbed terminal emulator for LXDE
+EAPI=6
+HOMEPAGE=https://wiki.lxde.org/en/LXTerminal
+IUSE=gtk3
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 !gtk3? ( x11-libs/gtk+:2 x11-libs/vte:0 ) gtk3? ( x11-libs/gtk+:3 x11-libs/vte:2.91 )
+SLOT=0
+SRC_URI=mirror://sourceforge/lxde/lxterminal-0.3.1.tar.xz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=b199f30f9100b29f9150c3b0b9a62a10
diff --git a/metadata/md5-cache/lxde-base/menu-cache-1.0.2-r1 b/metadata/md5-cache/lxde-base/menu-cache-1.0.2-r1
new file mode 100644
index 000000000000..17e08acf8044
--- /dev/null
+++ b/metadata/md5-cache/lxde-base/menu-cache-1.0.2-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=dev-libs/glib:2 x11-libs/libfm-extra sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=Library to create and utilize caches to speed up freedesktop application menus
+EAPI=6
+HOMEPAGE=http://lxde.sourceforge.net/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=dev-libs/glib:2 x11-libs/libfm-extra
+SLOT=0/2
+SRC_URI=mirror://sourceforge/lxde/menu-cache-1.0.2.tar.xz
+_md5_=b8656947a785f593505466c3b6ad3c0b
diff --git a/metadata/md5-cache/lxde-base/menu-cache-1.1.0 b/metadata/md5-cache/lxde-base/menu-cache-1.1.0
new file mode 100644
index 000000000000..0af0ab68b07b
--- /dev/null
+++ b/metadata/md5-cache/lxde-base/menu-cache-1.1.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure
+DEPEND=dev-libs/glib:2 x11-libs/libfm-extra sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=Library to create and utilize caches to speed up freedesktop application menus
+EAPI=6
+HOMEPAGE=http://lxde.sourceforge.net/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=dev-libs/glib:2 x11-libs/libfm-extra
+SLOT=0/2
+SRC_URI=mirror://sourceforge/lxde/menu-cache-1.1.0.tar.xz
+_md5_=2ae5c8aa4ed9156bcdc168b620122d77
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index adf602d2b7fd..446a8f820232 100644
Binary files a/metadata/md5-cache/mail-client/Manifest.gz and b/metadata/md5-cache/mail-client/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-client/sylpheed-3.6.0 b/metadata/md5-cache/mail-client/sylpheed-3.6.0
index 04bfde620975..3fc7d17a8e0c 100644
--- a/metadata/md5-cache/mail-client/sylpheed-3.6.0
+++ b/metadata/md5-cache/mail-client/sylpheed-3.6.0
@@ -4,10 +4,10 @@ DESCRIPTION=A lightweight email client and newsreader
 EAPI=6
 HOMEPAGE=http://sylpheed.sraoss.jp/
 IUSE=crypt ipv6 ldap libressl nls oniguruma pda spell ssl xface
-KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=net-libs/liblockfile x11-libs/gtk+:2 crypt? ( app-crypt/gpgme ) ldap? ( net-nds/openldap ) nls? ( sys-devel/gettext ) oniguruma? ( dev-libs/oniguruma:= ) pda? ( app-pda/jpilot ) spell? ( app-text/gtkspell:2 dev-libs/dbus-glib ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) app-misc/mime-types net-misc/curl
 SLOT=0
 SRC_URI=http://sylpheed.sraoss.jp/sylpheed/v3.6/sylpheed-3.6.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7f7c5187f5f31ca0a14b093e6891ee46
+_md5_=b31df69031d38d49432d9a430007e6c1
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index ca327c41f9ab..cd11728c5488 100644
Binary files a/metadata/md5-cache/mail-filter/Manifest.gz and b/metadata/md5-cache/mail-filter/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-filter/dcc-1.3.158 b/metadata/md5-cache/mail-filter/dcc-1.3.158
index 2170e5023249..37df21b6f070 100644
--- a/metadata/md5-cache/mail-filter/dcc-1.3.158
+++ b/metadata/md5-cache/mail-filter/dcc-1.3.158
@@ -4,10 +4,10 @@ DESCRIPTION=Distributed Checksum Clearinghouse
 EAPI=5
 HOMEPAGE=http://www.rhyolite.com/anti-spam/dcc/
 IUSE=cgi ipv6 rrdtool milter
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=DCC GPL-2
 RDEPEND=dev-lang/perl rrdtool? ( net-analyzer/rrdtool ) || ( net-misc/wget www-client/fetch net-misc/curl net-ftp/ftp ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
 SLOT=0
 SRC_URI=http://www.rhyolite.com/anti-spam/dcc/source/old/dcc-1.3.158.tar.Z
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=006a132fb927d5dd56e1fe0305bc5ef2
+_md5_=c571d3b2fb63674bbf9eac583ae1c294
diff --git a/metadata/md5-cache/mail-filter/mailfilter-0.8.4 b/metadata/md5-cache/mail-filter/mailfilter-0.8.4
index 286698d57e4b..bcd2106fc287 100644
--- a/metadata/md5-cache/mail-filter/mailfilter-0.8.4
+++ b/metadata/md5-cache/mail-filter/mailfilter-0.8.4
@@ -4,8 +4,8 @@ DESCRIPTION=Mailfilter is a utility to get rid of unwanted spam mails
 EAPI=6
 HOMEPAGE=http://mailfilter.sourceforge.net/
 IUSE=+ssl
-KEYWORDS=~amd64 ~ppc sparc ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~ppc sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/mailfilter/mailfilter-0.8.4.tar.gz
-_md5_=c7c00f7395b2d0a3652c1f18e67129a4
+_md5_=6867243c9123a807b8a1f6e487246674
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index c0c0ca71c9dc..b9d3936c0b25 100644
Binary files a/metadata/md5-cache/mail-mta/Manifest.gz and b/metadata/md5-cache/mail-mta/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-mta/postfix-3.2.4 b/metadata/md5-cache/mail-mta/postfix-3.2.4
index 614d161bfbf5..a2709fb0e885 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.2.4
+++ b/metadata/md5-cache/mail-mta/postfix-3.2.4
@@ -4,11 +4,11 @@ DESCRIPTION=A fast and secure drop-in replacement for sendmail
 EAPI=6
 HOMEPAGE=http://www.postfix.org/
 IUSE=+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=IBM
 RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) dovecot-sasl? ( net-mail/dovecot ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
 REQUIRED_USE=ldap-bind? ( ldap sasl )
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.2.4.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fa767471383f3f45cfddb0a5294826e7
+_md5_=e1618df7876f24d11c99ca1f97317875
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 57ae3e65b7f1..1e5ba703193e 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/sane-frontends-1.0.14-r2 b/metadata/md5-cache/media-gfx/sane-frontends-1.0.14-r3
similarity index 50%
rename from metadata/md5-cache/media-gfx/sane-frontends-1.0.14-r2
rename to metadata/md5-cache/media-gfx/sane-frontends-1.0.14-r3
index dc0249befecd..a11270fa6127 100644
--- a/metadata/md5-cache/media-gfx/sane-frontends-1.0.14-r2
+++ b/metadata/md5-cache/media-gfx/sane-frontends-1.0.14-r3
@@ -1,12 +1,13 @@
 DEFINED_PHASES=configure install
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-gfx/sane-backends gimp? ( media-gfx/gimp:2 )
+DEPEND=media-gfx/sane-backends gimp? ( media-gfx/gimp:2 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
 DESCRIPTION=Scanner Access Now Easy
 EAPI=6
 HOMEPAGE=http://www.sane-project.org
-IUSE=gimp
-KEYWORDS=~alpha amd64 ~ppc ~ppc64 sparc x86
+IUSE=gimp gtk
+KEYWORDS=alpha amd64 ~ppc ~ppc64 sparc x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2
+RDEPEND=media-gfx/sane-backends gimp? ( media-gfx/gimp:2 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
+REQUIRED_USE=gimp? ( gtk )
 SLOT=0
 SRC_URI=ftp://ftp.sane-project.org/pub/sane/sane-frontends-1.0.14/sane-frontends-1.0.14.tar.gz ftp://ftp.sane-project.org/pub/sane/old-versions/sane-frontends-1.0.14/sane-frontends-1.0.14.tar.gz
-_md5_=ae289987292fa95bc89566f51e661388
+_md5_=c52694e863dd62864a00b1fa2e64e2dc
diff --git a/metadata/md5-cache/media-gfx/ufraw-0.22-r2 b/metadata/md5-cache/media-gfx/ufraw-0.22-r2
index cb36083d806f..1098c430c651 100644
--- a/metadata/md5-cache/media-gfx/ufraw-0.22-r2
+++ b/metadata/md5-cache/media-gfx/ufraw-0.22-r2
@@ -4,11 +4,11 @@ DESCRIPTION=RAW Image format viewer and GIMP plugin
 EAPI=6
 HOMEPAGE=http://ufraw.sourceforge.net/
 IUSE=contrast fits gimp gnome gtk jpeg2k openmp timezone
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2= >=media-gfx/exiv2-0.11:0= media-libs/lcms:2= >=media-libs/lensfun-0.2.5:= media-libs/libpng:0= media-libs/tiff:0= virtual/jpeg:0= fits? ( sci-libs/cfitsio:0= ) gimp? ( >=media-gfx/gimp-2 ) gnome? ( >=gnome-base/gconf-2 ) gtk? ( >=media-gfx/gtkimageview-1.5 >=x11-libs/gtk+-2.6:2 ) jpeg2k? ( media-libs/jasper:= )
 REQUIRED_USE=gimp? ( gtk )
 SLOT=0
 SRC_URI=mirror://sourceforge/ufraw/ufraw-0.22.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=51eee3d20cc08b43373a6c593422c28a
+_md5_=612aee2bd6704d11171e37932caa47b2
diff --git a/metadata/md5-cache/media-gfx/valentina-0.5.0-r2 b/metadata/md5-cache/media-gfx/valentina-0.5.0-r2
index d1f7f3e83088..44905bb95be1 100644
--- a/metadata/md5-cache/media-gfx/valentina-0.5.0-r2
+++ b/metadata/md5-cache/media-gfx/valentina-0.5.0-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=app-text/poppler dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 app-arch/unzip >=sys-apps/sed-4
+DEPEND=app-text/poppler dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 app-arch/unzip >=sys-apps/sed-4
 DESCRIPTION=Cloth patternmaking software
 EAPI=6
 HOMEPAGE=https://valentinaproject.bitbucket.io/
 IUSE=gnome l10n_cs l10n_de l10n_el l10n_en l10n_en l10n_es l10n_fi l10n_fr l10n_he l10n_id l10n_it l10n_nl l10n_pt-BR l10n_ro l10n_ru l10n_uk l10n_zh-CN
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=app-text/poppler dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5
+RDEPEND=app-text/poppler dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5
 SLOT=0
 SRC_URI=https://bitbucket.org/dismine/valentina/get/v0.5.0.zip -> valentina-0.5.0.zip https://bitbucket.org/dismine/valentina/commits/d78ca13c4891ccf3542b0704a7d66af0f9b02938/raw -> valentina-4798.patch https://bitbucket.org/dismine/valentina/commits/98e869c4146204ef31822087fa826cfa1cd7e0f4/raw -> valentina-4802.patch https://bitbucket.org/dismine/valentina/commits/572fe909f75e013be310905c118e1afe4368db1c/raw -> valentina-5406.patch
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1da1e0dae07d377091552ad3f845248b
+_md5_=84311c4aeafd0d6bf770e2b229020d6d
diff --git a/metadata/md5-cache/media-gfx/valentina-9999 b/metadata/md5-cache/media-gfx/valentina-9999
index 4eb36fcda28a..2c5b91cdbf82 100644
--- a/metadata/md5-cache/media-gfx/valentina-9999
+++ b/metadata/md5-cache/media-gfx/valentina-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=configure install postinst unpack
-DEPEND=app-text/poppler dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 dev-vcs/mercurial >=sys-apps/sed-4
+DEPEND=app-text/poppler dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 dev-vcs/mercurial >=sys-apps/sed-4
 DESCRIPTION=Cloth patternmaking software
 EAPI=6
 HOMEPAGE=https://valentinaproject.bitbucket.io/
 IUSE=gnome l10n_cs l10n_de l10n_el l10n_en l10n_en l10n_es l10n_fi l10n_fr l10n_he l10n_id l10n_it l10n_nl l10n_pt-BR l10n_ro l10n_ru l10n_uk l10n_zh-CN
 LICENSE=GPL-3
-RDEPEND=app-text/poppler dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5
+RDEPEND=app-text/poppler dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	mercurial	0bdc9ce12272665fa3749c8408b4d389	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=48e08b2c800e0cd0bc36d481dc48b2c2
+_md5_=ef33d5aee5a9616f6303a34c3ea01954
diff --git a/metadata/md5-cache/media-gfx/xfig-3.2.6a b/metadata/md5-cache/media-gfx/xfig-3.2.6a
index ee091eb4f5fc..16134718d384 100644
--- a/metadata/md5-cache/media-gfx/xfig-3.2.6a
+++ b/metadata/md5-cache/media-gfx/xfig-3.2.6a
@@ -4,9 +4,9 @@ DESCRIPTION=A menu-driven tool to draw and manipulate objects interactively in a
 EAPI=6
 HOMEPAGE=http://mcj.sourceforge.net/
 IUSE=jpeg nls postscript
-KEYWORDS=alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=x11-libs/libXaw x11-libs/libXp x11-libs/libXaw3d x11-libs/libXi x11-libs/libXt media-libs/libpng:0= media-fonts/font-misc-misc media-fonts/urw-fonts >=media-gfx/transfig-3.2.5-r1 media-libs/netpbm jpeg? ( virtual/jpeg:0= ) nls? ( x11-libs/libXaw3d[unicode] ) postscript? ( app-text/ghostscript-gpl )
 SLOT=0
 SRC_URI=mirror://sourceforge/mcj/xfig-full-3.2.6a.tar.xz
-_md5_=6671ab8961aeb900a3c377302c0c0916
+_md5_=48d47be4d48b53b842f1731887d034eb
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 6dec405c50c6..6ce8447c6ab6 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.12.6 b/metadata/md5-cache/media-libs/fontconfig-2.12.6
index 091df0bb187f..645fe043a63b 100644
--- a/metadata/md5-cache/media-libs/fontconfig-2.12.6
+++ b/metadata/md5-cache/media-libs/fontconfig-2.12.6
@@ -4,11 +4,11 @@ DESCRIPTION=A library for configuring and customizing font access
 EAPI=6
 HOMEPAGE=http://fontconfig.org/
 IUSE=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
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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 ~x86-winnt
+KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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 ~x86-winnt
 LICENSE=MIT
 PDEPEND=!x86-winnt? ( app-eselect/eselect-fontconfig ) virtual/ttf-fonts
 RDEPEND=>=dev-libs/expat-2.1.0-r3[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/freetype-2.5.3-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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=1.0
 SRC_URI=http://fontconfig.org/release/fontconfig-2.12.6.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8eae5fc0cfd44dbba8e659eda6350baa
+_md5_=cd407cd8d16e8758878abaf3c8f1ea58
diff --git a/metadata/md5-cache/media-libs/gexiv2-0.10.8 b/metadata/md5-cache/media-libs/gexiv2-0.10.8
index 51bcf41b8386..603d3e99529e 100644
--- a/metadata/md5-cache/media-libs/gexiv2-0.10.8
+++ b/metadata/md5-cache/media-libs/gexiv2-0.10.8
@@ -4,11 +4,11 @@ DESCRIPTION=GObject-based wrapper around the Exiv2 library
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/gexiv2
 IUSE=introspection python static-libs test vala python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc x86
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc x86
 LICENSE=LGPL-2.1
 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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-libs/glib-2.26.1:2 >=media-gfx/exiv2-0.21:0= introspection? ( dev-libs/gobject-introspection:= ) vala? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) )
 REQUIRED_USE=python? ( introspection || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ) test? ( python introspection ) vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gexiv2/0.10/gexiv2-0.10.8.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e41f393ccdee9e5a0a837a57c2314f30
+_md5_=1ad055cf26fd9b9a43859eaebd77a077
diff --git a/metadata/md5-cache/media-libs/giblib-1.2.4-r1 b/metadata/md5-cache/media-libs/giblib-1.2.4-r1
index 3d4b79e87f38..0207f581cbd5 100644
--- a/metadata/md5-cache/media-libs/giblib-1.2.4-r1
+++ b/metadata/md5-cache/media-libs/giblib-1.2.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=a graphics library built on top of imlib2
 EAPI=4
 HOMEPAGE=http://freecode.com/projects/giblib http://www.linuxbrit.co.uk/giblib/
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=feh
 RDEPEND=>=media-libs/imlib2-1.0.3[X] x11-libs/libX11 x11-libs/libXext >=media-libs/freetype-2.0
 SLOT=0
 SRC_URI=http://www.linuxbrit.co.uk/downloads/giblib-1.2.4.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6488607ef179a7afa7b5678cd99e3c99
+_md5_=d07cc7d8754cf6a6de45304b12781822
diff --git a/metadata/md5-cache/media-libs/lensfun-0.3.2-r1 b/metadata/md5-cache/media-libs/lensfun-0.3.2-r1
index 2df27814f16f..a8af5bbf4b07 100644
--- a/metadata/md5-cache/media-libs/lensfun-0.3.2-r1
+++ b/metadata/md5-cache/media-libs/lensfun-0.3.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Library for rectifying and simulating photographic lens distortions
 EAPI=6
 HOMEPAGE=http://lensfun.sourceforge.net/
 IUSE=doc cpu_flags_x86_sse cpu_flags_x86_sse2 test 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
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-3 CC-BY-SA-3.0
 RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/glib-2.40 media-libs/libpng:0= sys-libs/zlib:=
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/lensfun/lensfun-0.3.2.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a349ce7abaeb949f8b0001ecf23c5189
+_md5_=19b9be2eaedcff30c59ef942f80d16a8
diff --git a/metadata/md5-cache/media-libs/libcdr-0.1.4 b/metadata/md5-cache/media-libs/libcdr-0.1.4
index 98f24a3366b8..a177443256c1 100644
--- a/metadata/md5-cache/media-libs/libcdr-0.1.4
+++ b/metadata/md5-cache/media-libs/libcdr-0.1.4
@@ -4,10 +4,10 @@ DESCRIPTION=Library parsing the Corel cdr documents
 EAPI=6
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libcdr
 IUSE=doc static-libs test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86
 LICENSE=MPL-2.0
 RDEPEND=dev-libs/icu:= dev-libs/librevenge media-libs/lcms:2 sys-libs/zlib
 SLOT=0
 SRC_URI=https://dev-www.libreoffice.org/src/libcdr/libcdr-0.1.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=28a9967ec7b26d86af0edead2923ed3d
+_md5_=90fccccedae77fbd0d1596025d2aca3b
diff --git a/metadata/md5-cache/media-libs/libdc1394-2.2.5-r1 b/metadata/md5-cache/media-libs/libdc1394-2.2.5-r1
index 7c50a9be1cd8..d7368d2a581b 100644
--- a/metadata/md5-cache/media-libs/libdc1394-2.2.5-r1
+++ b/metadata/md5-cache/media-libs/libdc1394-2.2.5-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Library to interface with IEEE 1394 cameras following the IIDC speci
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/libdc1394/
 IUSE=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
-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=>=sys-libs/libraw1394-2.1.0-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(-)?] >=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(-)?]
 SLOT=2
 SRC_URI=mirror://sourceforge/libdc1394/libdc1394-2.2.5.tar.gz https://dev.gentoo.org/~ssuominen/sdl.m4-20140620.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=57be184018ac995e9c0182f9b77da87f
+_md5_=c9b4ca64f7e030cfa02d7b7146fa506e
diff --git a/metadata/md5-cache/media-libs/libdvbpsi-1.3.1 b/metadata/md5-cache/media-libs/libdvbpsi-1.3.1
index 29ec0214fbdd..4dd3a2e754fb 100644
--- a/metadata/md5-cache/media-libs/libdvbpsi-1.3.1
+++ b/metadata/md5-cache/media-libs/libdvbpsi-1.3.1
@@ -4,8 +4,8 @@ DESCRIPTION=library for MPEG TS/DVB PSI tables decoding and generation
 EAPI=6
 HOMEPAGE=https://www.videolan.org/libdvbpsi
 IUSE=doc static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=0/10
 SRC_URI=https://download.videolan.org/pub/libdvbpsi/1.3.1/libdvbpsi-1.3.1.tar.bz2
-_md5_=9ac906e9458255d68bae2dd82cda164d
+_md5_=16ee70a6a36c35c6e96ed73627c633cc
diff --git a/metadata/md5-cache/media-libs/libdvdnav-6.0.0 b/metadata/md5-cache/media-libs/libdvdnav-6.0.0
index a04fc97a66f9..6f143a0b38f5 100644
--- a/metadata/md5-cache/media-libs/libdvdnav-6.0.0
+++ b/metadata/md5-cache/media-libs/libdvdnav-6.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Library for DVD navigation tools
 EAPI=6
 HOMEPAGE=https://www.videolan.org/developers/libdvdnav.html
 IUSE=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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libdvdread-5.0.3[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://downloads.videolan.org/pub/videolan/libdvdnav/6.0.0/libdvdnav-6.0.0.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c960cb4ba422dd2e4d6dc418a5fa78fe
+_md5_=a88291149bc97bef93d63cdf305ace71
diff --git a/metadata/md5-cache/media-libs/libdvdread-6.0.0 b/metadata/md5-cache/media-libs/libdvdread-6.0.0
index 43b84bd5f37a..606a85f3934f 100644
--- a/metadata/md5-cache/media-libs/libdvdread-6.0.0
+++ b/metadata/md5-cache/media-libs/libdvdread-6.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Library for DVD navigation tools
 EAPI=6
 HOMEPAGE=https://www.videolan.org/developers/libdvdnav.html
 IUSE=+css 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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=css? ( >=media-libs/libdvdcss-1.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(-)?] )
 SLOT=0
 SRC_URI=https://downloads.videolan.org/pub/videolan/libdvdread/6.0.0/libdvdread-6.0.0.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f61df7dc5c910a23b48b66a96fa84039
+_md5_=79521e2e9541240947fae41491045187
diff --git a/metadata/md5-cache/media-libs/libebur128-1.2.3 b/metadata/md5-cache/media-libs/libebur128-1.2.3
index 47d2485e016f..f0fc6e8d7e70 100644
--- a/metadata/md5-cache/media-libs/libebur128-1.2.3
+++ b/metadata/md5-cache/media-libs/libebur128-1.2.3
@@ -4,9 +4,9 @@ DESCRIPTION=A library implementing the EBU R128 loudness standard
 EAPI=6
 HOMEPAGE=https://github.com/jiixyj/libebur128
 IUSE=static-libs test 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 ~hppa ia64 ~ppc ~ppc64 x86
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 x86
 LICENSE=MIT
 SLOT=0/1
 SRC_URI=https://github.com/jiixyj/libebur128/archive/v1.2.3.tar.gz -> libebur128-1.2.3.tar.gz test? ( https://tech.ebu.ch/files/live/sites/tech/files/shared/testmaterial/ebu-loudness-test-setv05.zip )
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a017d44ff009b5d84cb6b70c20bbf42a
+_md5_=fbaeb0ed2b25d45761e74e4656f14160
diff --git a/metadata/md5-cache/media-libs/libfreehand-0.1.2 b/metadata/md5-cache/media-libs/libfreehand-0.1.2
index ba34cefc85d6..27f71e10f28c 100644
--- a/metadata/md5-cache/media-libs/libfreehand-0.1.2
+++ b/metadata/md5-cache/media-libs/libfreehand-0.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Library for import of FreeHand drawings
 EAPI=6
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libfreehand
 IUSE=doc static-libs test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86
 LICENSE=MPL-2.0
 RDEPEND=dev-libs/librevenge sys-libs/zlib
 SLOT=0
 SRC_URI=https://dev-www.libreoffice.org/src/libfreehand/libfreehand-0.1.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e5b81bbaaea48d93eead3d62f8a49abf
+_md5_=480fb0e6d25a6831c345623237b263d1
diff --git a/metadata/md5-cache/media-libs/libkate-0.4.1-r3 b/metadata/md5-cache/media-libs/libkate-0.4.1-r3
index bc8f84969f89..54cd9cc41f08 100644
--- a/metadata/md5-cache/media-libs/libkate-0.4.1-r3
+++ b/metadata/md5-cache/media-libs/libkate-0.4.1-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Codec for karaoke and text encapsulation for Ogg
 EAPI=6
 HOMEPAGE=https://code.google.com/p/libkate/
 IUSE=debug doc wxwidgets 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 python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 RDEPEND=media-libs/libogg:=[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/libpng: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(-)?] wxwidgets? ( 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(+)] dev-python/wxpython:3.0[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(+)] media-libs/liboggz )
 REQUIRED_USE=wxwidgets? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://libkate.googlecode.com/files/libkate-0.4.1.tar.gz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=690cb152683f3bc31fbe893e15d9a1c7
+_md5_=6c0636a8ce435a92b0438dc815f04d4c
diff --git a/metadata/md5-cache/media-libs/libogg-1.3.3 b/metadata/md5-cache/media-libs/libogg-1.3.3
index e3d7c5df246e..1172009729a7 100644
--- a/metadata/md5-cache/media-libs/libogg-1.3.3
+++ b/metadata/md5-cache/media-libs/libogg-1.3.3
@@ -3,9 +3,9 @@ DESCRIPTION=the Ogg media file format library
 EAPI=6
 HOMEPAGE=https://xiph.org/ogg/
 IUSE=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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://downloads.xiph.org/releases/ogg/libogg-1.3.3.tar.xz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ab34a01f4abd83394247c3e903b6b024
+_md5_=36eb7d6e78f442fabf2c38ae53f6996b
diff --git a/metadata/md5-cache/media-libs/libpagemaker-0.0.3-r1 b/metadata/md5-cache/media-libs/libpagemaker-0.0.3-r1
index d5f277cb80f7..c00e7e18e0c7 100644
--- a/metadata/md5-cache/media-libs/libpagemaker-0.0.3-r1
+++ b/metadata/md5-cache/media-libs/libpagemaker-0.0.3-r1
@@ -4,9 +4,9 @@ DESCRIPTION=C++ Library that parses the file format of Aldus/Adobe PageMaker doc
 EAPI=6
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker
 IUSE=debug doc tools
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MPL-2.0
 RDEPEND=dev-libs/librevenge
 SLOT=0
 SRC_URI=http://dev-www.libreoffice.org/src/libpagemaker/libpagemaker-0.0.3.tar.xz
-_md5_=193f68888b2198398f2c4af8fab4d782
+_md5_=d0b4ab8d9e6832bea015ac605e099771
diff --git a/metadata/md5-cache/media-libs/libsdl2-2.0.7 b/metadata/md5-cache/media-libs/libsdl2-2.0.7
index 5a18c78f619a..09644f87f4df 100644
--- a/metadata/md5-cache/media-libs/libsdl2-2.0.7
+++ b/metadata/md5-cache/media-libs/libsdl2-2.0.7
@@ -4,11 +4,11 @@ DESCRIPTION=Simple Direct Media Layer
 EAPI=6
 HOMEPAGE=http://www.libsdl.org
 IUSE=cpu_flags_x86_3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver 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 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=ZLIB
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.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(-)?] ) dbus? ( >=sys-apps/dbus-1.6.18-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(-)?] ) fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] ) gles? ( >=media-libs/mesa-9.1.6[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(-)?,gles2] ) nas? ( >=media-libs/nas-1.9.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(-)?] ) opengl? ( >=virtual/opengl-7.0-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(-)?] >=virtual/glu-9.0-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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-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(-)?] ) tslib? ( >=x11-libs/tslib-1.0-r3[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(-)?] ) udev? ( >=virtual/libudev-208:=[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(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[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/mesa-9.1.6[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(-)?,egl,gles2,wayland] >=x11-libs/libxkbcommon-0.2.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(-)?] ) X? ( >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libXcursor-1.1.14[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-1.3.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(-)?] >=x11-libs/libXi-1.7.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(-)?] >=x11-libs/libXrandr-1.4.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(-)?] >=x11-libs/libXt-1.1.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(-)?] >=x11-libs/libXxf86vm-1.1.3[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(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[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(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-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(-)?] ) )
 REQUIRED_USE=alsa? ( sound ) fusionsound? ( sound ) gles? ( video ) nas? ( sound ) opengl? ( video ) pulseaudio? ( sound ) wayland? ( gles ) xinerama? ( X ) xscreensaver? ( X )
 SLOT=0
 SRC_URI=http://www.libsdl.org/release/SDL2-2.0.7.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9cd4f397dc9d51c1ae2eeef9d3829eb9
+_md5_=1e2d6d08d53f35d2be4c76f816db6493
diff --git a/metadata/md5-cache/media-libs/libsdl2-2.0.8 b/metadata/md5-cache/media-libs/libsdl2-2.0.8
index 199a9788d3d8..0dc824fff773 100644
--- a/metadata/md5-cache/media-libs/libsdl2-2.0.8
+++ b/metadata/md5-cache/media-libs/libsdl2-2.0.8
@@ -4,11 +4,11 @@ DESCRIPTION=Simple Direct Media Layer
 EAPI=6
 HOMEPAGE=http://www.libsdl.org
 IUSE=cpu_flags_x86_3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver 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 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=ZLIB
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.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(-)?] ) dbus? ( >=sys-apps/dbus-1.6.18-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(-)?] ) fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] ) gles? ( >=media-libs/mesa-9.1.6[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(-)?,gles2] ) nas? ( >=media-libs/nas-1.9.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(-)?] ) opengl? ( >=virtual/opengl-7.0-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(-)?] >=virtual/glu-9.0-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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-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(-)?] ) tslib? ( >=x11-libs/tslib-1.0-r3[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(-)?] ) udev? ( >=virtual/libudev-208:=[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(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[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/mesa-9.1.6[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(-)?,egl,gles2,wayland] >=x11-libs/libxkbcommon-0.2.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(-)?] ) X? ( >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libXcursor-1.1.14[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-1.3.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(-)?] >=x11-libs/libXi-1.7.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(-)?] >=x11-libs/libXrandr-1.4.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(-)?] >=x11-libs/libXt-1.1.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(-)?] >=x11-libs/libXxf86vm-1.1.3[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(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[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(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-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(-)?] ) )
 REQUIRED_USE=alsa? ( sound ) fusionsound? ( sound ) gles? ( video ) nas? ( sound ) opengl? ( video ) pulseaudio? ( sound ) wayland? ( gles ) xinerama? ( X ) xscreensaver? ( X )
 SLOT=0
 SRC_URI=http://www.libsdl.org/release/SDL2-2.0.8.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9cd4f397dc9d51c1ae2eeef9d3829eb9
+_md5_=1e2d6d08d53f35d2be4c76f816db6493
diff --git a/metadata/md5-cache/media-libs/libshout-2.4.1-r1 b/metadata/md5-cache/media-libs/libshout-2.4.1-r1
index ed5342660899..b7d207b08fb1 100644
--- a/metadata/md5-cache/media-libs/libshout-2.4.1-r1
+++ b/metadata/md5-cache/media-libs/libshout-2.4.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=library for connecting and sending data to icecast servers
 EAPI=6
 HOMEPAGE=http://www.icecast.org/
 IUSE=libressl speex static-libs theora 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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2
 RDEPEND=>=media-libs/libogg-1.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(-)?] >=media-libs/libvorbis-1.3.3-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(-)?] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) speex? ( >=media-libs/speex-1.2_rc1-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(-)?] ) theora? ( >=media-libs/libtheora-1.1.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(-)?] )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/libshout/libshout-2.4.1.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6b9e6029a3b77fe1cc61915674b6a289
+_md5_=903c9e6ef33c42f4b1a7a16a8a07fa4d
diff --git a/metadata/md5-cache/media-libs/libtiger-0.3.4-r1 b/metadata/md5-cache/media-libs/libtiger-0.3.4-r1
index 355c97ad1f62..4e8859e21b48 100644
--- a/metadata/md5-cache/media-libs/libtiger-0.3.4-r1
+++ b/metadata/md5-cache/media-libs/libtiger-0.3.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A rendering library for Kate streams using Pango and Cairo
 EAPI=6
 HOMEPAGE=https://code.google.com/p/libtiger/
 IUSE=doc 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 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 RDEPEND=x11-libs/pango[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/libkate-0.2.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(-)?] x11-libs/cairo[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://libtiger.googlecode.com/files/libtiger-0.3.4.tar.gz
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d16159f40c6c5d819137af5b68826c2a
+_md5_=12e7451197a2ca83764e0b20af8e02c5
diff --git a/metadata/md5-cache/media-libs/opus-1.2.1 b/metadata/md5-cache/media-libs/opus-1.2.1
index 30d636d893ec..9a905e8b3e1f 100644
--- a/metadata/md5-cache/media-libs/opus-1.2.1
+++ b/metadata/md5-cache/media-libs/opus-1.2.1
@@ -4,9 +4,9 @@ DESCRIPTION=Open codec designed for internet transmission of interactive speech
 EAPI=6
 HOMEPAGE=https://opus-codec.org/
 IUSE=ambisonics custom-modes doc static-libs cpu_flags_x86_sse cpu_flags_arm_neon 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
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/opus/opus-1.2.1.tar.gz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2d01c3295634e5acf0e0a5e842f50f24
+_md5_=0b09bfacf3e023caf765eaa1e3b6214a
diff --git a/metadata/md5-cache/media-libs/resid-0.16_p2-r1 b/metadata/md5-cache/media-libs/resid-0.16_p2-r1
index b299c706c0dc..381e8bf226c7 100644
--- a/metadata/md5-cache/media-libs/resid-0.16_p2-r1
+++ b/metadata/md5-cache/media-libs/resid-0.16_p2-r1
@@ -4,9 +4,9 @@ DESCRIPTION=C++ library to emulate the C64 SID chip
 EAPI=6
 HOMEPAGE=http://sidplay2.sourceforge.net
 IUSE=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 ~ppc ~sparc ~x86
+KEYWORDS=alpha ~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/sidplay2/resid-0.16-p2.tgz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=6080f26473398272c49bb6044298eed1
+_md5_=1d7962aa5fcd2436db5027d1e46100d4
diff --git a/metadata/md5-cache/media-libs/sdl2-gfx-1.0.4 b/metadata/md5-cache/media-libs/sdl2-gfx-1.0.4
new file mode 100644
index 000000000000..f14c4c6b2d4a
--- /dev/null
+++ b/metadata/md5-cache/media-libs/sdl2-gfx-1.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-libs/libsdl2-2.0.1-r1[video,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(-)?] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Graphics drawing primitives library for SDL2
+EAPI=6
+HOMEPAGE=http://www.ferzkopp.net/joomla/content/view/19/14/
+IUSE=doc cpu_flags_x86_mmx 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=~amd64 ~x86
+LICENSE=ZLIB
+RDEPEND=>=media-libs/libsdl2-2.0.1-r1[video,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=http://www.ferzkopp.net/Software/SDL2_gfx/SDL2_gfx-1.0.4.tar.gz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=05ab2af6ea9bde8abaab202d9804633e
diff --git a/metadata/md5-cache/media-libs/sdl2-image-2.0.3 b/metadata/md5-cache/media-libs/sdl2-image-2.0.3
new file mode 100644
index 000000000000..e1ce46bf0eb5
--- /dev/null
+++ b/metadata/md5-cache/media-libs/sdl2-image-2.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libsdl2-2.0.1-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-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(-)?] png? ( >=media-libs/libpng-1.6.10: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(-)?] ) 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(-)?] ) tiff? ( >=media-libs/tiff-3.9.7-r1: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(-)?] ) webp? ( >=media-libs/libwebp-0.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(-)?] )
+DESCRIPTION=Image file loading library
+EAPI=6
+HOMEPAGE=http://www.libsdl.org/projects/SDL_image/
+IUSE=gif jpeg png static-libs tiff webp 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=ZLIB
+RDEPEND=>=media-libs/libsdl2-2.0.1-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-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(-)?] png? ( >=media-libs/libpng-1.6.10: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(-)?] ) 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(-)?] ) tiff? ( >=media-libs/tiff-3.9.7-r1: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(-)?] ) webp? ( >=media-libs/libwebp-0.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(-)?] )
+SLOT=0
+SRC_URI=http://www.libsdl.org/projects/SDL_image/release/SDL2_image-2.0.3.tar.gz
+_eclasses_=ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=1b735d40d4ead52121cc72aae820671f
diff --git a/metadata/md5-cache/media-libs/simage-1.7.0 b/metadata/md5-cache/media-libs/simage-1.7.0
deleted file mode 100644
index 0c0cada5971b..000000000000
--- a/metadata/md5-cache/media-libs/simage-1.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) png? ( media-libs/libpng:0 ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib ) virtual/pkgconfig
-DESCRIPTION=Image and video texturing library
-EAPI=2
-HOMEPAGE=https://bitbucket.org/Coin3D/simage
-IUSE=debug gif jpeg jpeg2k png sndfile static-libs tiff vorbis zlib
-KEYWORDS=amd64 ~arm ppc x86
-LICENSE=public-domain mpeg2enc
-RDEPEND=gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) png? ( media-libs/libpng:0 ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib )
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=https://bitbucket.org/Coin3D/coin/downloads/simage-1.7.0.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0f059a735b3313773ec5deaf5dd7c78a
diff --git a/metadata/md5-cache/media-libs/simage-1.7.0-r1 b/metadata/md5-cache/media-libs/simage-1.7.0-r1
index f8cf8c28ef6b..dfc621282d8e 100644
--- a/metadata/md5-cache/media-libs/simage-1.7.0-r1
+++ b/metadata/md5-cache/media-libs/simage-1.7.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Image and video texturing library
 EAPI=6
 HOMEPAGE=https://bitbucket.org/Coin3D/simage
 IUSE=debug gif jpeg jpeg2k png sndfile static-libs tiff vorbis zlib
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~hppa ~ia64 ppc ~ppc64 x86
 LICENSE=public-domain mpeg2enc
 RDEPEND=gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/jasper ) png? ( media-libs/libpng:0= ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0= ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib )
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://bitbucket.org/Coin3D/coin/downloads/simage-1.7.0.tar.gz
-_md5_=917c7bb1b655e2b57a51f3dade9c7532
+_md5_=c1e834654a954683075ee9b0228b6b62
diff --git a/metadata/md5-cache/media-libs/x264-0.0.20170701 b/metadata/md5-cache/media-libs/x264-0.0.20170701
index cfc4d86ec734..d57ce5c91d26 100644
--- a/metadata/md5-cache/media-libs/x264-0.0.20170701
+++ b/metadata/md5-cache/media-libs/x264-0.0.20170701
@@ -4,10 +4,10 @@ DESCRIPTION=A free library for encoding X264/AVC streams
 EAPI=6
 HOMEPAGE=https://www.videolan.org/developers/x264.html
 IUSE=10bit altivec +interlaced opencl pic static-libs cpu_flags_x86_sse +threads 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 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=opencl? ( >=virtual/opencl-0-r3[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/152
 SRC_URI=https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20170701-2245.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=247a99c36389a31a6fd4310e206e8493
+_md5_=3cd118dae3e1ec43f853acc688d4541b
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 069d8dc8d9ab..76b4e3cc542b 100644
Binary files a/metadata/md5-cache/media-plugins/Manifest.gz and b/metadata/md5-cache/media-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/media-plugins/live-2017.10.28 b/metadata/md5-cache/media-plugins/live-2017.10.28
index 439c28d979df..2968f35c4022 100644
--- a/metadata/md5-cache/media-plugins/live-2017.10.28
+++ b/metadata/md5-cache/media-plugins/live-2017.10.28
@@ -3,9 +3,9 @@ DESCRIPTION=Libraries for standards-based RTP/RTCP/RTSP multimedia streaming
 EAPI=5
 HOMEPAGE=http://www.live555.com/
 IUSE=examples 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 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 SLOT=0/7
 SRC_URI=http://www.live555.com/liveMedia/public/live.2017.10.28.tar.gz mirror://gentoo/live.2017.10.28.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5bfe6a8358238f569c3372edeaf55367
+_md5_=b18536e6a76d3de2dbe4a3e8d7a6b720
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 2ad2aa5cca31..9c5805adba4d 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/bpmdetect-0.6.1-r1 b/metadata/md5-cache/media-sound/bpmdetect-0.6.1-r1
deleted file mode 100644
index 303f0d864ffd..000000000000
--- a/metadata/md5-cache/media-sound/bpmdetect-0.6.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=media-libs/taglib media-libs/id3lib >=media-libs/fmod-4.25.07-r1:1 dev-qt/qtgui:4 sys-apps/sed dev-util/scons virtual/pkgconfig dev-util/scons
-DESCRIPTION=Automatic BPM detection utility
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/bpmdetect
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=media-libs/taglib media-libs/id3lib >=media-libs/fmod-4.25.07-r1:1 dev-qt/qtgui:4
-SLOT=0
-SRC_URI=mirror://sourceforge/bpmdetect/bpmdetect-0.6.1-src.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	fcace052aef60e6b0eb3023c26aa585a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=eff0703a9f460194cc54623a2f838ff6
diff --git a/metadata/md5-cache/media-sound/bpmdetect-0.7.0_pre20170810 b/metadata/md5-cache/media-sound/bpmdetect-0.7.0_pre20170810
new file mode 100644
index 000000000000..b9437c2ffbe9
--- /dev/null
+++ b/metadata/md5-cache/media-sound/bpmdetect-0.7.0_pre20170810
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 media-libs/flac media-libs/libmad media-libs/libvorbis media-libs/portaudio media-libs/taglib virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Automatic BPM detection utility
+EAPI=6
+HOMEPAGE=https://github.com/Tatsh/bpmdetect
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 media-libs/flac media-libs/libmad media-libs/libvorbis media-libs/portaudio media-libs/taglib
+SLOT=0
+SRC_URI=https://github.com/Tatsh/bpmdetect/archive/b13aac15904c1f821b1739d00445f49432705387.tar.gz -> bpmdetect-0.7.0_pre20170810.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ae3f05e4d44f46489c300370fa5a0580
diff --git a/metadata/md5-cache/media-sound/deinvert-9999 b/metadata/md5-cache/media-sound/deinvert-9999
new file mode 100644
index 000000000000..2088b465b41f
--- /dev/null
+++ b/metadata/md5-cache/media-sound/deinvert-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure prepare unpack
+DEPEND=liquid? ( net-libs/liquid-dsp ) wav? ( media-libs/libsndfile ) >=dev-vcs/git-1.8.2.1 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A voice inversion descrambler
+EAPI=6
+HOMEPAGE=https://github.com/windytan/deinvert
+IUSE=+liquid +wav
+LICENSE=MIT
+RDEPEND=liquid? ( net-libs/liquid-dsp ) wav? ( media-libs/libsndfile )
+SLOT=0
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=6f5dd42bf72a8337710dcd76576bd5ed
diff --git a/metadata/md5-cache/media-sound/grip-3.4.3 b/metadata/md5-cache/media-sound/grip-3.4.3
index 6991f94cfbb9..e893e6928ce7 100644
--- a/metadata/md5-cache/media-sound/grip-3.4.3
+++ b/metadata/md5-cache/media-sound/grip-3.4.3
@@ -4,10 +4,10 @@ DESCRIPTION=GTK+ based Audio CD Player/Ripper
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/grip/
 IUSE=vorbis
-KEYWORDS=alpha amd64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=gnome-base/libgnome >=gnome-base/libgnomeui-2.2.0 >=media-libs/id3lib-3.8.3 media-sound/cdparanoia media-sound/lame net-misc/curl >=x11-libs/gtk+-2.2:2 x11-libs/libX11 x11-libs/pango x11-libs/vte:0 vorbis? ( media-sound/vorbis-tools )
 SLOT=0
 SRC_URI=mirror://sourceforge/grip/grip-3.4.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f1427579919f261ddc6c0bdd0255ced2
+_md5_=6ed5e10c01192bd67e3c92e9d6733b35
diff --git a/metadata/md5-cache/media-sound/mpfc-1.3.8.1-r2 b/metadata/md5-cache/media-sound/mpfc-1.3.8.1-r2
index 1eb87e40803e..a6fa55e189ca 100644
--- a/metadata/md5-cache/media-sound/mpfc-1.3.8.1-r2
+++ b/metadata/md5-cache/media-sound/mpfc-1.3.8.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Music Player For Console
 EAPI=6
 HOMEPAGE=http://mpfc.sourceforge.net/
 IUSE=alsa cdda flac gpm mad nls oss static-libs vorbis wav
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=alsa? ( >=media-libs/alsa-lib-0.9.0 ) flac? ( media-libs/flac ) gpm? ( >=sys-libs/gpm-1.19.3 ) mad? ( media-libs/libmad ) vorbis? ( media-libs/libvorbis ) sys-libs/ncurses:0=[unicode] dev-libs/icu:=
 SLOT=0
 SRC_URI=mirror://sourceforge/mpfc/mpfc-1.3.8.1.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3f2c6757d6b80dc7afc821e5d82c5021
+_md5_=8c1edf58960f732620e6e20302b43aff
diff --git a/metadata/md5-cache/media-sound/twolame-0.3.13-r2 b/metadata/md5-cache/media-sound/twolame-0.3.13-r2
index 4ad47fdd8615..4f5574131bc3 100644
--- a/metadata/md5-cache/media-sound/twolame-0.3.13-r2
+++ b/metadata/md5-cache/media-sound/twolame-0.3.13-r2
@@ -4,10 +4,10 @@ DESCRIPTION=An optimised MPEG Audio Layer 2 (MP2) encoder
 EAPI=6
 HOMEPAGE=http://www.twolame.org
 IUSE=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 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libsndfile-1.0.25[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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r6 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/twolame/twolame-0.3.13.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b00d4504f29a7152494ec728007d6c76
+_md5_=18d7fb7c2458835d5a170c48ebfb4cc7
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 9031b1d4bfd0..328a9d839fb5 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/mediainfo-17.12 b/metadata/md5-cache/media-video/mediainfo-17.12
index c0312f6f7b6d..10b9ae0195f0 100644
--- a/metadata/md5-cache/media-video/mediainfo-17.12
+++ b/metadata/md5-cache/media-video/mediainfo-17.12
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=sys-libs/zlib >=media-libs/libzen-0.4.37 ~media-libs/libmediainfo-17.12[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.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=sys-libs/zlib >=media-libs/libzen-0.4.37 ~media-libs/libmediainfo-17.12[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:3.0[X] ) virtual/pkgconfig >=sys-apps/sed-4 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1: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
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=sys-libs/zlib >=media-libs/libzen-0.4.37 ~media-libs/libmediainfo-17.12[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:3.0[X] )
 SLOT=0
 SRC_URI=https://mediaarea.net/download/source/mediainfo/17.12/mediainfo_17.12.tar.xz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=55e8a327d5b76515cdc6aac4e9f0c7cd
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=780095202c66fad653d308e0dcc69c5a
diff --git a/metadata/md5-cache/media-video/mpv-0.27.2 b/metadata/md5-cache/media-video/mpv-0.27.2
index 3326aa9e8240..3d40e0f81305 100644
--- a/metadata/md5-cache/media-video/mpv-0.27.2
+++ b/metadata/md5-cache/media-video/mpv-0.27.2
@@ -4,11 +4,11 @@ DESCRIPTION=Media player based on MPlayer and mplayer2
 EAPI=6
 HOMEPAGE=https://mpv.io/
 IUSE=+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb dvd +egl encode gbm +iconv jack javascript jpeg lcms +libass libav libcaca libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib zsh-completion python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux
+KEYWORDS=alpha amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux
 LICENSE=LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )
 RDEPEND=!libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] ) libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] ) alsa? ( >=media-libs/alsa-lib-1.0.18 ) archive? ( >=app-arch/libarchive-3.0.0:= ) bluray? ( >=media-libs/libbluray-0.3.0:= ) cdda? ( dev-libs/libcdio-paranoia ) cuda? ( >=media-video/ffmpeg-3.3:0 ) drm? ( x11-libs/libdrm ) dvd? ( >=media-libs/libdvdnav-4.2.0 >=media-libs/libdvdread-4.1.0 ) egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( >=dev-lang/mujs-1.0.0 ) jpeg? ( virtual/jpeg:0 ) lcms? ( >=media-libs/lcms-2.6:2 ) libass? ( >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) lua? ( !luajit? ( <dev-lang/lua-5.3:= ) luajit? ( dev-lang/luajit:2 ) ) openal? ( >=media-libs/openal-1.13 ) pulseaudio? ( media-sound/pulseaudio ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[sound,threads,video] ) v4l? ( media-libs/libv4l ) vaapi? ( !libav? ( >=media-video/ffmpeg-3.3:0 ) libav? ( >=media-video/libav-13:0 ) x11-libs/libva:=[drm?,X?,wayland?] ) vdpau? ( !libav? ( >=media-video/ffmpeg-3.3:0 ) libav? ( >=media-video/libav-13:0 ) x11-libs/libvdpau ) wayland? ( >=dev-libs/wayland-1.6.0 >=x11-libs/libxkbcommon-0.3.0 ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr opengl? ( x11-libs/libXdamage virtual/opengl ) xv? ( x11-libs/libXv ) ) zlib? ( sys-libs/zlib ) cuda? ( x11-drivers/nvidia-drivers[X] ) selinux? ( sec-policy/selinux-mplayer ) tools? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=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=|| ( cli libmpv ) aqua? ( opengl ) cuda? ( !libav opengl ) egl? ( || ( gbm X wayland ) ) gbm? ( drm egl opengl ) lcms? ( opengl ) luajit? ( lua ) opengl? ( || ( aqua egl X raspberry-pi !cli ) ) raspberry-pi? ( opengl ) test? ( opengl ) tools? ( cli ) uchardet? ( iconv ) v4l? ( || ( alsa oss ) ) vaapi? ( || ( gbm X wayland ) ) vdpau? ( X ) wayland? ( egl ) X? ( egl? ( opengl ) ) xv? ( X ) zsh-completion? ( cli ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/mpv-player/mpv/archive/v0.27.2.tar.gz -> mpv-0.27.2.tar.gz https://dev.gentoo.org/~kensington/distfiles/mpv-0.27.2-patches-r0.tar.xz https://waf.io/waf-1.9.8
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	d1ea2758053cbb7c5b38b8f88654468d	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=58392fde9b027c1ffb8ac20a9d150486
+_md5_=4eaaf5a701a912ad56413a8652037819
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 3ad54ed154e0..49072287f712 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/idnkit-2.3 b/metadata/md5-cache/net-dns/idnkit-2.3
index 227f4850e24d..6204d12cf0fd 100644
--- a/metadata/md5-cache/net-dns/idnkit-2.3
+++ b/metadata/md5-cache/net-dns/idnkit-2.3
@@ -10,4 +10,4 @@ RDEPEND=virtual/libiconv
 SLOT=0
 SRC_URI=https://jprs.co.jp/idn/idnkit-2.3.tar.bz2
 _eclasses_=ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ae1736930da51a356d34b9b682c55b06
+_md5_=fca751d41467fb254c5a84248ade35f7
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index adc8ffa4d50b..151fddf5eed9 100644
Binary files a/metadata/md5-cache/net-firewall/Manifest.gz and b/metadata/md5-cache/net-firewall/Manifest.gz differ
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.1.12.3 b/metadata/md5-cache/net-firewall/shorewall-5.1.12.3
new file mode 100644
index 000000000000..82c54a2edc30
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/shorewall-5.1.12.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=A high-level tool for configuring Netfilter
+EAPI=6
+HOMEPAGE=http://www.shorewall.net/
+IUSE=doc +init +ipv4 ipv6 lite4 lite6 selinux
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214
+REQUIRED_USE=ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 )
+SLOT=0
+SRC_URI=http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.12/shorewall-core-5.1.12.3.tar.bz2 ipv4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.12/shorewall-5.1.12.3.tar.bz2 ) ipv6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.12/shorewall6-5.1.12.3.tar.bz2 ) lite4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.12/shorewall-lite-5.1.12.3.tar.bz2 ) lite6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.12/shorewall6-lite-5.1.12.3.tar.bz2 ) init? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.12/shorewall-init-5.1.12.3.tar.bz2 ) doc? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.12/shorewall-docs-html-5.1.12.3.tar.bz2 )
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=e3f12abc0c511f8904a17ab3820ab78b
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index e9b801285124..901bd0e511bf 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-1.5.0 b/metadata/md5-cache/net-im/signal-desktop-bin-1.5.2
similarity index 85%
rename from metadata/md5-cache/net-im/signal-desktop-bin-1.5.0
rename to metadata/md5-cache/net-im/signal-desktop-bin-1.5.2
index da8d8300016c..5b93792b6db1 100644
--- a/metadata/md5-cache/net-im/signal-desktop-bin-1.5.0
+++ b/metadata/md5-cache/net-im/signal-desktop-bin-1.5.2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install postinst postrm unpack
 DEPEND=>=sys-apps/sed-4
-DESCRIPTION=Signal Desktop
+DESCRIPTION=Allows you to send and receive messages of Signal Messenger on your computer
 EAPI=6
 HOMEPAGE=https://signal.org/ https://github.com/WhisperSystems/Signal-Desktop
 IUSE=ayatana
@@ -9,6 +9,6 @@ LICENSE=GPL-3
 RDEPEND=gnome-base/gconf:2 dev-libs/nss x11-libs/libXtst net-print/cups ayatana? ( dev-libs/libappindicator:3 )
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_1.5.0_amd64.deb
+SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_1.5.2_amd64.deb
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2ebefa3ae45f3052bcaffea6e53b7e52
+_md5_=fd3b8eaafd4ec082ff5552b9bc49ad91
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index d597ce947e99..2b3253771677 100644
Binary files a/metadata/md5-cache/net-irc/Manifest.gz and b/metadata/md5-cache/net-irc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-irc/muh-2.2a-r1 b/metadata/md5-cache/net-irc/muh-2.2a-r1
index a2c3e38df595..f1b725a4372d 100644
--- a/metadata/md5-cache/net-irc/muh-2.2a-r1
+++ b/metadata/md5-cache/net-irc/muh-2.2a-r1
@@ -3,8 +3,8 @@ DESCRIPTION=Persistent IRC bouncer
 EAPI=6
 HOMEPAGE=http://mind.riot.org/muh/
 IUSE=ipv6
-KEYWORDS=~alpha amd64 ~hppa ~mips ~ppc ~sparc x86
+KEYWORDS=alpha amd64 ~hppa ~mips ~ppc ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/muh/muh-2.2a.tar.gz
-_md5_=2f7ce610ac0869b73f348f17e8fdb70c
+_md5_=fb510dc4b2f8466ebb0ce35f75a97dcf
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 5400e23b327e..0c0736c03b00 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/libident-0.32-r1 b/metadata/md5-cache/net-libs/libident-0.32-r1
index 4dc1b7acffa8..b76a8b67d418 100644
--- a/metadata/md5-cache/net-libs/libident-0.32-r1
+++ b/metadata/md5-cache/net-libs/libident-0.32-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=A small library to interface to the Ident protocol server
 EAPI=6
 HOMEPAGE=http://www.simphalempin.com/dev/libident/
-KEYWORDS=~alpha amd64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=alpha amd64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://people.via.ecp.fr/~rem/libident/libident-0.32.tar.bz2
-_md5_=1250ed57bb1914cb74d0fd24acf46859
+_md5_=9905f0d39c1737d8901723ccd68d80ea
diff --git a/metadata/md5-cache/net-libs/libnfsidmap-0.25-r1 b/metadata/md5-cache/net-libs/libnfsidmap-0.25-r1
index 4ac08080519b..a9478cded52f 100644
--- a/metadata/md5-cache/net-libs/libnfsidmap-0.25-r1
+++ b/metadata/md5-cache/net-libs/libnfsidmap-0.25-r1
@@ -4,10 +4,10 @@ DESCRIPTION=NFSv4 ID <-> name mapping library
 EAPI=4
 HOMEPAGE=http://www.citi.umich.edu/projects/nfsv4/linux/
 IUSE=ldap static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=BSD
 RDEPEND=ldap? ( net-nds/openldap ) !<net-fs/nfs-utils-1.2.2 !net-fs/idmapd
 SLOT=0
 SRC_URI=http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/libnfsidmap-0.25.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e25c942c14fadaa26dfa09cfa06543eb
+_md5_=a6646d8f16f14470d0a7b09e42fdb832
diff --git a/metadata/md5-cache/net-libs/libsoup-2.58.2 b/metadata/md5-cache/net-libs/libsoup-2.58.2
index 57d822016183..e97bf6c955b9 100644
--- a/metadata/md5-cache/net-libs/libsoup-2.58.2
+++ b/metadata/md5-cache/net-libs/libsoup-2.58.2
@@ -4,11 +4,11 @@ DESCRIPTION=An HTTP library implementation in C
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/libsoup
 IUSE=debug gssapi +introspection samba ssl test vala 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 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.34.3: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/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-db/sqlite-3.8.2:3[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(-)?] >=net-libs/glib-networking-2.38.2[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(-)?] gssapi? ( virtual/krb5[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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) samba? ( net-fs/samba )
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/libsoup/2.58/libsoup-2.58.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5d7928dbec11ba183e70a3a3d653d656
+_md5_=39fb3f5cb5cfb7d8230fbde30d49e303
diff --git a/metadata/md5-cache/net-libs/libtrace-4.0.1 b/metadata/md5-cache/net-libs/libtrace-4.0.3
similarity index 96%
rename from metadata/md5-cache/net-libs/libtrace-4.0.1
rename to metadata/md5-cache/net-libs/libtrace-4.0.3
index b7d3823c96bf..bc451259e156 100644
--- a/metadata/md5-cache/net-libs/libtrace-4.0.1
+++ b/metadata/md5-cache/net-libs/libtrace-4.0.3
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libpcap-0.8 dev-libs/openssl:0= ncurses? ( sys-libs/ncurses:0= ) net-libs/wandio numa? ( sys-process/numactl )
 SLOT=0
-SRC_URI=http://research.wand.net.nz/software/libtrace/libtrace-4.0.1.tar.gz
+SRC_URI=http://research.wand.net.nz/software/libtrace/libtrace-4.0.3.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b7cb995c297b8b48ebd4c26f52a1bf3f
+_md5_=50c96ce44813f4a3818d94a5f99e549d
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.7.1 b/metadata/md5-cache/net-libs/mbedtls-2.7.1
index bf9816ae124a..3d770be5df13 100644
--- a/metadata/md5-cache/net-libs/mbedtls-2.7.1
+++ b/metadata/md5-cache/net-libs/mbedtls-2.7.1
@@ -4,10 +4,10 @@ DESCRIPTION=Cryptographic library for embedded systems
 EAPI=6
 HOMEPAGE=https://tls.mbed.org/
 IUSE=cpu_flags_x86_sse2 doc havege libressl programs test threads 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 ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=Apache-2.0
 RDEPEND=programs? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( >=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(-)?] )
 SLOT=0/10
 SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.7.1.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6b1a9aeb89c09f01ab6034c7d7d01dc7
+_md5_=3d1a97f4293a9b2798a1e906b78b0193
diff --git a/metadata/md5-cache/net-libs/phodav-2.2 b/metadata/md5-cache/net-libs/phodav-2.2
index 10a8a1bee8c1..3c85e7e5e252 100644
--- a/metadata/md5-cache/net-libs/phodav-2.2
+++ b/metadata/md5-cache/net-libs/phodav-2.2
@@ -4,10 +4,10 @@ DESCRIPTION=WebDav server implementation using libsoup
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/phodav
 IUSE=spice systemd zeroconf
-KEYWORDS=~alpha amd64 ~arm ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ~arm ppc ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.51:2 >=net-libs/libsoup-2.48:2.4 dev-libs/libxml2 zeroconf? ( net-dns/avahi )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/phodav/2.2/phodav-2.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7268364c2e83ae341e14854787403623
+_md5_=d22bb4b31a7677d3019cf53a70fe5fb5
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 7f6649996fb5..2a85dd2aec19 100644
Binary files a/metadata/md5-cache/net-mail/Manifest.gz and b/metadata/md5-cache/net-mail/Manifest.gz differ
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.34 b/metadata/md5-cache/net-mail/dovecot-2.2.34
index 5b2af5583fc3..7b0fbab72391 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.2.34
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.34
@@ -4,11 +4,11 @@ DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
 EAPI=6
 HOMEPAGE=https://www.dovecot.org/
 IUSE=kerberos ldap mysql pam postgres sqlite vpopmail bzip2 lzma lz4 zlib caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat ssl
-KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=LGPL-2.1 MIT
 RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
 REQUIRED_USE=ssl
 SLOT=0
 SRC_URI=https://dovecot.org/releases/2.2/dovecot-2.2.34.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.21.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.21.tar.gz )
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=55f1e8b69a07d611146571942adf383d
+_md5_=5f762e5a4ff4da162be137d109eb7ec6
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index fd54590b803f..eee87d06c4c8 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/dhcp-4.3.6_p1 b/metadata/md5-cache/net-misc/dhcp-4.3.6_p1
index 1ce191871c1c..26c8c44cce65 100644
--- a/metadata/md5-cache/net-misc/dhcp-4.3.6_p1
+++ b/metadata/md5-cache/net-misc/dhcp-4.3.6_p1
@@ -4,10 +4,10 @@ DESCRIPTION=ISC Dynamic Host Configuration Protocol (DHCP) client/server
 EAPI=6
 HOMEPAGE=http://www.isc.org/products/DHCP
 IUSE=+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=ISC BSD SSLeay GPL-2
 RDEPEND=client? ( kernel_linux? ( ipv6? ( sys-apps/iproute2 ) sys-apps/net-tools ) ) ldap? ( net-nds/openldap ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) ) selinux? ( sec-policy/selinux-dhcp ) vim-syntax? ( app-vim/dhcpd-syntax )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/dhcp/dhcp-4.3.6-P1.tar.gz ftp://ftp.isc.org/isc/dhcp/4.3.6-P1/dhcp-4.3.6-P1.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=809add7d90614b6d62a5af9356c0a7d8
+_md5_=54c84288042eae5cd16701280d9d0cd8
diff --git a/metadata/md5-cache/net-misc/dhcpcd-6.11.5 b/metadata/md5-cache/net-misc/dhcpcd-6.11.5
index 53421f64ca6f..254fdf82647a 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-6.11.5
+++ b/metadata/md5-cache/net-misc/dhcpcd-6.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client
 EAPI=6
 HOMEPAGE=http://roy.marples.name/projects/dhcpcd/
 IUSE=elibc_glibc +embedded ipv6 kernel_linux +udev
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=udev? ( virtual/udev )
 SLOT=0
 SRC_URI=http://roy.marples.name/downloads/dhcpcd/dhcpcd-6.11.5.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2504373c229f7bac70e0d640c7e38f58
+_md5_=7f599c2182673778c09a398ac4a93774
diff --git a/metadata/md5-cache/net-misc/dropbear-2018.76 b/metadata/md5-cache/net-misc/dropbear-2018.76
new file mode 100644
index 000000000000..c773bdbbcc03
--- /dev/null
+++ b/metadata/md5-cache/net-misc/dropbear-2018.76
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare
+DEPEND=!static? ( zlib? ( sys-libs/zlib ) dev-libs/libtommath ) pam? ( virtual/pam ) static? ( zlib? ( sys-libs/zlib[static-libs(+)] ) dev-libs/libtommath[static-libs(+)] )
+DESCRIPTION=small SSH 2 client/server designed for small memory environments
+EAPI=5
+HOMEPAGE=http://matt.ucc.asn.au/dropbear/dropbear.html
+IUSE=bsdpty minimal multicall pam +shadow static +syslog zlib savedconfig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=!static? ( zlib? ( sys-libs/zlib ) dev-libs/libtommath ) pam? ( virtual/pam ) pam? ( >=sys-auth/pambase-20080219.1 )
+REQUIRED_USE=pam? ( !static )
+SLOT=0
+SRC_URI=http://matt.ucc.asn.au/dropbear/releases/dropbear-2018.76.tar.bz2 http://matt.ucc.asn.au/dropbear/testing/dropbear-2018.76.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=26823e32dd0afa25f362f1e458be440b
diff --git a/metadata/md5-cache/net-misc/dropbox-41.3.76 b/metadata/md5-cache/net-misc/dropbox-41.3.76
deleted file mode 100644
index 2b1f85a0b4c0..000000000000
--- a/metadata/md5-cache/net-misc/dropbox-41.3.76
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=librsync-bundled? ( dev-util/patchelf ) >=sys-apps/sed-4 virtual/pkgconfig
-DESCRIPTION=Dropbox daemon (pretends to be GUI-less)
-EAPI=6
-HOMEPAGE=http://dropbox.com/
-IUSE=+librsync-bundled selinux X python_targets_python2_7
-KEYWORDS=amd64 x86 ~x86-linux
-LICENSE=CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox
-RDEPEND=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(+)] X? ( dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[-gles2,xcb] dev-qt/qtopengl:5[-gles2] dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5[-gles2] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5[-gles2] media-libs/fontconfig media-libs/freetype virtual/jpeg x11-libs/libSM x11-libs/libX11 x11-libs/libXinerama x11-libs/libXxf86vm x11-libs/pango[X] x11-misc/wmctrl x11-themes/hicolor-icon-theme ) !librsync-bundled? ( <net-libs/librsync-2 ) selinux? ( sec-policy/selinux-dropbox ) app-arch/bzip2 dev-libs/popt net-misc/wget >=sys-devel/gcc-4.2.0 sys-libs/zlib || ( sys-libs/ncurses:5/5 sys-libs/ncurses:0/5 )
-REQUIRED_USE=python_targets_python2_7
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=x86? ( https://dl.dropboxusercontent.com/u/17/dropbox-lnx.x86-41.3.76.tar.gz ) amd64? ( https://dl.dropboxusercontent.com/u/17/dropbox-lnx.x86_64-41.3.76.tar.gz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fefa9008ecc22c3c4d72d3697826e3e1
diff --git a/metadata/md5-cache/net-misc/dropbox-43.3.47 b/metadata/md5-cache/net-misc/dropbox-43.3.47
deleted file mode 100644
index 1a5cb88d17d4..000000000000
--- a/metadata/md5-cache/net-misc/dropbox-43.3.47
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=librsync-bundled? ( dev-util/patchelf ) >=sys-apps/sed-4 virtual/pkgconfig
-DESCRIPTION=Dropbox daemon (pretends to be GUI-less)
-EAPI=6
-HOMEPAGE=http://dropbox.com/
-IUSE=+librsync-bundled selinux X python_targets_python2_7 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_5
-KEYWORDS=~amd64 ~x86 ~x86-linux
-LICENSE=CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?] X? ( dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[-gles2,xcb] dev-qt/qtopengl:5[-gles2] dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5[-gles2] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5[-gles2] media-libs/fontconfig media-libs/freetype virtual/jpeg x11-libs/libSM x11-libs/libX11 x11-libs/libXinerama x11-libs/libXxf86vm x11-libs/pango[X] x11-misc/wmctrl x11-themes/hicolor-icon-theme ) !librsync-bundled? ( <net-libs/librsync-2 ) selinux? ( sec-policy/selinux-dropbox ) app-arch/bzip2 dev-libs/popt net-misc/wget >=sys-devel/gcc-4.2.0 sys-libs/zlib || ( sys-libs/ncurses:5/5 sys-libs/ncurses:0/5 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 )
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=x86? ( https://dl.dropboxusercontent.com/u/17/dropbox-lnx.x86-43.3.47.tar.gz ) amd64? ( https://dl.dropboxusercontent.com/u/17/dropbox-lnx.x86_64-43.3.47.tar.gz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6d7297fe28824a2fe366e4a94816f3b3
diff --git a/metadata/md5-cache/net-misc/dropbox-45.3.88 b/metadata/md5-cache/net-misc/dropbox-45.3.88
new file mode 100644
index 000000000000..461591ab2b6a
--- /dev/null
+++ b/metadata/md5-cache/net-misc/dropbox-45.3.88
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=librsync-bundled? ( dev-util/patchelf ) >=sys-apps/sed-4 virtual/pkgconfig
+DESCRIPTION=Dropbox daemon (pretends to be GUI-less)
+EAPI=6
+HOMEPAGE=http://dropbox.com/
+IUSE=+librsync-bundled selinux X python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=amd64 x86 ~x86-linux
+LICENSE=CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] X? ( dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[-gles2,xcb] dev-qt/qtopengl:5[-gles2] dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5[-gles2] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5[-gles2] media-libs/fontconfig media-libs/freetype virtual/jpeg x11-libs/libSM x11-libs/libX11 x11-libs/libXinerama x11-libs/libXxf86vm x11-libs/pango[X] x11-misc/wmctrl x11-themes/hicolor-icon-theme ) !librsync-bundled? ( <net-libs/librsync-2 ) selinux? ( sec-policy/selinux-dropbox ) app-arch/bzip2 dev-libs/popt net-misc/wget >=sys-devel/gcc-4.2.0 sys-libs/zlib || ( sys-libs/ncurses:5/5 sys-libs/ncurses:0/5 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-45.3.88.tar.gz ) amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-45.3.88.tar.gz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=051747607c0bf70f987f37042fd3d366
diff --git a/metadata/md5-cache/net-misc/gns3-gui-2.1.3 b/metadata/md5-cache/net-misc/gns3-gui-2.1.3-r1
similarity index 78%
rename from metadata/md5-cache/net-misc/gns3-gui-2.1.3
rename to metadata/md5-cache/net-misc/gns3-gui-2.1.3-r1
index 0eff308406d2..c1619c9ad51f 100644
--- a/metadata/md5-cache/net-misc/gns3-gui-2.1.3
+++ b/metadata/md5-cache/net-misc/gns3-gui-2.1.3-r1
@@ -6,10 +6,10 @@ HOMEPAGE=http://www.gns3.net/
 IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=dev-python/libcloud-0.15.1[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-python/ws4py-0.3.4[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-python/requests-2.6.0[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-python/paramiko-1.15.1[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(-)] =net-misc/gns3-server-2.1.3[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-python/PyQt5[gui,network,svg,widgets,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(-)] 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(-)]
+RDEPEND=>=dev-python/libcloud-0.15.1[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-python/ws4py-0.3.4[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-python/requests-2.6.0[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-python/paramiko-1.15.1[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(-)] ~net-misc/gns3-server-2.1.3[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-python/PyQt5[gui,network,svg,websockets,widgets,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(-)] 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(-)]
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/GNS3/gns3-gui/archive/v2.1.3.tar.gz -> gns3-gui-2.1.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=00640e653f784343e423a1e319baca6a
+_md5_=601025fa7f2231d2092568090b5e0c56
diff --git a/metadata/md5-cache/net-misc/gns3-server-2.1.3 b/metadata/md5-cache/net-misc/gns3-server-2.1.3
deleted file mode 100644
index 9caca8db39dc..000000000000
--- a/metadata/md5-cache/net-misc/gns3-server-2.1.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[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(-)] 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(-)]
-DESCRIPTION=GNS3 server to asynchronously manage emulators
-EAPI=6
-HOMEPAGE=http://www.gns3.net/
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=app-emulation/dynamips-0.2.12 >=dev-python/aiohttp-2.2.0[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-python/aiohttp-cors-0.5.3[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-python/docker-py-1.4.0[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-python/netifaces-0.8-r2[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-python/jinja-2.7.3[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-python/jsonschema-2.4.0[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-python/libcloud-0.14.1[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-python/raven-5.23.0[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-python/psutil-3.0.0[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-python/pyzmq-14.3.1[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-python/python-zipstream-1.1.4[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(-)] >=www-servers/tornado-3.1.1[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-python/typing-3.5.3.0[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-python/yarl-0.11[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(-)] 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(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/GNS3/gns3-server/archive/v2.1.3.tar.gz -> gns3-server-2.1.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9933115aadca0ac5f3a47ed4538bc1e2
diff --git a/metadata/md5-cache/net-misc/gns3-server-2.1.3-r1 b/metadata/md5-cache/net-misc/gns3-server-2.1.3-r1
new file mode 100644
index 000000000000..a15c776d64fc
--- /dev/null
+++ b/metadata/md5-cache/net-misc/gns3-server-2.1.3-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/setuptools[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(-)] 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(-)]
+DESCRIPTION=GNS3 server to asynchronously manage emulators
+EAPI=6
+HOMEPAGE=http://www.gns3.net/
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-emulation/dynamips-0.2.12 >=dev-python/aiohttp-2.2.0[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-python/aiohttp-cors-0.6[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-python/aiohttp-cors-0.5.3[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-python/docker-py-1.4.0[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-python/netifaces-0.8-r2[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-python/jinja-2.7.3[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-python/jsonschema-2.4.0[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-python/libcloud-0.14.1[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-python/raven-5.23.0[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-python/prompt_toolkit[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-python/psutil-3.0.0[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-python/pyzmq-14.3.1[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-python/python-zipstream-1.1.4[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(-)] >=www-servers/tornado-3.1.1[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-python/typing-3.5.3.0[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-python/yarl-0.11[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(-)] 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(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/GNS3/gns3-server/archive/v2.1.3.tar.gz -> gns3-server-2.1.3.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=268738fe9d2dda960afa545d1604d4c7
diff --git a/metadata/md5-cache/net-misc/iperf-3.3 b/metadata/md5-cache/net-misc/iperf-3.5
similarity index 90%
rename from metadata/md5-cache/net-misc/iperf-3.3
rename to metadata/md5-cache/net-misc/iperf-3.5
index 366c45d3df72..a6181ceaf525 100644
--- a/metadata/md5-cache/net-misc/iperf-3.3
+++ b/metadata/md5-cache/net-misc/iperf-3.5
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux
 LICENSE=BSD
 RDEPEND=sctp? ( net-misc/lksctp-tools )
 SLOT=3
-SRC_URI=https://github.com/esnet/iperf/archive/3.3.tar.gz -> iperf-3.3.tar.gz
+SRC_URI=https://github.com/esnet/iperf/archive/3.5.tar.gz -> iperf-3.5.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d5ac93cca54796d29104725cbd39e50e
+_md5_=c1f418b919efb1f6e01c51d71d7f7d94
diff --git a/metadata/md5-cache/net-misc/quagga-1.2.4 b/metadata/md5-cache/net-misc/quagga-1.2.4
index 57114ea602ca..dda7b4977c5a 100644
--- a/metadata/md5-cache/net-misc/quagga-1.2.4
+++ b/metadata/md5-cache/net-misc/quagga-1.2.4
@@ -4,10 +4,10 @@ DESCRIPTION=A free routing daemon replacing Zebra supporting RIP, OSPF and BGP
 EAPI=6
 HOMEPAGE=http://quagga.net/
 IUSE=bgpclassless caps fpm doc elibc_glibc ipv6 multipath nhrpd ospfapi pam protobuf +readline snmp tcp-zebra test
-KEYWORDS=~alpha amd64 ~arm hppa ~ppc ~s390 sparc x86
+KEYWORDS=alpha amd64 ~arm hppa ~ppc ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=caps? ( sys-libs/libcap ) nhrpd? ( net-dns/c-ares:0= ) protobuf? ( dev-libs/protobuf-c:0= ) readline? ( sys-libs/readline:0= pam? ( sys-libs/pam ) ) snmp? ( net-analyzer/net-snmp ) !elibc_glibc? ( dev-libs/libpcre ) sys-apps/iproute2 virtual/tmpfiles
 SLOT=0
 SRC_URI=mirror://nongnu/quagga/quagga-1.2.4.tar.gz bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/ht-20040304-classless-bgp.patch )
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1809850aaa30e0e60abce051b0e6d8f4
+_md5_=28f4eeed449b15daf81672d677ac96a7
diff --git a/metadata/md5-cache/net-misc/rsync-3.1.3 b/metadata/md5-cache/net-misc/rsync-3.1.3
index 13385d915b17..97688efb78ee 100644
--- a/metadata/md5-cache/net-misc/rsync-3.1.3
+++ b/metadata/md5-cache/net-misc/rsync-3.1.3
@@ -4,10 +4,10 @@ DESCRIPTION=File transfer program to keep remote files into sync
 EAPI=6
 HOMEPAGE=https://rsync.samba.org/
 IUSE=acl examples iconv ipv6 static stunnel xattr
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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 ~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-3
 RDEPEND=!static? ( acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv )
 SLOT=0
 SRC_URI=https://rsync.samba.org/ftp/rsync/src/rsync-3.1.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0c38fd98a07b26bec5b4931c3ad01449
+_md5_=e3cad0d7c3906feb68b8171c664026ce
diff --git a/metadata/md5-cache/net-misc/socat-1.7.3.2 b/metadata/md5-cache/net-misc/socat-1.7.3.2
index 729812580f2d..d23320ec265f 100644
--- a/metadata/md5-cache/net-misc/socat-1.7.3.2
+++ b/metadata/md5-cache/net-misc/socat-1.7.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=Multipurpose relay (SOcket CAT)
 EAPI=6
 HOMEPAGE=http://www.dest-unreach.org/socat/
 IUSE=bindist libressl ssl readline ipv6 tcpd
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) readline? ( sys-libs/readline:= ) tcpd? ( sys-apps/tcp-wrappers )
 RESTRICT=test ssl? ( readline? ( bindist ) )
 SLOT=0
 SRC_URI=http://www.dest-unreach.org/socat/download/socat-1.7.3.2.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a2cbed38a97a5dd1bda7a31875c218e1
+_md5_=e6c0f1ed6381b64084f17b571c869f02
diff --git a/metadata/md5-cache/net-misc/ubridge-0.9.14 b/metadata/md5-cache/net-misc/ubridge-0.9.14
index f083dcfd531c..6db1e5e9ccd2 100644
--- a/metadata/md5-cache/net-misc/ubridge-0.9.14
+++ b/metadata/md5-cache/net-misc/ubridge-0.9.14
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install postinst prepare setup
 DEPEND=net-libs/libpcap:= filecaps? ( sys-libs/libcap )
-DESCRIPTION=Bridge for UDP tunnels, Ethernet, TAP and VMnet interfaces.
+DESCRIPTION=Bridge for UDP tunnels, Ethernet, TAP and VMnet interfaces
 EAPI=6
 HOMEPAGE=https://github.com/GNS3/ubridge
 IUSE=+filecaps
@@ -10,4 +10,4 @@ RDEPEND=net-libs/libpcap:=
 SLOT=0
 SRC_URI=https://github.com/GNS3/ubridge/archive/v0.9.14.tar.gz -> ubridge-0.9.14.tar.gz
 _eclasses_=fcaps	e80204189039ecc03f24151c518375f0	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=42f62c2d7943d7b34076a86c23d99078
+_md5_=20a25db69febf33668f06330e2c351a6
diff --git a/metadata/md5-cache/net-misc/valve-1.0 b/metadata/md5-cache/net-misc/valve-1.0
deleted file mode 100644
index 511b0fcdb57a..000000000000
--- a/metadata/md5-cache/net-misc/valve-1.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install test
-DESCRIPTION=Copies data while enforcing a specified maximum transfer rate
-EAPI=0
-HOMEPAGE=http://www.fourmilab.ch/webtools/valve/
-IUSE=doc
-KEYWORDS=~x86 ~ppc ~amd64
-LICENSE=public-domain
-SLOT=0
-SRC_URI=http://www.fourmilab.ch/webtools/valve/valve-1.0.tar.gz
-_md5_=d4060c2b48964cc1d9e8122861cece9f
diff --git a/metadata/md5-cache/net-misc/valve-1.0-r1 b/metadata/md5-cache/net-misc/valve-1.0-r1
index 001d88910253..abb596598d9e 100644
--- a/metadata/md5-cache/net-misc/valve-1.0-r1
+++ b/metadata/md5-cache/net-misc/valve-1.0-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install test
 DESCRIPTION=Copy data while enforcing a specified maximum transfer rate
 EAPI=6
-HOMEPAGE=http://www.fourmilab.ch/webtools/valve
+HOMEPAGE=https://www.fourmilab.ch/webtools/valve/
 IUSE=test doc
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=public-domain
 SLOT=0
-SRC_URI=http://www.fourmilab.ch/webtools/valve/valve-1.0.tar.gz
-_md5_=714ab71b25e2b3178cd3f750e6ab2d4b
+SRC_URI=https://www.fourmilab.ch/webtools/valve/valve-1.0.tar.gz
+_md5_=85a70e416926d3c55ffc4e9dfc59a2e3
diff --git a/metadata/md5-cache/net-nntp/Manifest.gz b/metadata/md5-cache/net-nntp/Manifest.gz
index e54535c9e38e..8b6d6c71a8b6 100644
Binary files a/metadata/md5-cache/net-nntp/Manifest.gz and b/metadata/md5-cache/net-nntp/Manifest.gz differ
diff --git a/metadata/md5-cache/net-nntp/tin-2.4.2 b/metadata/md5-cache/net-nntp/tin-2.4.2
index b1c3e9a10bd7..67c4287c71c9 100644
--- a/metadata/md5-cache/net-nntp/tin-2.4.2
+++ b/metadata/md5-cache/net-nntp/tin-2.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=A threaded NNTP and spool based UseNet newsreader
 EAPI=6
 HOMEPAGE=http://www.tin.org/
 IUSE=cancel-locks debug doc +etiquette gpg idn ipv6 mime nls sasl socks5 spell unicode
-KEYWORDS=~amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre dev-libs/uulib gpg? ( app-crypt/gnupg ) idn? ( net-dns/libidn ) mime? ( net-mail/metamail ) nls? ( sys-devel/gettext ) sasl? ( virtual/gsasl ) socks5? ( net-proxy/dante ) sys-libs/ncurses:0[unicode?] unicode? ( dev-libs/icu:= )
 SLOT=0
 SRC_URI=ftp://ftp.tin.org/pub/news/clients/tin/stable/tin-2.4.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1c0a8f13b6e5570ae20b9b557113a4c7
+_md5_=8359cc331b338b83de06890d32c0b235
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 57148793a802..75b4ded47f9e 100644
Binary files a/metadata/md5-cache/sci-geosciences/Manifest.gz and b/metadata/md5-cache/sci-geosciences/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-geosciences/grass-7.0.5-r1 b/metadata/md5-cache/sci-geosciences/grass-7.0.5-r1
deleted file mode 100644
index c80f27895552..000000000000
--- a/metadata/md5-cache/sci-geosciences/grass-7.0.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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-admin/eselect-1.2 dev-python/numpy[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(+)] media-libs/libprojectm sci-libs/proj sci-libs/xdrfile sci-libs/gdal sys-libs/gdbm sys-libs/ncurses:0= sys-libs/zlib fftw? ( sci-libs/fftw:3.0 ) geos? ( sci-libs/geos ) blas? ( virtual/blas sci-libs/cblas-reference ) lapack? ( virtual/lapack ) liblas? ( sci-geosciences/liblas ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:0= ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff:0= ) truetype? ( media-libs/freetype:2 ) X? ( dev-python/wxpython:3.0[cairo,opengl?] x11-libs/cairo[X,opengl?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libXt ) virtual/pkgconfig sys-devel/flex sys-devel/gettext sys-devel/bison X? ( dev-lang/swig x11-proto/xextproto x11-proto/xproto ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4
-DESCRIPTION=A free GIS with raster and vector functionality, as well as 3D vizualization
-EAPI=6
-HOMEPAGE=http://grass.osgeo.org/
-IUSE=X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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-admin/eselect-1.2 dev-python/numpy[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(+)] media-libs/libprojectm sci-libs/proj sci-libs/xdrfile sci-libs/gdal sys-libs/gdbm sys-libs/ncurses:0= sys-libs/zlib fftw? ( sci-libs/fftw:3.0 ) geos? ( sci-libs/geos ) blas? ( virtual/blas sci-libs/cblas-reference ) lapack? ( virtual/lapack ) liblas? ( sci-geosciences/liblas ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:0= ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff:0= ) truetype? ( media-libs/freetype:2 ) X? ( dev-python/wxpython:3.0[cairo,opengl?] x11-libs/cairo[X,opengl?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libXt )
-REQUIRED_USE=python_targets_python2_7 opengl? ( X )
-SLOT=0/7.0.5
-SRC_URI=http://grass.osgeo.org/grass70/source/grass-7.0.5.tar.gz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8beb9ad84aeedfe267cc1906759f18ac
diff --git a/metadata/md5-cache/sci-geosciences/laszip-2.2.0 b/metadata/md5-cache/sci-geosciences/laszip-2.2.0
index aedeaf1c4ac5..6e0018bb8ff5 100644
--- a/metadata/md5-cache/sci-geosciences/laszip-2.2.0
+++ b/metadata/md5-cache/sci-geosciences/laszip-2.2.0
@@ -3,9 +3,9 @@ DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >
 DESCRIPTION=Library for free and lossless compression of the LAS LiDAR format
 EAPI=5
 HOMEPAGE=http://www.laszip.org/
-KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~ia64 ppc ~ppc64 x86
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=https://github.com/LASzip/LASzip/releases/download/v2.2.0/laszip-src-2.2.0.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bce650be650b0ef7922aa0d475e29732
+_md5_=fbcddae8b76f57b3b9de2e091ba39e7f
diff --git a/metadata/md5-cache/sci-geosciences/liblas-1.8.0 b/metadata/md5-cache/sci-geosciences/liblas-1.8.0
deleted file mode 100644
index fcf50623b30e..000000000000
--- a/metadata/md5-cache/sci-geosciences/liblas-1.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= sci-geosciences/laszip gdal? ( sci-libs/gdal ) geotiff? ( sci-libs/libgeotiff ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=C/C++ library for manipulating the LAS LiDAR format common in GIS
-EAPI=5
-HOMEPAGE=http://www.liblas.org
-IUSE=gdal geotiff 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 ~ppc64 x86
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= sci-geosciences/laszip gdal? ( sci-libs/gdal ) geotiff? ( sci-libs/libgeotiff )
-REQUIRED_USE=gdal? ( geotiff )
-SLOT=0
-SRC_URI=http://download.osgeo.org/liblas/libLAS-1.8.0.tar.bz2
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7e6cdb86ef91258afe963e48ff63e8b5
diff --git a/metadata/md5-cache/sci-geosciences/liblas-1.8.1 b/metadata/md5-cache/sci-geosciences/liblas-1.8.1
index fc0a223b9751..89f7df0f8390 100644
--- a/metadata/md5-cache/sci-geosciences/liblas-1.8.1
+++ b/metadata/md5-cache/sci-geosciences/liblas-1.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=C/C++ library for manipulating the LAS LiDAR format common in GIS
 EAPI=6
 HOMEPAGE=http://www.liblas.org
 IUSE=gdal
-KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~ia64 ppc ~ppc64 x86
 LICENSE=BSD
 RDEPEND=dev-libs/boost:= sci-geosciences/laszip sci-libs/libgeotiff gdal? ( sci-libs/gdal )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.osgeo.org/liblas/libLAS-1.8.1.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6d4e1fbe4d47906b1cd59ede61719d1c
+_md5_=493e6033cdcf0e0030fbda3e5c5d1d1c
diff --git a/metadata/md5-cache/sci-geosciences/qgis-2.18.12 b/metadata/md5-cache/sci-geosciences/qgis-2.18.12
index c9b1d4980ed6..de1506db7b92 100644
--- a/metadata/md5-cache/sci-geosciences/qgis-2.18.12
+++ b/metadata/md5-cache/sci-geosciences/qgis-2.18.12
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=app-crypt/qca:2[qt4,ssl] >=dev-db/spatialite-4.1.0 dev-db/sqlite:3 dev-libs/expat dev-libs/qjson dev-qt/designer:4 dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtscript:4 dev-qt/qtsvg:4 dev-qt/qtsql:4 sci-libs/gdal:=[geos,python?,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(+)] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj x11-libs/qscintilla:=[qt4(-)] >=x11-libs/qwt-6.1.2:6=[svg,qt4(-)] >=x11-libs/qwtpolar-1[qt4(-)] georeferencer? ( sci-libs/gsl:= ) grass? ( >=sci-geosciences/grass-7.0.0:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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/future[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/httplib2[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/jinja[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/markupsafe[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/pygments[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/PyQt4[X,sql,svg,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/python-dateutil[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/pytz[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/pyyaml[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/qscintilla-python[qt4(+),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/requests[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/sip:=[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/six[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(+)] postgres? ( dev-python/psycopg: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-devel/bison sys-devel/flex sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DEPEND=app-crypt/qca:2[qt4,ssl] >=dev-db/spatialite-4.1.0 dev-db/sqlite:3 dev-libs/expat dev-libs/qjson dev-qt/designer:4 dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtscript:4 dev-qt/qtsvg:4 dev-qt/qtsql:4 sci-libs/gdal:=[geos,python?,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(+)] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj x11-libs/qscintilla:=[qt4(-)] >=x11-libs/qwt-6.1.2:6=[svg,qt4(-)] >=x11-libs/qwtpolar-1[qt4(-)] georeferencer? ( sci-libs/gsl:= ) grass? ( >=sci-geosciences/grass-7.0.0:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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/future[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/httplib2[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/jinja[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/markupsafe[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/pygments[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/PyQt4[X,sql,svg,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/python-dateutil[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/pytz[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/pyyaml[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/qscintilla-python[qt4(-),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/requests[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/sip:=[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/six[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(+)] postgres? ( dev-python/psycopg: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-devel/bison sys-devel/flex sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
 DESCRIPTION=User friendly Geographic Information System
 EAPI=6
 HOMEPAGE=http://www.qgis.org/
 IUSE=examples georeferencer grass mapserver oracle postgres python python_targets_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+ GPL-3+
-RDEPEND=app-crypt/qca:2[qt4,ssl] >=dev-db/spatialite-4.1.0 dev-db/sqlite:3 dev-libs/expat dev-libs/qjson dev-qt/designer:4 dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtscript:4 dev-qt/qtsvg:4 dev-qt/qtsql:4 sci-libs/gdal:=[geos,python?,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(+)] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj x11-libs/qscintilla:=[qt4(-)] >=x11-libs/qwt-6.1.2:6=[svg,qt4(-)] >=x11-libs/qwtpolar-1[qt4(-)] georeferencer? ( sci-libs/gsl:= ) grass? ( >=sci-geosciences/grass-7.0.0:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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/future[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/httplib2[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/jinja[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/markupsafe[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/pygments[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/PyQt4[X,sql,svg,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/python-dateutil[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/pytz[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/pyyaml[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/qscintilla-python[qt4(+),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/requests[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/sip:=[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/six[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(+)] postgres? ( dev-python/psycopg: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(+)] ) ) sci-geosciences/gpsbabel
+RDEPEND=app-crypt/qca:2[qt4,ssl] >=dev-db/spatialite-4.1.0 dev-db/sqlite:3 dev-libs/expat dev-libs/qjson dev-qt/designer:4 dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtscript:4 dev-qt/qtsvg:4 dev-qt/qtsql:4 sci-libs/gdal:=[geos,python?,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(+)] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj x11-libs/qscintilla:=[qt4(-)] >=x11-libs/qwt-6.1.2:6=[svg,qt4(-)] >=x11-libs/qwtpolar-1[qt4(-)] georeferencer? ( sci-libs/gsl:= ) grass? ( >=sci-geosciences/grass-7.0.0:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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/future[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/httplib2[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/jinja[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/markupsafe[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/pygments[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/PyQt4[X,sql,svg,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/python-dateutil[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/pytz[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/pyyaml[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/qscintilla-python[qt4(-),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/requests[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/sip:=[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/six[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(+)] postgres? ( dev-python/psycopg: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(+)] ) ) sci-geosciences/gpsbabel
 REQUIRED_USE=mapserver? ( python ) python? ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://qgis.org/downloads/qgis-2.18.12.tar.bz2 examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6745aea3527c671448d38a1f66ffec53
+_md5_=6841d5d6d8d5dce02f594ab45a8fac88
diff --git a/metadata/md5-cache/sci-geosciences/qgis-2.18.14 b/metadata/md5-cache/sci-geosciences/qgis-2.18.14
index 5827ac522bb4..6e0b01561b65 100644
--- a/metadata/md5-cache/sci-geosciences/qgis-2.18.14
+++ b/metadata/md5-cache/sci-geosciences/qgis-2.18.14
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=app-crypt/qca:2[qt4,ssl] >=dev-db/spatialite-4.1.0 dev-db/sqlite:3 dev-libs/expat dev-libs/qjson dev-qt/designer:4 dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtscript:4 dev-qt/qtsvg:4 dev-qt/qtsql:4 sci-libs/gdal:=[geos,python?,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(+)] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj x11-libs/qscintilla:=[qt4(-)] >=x11-libs/qwt-6.1.2:6=[svg,qt4(-)] >=x11-libs/qwtpolar-1[qt4(-)] georeferencer? ( sci-libs/gsl:= ) grass? ( >=sci-geosciences/grass-7.0.0:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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/future[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/httplib2[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/jinja[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/markupsafe[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/pygments[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/PyQt4[X,sql,svg,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/python-dateutil[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/pytz[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/pyyaml[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/qscintilla-python[qt4(+),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/requests[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/sip:=[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/six[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(+)] postgres? ( dev-python/psycopg: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-devel/bison sys-devel/flex sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DEPEND=app-crypt/qca:2[qt4,ssl] >=dev-db/spatialite-4.1.0 dev-db/sqlite:3 dev-libs/expat dev-libs/qjson dev-qt/designer:4 dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtscript:4 dev-qt/qtsvg:4 dev-qt/qtsql:4 sci-libs/gdal:=[geos,python?,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(+)] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj x11-libs/qscintilla:=[qt4(-)] >=x11-libs/qwt-6.1.2:6=[svg,qt4(-)] >=x11-libs/qwtpolar-1[qt4(-)] georeferencer? ( sci-libs/gsl:= ) grass? ( >=sci-geosciences/grass-7.0.0:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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/future[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/httplib2[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/jinja[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/markupsafe[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/pygments[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/PyQt4[X,sql,svg,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/python-dateutil[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/pytz[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/pyyaml[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/qscintilla-python[qt4(-),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/requests[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/sip:=[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/six[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(+)] postgres? ( dev-python/psycopg: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-devel/bison sys-devel/flex sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
 DESCRIPTION=User friendly Geographic Information System
 EAPI=6
 HOMEPAGE=https://www.qgis.org/
 IUSE=examples georeferencer grass mapserver oracle postgres python python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ GPL-3+
-RDEPEND=app-crypt/qca:2[qt4,ssl] >=dev-db/spatialite-4.1.0 dev-db/sqlite:3 dev-libs/expat dev-libs/qjson dev-qt/designer:4 dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtscript:4 dev-qt/qtsvg:4 dev-qt/qtsql:4 sci-libs/gdal:=[geos,python?,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(+)] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj x11-libs/qscintilla:=[qt4(-)] >=x11-libs/qwt-6.1.2:6=[svg,qt4(-)] >=x11-libs/qwtpolar-1[qt4(-)] georeferencer? ( sci-libs/gsl:= ) grass? ( >=sci-geosciences/grass-7.0.0:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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/future[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/httplib2[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/jinja[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/markupsafe[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/pygments[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/PyQt4[X,sql,svg,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/python-dateutil[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/pytz[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/pyyaml[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/qscintilla-python[qt4(+),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/requests[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/sip:=[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/six[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(+)] postgres? ( dev-python/psycopg: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(+)] ) ) sci-geosciences/gpsbabel
+RDEPEND=app-crypt/qca:2[qt4,ssl] >=dev-db/spatialite-4.1.0 dev-db/sqlite:3 dev-libs/expat dev-libs/qjson dev-qt/designer:4 dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtscript:4 dev-qt/qtsvg:4 dev-qt/qtsql:4 sci-libs/gdal:=[geos,python?,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(+)] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj x11-libs/qscintilla:=[qt4(-)] >=x11-libs/qwt-6.1.2:6=[svg,qt4(-)] >=x11-libs/qwtpolar-1[qt4(-)] georeferencer? ( sci-libs/gsl:= ) grass? ( >=sci-geosciences/grass-7.0.0:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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/future[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/httplib2[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/jinja[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/markupsafe[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/pygments[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/PyQt4[X,sql,svg,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/python-dateutil[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/pytz[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/pyyaml[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/qscintilla-python[qt4(-),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/requests[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/sip:=[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/six[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(+)] postgres? ( dev-python/psycopg: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(+)] ) ) sci-geosciences/gpsbabel
 REQUIRED_USE=mapserver? ( python ) python? ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://qgis.org/downloads/qgis-2.18.14.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a66a82cef5b38536abbbd07eedbbe757
+_md5_=c4888f4a82e34b089d8526db7dd04315
diff --git a/metadata/md5-cache/sci-geosciences/qgis-2.18.16 b/metadata/md5-cache/sci-geosciences/qgis-2.18.16
index aea912f83153..5d1c8183c85e 100644
--- a/metadata/md5-cache/sci-geosciences/qgis-2.18.16
+++ b/metadata/md5-cache/sci-geosciences/qgis-2.18.16
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=app-crypt/qca:2[qt4,ssl] >=dev-db/spatialite-4.1.0 dev-db/sqlite:3 dev-libs/expat dev-libs/qjson dev-qt/designer:4 dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtscript:4 dev-qt/qtsvg:4 dev-qt/qtsql:4 sci-libs/gdal:=[geos,python?,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(+)] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj x11-libs/qscintilla:=[qt4(-)] >=x11-libs/qwt-6.1.2:6=[svg,qt4(-)] >=x11-libs/qwtpolar-1[qt4(-)] georeferencer? ( sci-libs/gsl:= ) grass? ( >=sci-geosciences/grass-7.0.0:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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/future[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/httplib2[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/jinja[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/markupsafe[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/pygments[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/PyQt4[X,sql,svg,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/python-dateutil[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/pytz[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/pyyaml[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/qscintilla-python[qt4,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/requests[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/sip:=[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/six[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(+)] postgres? ( dev-python/psycopg: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-devel/bison sys-devel/flex sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DEPEND=app-crypt/qca:2[qt4,ssl] >=dev-db/spatialite-4.1.0 dev-db/sqlite:3 dev-libs/expat dev-libs/qjson dev-qt/designer:4 dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtscript:4 dev-qt/qtsvg:4 dev-qt/qtsql:4 sci-libs/gdal:=[geos,python?,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(+)] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj x11-libs/qscintilla:=[qt4(-)] >=x11-libs/qwt-6.1.2:6=[svg,qt4(-)] >=x11-libs/qwtpolar-1[qt4(-)] georeferencer? ( sci-libs/gsl:= ) grass? ( >=sci-geosciences/grass-7.0.0:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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/future[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/httplib2[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/jinja[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/markupsafe[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/pygments[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/PyQt4[X,sql,svg,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/python-dateutil[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/pytz[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/pyyaml[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/qscintilla-python[qt4(-),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/requests[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/sip:=[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/six[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(+)] postgres? ( dev-python/psycopg: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-devel/bison sys-devel/flex sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
 DESCRIPTION=User friendly Geographic Information System
 EAPI=6
 HOMEPAGE=https://www.qgis.org/
 IUSE=examples georeferencer grass mapserver oracle postgres python python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ GPL-3+
-RDEPEND=app-crypt/qca:2[qt4,ssl] >=dev-db/spatialite-4.1.0 dev-db/sqlite:3 dev-libs/expat dev-libs/qjson dev-qt/designer:4 dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtscript:4 dev-qt/qtsvg:4 dev-qt/qtsql:4 sci-libs/gdal:=[geos,python?,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(+)] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj x11-libs/qscintilla:=[qt4(-)] >=x11-libs/qwt-6.1.2:6=[svg,qt4(-)] >=x11-libs/qwtpolar-1[qt4(-)] georeferencer? ( sci-libs/gsl:= ) grass? ( >=sci-geosciences/grass-7.0.0:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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/future[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/httplib2[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/jinja[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/markupsafe[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/pygments[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/PyQt4[X,sql,svg,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/python-dateutil[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/pytz[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/pyyaml[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/qscintilla-python[qt4,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/requests[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/sip:=[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/six[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(+)] postgres? ( dev-python/psycopg: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(+)] ) ) sci-geosciences/gpsbabel
+RDEPEND=app-crypt/qca:2[qt4,ssl] >=dev-db/spatialite-4.1.0 dev-db/sqlite:3 dev-libs/expat dev-libs/qjson dev-qt/designer:4 dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtscript:4 dev-qt/qtsvg:4 dev-qt/qtsql:4 sci-libs/gdal:=[geos,python?,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(+)] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj x11-libs/qscintilla:=[qt4(-)] >=x11-libs/qwt-6.1.2:6=[svg,qt4(-)] >=x11-libs/qwtpolar-1[qt4(-)] georeferencer? ( sci-libs/gsl:= ) grass? ( >=sci-geosciences/grass-7.0.0:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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/future[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/httplib2[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/jinja[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/markupsafe[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/pygments[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/PyQt4[X,sql,svg,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/python-dateutil[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/pytz[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/pyyaml[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/qscintilla-python[qt4(-),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/requests[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/sip:=[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/six[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(+)] postgres? ( dev-python/psycopg: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(+)] ) ) sci-geosciences/gpsbabel
 REQUIRED_USE=mapserver? ( python ) python? ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://qgis.org/downloads/qgis-2.18.16.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cfe29fcc5077c1d17371a260cc124689
+_md5_=c4888f4a82e34b089d8526db7dd04315
diff --git a/metadata/md5-cache/sci-geosciences/qgis-3.0.0 b/metadata/md5-cache/sci-geosciences/qgis-3.0.0
deleted file mode 100644
index 685c1c13f1c2..000000000000
--- a/metadata/md5-cache/sci-geosciences/qgis-3.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtpositioning-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=sci-libs/gdal-2.2.3:=[geos,python?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] designer? ( >=dev-qt/designer-5.9.1:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( >=sci-geosciences/grass-7.0.0:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/future[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/httplib2[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/jinja[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/markupsafe[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/owslib[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pygments[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/PyQt5[sql,svg,webkit?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/python-dateutil[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pytz[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pyyaml[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/requests[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/sip:=[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/six[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] postgres? ( dev-python/psycopg:2[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] ) ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=dev-qt/linguist-tools-5.9.1:5 >=dev-qt/qttest-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 sys-devel/bison sys-devel/flex sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
-DESCRIPTION=User friendly Geographic Information System
-EAPI=6
-HOMEPAGE=https://www.qgis.org/
-IUSE=designer examples georeferencer grass mapserver oracle polar postgres python webkit python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ GPL-3+
-RDEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtpositioning-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=sci-libs/gdal-2.2.3:=[geos,python?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] designer? ( >=dev-qt/designer-5.9.1:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( >=sci-geosciences/grass-7.0.0:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/future[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/httplib2[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/jinja[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/markupsafe[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/owslib[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pygments[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/PyQt5[sql,svg,webkit?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/python-dateutil[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pytz[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pyyaml[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/requests[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/sip:=[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/six[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] postgres? ( dev-python/psycopg:2[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] ) ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) sci-geosciences/gpsbabel
-REQUIRED_USE=mapserver? ( python ) python? ( python_targets_python3_5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://qgis.org/downloads/qgis-3.0.0.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=de4bd8cf2da4ddc4610468e6a470a299
diff --git a/metadata/md5-cache/sci-geosciences/qgis-3.0.0-r1 b/metadata/md5-cache/sci-geosciences/qgis-3.0.0-r1
new file mode 100644
index 000000000000..8ede5ec9a5c5
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/qgis-3.0.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/designer-5.9.1:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtpositioning-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=sci-libs/gdal-2.2.3:=[geos,python?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( >=dev-qt/qt3d-5.9.1:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( >=sci-geosciences/grass-7.0.0:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/future[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/httplib2[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/jinja[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/markupsafe[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/owslib[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pygments[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/PyQt5[designer,sql,svg,webkit?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/python-dateutil[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pytz[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pyyaml[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/requests[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/sip:=[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/six[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] postgres? ( dev-python/psycopg:2[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] ) ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=dev-qt/linguist-tools-5.9.1:5 >=dev-qt/qttest-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 sys-devel/bison sys-devel/flex sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DESCRIPTION=User friendly Geographic Information System
+EAPI=6
+HOMEPAGE=https://www.qgis.org/
+IUSE=3d examples georeferencer grass mapserver oracle polar postgres python webkit python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ GPL-3+
+RDEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/designer-5.9.1:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtpositioning-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=sci-libs/gdal-2.2.3:=[geos,python?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( >=dev-qt/qt3d-5.9.1:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( >=sci-geosciences/grass-7.0.0:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/future[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/httplib2[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/jinja[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/markupsafe[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/owslib[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pygments[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/PyQt5[designer,sql,svg,webkit?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/python-dateutil[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pytz[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pyyaml[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/requests[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/sip:=[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/six[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] postgres? ( dev-python/psycopg:2[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] ) ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) sci-geosciences/gpsbabel
+REQUIRED_USE=mapserver? ( python ) python? ( python_targets_python3_5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://qgis.org/downloads/qgis-3.0.0.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9501cd228e2351da68fa96eb645081d8
diff --git a/metadata/md5-cache/sci-geosciences/qgis-9999 b/metadata/md5-cache/sci-geosciences/qgis-9999
index 7b8676e4988a..468498ec1494 100644
--- a/metadata/md5-cache/sci-geosciences/qgis-9999
+++ b/metadata/md5-cache/sci-geosciences/qgis-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtpositioning-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=sci-libs/gdal-2.2.3:=[geos,python?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] designer? ( >=dev-qt/designer-5.9.1:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( >=sci-geosciences/grass-7.0.0:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/future[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/httplib2[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/jinja[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/markupsafe[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/owslib[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pygments[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/PyQt5[sql,svg,webkit?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/python-dateutil[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pytz[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pyyaml[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/requests[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/sip:=[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/six[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] postgres? ( dev-python/psycopg:2[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] ) ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=dev-qt/linguist-tools-5.9.1:5 >=dev-qt/qttest-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 sys-devel/bison sys-devel/flex sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1 >=sys-apps/sed-4
+DEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/designer-5.9.1:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtpositioning-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=sci-libs/gdal-2.2.3:=[geos,python?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( >=dev-qt/qt3d-5.9.1:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( >=sci-geosciences/grass-7.0.0:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/future[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/httplib2[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/jinja[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/markupsafe[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/owslib[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pygments[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/PyQt5[designer,sql,svg,webkit?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/python-dateutil[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pytz[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pyyaml[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/requests[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/sip:=[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/six[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] postgres? ( dev-python/psycopg:2[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] ) ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=dev-qt/linguist-tools-5.9.1:5 >=dev-qt/qttest-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 sys-devel/bison sys-devel/flex sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1 >=sys-apps/sed-4
 DESCRIPTION=User friendly Geographic Information System
 EAPI=6
 HOMEPAGE=https://www.qgis.org/
-IUSE=designer examples georeferencer grass mapserver oracle polar postgres python webkit python_targets_python3_5
+IUSE=3d examples georeferencer grass mapserver oracle polar postgres python webkit python_targets_python3_5
 LICENSE=GPL-2+ GPL-3+
-RDEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtpositioning-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=sci-libs/gdal-2.2.3:=[geos,python?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] designer? ( >=dev-qt/designer-5.9.1:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( >=sci-geosciences/grass-7.0.0:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/future[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/httplib2[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/jinja[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/markupsafe[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/owslib[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pygments[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/PyQt5[sql,svg,webkit?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/python-dateutil[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pytz[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pyyaml[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/requests[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/sip:=[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/six[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] postgres? ( dev-python/psycopg:2[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] ) ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) sci-geosciences/gpsbabel
+RDEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/designer-5.9.1:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtpositioning-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=sci-libs/gdal-2.2.3:=[geos,python?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( >=dev-qt/qt3d-5.9.1:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( >=sci-geosciences/grass-7.0.0:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/future[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/httplib2[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/jinja[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/markupsafe[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/owslib[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pygments[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/PyQt5[designer,sql,svg,webkit?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/python-dateutil[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pytz[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pyyaml[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/requests[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/sip:=[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/six[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] postgres? ( dev-python/psycopg:2[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] ) ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) sci-geosciences/gpsbabel
 REQUIRED_USE=mapserver? ( python ) python? ( python_targets_python3_5 )
 RESTRICT=test
 SLOT=0
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=de4bd8cf2da4ddc4610468e6a470a299
+_md5_=76f4e4b103e931943c1cf539a8adbb23
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 491987f17fea..8606fff2047e 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/gdal-2.2.3-r1 b/metadata/md5-cache/sci-libs/gdal-2.2.3-r1
index 24d4a57b279c..f3950f132ba7 100644
--- a/metadata/md5-cache/sci-libs/gdal-2.2.3-r1
+++ b/metadata/md5-cache/sci-libs/gdal-2.2.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Translator library for raster geospatial data formats (includes OGR
 EAPI=6
 HOMEPAGE=http://www.gdal.org/
 IUSE=armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 elibc_FreeBSD java
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD Info-ZIP MIT
 RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:= media-libs/tiff:0= sci-libs/libgeotiff sys-libs/zlib:=[minizip(+)] armadillo? ( sci-libs/armadillo:=[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio:= ) geos? ( >=sci-libs/geos-2.2.1 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3.1 ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) mdb? ( dev-java/jackcess:1 ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= ) pdf? ( >=app-text/poppler-0.24.3:= ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) 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(-)] dev-python/numpy[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(-)] ) spatialite? ( dev-db/spatialite ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) xls? ( dev-libs/freexl ) java? ( >=virtual/jre-1.7:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=mdb? ( java ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) spatialite? ( sqlite )
 SLOT=0/2.2
 SRC_URI=http://download.osgeo.org/gdal/2.2.3/gdal-2.2.3.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f59d6b2ecc1a1da3177f591da65f6d3c
+_md5_=46bb8c1b1721681b238120ba8f1cbf0a
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index e4b16bf6ce9c..59d9303e4473 100644
Binary files a/metadata/md5-cache/sci-mathematics/Manifest.gz and b/metadata/md5-cache/sci-mathematics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-mathematics/cgal-4.11.1 b/metadata/md5-cache/sci-mathematics/cgal-4.11.1
new file mode 100644
index 000000000000..d1c525a58994
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/cgal-4.11.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-cpp/eigen-3.1 dev-libs/boost:=[threads] dev-libs/mpfr:0= sys-libs/zlib:= x11-libs/libX11:= virtual/glu:= virtual/opengl:= gmp? ( dev-libs/gmp:=[cxx] ) mpfi? ( sci-libs/mpfi ) ntl? ( dev-libs/ntl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) app-arch/xz-utils virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=C++ library for geometric algorithms and data structures
+EAPI=6
+HOMEPAGE=https://www.cgal.org/
+IUSE=doc examples +gmp mpfi ntl qt5
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-3 GPL-3 Boost-1.0
+RDEPEND=>=dev-cpp/eigen-3.1 dev-libs/boost:=[threads] dev-libs/mpfr:0= sys-libs/zlib:= x11-libs/libX11:= virtual/glu:= virtual/opengl:= gmp? ( dev-libs/gmp:=[cxx] ) mpfi? ( sci-libs/mpfi ) ntl? ( dev-libs/ntl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 )
+SLOT=0/13
+SRC_URI=https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.11.1/CGAL-4.11.1.tar.xz doc? ( https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.11.1/CGAL-4.11.1-doc_html.tar.xz )
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=11eace43da1731a0092df509f6fb9322
diff --git a/metadata/md5-cache/sci-mathematics/octave-epstk-2.3 b/metadata/md5-cache/sci-mathematics/octave-epstk-2.3
deleted file mode 100644
index c75d7295ca13..000000000000
--- a/metadata/md5-cache/sci-mathematics/octave-epstk-2.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Graphical output functions for Matlab and Octave
-EAPI=2
-HOMEPAGE=http://www.epstk.de/
-IUSE=doc
-KEYWORDS=~x86 ~amd64
-LICENSE=GPL-2
-RDEPEND=sci-mathematics/octave app-text/ghostscript-gpl
-SLOT=0
-SRC_URI=mirror://debian/pool/main/o/octave-epstk/octave-epstk_2.3.orig.tar.bz2 mirror://debian/pool/main/o/octave-epstk/octave-epstk_2.3-2.debian.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e8b372190546d5124e9be58717f35e3e
diff --git a/metadata/md5-cache/sci-misc/Manifest.gz b/metadata/md5-cache/sci-misc/Manifest.gz
index 05b91808faf3..591ad6082b6a 100644
Binary files a/metadata/md5-cache/sci-misc/Manifest.gz and b/metadata/md5-cache/sci-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-misc/netlogo-bin-6.0.2 b/metadata/md5-cache/sci-misc/netlogo-bin-6.0.2
new file mode 100644
index 000000000000..23d055165574
--- /dev/null
+++ b/metadata/md5-cache/sci-misc/netlogo-bin-6.0.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Cross-platform multi-agent programmable modeling environment
+EAPI=6
+HOMEPAGE=http://ccl.northwestern.edu/netlogo/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=netlogo GPL-2 LGPL-2.1 LGPL-3 BSD Apache-2.0
+RDEPEND=>=virtual/jre-1.8
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~jlec/distfiles/netlogo.gif.tar amd64? ( http://ccl.northwestern.edu/netlogo/6.0.2/NetLogo-6.0.2-64.tgz ) x86? ( http://ccl.northwestern.edu/netlogo/6.0.2/NetLogo-6.0.2-32.tgz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6
+_md5_=9d4b3b70a1ae708590b67d3a6fd9daf5
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index 3b160810894e..58bf2b9130e0 100644
Binary files a/metadata/md5-cache/sci-physics/Manifest.gz and b/metadata/md5-cache/sci-physics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-physics/lammps-20180222 b/metadata/md5-cache/sci-physics/lammps-20180222
new file mode 100644
index 000000000000..aaaa6dc82d25
--- /dev/null
+++ b/metadata/md5-cache/sci-physics/lammps-20180222
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=app-arch/gzip media-libs/libpng:0 sys-libs/zlib mpi? ( virtual/mpi sci-libs/hdf5[mpi] ) 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(-)] ) sci-libs/voro++ virtual/blas virtual/lapack sci-libs/fftw:3.0 netcdf? ( sci-libs/netcdf ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.7.2 virtual/fortran
+DESCRIPTION=Large-scale Atomic/Molecular Massively Parallel Simulator
+EAPI=6
+HOMEPAGE=http://lammps.sandia.gov/
+IUSE=cuda examples gzip lammps-memalign mpi netcdf python test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/gzip media-libs/libpng:0 sys-libs/zlib mpi? ( virtual/mpi sci-libs/hdf5[mpi] ) 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(-)] ) sci-libs/voro++ virtual/blas virtual/lapack sci-libs/fftw:3.0 netcdf? ( sci-libs/netcdf ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) dev-cpp/eigen:3 virtual/fortran
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=https://github.com/lammps/lammps/archive/patch_22Feb2018.tar.gz -> lammps-patch_22Feb2018.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7879e1d64e3c324a9185d524631d775e
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 5f1f8f511114..15254df5614d 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/bleachbit-1.19-r1 b/metadata/md5-cache/sys-apps/bleachbit-1.19-r1
deleted file mode 100644
index 41181f9e1494..000000000000
--- a/metadata/md5-cache/sys-apps/bleachbit-1.19-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=gtk? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nls? ( sys-devel/gettext ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Clean junk to free disk space and to maintain privacy
-EAPI=6
-HOMEPAGE=https://www.bleachbit.org
-IUSE=+gtk nls python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=gtk? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/bleachbit/bleachbit/archive/v1.19.tar.gz -> bleachbit-1.19.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e8aa1332d279988b8638ab83c0c6fa5f
diff --git a/metadata/md5-cache/sys-apps/bleachbit-2.0 b/metadata/md5-cache/sys-apps/bleachbit-2.0
new file mode 100644
index 000000000000..c478e48dd9e1
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/bleachbit-2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=gtk? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/gettext python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Clean junk to free disk space and to maintain privacy
+EAPI=6
+HOMEPAGE=https://www.bleachbit.org
+IUSE=+gtk python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=gtk? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/bleachbit/bleachbit/archive/v2.0.tar.gz -> bleachbit-2.0.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=be4ae85e70ac925aee7e294087277126
diff --git a/metadata/md5-cache/sys-apps/dbus-broker-11 b/metadata/md5-cache/sys-apps/dbus-broker-11
new file mode 100644
index 000000000000..dc5921971bfb
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/dbus-broker-11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=audit? ( sys-process/audit ) launcher? ( >=dev-libs/expat-2.2 >=dev-libs/glib-2.50:2 >=sys-apps/systemd-230 ) selinux? ( sys-libs/libselinux ) dev-python/docutils virtual/pkgconfig >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2
+DESCRIPTION=Linux D-Bus Message Broker
+EAPI=6
+HOMEPAGE=https://github.com/bus1/dbus-broker/wiki
+IUSE=audit +launcher selinux
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=audit? ( sys-process/audit ) launcher? ( >=dev-libs/expat-2.2 >=dev-libs/glib-2.50:2 >=sys-apps/systemd-230 ) selinux? ( sys-libs/libselinux )
+SLOT=0
+SRC_URI=https://github.com/bus1/dbus-broker/archive/v11/dbus-broker-11.tar.gz https://github.com/c-util/c-dvar/archive/f0a525477142f64c45b0be9393cc3b5dc3a6d6f9/c-dvar-f0a525477142f64c45b0be9393cc3b5dc3a6d6f9.tar.gz https://github.com/c-util/c-list/archive/05bada3508c21027dbbbf1319f27ed65c7c03bc0/c-list-05bada3508c21027dbbbf1319f27ed65c7c03bc0.tar.gz https://github.com/c-util/c-rbtree/archive/ba0527e9157316cdb60522f23fb884ea196b1346/c-rbtree-ba0527e9157316cdb60522f23fb884ea196b1346.tar.gz https://github.com/c-util/c-sundry/archive/50c8ccf01b39b3f11e59c69d1cafea5bef5a9769/c-sundry-50c8ccf01b39b3f11e59c69d1cafea5bef5a9769.tar.gz https://github.com/c-util/c-utf8/archive/cc67174f455c9196ebffc37b4d4f249da3dbc66f/c-utf8-cc67174f455c9196ebffc37b4d4f249da3dbc66f.tar.gz
+_eclasses_=meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=acf6ee9657f1e2d5a3c61e0bc7dba7bf
diff --git a/metadata/md5-cache/sys-apps/dbus-broker-9999 b/metadata/md5-cache/sys-apps/dbus-broker-9999
index 01324252187f..1b8c902be9f1 100644
--- a/metadata/md5-cache/sys-apps/dbus-broker-9999
+++ b/metadata/md5-cache/sys-apps/dbus-broker-9999
@@ -8,4 +8,4 @@ LICENSE=Apache-2.0
 RDEPEND=audit? ( sys-process/audit ) launcher? ( >=dev-libs/expat-2.2 >=dev-libs/glib-2.50:2 >=sys-apps/systemd-230 ) selinux? ( sys-libs/libselinux )
 SLOT=0
 _eclasses_=git-r3	fec09a83ae965b041b47f5ff7c8ba29a	meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b172dcc4dd55c7cb88ecd0398efecadf
+_md5_=acf6ee9657f1e2d5a3c61e0bc7dba7bf
diff --git a/metadata/md5-cache/sys-apps/gawk-4.2.1-r1 b/metadata/md5-cache/sys-apps/gawk-4.2.1-r1
new file mode 100644
index 000000000000..1360f135e029
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/gawk-4.2.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=dev-libs/gmp:0= mpfr? ( dev-libs/mpfr:0= ) readline? ( sys-libs/readline:0= ) nls? ( sys-devel/gettext )
+DESCRIPTION=GNU awk pattern-matching language
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/gawk/gawk.html
+IUSE=forced-sandbox mpfr nls readline
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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/gmp:0= mpfr? ( dev-libs/mpfr:0= ) readline? ( sys-libs/readline:0= )
+SLOT=0
+SRC_URI=mirror://gnu/gawk/gawk-4.2.1.tar.xz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=3e63f81d2c9cd3b88d72d9926640fb14
diff --git a/metadata/md5-cache/sys-apps/hwids-20171003 b/metadata/md5-cache/sys-apps/hwids-20171003
index 3526f066edc7..0d132639c6e5 100644
--- a/metadata/md5-cache/sys-apps/hwids-20171003
+++ b/metadata/md5-cache/sys-apps/hwids-20171003
@@ -4,10 +4,10 @@ DESCRIPTION=Hardware (PCI, USB, OUI, IAB) IDs databases
 EAPI=6
 HOMEPAGE=https://github.com/gentoo/hwids
 IUSE=+net +pci +udev +usb
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=|| ( GPL-2 BSD ) public-domain
 RDEPEND=udev? ( virtual/udev ) !<sys-apps/pciutils-3.1.9-r2 !<sys-apps/usbutils-005-r1
 SLOT=0
 SRC_URI=https://github.com/gentoo/hwids/archive/hwids-20171003.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=33f2f05c0982ef4ce3967194c3fa02e3
+_md5_=6a140601bd5f6aa4aac5c5f170bb07e2
diff --git a/metadata/md5-cache/sys-apps/man-1.6g-r1 b/metadata/md5-cache/sys-apps/man-1.6g-r1
index 7c97e807488e..83393a232d84 100644
--- a/metadata/md5-cache/sys-apps/man-1.6g-r1
+++ b/metadata/md5-cache/sys-apps/man-1.6g-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Standard commands to read man pages
 EAPI=4
 HOMEPAGE=http://primates.ximian.com/~flucifredi/man/
 IUSE=+lzma nls selinux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=|| ( >=sys-apps/groff-1.19.2-r1 app-doc/heirloom-doctools ) !sys-apps/man-db !<app-arch/lzma-4.63 lzma? ( app-arch/xz-utils ) selinux? ( sec-policy/selinux-makewhatis )
 SLOT=0
 SRC_URI=http://primates.ximian.com/~flucifredi/man/man-1.6g.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e3acb19623b4bcced3fe7cd6b17eae8e
+_md5_=308b3abcccd4f93ea5c055aea2e5ad38
diff --git a/metadata/md5-cache/sys-apps/prctl-1.6 b/metadata/md5-cache/sys-apps/prctl-1.6
index 162fdbcb955b..b220057b0e1b 100644
--- a/metadata/md5-cache/sys-apps/prctl-1.6
+++ b/metadata/md5-cache/sys-apps/prctl-1.6
@@ -3,9 +3,9 @@ DEPEND=sys-apps/groff
 DESCRIPTION=Tool to query and modify process behavior
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/prctl/
-KEYWORDS=~alpha ~amd64 ia64 ~x86
+KEYWORDS=alpha ~amd64 ia64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/prctl/prctl-1.6.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9ee41c979df38d6d9b82dbde631944d1
+_md5_=3131bb3505efc55fe16e0de5c01652c6
diff --git a/metadata/md5-cache/sys-apps/qdiskusage-1.0.4 b/metadata/md5-cache/sys-apps/qdiskusage-1.0.4
deleted file mode 100644
index fdbd85597960..000000000000
--- a/metadata/md5-cache/sys-apps/qdiskusage-1.0.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-qt/qtgui:4 app-arch/unzip
-DESCRIPTION=Qt4 Graphical Disk Usage Analyzer
-EAPI=2
-HOMEPAGE=http://www.qt-apps.org/content/show.php/QDiskUsage?content=107012
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtgui:4
-SLOT=0
-SRC_URI=http://qt-apps.org/CONTENT/content-files/107012-QDiskUsage-1.0.4.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b9c2267024f1f6dc850817e99f1612af
diff --git a/metadata/md5-cache/sys-apps/qingy-1.0.0-r3 b/metadata/md5-cache/sys-apps/qingy-1.0.0-r3
index 79f870f8daf7..f53cc70f5f3e 100644
--- a/metadata/md5-cache/sys-apps/qingy-1.0.0-r3
+++ b/metadata/md5-cache/sys-apps/qingy-1.0.0-r3
@@ -4,10 +4,10 @@ DESCRIPTION=A DirectFB getty replacement
 EAPI=6
 HOMEPAGE=http://qingy.sourceforge.net/
 IUSE=consolekit crypt emacs gpm opensslcrypt pam static X
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.7-r7:= opensslcrypt? ( dev-libs/openssl:0= ) crypt? ( >=dev-libs/libgcrypt-1.2.1:0= ) emacs? ( virtual/emacs ) pam? ( >=sys-libs/pam-0.75-r11 ) X? ( x11-libs/libX11:= x11-libs/libXScrnSaver:= x11-proto/scrnsaverproto ) consolekit? ( sys-auth/consolekit sys-apps/dbus ) pam? ( sys-auth/pambase )
 SLOT=0
 SRC_URI=mirror://sourceforge/qingy/qingy-1.0.0.tar.bz2 mirror://gentoo/qingy-gentoo-theme-2.1.tar.bz2 https://dev.gentoo.org/~gienah/2big4tree/sys-apps/qingy/qingy-1.0.0-screensavers.patch.gz https://dev.gentoo.org/~gienah/2big4tree/sys-apps/qingy/qingy-1.0.0-consolekit-pam.patch.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1a6d2408a3e748629f79029d72e243c9
+_md5_=a60cddd57e2f5148d96f48a8530c2dd1
diff --git a/metadata/md5-cache/sys-apps/sed-4.4-r1 b/metadata/md5-cache/sys-apps/sed-4.4-r1
new file mode 100644
index 000000000000..ace6e4f0d1bf
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/sed-4.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=acl? ( virtual/acl ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) nls? ( sys-devel/gettext )
+DESCRIPTION=Super-useful stream editor
+EAPI=5
+HOMEPAGE=http://sed.sourceforge.net/
+IUSE=acl forced-sandbox nls selinux static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-3
+RDEPEND=acl? ( virtual/acl ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux )
+SLOT=0
+SRC_URI=mirror://gnu/sed/sed-4.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=16011ad88b0603e0cb5050098d5cee64
diff --git a/metadata/md5-cache/sys-apps/shadow-4.5 b/metadata/md5-cache/sys-apps/shadow-4.5
index 154272e583dd..d950525d9900 100644
--- a/metadata/md5-cache/sys-apps/shadow-4.5
+++ b/metadata/md5-cache/sys-apps/shadow-4.5
@@ -4,10 +4,10 @@ DESCRIPTION=Utilities to deal with user accounts
 EAPI=5
 HOMEPAGE=https://github.com/shadow-maint/shadow http://pkg-shadow.alioth.debian.org/
 IUSE=acl audit +cracklib nls pam selinux skey xattr
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=BSD GPL-2
 RDEPEND=acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2.6:0= ) cracklib? ( >=sys-libs/cracklib-2.7-r3:0= ) pam? ( virtual/pam:0= ) skey? ( sys-auth/skey:0= ) selinux? ( >=sys-libs/libselinux-1.28:0= sys-libs/libsemanage:0= ) nls? ( virtual/libintl ) xattr? ( sys-apps/attr:0= ) pam? ( >=sys-auth/pambase-20150213 )
 SLOT=0
 SRC_URI=https://github.com/shadow-maint/shadow/releases/download/4.5/shadow-4.5.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7fd464af731d46fb7ec53883cf2c904c
+_md5_=47586723b66bb52a4b7097161908caa0
diff --git a/metadata/md5-cache/sys-apps/systemd-237-r3 b/metadata/md5-cache/sys-apps/systemd-237-r3
new file mode 100644
index 000000000000..b1ef610a4f73
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-237-r3
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm pretend setup test unpack
+DEPEND=>=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( libidn2? ( net-dns/libidn2 ) !libidn2? ( net-dns/libidn ) ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[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(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) app-arch/xz-utils:0 dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 >=sys-kernel/linux-headers-3.11 virtual/pkgconfig gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( dev-lang/python:3.6 dev-python/lxml[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/lxml[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/lxml[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ) >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=System and service manager for Linux
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
+IUSE=acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +seccomp selinux ssl +sysv-utils test usrmerge vanilla xkb 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 ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-apps/hwids-20150417[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
+RDEPEND=>=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( libidn2? ( net-dns/libidn2 ) !libidn2? ( net-dns/libidn ) ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[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(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !<sys-kernel/dracut-044 !sys-fs/eudev !sys-fs/udev
+REQUIRED_USE=importd? ( curl gcrypt lzma )
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://github.com/systemd/systemd/archive/v237/systemd-237.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-237-patches-0.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=2a6db326c13c25f97b4e4bef9ba037d6
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 4ab06541b792..b8aa4bab4046 100644
Binary files a/metadata/md5-cache/sys-auth/Manifest.gz and b/metadata/md5-cache/sys-auth/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-auth/elogind-235.2-r1 b/metadata/md5-cache/sys-auth/elogind-235.2-r1
deleted file mode 100644
index 69e1f0bbc3fe..000000000000
--- a/metadata/md5-cache/sys-auth/elogind-235.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/acl ) pam? ( virtual/pam ) selinux? ( sys-libs/libselinux ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-util/gperf dev-util/intltool sys-devel/libtool virtual/pkgconfig >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2 virtual/pkgconfig
-DESCRIPTION=The systemd project's logind, extracted to a standalone package
-EAPI=6
-HOMEPAGE=https://github.com/elogind/elogind
-IUSE=+acl debug doc +pam +policykit selinux
-KEYWORDS=amd64 ~arm x86
-LICENSE=CC0-1.0 LGPL-2.1+ public-domain
-PDEPEND=sys-apps/dbus policykit? ( sys-auth/polkit )
-RDEPEND=sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/acl ) pam? ( virtual/pam ) selinux? ( sys-libs/libselinux ) !sys-apps/systemd
-SLOT=0
-SRC_URI=https://github.com/elogind/elogind/archive/v235.2.tar.gz -> elogind-235.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e30b8cbea7f94dcb93cc6dad375e9110
diff --git a/metadata/md5-cache/sys-auth/elogind-235.2-r2 b/metadata/md5-cache/sys-auth/elogind-235.2-r2
index aa30f16b6741..2e3cb95f6bcf 100644
--- a/metadata/md5-cache/sys-auth/elogind-235.2-r2
+++ b/metadata/md5-cache/sys-auth/elogind-235.2-r2
@@ -11,4 +11,4 @@ RDEPEND=sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/ac
 SLOT=0
 SRC_URI=https://github.com/elogind/elogind/archive/v235.2.tar.gz -> elogind-235.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e6575206679143c8db4a3eab2c758627
+_md5_=fb5605f6056614ba4309ea90ed09932f
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 22a35435d58c..d91f40fa6574 100644
Binary files a/metadata/md5-cache/sys-boot/Manifest.gz and b/metadata/md5-cache/sys-boot/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-boot/plymouth-0.9.3-r1 b/metadata/md5-cache/sys-boot/plymouth-0.9.3-r1
index ffb2c76e5a37..0f32ee470880 100644
--- a/metadata/md5-cache/sys-boot/plymouth-0.9.3-r1
+++ b/metadata/md5-cache/sys-boot/plymouth-0.9.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Graphical boot animation (splash) and logger
 EAPI=6
 HOMEPAGE=https://cgit.freedesktop.org/plymouth/
 IUSE=debug gdm +gtk +libkms +pango static-libs
-KEYWORDS=alpha amd64 arm ia64 ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.2.16:= gtk? ( dev-libs/glib:2 >=x11-libs/gtk+-3.14:3 x11-libs/cairo ) libkms? ( x11-libs/libdrm[libkms] ) pango? ( >=x11-libs/pango-1.21 ) virtual/udev !<sys-kernel/dracut-0.37-r3
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~aidecoe/distfiles/sys-boot/plymouth/gentoo-logo.png https://www.freedesktop.org/software/plymouth/releases/plymouth-0.9.3.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=389c961310816d84ccff6f0d1e0874d7
+_md5_=8a17a65a636b90a31c0ea9eb57af7320
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index eb43aa54dda0..72d477e045e6 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/automake-1.10.3-r3 b/metadata/md5-cache/sys-devel/automake-1.10.3-r3
index 35bc210ad453..0832c9962ca0 100644
--- a/metadata/md5-cache/sys-devel/automake-1.10.3-r3
+++ b/metadata/md5-cache/sys-devel/automake-1.10.3-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/automake/
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 SLOT=1.10
 SRC_URI=mirror://gnu/automake/automake-1.10.3.tar.bz2
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=13fb75692f682f2130b70b9c6dd19cd2
+_md5_=5855e0f4542088f9ceb96cce63f63e5b
diff --git a/metadata/md5-cache/sys-devel/automake-1.11.6-r3 b/metadata/md5-cache/sys-devel/automake-1.11.6-r3
index 6e91689dce2e..028276bb0ea8 100644
--- a/metadata/md5-cache/sys-devel/automake-1.11.6-r3
+++ b/metadata/md5-cache/sys-devel/automake-1.11.6-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/automake/
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 SLOT=1.11
 SRC_URI=mirror://gnu/automake/automake-1.11.6.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c02e5cc3f25887ac7044581d7a990e98
+_md5_=21d6d626d303547943344a4fb83a5e21
diff --git a/metadata/md5-cache/sys-devel/automake-1.12.6-r2 b/metadata/md5-cache/sys-devel/automake-1.12.6-r2
index 993a5d6ecd68..ac7f2561337c 100644
--- a/metadata/md5-cache/sys-devel/automake-1.12.6-r2
+++ b/metadata/md5-cache/sys-devel/automake-1.12.6-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/automake/
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 SLOT=1.12
 SRC_URI=mirror://gnu/automake/automake-1.12.6.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f4695fb082e29342ddec7c67b37a0cd5
+_md5_=78c63d8f19954d3a11e1759acb0f3018
diff --git a/metadata/md5-cache/sys-devel/automake-1.13.4-r2 b/metadata/md5-cache/sys-devel/automake-1.13.4-r2
index 48259412e2b2..139a42fd1491 100644
--- a/metadata/md5-cache/sys-devel/automake-1.13.4-r2
+++ b/metadata/md5-cache/sys-devel/automake-1.13.4-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/automake/
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 SLOT=1.13
 SRC_URI=mirror://gnu/automake/automake-1.13.4.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=16c78b5e2beb179147910a166617d342
+_md5_=950864975bfbb4ec3b25d9bbd6bf1a2d
diff --git a/metadata/md5-cache/sys-devel/automake-1.14.1-r2 b/metadata/md5-cache/sys-devel/automake-1.14.1-r2
index eb813da5c9a6..0bb249eddf7a 100644
--- a/metadata/md5-cache/sys-devel/automake-1.14.1-r2
+++ b/metadata/md5-cache/sys-devel/automake-1.14.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/automake/
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 SLOT=1.14
 SRC_URI=mirror://gnu/automake/automake-1.14.1.tar.xz https://alpha.gnu.org/pub/gnu/automake/automake-1.14.1.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=df10ce67b28e012cef5c444e4b3adf08
+_md5_=ddc57ee87da2a3143de6320e9293ea13
diff --git a/metadata/md5-cache/sys-devel/automake-1.15.1-r2 b/metadata/md5-cache/sys-devel/automake-1.15.1-r2
index 10c1062facfa..9fc21fd463f5 100644
--- a/metadata/md5-cache/sys-devel/automake-1.15.1-r2
+++ b/metadata/md5-cache/sys-devel/automake-1.15.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/automake/
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 SLOT=1.15
 SRC_URI=mirror://gnu/automake/automake-1.15.1.tar.xz https://alpha.gnu.org/pub/gnu/automake/automake-1.15.1.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=dee388c2c00a82528c05aca258543a97
+_md5_=5756124979854c664a4a1b0375aca826
diff --git a/metadata/md5-cache/sys-devel/automake-1.9.6-r5 b/metadata/md5-cache/sys-devel/automake-1.9.6-r5
index 18cc4f6b2b46..e1c9d8d9756e 100644
--- a/metadata/md5-cache/sys-devel/automake-1.9.6-r5
+++ b/metadata/md5-cache/sys-devel/automake-1.9.6-r5
@@ -4,10 +4,10 @@ DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/automake/
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* >=sys-apps/texinfo-4.7 sys-devel/gnuconfig
 SLOT=1.9
 SRC_URI=mirror://gnu/automake/automake-1.9.6.tar.bz2
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=957e9a8529a538653cf017a692d7c9db
+_md5_=891121bb416045be043698f091b56994
diff --git a/metadata/md5-cache/sys-devel/patch-2.7.6-r1 b/metadata/md5-cache/sys-devel/patch-2.7.6-r1
index c8201f44fb28..aa893b6f11ed 100644
--- a/metadata/md5-cache/sys-devel/patch-2.7.6-r1
+++ b/metadata/md5-cache/sys-devel/patch-2.7.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Utility to apply diffs to files
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/patch/patch.html
 IUSE=static test xattr
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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 ~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-3+
 RDEPEND=xattr? ( sys-apps/attr )
 SLOT=0
 SRC_URI=mirror://gnu/patch/patch-2.7.6.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fa3520420fe1d24485de792851c4c7b0
+_md5_=e8edd3cb7d33110ea1f977a5de793bcd
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 42c9fdbb0b78..19d2d963f580 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/mtools-4.0.18-r2 b/metadata/md5-cache/sys-fs/mtools-4.0.18-r2
index 2e478cad4222..ca35699aab5b 100644
--- a/metadata/md5-cache/sys-fs/mtools-4.0.18-r2
+++ b/metadata/md5-cache/sys-fs/mtools-4.0.18-r2
@@ -4,10 +4,10 @@ DESCRIPTION=utilities to access MS-DOS disks from Unix without mounting them
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools
 IUSE=X elibc_glibc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris
+KEYWORDS=alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris
 LICENSE=GPL-3
 RDEPEND=!elibc_glibc? ( virtual/libiconv ) X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
 SLOT=0
 SRC_URI=mirror://gnu/mtools/mtools-4.0.18.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=92d10ae9a2e21aa2e917be5b3eb36570
+_md5_=7304a5e7852f5a71a2bad5e075385d1c
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 2577cf2a3255..cd672cf7e848 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.24 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.24
new file mode 100644
index 000000000000..9170bac0d666
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.24
@@ -0,0 +1,14 @@
+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 4.14 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.24
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-29.base.tar.xz mirror://gentoo/genpatches-4.14-29.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-29.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=f237d80d08850e574283293ce2232cd7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.120 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.120
new file mode 100644
index 000000000000..814d66e03bd8
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.120
@@ -0,0 +1,14 @@
+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 4.4 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.4.120
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-124.base.tar.xz mirror://gentoo/genpatches-4.4-124.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-124.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=77441474ee8a7e185046d41636f6819d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.86 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.86
new file mode 100644
index 000000000000..67eb8badf6f9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.86
@@ -0,0 +1,14 @@
+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 4.9 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.86
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-89.base.tar.xz mirror://gentoo/genpatches-4.9-89.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-89.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=cf248926c0fb9cac59da3e5ad5adab24
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.16_rc4 b/metadata/md5-cache/sys-kernel/git-sources-4.16_rc4
new file mode 100644
index 000000000000..320c43043b7d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-4.16_rc4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-devel/patch-2.7.5 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=5
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.16_rc4
+SRC_URI=https://git.kernel.org/torvalds/p/v4.16-rc4/v4.15 -> patch-4.16-rc4.patch mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=f574e23ca6bde475eeea1dd06b588440
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.54 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.55
similarity index 93%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-3.16.54
rename to metadata/md5-cache/sys-kernel/vanilla-sources-3.16.55
index 41147ee99bfe..c04c1941e10d 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.54
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.55
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
 RESTRICT=binchecks strip
-SLOT=3.16.54
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.16.54.xz mirror://kernel/linux/kernel/v3.x/linux-3.16.tar.xz
+SLOT=3.16.55
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.16.55.xz mirror://kernel/linux/kernel/v3.x/linux-3.16.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c17426767d4d7574c7b84c5adfcb4305
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.99 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.100
similarity index 89%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-3.2.99
rename to metadata/md5-cache/sys-kernel/vanilla-sources-3.2.100
index fa00b703a386..1e98fe964164 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.99
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.100
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
 RESTRICT=binchecks strip
-SLOT=3.2.99
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.2.99.xz mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz
+SLOT=3.2.100
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.2.100.xz mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c17426767d4d7574c7b84c5adfcb4305
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.23 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.24
similarity index 93%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.14.23
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.14.24
index e97288848036..530f9fb4ff2f 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.23
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.24
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
 RESTRICT=binchecks strip
-SLOT=4.14.23
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.23.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
+SLOT=4.14.24
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.24.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c17426767d4d7574c7b84c5adfcb4305
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.119 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.120
similarity index 93%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.4.119
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.4.120
index 05940779a3f2..a02784ba0835 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.119
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.120
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
 RESTRICT=binchecks strip
-SLOT=4.4.119
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.119.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
+SLOT=4.4.120
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.120.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c17426767d4d7574c7b84c5adfcb4305
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.85 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.86
similarity index 93%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.9.85
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.9.86
index 135874822696..f86288234c35 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.85
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.86
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
 RESTRICT=binchecks strip
-SLOT=4.9.85
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.85.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
+SLOT=4.9.86
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.86.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c17426767d4d7574c7b84c5adfcb4305
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 3aa222aa0d8e..6260840ca539 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/db-5.1.29-r1 b/metadata/md5-cache/sys-libs/db-5.1.29-r1
index 62e1d693cc68..886f44efa21f 100644
--- a/metadata/md5-cache/sys-libs/db-5.1.29-r1
+++ b/metadata/md5-cache/sys-libs/db-5.1.29-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=test? ( tcl )
 SLOT=5.1
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.1.29.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	db	95648c4206d867f20f80219c283da12a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2bfa0148296b271ba4656d8f7be74386
+_md5_=a9ac004b6a902d54a4f8f6a22c287d1d
diff --git a/metadata/md5-cache/sys-libs/db-5.3.28-r2 b/metadata/md5-cache/sys-libs/db-5.3.28-r2
index cf0053dfb1f6..6cc77492b727 100644
--- a/metadata/md5-cache/sys-libs/db-5.3.28-r2
+++ b/metadata/md5-cache/sys-libs/db-5.3.28-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=test? ( tcl )
 SLOT=5.3
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.3.28.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	db	95648c4206d867f20f80219c283da12a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=25be504779782decd58554614e0aee6d
+_md5_=9a584499919935e7abb89a5df3c71441
diff --git a/metadata/md5-cache/sys-libs/db-5.3.28-r3 b/metadata/md5-cache/sys-libs/db-5.3.28-r3
index c6e716705016..79183e52ad52 100644
--- a/metadata/md5-cache/sys-libs/db-5.3.28-r3
+++ b/metadata/md5-cache/sys-libs/db-5.3.28-r3
@@ -11,4 +11,4 @@ REQUIRED_USE=test? ( tcl )
 SLOT=5.3
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.3.28.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	db	95648c4206d867f20f80219c283da12a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=54f231213401e86c393b1d1e10865469
+_md5_=9769c36de6822b31f8f474b0c8f1031c
diff --git a/metadata/md5-cache/sys-libs/db-6.0.35 b/metadata/md5-cache/sys-libs/db-6.0.35
index 6dc46c3ae0f0..d3c4f4a661d4 100644
--- a/metadata/md5-cache/sys-libs/db-6.0.35
+++ b/metadata/md5-cache/sys-libs/db-6.0.35
@@ -11,4 +11,4 @@ REQUIRED_USE=test? ( tcl )
 SLOT=6.0
 SRC_URI=http://download.oracle.com/berkeley-db/db-6.0.35.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	db	95648c4206d867f20f80219c283da12a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=78761ce33e9bbaa5bb02dab0d6b9de96
+_md5_=3c85535ee1c99c73a6552e128499af59
diff --git a/metadata/md5-cache/sys-libs/db-6.0.35-r1 b/metadata/md5-cache/sys-libs/db-6.0.35-r1
index bfd65709f399..28b6f9e64c3b 100644
--- a/metadata/md5-cache/sys-libs/db-6.0.35-r1
+++ b/metadata/md5-cache/sys-libs/db-6.0.35-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=test? ( tcl )
 SLOT=6.0
 SRC_URI=http://download.oracle.com/berkeley-db/db-6.0.35.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	db	95648c4206d867f20f80219c283da12a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=8b7095f1b05538b252fa4d5660a1ed65
+_md5_=6e2d4f7a981677284a6bc76bb0af8512
diff --git a/metadata/md5-cache/sys-libs/db-6.1.29 b/metadata/md5-cache/sys-libs/db-6.1.29
index f4c2468ce3ca..362313c05b79 100644
--- a/metadata/md5-cache/sys-libs/db-6.1.29
+++ b/metadata/md5-cache/sys-libs/db-6.1.29
@@ -11,4 +11,4 @@ REQUIRED_USE=test? ( tcl )
 SLOT=6.1
 SRC_URI=http://download.oracle.com/berkeley-db/db-6.1.29.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	db	95648c4206d867f20f80219c283da12a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=a130bc2aeb7e7dce7c13cde23ccdddc4
+_md5_=6ee148ca6e20a0f365e6103e08fec9aa
diff --git a/metadata/md5-cache/sys-libs/db-6.1.29-r1 b/metadata/md5-cache/sys-libs/db-6.1.29-r1
index 3bc289c3b7dc..92637b2205c2 100644
--- a/metadata/md5-cache/sys-libs/db-6.1.29-r1
+++ b/metadata/md5-cache/sys-libs/db-6.1.29-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=test? ( tcl )
 SLOT=6.1
 SRC_URI=http://download.oracle.com/berkeley-db/db-6.1.29.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	db	95648c4206d867f20f80219c283da12a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=4031e96866c9862e001c932cefd9ff3a
+_md5_=8f0173e2e719b1cdc855e4510faa700b
diff --git a/metadata/md5-cache/sys-libs/db-6.2.23 b/metadata/md5-cache/sys-libs/db-6.2.23
index decd025b8593..d1c34af1e3c2 100644
--- a/metadata/md5-cache/sys-libs/db-6.2.23
+++ b/metadata/md5-cache/sys-libs/db-6.2.23
@@ -11,4 +11,4 @@ REQUIRED_USE=test? ( tcl )
 SLOT=6.2
 SRC_URI=http://download.oracle.com/berkeley-db/db-6.2.23.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	db	95648c4206d867f20f80219c283da12a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=74ccee998b3f4d6904a9100203be2173
+_md5_=75ba9b56faef0cbb551c8c6db2b6fcbf
diff --git a/metadata/md5-cache/sys-libs/db-6.2.23-r1 b/metadata/md5-cache/sys-libs/db-6.2.23-r1
index 1effd023a062..9eb591112751 100644
--- a/metadata/md5-cache/sys-libs/db-6.2.23-r1
+++ b/metadata/md5-cache/sys-libs/db-6.2.23-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=test? ( tcl )
 SLOT=6.2
 SRC_URI=http://download.oracle.com/berkeley-db/db-6.2.23.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	db	95648c4206d867f20f80219c283da12a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=8c902de5fc7f7ef609c9feb1f509788d
+_md5_=759751774e3e4817e694975ebadad9c0
diff --git a/metadata/md5-cache/sys-libs/db-6.2.32 b/metadata/md5-cache/sys-libs/db-6.2.32
index 0e4f0b61c83e..b363b0a8e77a 100644
--- a/metadata/md5-cache/sys-libs/db-6.2.32
+++ b/metadata/md5-cache/sys-libs/db-6.2.32
@@ -11,4 +11,4 @@ REQUIRED_USE=test? ( tcl )
 SLOT=6.2
 SRC_URI=http://download.oracle.com/berkeley-db/db-6.2.32.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	db	95648c4206d867f20f80219c283da12a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2966a5e6c88bd719282fa7420c25888e
+_md5_=7ecb6b78626afa3b0605d5f9dc2ca710
diff --git a/metadata/md5-cache/sys-libs/db-6.2.32-r1 b/metadata/md5-cache/sys-libs/db-6.2.32-r1
index d1ec628ed771..721fb3447abe 100644
--- a/metadata/md5-cache/sys-libs/db-6.2.32-r1
+++ b/metadata/md5-cache/sys-libs/db-6.2.32-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=test? ( tcl )
 SLOT=6.2
 SRC_URI=http://download.oracle.com/berkeley-db/db-6.2.32.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	db	95648c4206d867f20f80219c283da12a	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=e871e9134c4d3bf7d277421f8c42e93d
+_md5_=c5b59860ee00bf385ae5383237400185
diff --git a/metadata/md5-cache/sys-libs/glibc-2.19-r2 b/metadata/md5-cache/sys-libs/glibc-2.19-r2
new file mode 100644
index 000000000000..eced7994a671
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/glibc-2.19-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend test unpack
+DEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) >=app-misc/pax-utils-0.1.10 !<sys-apps/sandbox-1.6 !<sys-apps/portage-2.1.2 !<sys-devel/bison-2.7 doc? ( sys-apps/texinfo ) >=sys-devel/binutils-2.24 >=sys-devel/gcc-4.9 virtual/os-headers sys-devel/gnuconfig virtual/pkgconfig
+DESCRIPTION=GNU libc C library
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/libc/
+IUSE=audit caps compile-locales debug doc gd hardened headers-only multilib nscd profile selinux suid systemtap vanilla
+LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
+PDEPEND=!vanilla? ( sys-libs/timezone-data )
+RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) sys-apps/gentoo-functions !sys-kernel/ps3-sources !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data )
+RESTRICT=strip
+SLOT=2.2
+SRC_URI=mirror://gnu/glibc/glibc-2.19.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.19-patches-9.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=6f4a179fc9d0db46896113adf2e87ea0
diff --git a/metadata/md5-cache/sys-libs/glibc-2.25-r10 b/metadata/md5-cache/sys-libs/glibc-2.25-r10
index 6e08be2a67b9..1a9c9264c695 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.25-r10
+++ b/metadata/md5-cache/sys-libs/glibc-2.25-r10
@@ -4,7 +4,7 @@ DESCRIPTION=GNU libc6 (also called glibc2) C library
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/libc/libc.html
 IUSE=audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla headers-only
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
 RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !sys-kernel/ps3-sources sys-apps/gentoo-functions !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data )
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25-patches-13.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.25-patches-13.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.25-patches-13.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/glibc-2.25-patches-13.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/glibc-2.25-patches-13.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	toolchain-glibc	1a9c5bd1f2df386fb769880b03950ffc	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ce21bfeac8845e0fe0bfc35655e05efb
+_md5_=e47d9b1667c5bbb2399018e389a3f088
diff --git a/metadata/md5-cache/sys-libs/glibc-2.25-r11 b/metadata/md5-cache/sys-libs/glibc-2.25-r11
index f4ecfd225688..10d1d1880499 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.25-r11
+++ b/metadata/md5-cache/sys-libs/glibc-2.25-r11
@@ -9,6 +9,6 @@ PDEPEND=!vanilla? ( sys-libs/timezone-data )
 RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !sys-kernel/ps3-sources sys-apps/gentoo-functions !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data )
 RESTRICT=strip
 SLOT=2.2
-SRC_URI=mirror://gnu/glibc/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25-patches-14.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.25-patches-14.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.25-patches-14.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/glibc-2.25-patches-14.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/glibc-2.25-patches-14.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
+SRC_URI=mirror://gnu/glibc/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/glibc-2.25-patches-15.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	toolchain-glibc	1a9c5bd1f2df386fb769880b03950ffc	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2861fd1a123cbeb57558f186f5cf7d9c
+_md5_=7216542e69896793228357540e8c1a92
diff --git a/metadata/md5-cache/sys-libs/libomp-5.0.1 b/metadata/md5-cache/sys-libs/libomp-5.0.1
index 007629b357d3..05ac6005d5a2 100644
--- a/metadata/md5-cache/sys-libs/libomp-5.0.1
+++ b/metadata/md5-cache/sys-libs/libomp-5.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
 EAPI=6
 HOMEPAGE=https://openmp.llvm.org
 IUSE=hwloc kernel_linux ompt test 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 ~arm64 x86 ~amd64-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x64-macos
 LICENSE=|| ( UoI-NCSA MIT ) MIT LLVM-Grant
 RDEPEND=hwloc? ( sys-apps/hwloc: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(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/5.0.1/openmp-5.0.1.src.tar.xz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=742d201b852c221f15a20da6db7383e4
+_md5_=bafe2999b3b3f5e831f2d886ef8fd6a8
diff --git a/metadata/md5-cache/sys-libs/libsmbios-2.3.0-r1 b/metadata/md5-cache/sys-libs/libsmbios-2.3.0-r1
deleted file mode 100644
index 0fb53d0342cc..000000000000
--- a/metadata/md5-cache/sys-libs/libsmbios-2.3.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) python? ( 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(+)] ) virtual/pkgconfig doc? ( app-doc/doxygen ) graphviz? ( media-gfx/graphviz ) nls? ( sys-devel/gettext ) test? ( >=dev-util/cppunit-1.9.6 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Provide access to (SM)BIOS information
-EAPI=6
-HOMEPAGE=http://linux.dell.com/libsmbios/main/index.html
-IUSE=doc graphviz nls python static-libs test python_targets_python2_7
-KEYWORDS=amd64 ia64 x86
-LICENSE=GPL-2 OSL-2.0
-RDEPEND=dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) python? ( 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(+)] )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://linux.dell.com/libsmbios/download/libsmbios/libsmbios-2.3.0/libsmbios-2.3.0.tar.xz http://linux.dell.com/libsmbios/download/libsmbios/old/libsmbios-2.3.0/libsmbios-2.3.0.tar.xz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b5c545ebc60b108bc74a598b44aab293
diff --git a/metadata/md5-cache/sys-libs/libsmbios-2.4.1 b/metadata/md5-cache/sys-libs/libsmbios-2.4.1
new file mode 100644
index 000000000000..a2236c681d4c
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libsmbios-2.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) virtual/pkgconfig doc? ( app-doc/doxygen ) graphviz? ( media-gfx/graphviz ) nls? ( sys-devel/gettext ) test? ( >=dev-util/cppunit-1.9.6 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Provide access to (SM)BIOS information
+EAPI=6
+HOMEPAGE=http://linux.dell.com/files/libsmbios/
+IUSE=doc graphviz nls python static-libs test 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
+KEYWORDS=~amd64 ~ia64 ~x86
+LICENSE=GPL-2 OSL-2.0
+RDEPEND=dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=https://github.com/dell/libsmbios/archive/v2.4.1.tar.gz -> libsmbios-2.4.1.tar.gz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=ea2e22fd6c99dd9f746ba43646e58290
diff --git a/metadata/md5-cache/sys-libs/slang-2.3.2_pre23 b/metadata/md5-cache/sys-libs/slang-2.3.2
similarity index 80%
rename from metadata/md5-cache/sys-libs/slang-2.3.2_pre23
rename to metadata/md5-cache/sys-libs/slang-2.3.2
index 772cda2988dd..969d894edfbf 100644
--- a/metadata/md5-cache/sys-libs/slang-2.3.2_pre23
+++ b/metadata/md5-cache/sys-libs/slang-2.3.2
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= cjk? ( >=dev-libs/oniguruma-5.9.5:=[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(-)?] ) pcre? ( >=dev-libs/libpcre-8.33-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(-)?] ) png? ( >=media-libs/libpng-1.6.10: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(-)?] ) readline? ( >=sys-libs/readline-6.2_p5-r1: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(-)?] ) zlib? ( >=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(-)?] )
 SLOT=0
-SRC_URI=https://www.jedsoft.org/snapshots/slang-pre2.3.2-23.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3d9c3f987e39a64b42b61a35429113fc
+SRC_URI=http://www.jedsoft.org/releases/slang/slang-2.3.2.tar.bz2 http://www.jedsoft.org/releases/slang/old/slang-2.3.2.tar.bz2
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=b9a60aa3173d15f3449326a3bf219ed0
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index ebcb61ef24a9..4d2816069415 100644
Binary files a/metadata/md5-cache/sys-power/Manifest.gz and b/metadata/md5-cache/sys-power/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-power/upower-0.99.5 b/metadata/md5-cache/sys-power/upower-0.99.5
index 4bb0b134af3f..f54c620eceb2 100644
--- a/metadata/md5-cache/sys-power/upower-0.99.5
+++ b/metadata/md5-cache/sys-power/upower-0.99.5
@@ -4,10 +4,10 @@ DESCRIPTION=D-Bus abstraction for enumerating power devices, querying history an
 EAPI=6
 HOMEPAGE=https://upower.freedesktop.org/
 IUSE=doc +introspection ios kernel_FreeBSD kernel_linux selinux
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.34:2 sys-apps/dbus:= introspection? ( dev-libs/gobject-introspection:= ) kernel_linux? ( virtual/libusb:1 virtual/libgudev:= virtual/udev ios? ( >=app-pda/libimobiledevice-1:= >=app-pda/libplist-1:= ) ) selinux? ( sec-policy/selinux-devicekit )
 SLOT=0/3
 SRC_URI=https://upower.freedesktop.org/releases/upower-0.99.5.tar.xz
 _eclasses_=ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a19c342543ed4ee4a188d94a0c488deb
+_md5_=c07669f747b51fdfae0d98843c80be6f
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index a0c34e8a2dba..35a1467aeaad 100644
Binary files a/metadata/md5-cache/sys-process/Manifest.gz and b/metadata/md5-cache/sys-process/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-process/audit-2.7.1 b/metadata/md5-cache/sys-process/audit-2.7.1
index 5c2abcf11f76..28e90e030fda 100644
--- a/metadata/md5-cache/sys-process/audit-2.7.1
+++ b/metadata/md5-cache/sys-process/audit-2.7.1
@@ -4,7 +4,7 @@ DESCRIPTION=Userspace utilities for storing and processing auditing records
 EAPI=6
 HOMEPAGE=https://people.redhat.com/sgrubb/audit/
 IUSE=gssapi ldap python 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 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-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=GPL-2
 RDEPEND=gssapi? ( virtual/krb5 ) ldap? ( net-nds/openldap ) sys-libs/libcap-ng 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? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://people.redhat.com/sgrubb/audit/audit-2.7.1.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=347952bca5584ff3c435eb5bb53c7399
+_md5_=0f6e619d464140fa5867142d7b470d67
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index a532cb2c6d7a..13567b0e801b 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/libgudev-232 b/metadata/md5-cache/virtual/libgudev-232
index 3c29e0c9282e..30681e635528 100644
--- a/metadata/md5-cache/virtual/libgudev-232
+++ b/metadata/md5-cache/virtual/libgudev-232
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for libgudev providers
 EAPI=6
 IUSE=introspection 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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86
 RDEPEND=>=dev-libs/libgudev-232: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(-)?,introspection?,static-libs?]
 SLOT=0/0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=bb5a37366239dc193771d6379a2df85f
+_md5_=d5c17547f93f041a4cdc1c4279bba853
diff --git a/metadata/md5-cache/virtual/python-funcsigs-1 b/metadata/md5-cache/virtual/python-funcsigs-1
index f5d84fe89691..d92928979325 100644
--- a/metadata/md5-cache/virtual/python-funcsigs-1
+++ b/metadata/md5-cache/virtual/python-funcsigs-1
@@ -2,9 +2,9 @@ DEFINED_PHASES=-
 DESCRIPTION=A Virtual for Python function signatures from PEP362 (py3.6 variant)
 EAPI=6
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=dev-python/funcsigs-1 ) python_targets_pypy3? ( >=dev-python/funcsigs-1 ) python_targets_python2_7? ( >=dev-python/funcsigs-1 ) python_targets_python3_4? ( >=dev-python/funcsigs-1 ) python_targets_python3_5? ( >=dev-python/funcsigs-1 )
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=37297d215cb62ae5866a49fe910760d9
+_md5_=26c3b541794b2cd450b9bc5949905690
diff --git a/metadata/md5-cache/virtual/python-pathlib-1.0 b/metadata/md5-cache/virtual/python-pathlib-1.0
index ba3e71d2660b..12089d249972 100644
--- a/metadata/md5-cache/virtual/python-pathlib-1.0
+++ b/metadata/md5-cache/virtual/python-pathlib-1.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=-
 DESCRIPTION=A virtual for Python pathlib module
 EAPI=5
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 ia64 x86
+KEYWORDS=amd64 ~arm64 ia64 ppc64 x86
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( dev-python/pathlib[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( dev-python/pathlib[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pathlib[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4d229217bc161b565dbdc12084f621c0
+_md5_=bcf50052622012935eb3e0418146c096
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index cd93aa17c594..04f90c06c02b 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/roundup-1.5.1 b/metadata/md5-cache/www-apps/roundup-1.5.1
index 4a2f47fa5997..d19e7b6047df 100644
--- a/metadata/md5-cache/www-apps/roundup-1.5.1
+++ b/metadata/md5-cache/www-apps/roundup-1.5.1
@@ -4,11 +4,11 @@ DESCRIPTION=Issue-tracking system with command-line, web, and e-mail interfaces
 EAPI=6
 HOMEPAGE=http://roundup.sourceforge.net https://pypi.python.org/pypi/roundup
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ppc ~sparc x86
+KEYWORDS=amd64 ppc sparc x86
 LICENSE=MIT ZPL
 RDEPEND=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_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/roundup/roundup-1.5.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c78a66448d7e08803036a42d15323c15
+_md5_=e4a22e0461960528f08d9a81d81c16db
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 82f19868a638..5f00f40b1820 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/chromium-64.0.3282.186 b/metadata/md5-cache/www-client/chromium-64.0.3282.186
index ee364de35541..23d1ac18ed25 100644
--- a/metadata/md5-cache/www-client/chromium-64.0.3282.186
+++ b/metadata/md5-cache/www-client/chromium-64.0.3282.186
@@ -4,11 +4,11 @@ DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=6
 HOMEPAGE=http://chromium.org/
 IUSE=component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/atk dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.5.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-64.0.3282.186.tar.xz
 _eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fe29ba099f411d03fcd816a4967adce7
+_md5_=0e1b0a4eb92f61d0f0597baf33907b43
diff --git a/metadata/md5-cache/www-client/chromium-65.0.3325.73 b/metadata/md5-cache/www-client/chromium-65.0.3325.106
similarity index 98%
rename from metadata/md5-cache/www-client/chromium-65.0.3325.73
rename to metadata/md5-cache/www-client/chromium-65.0.3325.106
index 6c3003c70118..772d169e17a6 100644
--- a/metadata/md5-cache/www-client/chromium-65.0.3325.73
+++ b/metadata/md5-cache/www-client/chromium-65.0.3325.106
@@ -4,11 +4,11 @@ DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=6
 HOMEPAGE=http://chromium.org/
 IUSE=component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/atk dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.6.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-65.0.3325.73.tar.xz
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-65.0.3325.106.tar.xz
 _eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=32c2b7c33057eb62364898d858d991fc
+_md5_=c39c47cbdbec373a13fd787c9e8544e4
diff --git a/metadata/md5-cache/www-client/chromium-65.0.3325.88 b/metadata/md5-cache/www-client/chromium-65.0.3325.88
index d357db693fd0..eeb5f4f8c987 100644
--- a/metadata/md5-cache/www-client/chromium-65.0.3325.88
+++ b/metadata/md5-cache/www-client/chromium-65.0.3325.88
@@ -4,11 +4,11 @@ DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=6
 HOMEPAGE=http://chromium.org/
 IUSE=component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/atk dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.6.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-65.0.3325.88.tar.xz
 _eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=32c2b7c33057eb62364898d858d991fc
+_md5_=c39c47cbdbec373a13fd787c9e8544e4
diff --git a/metadata/md5-cache/www-client/chromium-66.0.3355.0 b/metadata/md5-cache/www-client/chromium-66.0.3355.0
new file mode 100644
index 000000000000..f9d9d156b3dc
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-66.0.3355.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/atk dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.6.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-6.9.4 sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/clang-5 virtual/pkgconfig dev-vcs/git || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=6
+HOMEPAGE=http://chromium.org/
+IUSE=component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/atk dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.6.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-66.0.3355.0.tar.xz
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=32baeba2a35a86e83819539259374521
diff --git a/metadata/md5-cache/www-client/opera-developer-53.0.2885.0 b/metadata/md5-cache/www-client/opera-developer-53.0.2885.0
new file mode 100644
index 000000000000..73d22e3e6f7e
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-developer-53.0.2885.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=A fast and secure web browser
+EAPI=5
+HOMEPAGE=http://www.opera.com/
+IUSE=+l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64
+LICENSE=OPERA-2014
+RDEPEND=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 net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver 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/libXtst x11-libs/libnotify x11-libs/pango[X]
+SLOT=0
+SRC_URI=amd64? ( http://download1.operacdn.com/pub/opera-developer/53.0.2885.0/linux/opera-developer_53.0.2885.0_amd64.deb http://download2.operacdn.com/pub/opera-developer/53.0.2885.0/linux/opera-developer_53.0.2885.0_amd64.deb http://download3.operacdn.com/pub/opera-developer/53.0.2885.0/linux/opera-developer_53.0.2885.0_amd64.deb http://download4.operacdn.com/pub/opera-developer/53.0.2885.0/linux/opera-developer_53.0.2885.0_amd64.deb )
+_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fa0a012555bec1bb5e09a23f4458261d
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index 967ce037f28c..27ab944f86b1 100644
Binary files a/metadata/md5-cache/x11-apps/Manifest.gz and b/metadata/md5-cache/x11-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-apps/appres-1.0.5 b/metadata/md5-cache/x11-apps/appres-1.0.5
new file mode 100644
index 000000000000..d766492be4f2
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/appres-1.0.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=x11-libs/libX11 x11-libs/libXt >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DESCRIPTION=list X application resource database
+EAPI=5
+HOMEPAGE=https://www.x.org/wiki/
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=MIT
+RDEPEND=x11-libs/libX11 x11-libs/libXt
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/appres-1.0.5.tar.bz2
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
+_md5_=dddeb6f07fd877687b4dde9c064db2b0
diff --git a/metadata/md5-cache/x11-apps/editres-1.0.7 b/metadata/md5-cache/x11-apps/editres-1.0.7
new file mode 100644
index 000000000000..530de287e027
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/editres-1.0.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DESCRIPTION=a dynamic resource editor for X Toolkit applications
+EAPI=5
+HOMEPAGE=https://www.x.org/wiki/
+KEYWORDS=amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86
+LICENSE=MIT
+RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/editres-1.0.7.tar.bz2
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
+_md5_=750ef33801582319df9581d6f9db5fdd
diff --git a/metadata/md5-cache/x11-apps/iceauth-1.0.8 b/metadata/md5-cache/x11-apps/iceauth-1.0.8
new file mode 100644
index 000000000000..8adcd49f3de2
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/iceauth-1.0.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=x11-libs/libICE x11-proto/xproto >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DESCRIPTION=ICE authority file utility
+EAPI=5
+HOMEPAGE=https://www.x.org/wiki/
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris ~x86-winnt
+LICENSE=MIT
+RDEPEND=x11-libs/libICE
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/iceauth-1.0.8.tar.bz2
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
+_md5_=a41b47d29067f3be916db19ff5886cb3
diff --git a/metadata/md5-cache/x11-apps/listres-1.0.4 b/metadata/md5-cache/x11-apps/listres-1.0.4
new file mode 100644
index 000000000000..8781b3b04322
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/listres-1.0.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DESCRIPTION=list resources in widgets
+EAPI=4
+HOMEPAGE=https://www.x.org/wiki/
+KEYWORDS=amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86
+LICENSE=MIT
+RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/listres-1.0.4.tar.bz2
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
+_md5_=1911fccba5ce0ed0468376eb5ccc75d0
diff --git a/metadata/md5-cache/x11-apps/viewres-1.0.5 b/metadata/md5-cache/x11-apps/viewres-1.0.5
new file mode 100644
index 000000000000..cbfd9e89e657
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/viewres-1.0.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DESCRIPTION=graphical class browser for Xt
+EAPI=5
+HOMEPAGE=https://www.x.org/wiki/
+KEYWORDS=amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86
+LICENSE=MIT
+RDEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/viewres-1.0.5.tar.bz2
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
+_md5_=327f92cecadda90d2a2b174fa425d1a0
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index 19022387c83e..f27c7283713c 100644
Binary files a/metadata/md5-cache/x11-base/Manifest.gz and b/metadata/md5-cache/x11-base/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-base/xorg-proto-2018.4 b/metadata/md5-cache/x11-base/xorg-proto-2018.4
index 39c2bd5041e6..98ee6b45717c 100644
--- a/metadata/md5-cache/x11-base/xorg-proto-2018.4
+++ b/metadata/md5-cache/x11-base/xorg-proto-2018.4
@@ -3,10 +3,10 @@ DEPEND=>=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2
 DESCRIPTION=X.Org combined protocol headers
 EAPI=6
 HOMEPAGE=https://cgit.freedesktop.org/xorg/proto/xorgproto/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x64-solaris
 LICENSE=MIT
 RDEPEND=!<x11-proto/bigreqsproto-1.1.2-r1 !<x11-proto/compositeproto-0.4.2-r2 !<x11-proto/damageproto-1.2.1-r2 !<x11-proto/dmxproto-2.3.1-r2 !<x11-proto/dri2proto-2.8-r2 !<x11-proto/dri3proto-1.0-r1 !<x11-proto/fixesproto-5.0-r2 !<x11-proto/fontsproto-2.1.3-r1 !<x11-proto/glproto-1.4.17-r2 !<x11-proto/inputproto-2.3.2-r1 !<x11-proto/kbproto-1.0.7-r1 !<x11-proto/presentproto-1.1-r1 !<x11-proto/randrproto-1.5.0-r1 !<x11-proto/recordproto-1.14.2-r2 !<x11-proto/renderproto-0.11.1-r2 !<x11-proto/resourceproto-1.2.0-r1 !<x11-proto/scrnsaverproto-1.2.2-r2 !<x11-proto/trapproto-3.4.3-r1 !<x11-proto/videoproto-2.3.3-r1 !<x11-proto/xcmiscproto-1.2.2-r1 !<x11-proto/xextproto-7.3.0-r1 !<x11-proto/xf86bigfontproto-1.2.0-r2 !<x11-proto/xf86dgaproto-2.1-r3 !<x11-proto/xf86driproto-2.1.1-r2 !<x11-proto/xf86miscproto-0.9.3-r1 !<x11-proto/xf86vidmodeproto-2.3.1-r2 !<x11-proto/xineramaproto-1.2.1-r2 !<x11-proto/xproto-7.0.31-r1 !x11-proto/fontcacheproto !x11-proto/xf86rushproto
 SLOT=0
 SRC_URI=https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2018.4.tar.gz
 _eclasses_=meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8020de2724e9f65c505f731bbbef78f0
+_md5_=17ad7a62d7fe0cbe6421569d40dd46b3
diff --git a/metadata/md5-cache/x11-base/xorg-server-9999 b/metadata/md5-cache/x11-base/xorg-server-9999
index a2e73c254edc..c9cc7dd170a0 100644
--- a/metadata/md5-cache/x11-base/xorg-server-9999
+++ b/metadata/md5-cache/x11-base/xorg-server-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=>=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.46 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) glamor? ( media-libs/libepoxy[X] >=media-libs/mesa-10.3.4-r1[egl,gbm] !x11-libs/glamor ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-10.3.4-r1 ) udev? ( >=virtual/udev-150 ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 media-libs/libepoxy >=dev-libs/wayland-protocols-1.1 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) sys-devel/flex >=x11-base/xorg-proto-2018.3 dmx? ( doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) glamor? ( media-libs/libepoxy[X] >=media-libs/mesa-10.3.4-r1[egl,gbm] !x11-libs/glamor ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-10.3.4-r1 ) udev? ( >=virtual/udev-150 ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 media-libs/libepoxy >=dev-libs/wayland-protocols-1.1 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) sys-devel/flex >=x11-base/xorg-proto-2018.3 dmx? ( doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org X servers
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/
 IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug +glamor ipv6 libressl minimal selinux systemd +udev unwind xcsecurity static-libs doc
 LICENSE=MIT
 PDEPEND=xorg? ( >=x11-base/xorg-drivers-9999 )
-RDEPEND=>=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.46 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) glamor? ( media-libs/libepoxy[X] >=media-libs/mesa-10.3.4-r1[egl,gbm] !x11-libs/glamor ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-10.3.4-r1 ) udev? ( >=virtual/udev-150 ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 media-libs/libepoxy >=dev-libs/wayland-protocols-1.1 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) selinux? ( sec-policy/selinux-xserver ) !x11-drivers/xf86-video-modesetting
+RDEPEND=>=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) glamor? ( media-libs/libepoxy[X] >=media-libs/mesa-10.3.4-r1[egl,gbm] !x11-libs/glamor ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-10.3.4-r1 ) udev? ( >=virtual/udev-150 ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 media-libs/libepoxy >=dev-libs/wayland-protocols-1.1 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) selinux? ( sec-policy/selinux-xserver ) !x11-drivers/xf86-video-modesetting
 REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) xephyr? ( kdrive )
 SLOT=0/9999
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=a18ca3249e41b1c76901d70de0398c8f
+_md5_=e627b3f18f46226e3fbdc5634934f13a
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 0e9d863e581e..840b0fd1e6a6 100644
Binary files a/metadata/md5-cache/x11-drivers/Manifest.gz and b/metadata/md5-cache/x11-drivers/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20180214 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20180214
index e2fdb9a042cb..9df1521946b9 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20180214
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20180214
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( sna uxa )
 SLOT=0
 SRC_URI=https://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/75795523003798d789d417e82aaa81c7ea1ed616.tar.xz -> xf86-video-intel-2.99.917_p20180214.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=1f48d78dbc87c8893c8badf57915dacd
+_md5_=efe2ee50614bd6f7b1f57ff20bc21ac8
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-9999 b/metadata/md5-cache/x11-drivers/xf86-video-intel-9999
new file mode 100644
index 000000000000..cd33f294f4b6
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=x11-libs/libXext x11-libs/libXfixes x11-libs/libXScrnSaver >=x11-libs/pixman-0.27.1 >=x11-libs/libdrm-2.4.52[video_cards_intel] dri3? ( >=x11-base/xorg-server-1.18 !<=media-libs/mesa-12.0.4 ) sna? ( >=x11-base/xorg-server-1.10 ) tools? ( x11-libs/libX11 x11-libs/libxcb x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libxshmfence x11-libs/libXtst ) udev? ( virtual/udev ) xvmc? ( x11-libs/libXvMC >=x11-libs/libxcb-1.5 x11-libs/xcb-util ) >=x11-proto/dri2proto-2.6 x11-proto/dri3proto x11-proto/presentproto x11-proto/resourceproto >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DESCRIPTION=X.Org driver for Intel cards
+EAPI=5
+HOMEPAGE=https://www.x.org/wiki/
+IUSE=debug dri3 +sna tools +udev uxa xvmc dri
+LICENSE=MIT
+RDEPEND=x11-libs/libXext x11-libs/libXfixes x11-libs/libXScrnSaver >=x11-libs/pixman-0.27.1 >=x11-libs/libdrm-2.4.52[video_cards_intel] dri3? ( >=x11-base/xorg-server-1.18 !<=media-libs/mesa-12.0.4 ) sna? ( >=x11-base/xorg-server-1.10 ) tools? ( x11-libs/libX11 x11-libs/libxcb x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libxshmfence x11-libs/libXtst ) udev? ( virtual/udev ) xvmc? ( x11-libs/libXvMC >=x11-libs/libxcb-1.5 x11-libs/xcb-util ) x11-base/xorg-server:= dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
+REQUIRED_USE=|| ( sna uxa )
+SLOT=0
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
+_md5_=c86be031af1acd595e4d14bab5cae00b
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index f37e829c4de8..a70afd099c53 100644
Binary files a/metadata/md5-cache/x11-libs/Manifest.gz and b/metadata/md5-cache/x11-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-libs/gl2ps-1.4.0 b/metadata/md5-cache/x11-libs/gl2ps-1.4.0
new file mode 100644
index 000000000000..2ed654b448cf
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/gl2ps-1.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/freeglut x11-libs/libXmu png? ( media-libs/libpng:0= ) zlib? ( sys-libs/zlib ) doc? ( dev-tex/tth dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=OpenGL to PostScript printing library
+EAPI=6
+HOMEPAGE=http://www.geuz.org/gl2ps/
+IUSE=doc png zlib
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=LGPL-2
+RDEPEND=media-libs/freeglut x11-libs/libXmu png? ( media-libs/libpng:0= ) zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=http://geuz.org/gl2ps/src/gl2ps-1.4.0.tgz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=80e6ab2a4d22ec045ba7e414dc9ee400
diff --git a/metadata/md5-cache/x11-libs/gtksourceview-3.24.6 b/metadata/md5-cache/x11-libs/gtksourceview-3.24.6
index 99b59e112570..944696c8a788 100644
--- a/metadata/md5-cache/x11-libs/gtksourceview-3.24.6
+++ b/metadata/md5-cache/x11-libs/gtksourceview-3.24.6
@@ -4,11 +4,11 @@ DESCRIPTION=A text widget implementing syntax highlighting and other features
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GtkSourceView
 IUSE=glade +introspection vala test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.48:2 >=dev-libs/libxml2-2.6:2 >=x11-libs/gtk+-3.20:3[introspection?] glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=3.0/3
 SRC_URI=mirror://gnome/sources/gtksourceview/3.24/gtksourceview-3.24.6.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a370458ab43e1b049aa33509f3cbe151
+_md5_=6c19d5c81bb47d937c612acc36ae6739
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.91 b/metadata/md5-cache/x11-libs/libdrm-2.4.91
new file mode 100644
index 000000000000..342df5a72f43
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.91
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.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(-)?] ) video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-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(-)?] ) valgrind? ( dev-util/valgrind ) >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2
+DESCRIPTION=X.Org libdrm library
+EAPI=6
+HOMEPAGE=https://dri.freedesktop.org/
+IUSE=video_cards_amdgpu video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_tegra video_cards_vc4 video_cards_vivante video_cards_vmware libkms valgrind 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 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.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(-)?] ) video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-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(-)?] )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.91.tar.bz2
+_eclasses_=meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=5dc38c6cbddd921df655d29249c30065
diff --git a/metadata/md5-cache/x11-libs/libwnck-3.24.1 b/metadata/md5-cache/x11-libs/libwnck-3.24.1
index 0e06b7f55754..6db86ce5d759 100644
--- a/metadata/md5-cache/x11-libs/libwnck-3.24.1
+++ b/metadata/md5-cache/x11-libs/libwnck-3.24.1
@@ -4,10 +4,10 @@ DESCRIPTION=A window navigation construction kit
 EAPI=6
 HOMEPAGE=https://developer.gnome.org/libwnck/stable/
 IUSE=+introspection startup-notification tools
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=x11-libs/cairo[X] >=x11-libs/gtk+-3.22:3[introspection?] >=dev-libs/glib-2.32:2 x11-libs/libX11 x11-libs/libXres x11-libs/libXext introspection? ( >=dev-libs/gobject-introspection-0.6.14:= ) startup-notification? ( >=x11-libs/startup-notification-0.4 )
 SLOT=3
 SRC_URI=mirror://gnome/sources/libwnck/3.24/libwnck-3.24.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=79de3922f139a784bf2c4e12c028efc1
+_md5_=3910eb3f31be9e88453469040079f15e
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.13 b/metadata/md5-cache/x11-libs/libxcb-1.13
new file mode 100644
index 000000000000..518fc43db51c
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libxcb-1.13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=>=dev-libs/libpthread-stubs-0.3-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(-)?] >=x11-libs/libXau-1.0.7-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(-)?] >=x11-libs/libXdmcp-1.1.1-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(-)?] test? ( dev-libs/check[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(-)?] ) doc? ( app-doc/doxygen[dot] ) dev-libs/libxslt || ( dev-lang/python:3.6[xml] dev-lang/python:3.5[xml] dev-lang/python:3.4[xml] >=dev-lang/python-2.7.5-r2:2.7[xml] ) || ( ( dev-lang/python:3.6[xml] >=x11-proto/xcb-proto-1.13[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(-)?,python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5[xml] >=x11-proto/xcb-proto-1.13[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(-)?,python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4[xml] >=x11-proto/xcb-proto-1.13[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(-)?,python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=x11-proto/xcb-proto-1.13[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(-)?,python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DESCRIPTION=X C-language Bindings library
+EAPI=5
+HOMEPAGE=https://xcb.freedesktop.org/
+IUSE=doc selinux test xkb 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 doc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=dev-libs/libpthread-stubs-0.3-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(-)?] >=x11-libs/libXau-1.0.7-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(-)?] >=x11-libs/libXdmcp-1.1.1-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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
+SLOT=0/1.12
+SRC_URI=https://xcb.freedesktop.org/dist/libxcb-1.13.tar.bz2
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
+_md5_=1d90ba3ee73e88634267e3be78a7e19e
diff --git a/metadata/md5-cache/x11-libs/pango-1.40.14 b/metadata/md5-cache/x11-libs/pango-1.40.14
index 3ed017ec07d3..9314ccd4a652 100644
--- a/metadata/md5-cache/x11-libs/pango-1.40.14
+++ b/metadata/md5-cache/x11-libs/pango-1.40.14
@@ -4,10 +4,10 @@ DESCRIPTION=Internationalized text layout and rendering library
 EAPI=6
 HOMEPAGE=http://www.pango.org/
 IUSE=X +introspection test 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 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+ FTL
 RDEPEND=>=media-libs/harfbuzz-1.2.3:=[glib(+),truetype(+),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/glib-2.34.3: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(-)?] >=media-libs/fontconfig-2.10.92:1.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/freetype-2.5.0.1: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(-)?] >=x11-libs/cairo-1.12.14-r4:=[X?,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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) X? ( >=x11-libs/libXrender-0.9.8[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-1.6.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(-)?] >=x11-libs/libXft-2.3.1-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=mirror://gnome/sources/pango/1.40/pango-1.40.14.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5bbce8caa8829feae43d3cbc34545334
+_md5_=5e66650baace033ebfe38b317034c70d
diff --git a/metadata/md5-cache/x11-libs/qscintilla-2.10.3 b/metadata/md5-cache/x11-libs/qscintilla-2.10.3
new file mode 100644
index 000000000000..32422a823e6f
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/qscintilla-2.10.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install unpack
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 )
+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
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 )
+SLOT=0/13
+SRC_URI=mirror://sourceforge/pyqt/QScintilla_gpl-2.10.3.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d0bdcf82d3f56a942a2544dd47043b84
diff --git a/metadata/md5-cache/x11-libs/vte-0.48.4 b/metadata/md5-cache/x11-libs/vte-0.48.4
index 298a7ae4f12e..0eeee7e50959 100644
--- a/metadata/md5-cache/x11-libs/vte-0.48.4
+++ b/metadata/md5-cache/x11-libs/vte-0.48.4
@@ -4,11 +4,11 @@ DESCRIPTION=Library providing a virtual terminal emulator widget
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/action/show/Apps/Terminal/VTE
 IUSE=+crypt debug glade +introspection vala vanilla
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40:2 >=dev-libs/libpcre2-10.21 >=x11-libs/gtk+-3.16:3[introspection?] >=x11-libs/pango-1.22.0 sys-libs/ncurses:0= sys-libs/zlib crypt? ( >=net-libs/gnutls-3.2.7:0= ) glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) !x11-libs/vte:2.90[glade]
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.91
 SRC_URI=mirror://gnome/sources/vte/0.48/vte-0.48.4.tar.xz !vanilla? ( https://dev.gentoo.org/~eva/distfiles/vte/vte-0.48.4-command-notify.patch.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=26c2252be5b4bae67042d9a5f33dfbc7
+_md5_=766219e99a5cdc95b9aa7189c09aedc7
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 8d5b4779b1af..aa227b660bc8 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/util-macros-1.19.2 b/metadata/md5-cache/x11-misc/util-macros-1.19.2
new file mode 100644
index 000000000000..a638b50d5f55
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/util-macros-1.19.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 ) virtual/pkgconfig
+DESCRIPTION=X.Org autotools utility macros
+EAPI=5
+HOMEPAGE=https://www.x.org/wiki/
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/util/util-macros-1.19.2.tar.bz2
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
+_md5_=45b773bc716a1e387c43e500ca8a0ff9
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.38 b/metadata/md5-cache/x11-misc/xscreensaver-5.38
index ded53fdd361f..a7d7cd03bb30 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.38
+++ b/metadata/md5-cache/x11-misc/xscreensaver-5.38
@@ -4,10 +4,10 @@ DESCRIPTION=A modular screen saver and locker for the X Window System
 EAPI=6
 HOMEPAGE=https://www.jwz.org/xscreensaver/
 IUSE=gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gdk-pixbuf:2[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) ) opengl? ( virtual/glu virtual/opengl ) pam? ( virtual/pam ) xinerama? ( x11-libs/libXinerama ) perl? ( dev-lang/perl dev-perl/libwww-perl virtual/perl-Digest-MD5 ) selinux? ( sec-policy/selinux-xscreensaver )
 SLOT=0
 SRC_URI=https://www.jwz.org/xscreensaver/xscreensaver-5.38.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c403b8a0b8369358fffda4526a917990
+_md5_=8c417e3c4cb4dc48e97687489a1dbf13
diff --git a/metadata/md5-cache/x11-proto/Manifest.gz b/metadata/md5-cache/x11-proto/Manifest.gz
index 6fd7924d231a..ff8a0bdf7ffd 100644
Binary files a/metadata/md5-cache/x11-proto/Manifest.gz and b/metadata/md5-cache/x11-proto/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-proto/xcb-proto-1.13 b/metadata/md5-cache/x11-proto/xcb-proto-1.13
new file mode 100644
index 000000000000..5ee32907d206
--- /dev/null
+++ b/metadata/md5-cache/x11-proto/xcb-proto-1.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=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-libs/libxml2 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DESCRIPTION=X C-language Bindings protocol headers
+EAPI=5
+HOMEPAGE=https://xcb.freedesktop.org/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+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(-)] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
+_md5_=cbd8d1fbe375c9392fddebac73652380
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 611d85d59f8b..f0388123ba69 100644
Binary files a/metadata/md5-cache/x11-terms/Manifest.gz and b/metadata/md5-cache/x11-terms/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-terms/eterm-0.9.6-r1 b/metadata/md5-cache/x11-terms/eterm-0.9.6-r1
index e1d04f3b5e34..6f1ed6b0829c 100644
--- a/metadata/md5-cache/x11-terms/eterm-0.9.6-r1
+++ b/metadata/md5-cache/x11-terms/eterm-0.9.6-r1
@@ -4,9 +4,9 @@ DESCRIPTION=A vt102 terminal emulator for X
 EAPI=6
 HOMEPAGE=http://www.eterm.org/
 IUSE=escreen minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode +utempter
-KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-proto/xextproto x11-proto/xproto x11-libs/libast media-libs/imlib2[X] media-fonts/font-misc-misc escreen? ( app-misc/screen )
 SLOT=0
 SRC_URI=http://www.eterm.org/download/Eterm-0.9.6.tar.gz !minimal? ( http://www.eterm.org/download/Eterm-bg-0.9.6.tar.gz )
-_md5_=8c976f7b5de5279174f3cc85153b64b2
+_md5_=1f9ac735e041ab6e26b2e694b891fec6
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index ba926fdaa064..1b5ceb5f5ec1 100644
Binary files a/metadata/md5-cache/x11-themes/Manifest.gz and b/metadata/md5-cache/x11-themes/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.24.0 b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.24.0
index 13a84b2b1065..f1ad6f47c55e 100644
--- a/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.24.0
+++ b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.24.0
@@ -4,11 +4,11 @@ DESCRIPTION=GNOME default icon theme
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/adwaita-icon-theme/
 IUSE=branding
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-3 CC-BY-SA-3.0 ) branding? ( CC-BY-SA-4.0 )
 RDEPEND=>=x11-themes/hicolor-icon-theme-0.10 gnome-base/librsvg:2 !<x11-themes/gnome-themes-standard-3.14
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/adwaita-icon-theme/3.24/adwaita-icon-theme-3.24.0.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4e763b701519aff625365c7974b50be1
+_md5_=b4587d940ea0c2142a1c8acba9448139
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index cc19d641bf6d..af93774aed09 100644
Binary files a/metadata/md5-cache/x11-wm/Manifest.gz and b/metadata/md5-cache/x11-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-wm/afterstep-2.2.12 b/metadata/md5-cache/x11-wm/afterstep-2.2.12
index 9e813a049253..3b0e77b6c872 100644
--- a/metadata/md5-cache/x11-wm/afterstep-2.2.12
+++ b/metadata/md5-cache/x11-wm/afterstep-2.2.12
@@ -4,10 +4,10 @@ DESCRIPTION=A feature rich NeXTish window manager
 EAPI=5
 HOMEPAGE=http://www.afterstep.org/
 IUSE=alsa debug dbus gif gtk jpeg cpu_flags_x86_mmx nls png svg tiff xinerama
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=media-libs/freetype sys-libs/readline:0= x11-libs/libICE x11-libs/libXext x11-libs/libSM x11-libs/libXmu x11-libs/libXt x11-libs/libX11 x11-libs/libXpm x11-libs/libXrender alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) jpeg? ( virtual/jpeg:= ) gif? ( >=media-libs/giflib-4.1.0 ) gtk? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng:0= ) svg? ( gnome-base/librsvg:2 ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=ftp://ftp.afterstep.org/stable/AfterStep-2.2.12.tar.bz2 mirror://sourceforge/afterstep/AfterStep-2.2.12.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=11375c113e77e5d399d1fbb12cf415c0
+_md5_=e55838e6b31ca170d369e66ee549430e
diff --git a/metadata/md5-cache/x11-wm/stumpwm-1.0.0 b/metadata/md5-cache/x11-wm/stumpwm-1.0.0
deleted file mode 100644
index 3338a005ac14..000000000000
--- a/metadata/md5-cache/x11-wm/stumpwm-1.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=dev-lisp/cl-ppcre sbcl? ( >=dev-lisp/sbcl-1.0.32 ) sbcl? ( >=dev-lisp/clx-0.7.3 ) !sbcl? ( !clisp? ( !ecl? ( >=dev-lisp/sbcl-1.0.32 ) ) ) !sbcl? ( !clisp? ( ecl? ( >=dev-lisp/ecls-10.4.1 ) ) ) !sbcl? ( clisp? ( >=dev-lisp/clisp-2.44[X,new-clx] ) ) emacs? ( virtual/emacs app-emacs/slime ) sys-apps/texinfo doc? ( virtual/texi2dvi ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Stumpwm is a Window Manager written entirely in Common Lisp.
-EAPI=6
-HOMEPAGE=https://stumpwm.github.io/
-IUSE=contrib doc emacs clisp ecl +sbcl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=contrib? ( x11-wm/stumpwm-contrib ) virtual/commonlisp
-RDEPEND=dev-lisp/cl-ppcre sbcl? ( >=dev-lisp/sbcl-1.0.32 ) sbcl? ( >=dev-lisp/clx-0.7.3 ) !sbcl? ( !clisp? ( !ecl? ( >=dev-lisp/sbcl-1.0.32 ) ) ) !sbcl? ( !clisp? ( ecl? ( >=dev-lisp/ecls-10.4.1 ) ) ) !sbcl? ( clisp? ( >=dev-lisp/clisp-2.44[X,new-clx] ) ) emacs? ( virtual/emacs app-emacs/slime )
-RESTRICT=strip mirror
-SLOT=0
-SRC_URI=https://github.com/stumpwm/stumpwm/archive/1.0.0.tar.gz -> stumpwm-1.0.0.tar.gz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	common-lisp-3	8c4aaa6d66cd2daed8572bb60bf6fe07	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f911e48c0b39855c5a7759083d07d218
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 057550f6be2f..80bdec1862ce 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 19210 BLAKE2B ef1f48dd093e1998551b0b59e75894e45eb7ca46c1a209056e180347c77c96964d5ad0ad9fb97af17a3dc4b5e22e7a68a01179290c2f353189c8e372de002ca6 SHA512 c6dea10b94a1651479a6ecf044fbeebd1514365c2d442a51f76fbb3537f37b434ac895c1042ca2d48fa1ef69ea3a2d992f9142e08c893c09c4c4157458ca9547
-TIMESTAMP 2018-03-04T19:38:26Z
+TIMESTAMP 2018-03-06T04:38:25Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlqcSzJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlqeG0FfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDM4A//f12JMOvkvPTUl8WWyPd/CuoYxydWpert5U1Ft67Dl5fWzWtQ6v0w7Xi7
-WPRDAgcWpxVyjc4vieB11mJv2Imib7DoOImmiQLiGn+PHSVytHzJYPeGK5CLjXDX
-9A9T2YzXoDzL9FmBfWCDX3kU4T102cHZbqoy8Bx+pOGNsIW5mNnxlYqltZdVLuTN
-qoayNbHG+AQeUbSiyUu/prm6spFJvwwGhmE+Ea+Bv+B4uWRcTKPMrRb+CVeiWQNV
-A7Y5Qwx6lC9IoFrzgGd6GmVXGvDkKKv5ESiKzey+2lgGYCJPbQOlb/kSDu/i1Dh5
-hmNYBpsRUt8WebIsTGXzjys8/q+4KzoBJ4ocOXEFSZOypX1qEuC4CaO9Po6ZUetg
-KYHQpGu8GPfMxfgthnzZRVRoko8PO/ceP5t92El4nF5MPZEg59vE8RHVVFgT41U7
-zN48DAqvc7IRKN3gtwSpz/TDs62+SDVp6HA0Q2a9FXSaXaREE//pZUT2fubVU/px
-4ob9Vk7jdZJAcKhMS1CmvMeWtNKos97TupmyVafyzxGsB38QczlnH8CsOoFksuLE
-EVgW4Y7YImD9n0wHkUz2mi8K3friWXDjIXmknrznKr97P1RbIcnNef4vo0fv1ZE/
-rPGUGryHlR3c5rMX87UWO/l1Y2wdMogV/97LaX2h0RuN8c1tl78=
-=VA2m
+klAi3RAAoVhuU3HmP7EVj2ECioFRpr9budRWGWYZsQfqeK5IwvlYcYZERrzlV2Zt
+nZaIQ2E85uFQMeLwWHhsuH+Xc/NQJDJWIShctY7tIYulmkJtsFUsf9jAQZX60SJ3
+cCGotYPejeXUldJ2BsiOTwBn9jvADXpCv2Mlk78gsSTLq7bHucpgI2jMYfKii6it
+PUEJ2L0SA43jWIaGiNkkNV9uExOxyRYFOtAIBuIiluXY3s26krfqYYxc08fB57zJ
+442JZIxl0g5wn0OT5RHkMKdDPymGJP6w7rgFoRp8mMaprN0nKvrW3ZHfIoUjO7wi
+yL1/gzNyRWGA/MAfq8r+qWzLhBi48aMYpJWyp03KEEotai4IHZQivn+LoUZCQVYL
+dNUZ0DZg79QVx3yAxNOK+V2QnYTJWW0WlcqJ/MPzVlbjJFtjm+pdjDzW2opAO5/S
+fTibI6fpzWJp33+902HYyL+bv9xHtHsTHwmeiCNFNIwg3PQ+h9sKiXIWV3OQLWws
+hSfnodfyGwbwxm1OFr4qDmvLVa2E6CSi68W4McfjQ5RJVOKcSWucxLcBVtiYl+Qh
+NRZdqfZsR8f9qRWipJxmzhhcyP/dTbmk7LodJNy7e+JMS8PCIJXhqiOB5M+7UX/Z
+PqWom1PTeWKNLzo+c0oZ3jzbZIQ7B6mN7O2SqSBuuwkkYZvjXNw=
+=yuwP
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index a8825650bef3..979711297af5 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 04 Mar 2018 19:38:22 +0000
+Tue, 06 Mar 2018 04:38:22 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index e9dfc05bd9b3..2968f6ac2ff3 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -138,11 +138,6 @@
       <email>leio@gentoo.org</email>
       <name>Mart Raudsepp</name>
     </member>
-    <member>
-      <email>maffblaster@gentoo.org</email>
-      <name>Matthew Marchese</name>
-      <role>Minion</role>
-    </member>
     <member>
       <email>neddyseagoon@gentoo.org</email>
       <name>Roy Bamford</name>
diff --git a/metadata/timestamp b/metadata/timestamp
index 37ecabe538a5..9646b0c346bc 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Mar  4 19:38:22 UTC 2018
+Tue Mar  6 04:38:21 UTC 2018
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 3801b092aae6..9d9f0afdf762 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -532,7 +532,8 @@
 1702282250 ./dev-java/metadata-extractor/metadata-extractor-2.8.1.ebuild
 1803011208 ./dev-java/ant-apache-regexp/ant-apache-regexp-1.9.2.ebuild
 1803011208 ./dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild
-1702282250 ./dev-java/commons-math/commons-math-3.2.ebuild
+1803060138 ./dev-java/commons-math/commons-math-2.1-r2.ebuild
+1803060138 ./dev-java/commons-math/commons-math-3.2.ebuild
 1702282250 ./dev-java/commons-math/commons-math-2.1-r1.ebuild
 1803011208 ./dev-java/xpp2/xpp2-2.1.10-r2.ebuild
 1702282250 ./dev-java/dbus-java/dbus-java-2.7-r1.ebuild
@@ -989,25 +990,25 @@
 1801222139 ./sys-libs/libblockdev/libblockdev-2.14-r1.ebuild
 1706272056 ./sys-libs/libstatgrab/libstatgrab-0.91.ebuild
 1702282250 ./sys-libs/libstatgrab/libstatgrab-0.17.ebuild
-1801231609 ./sys-libs/db/db-6.2.32.ebuild
-1801231609 ./sys-libs/db/db-5.3.28-r2.ebuild
+1803052308 ./sys-libs/db/db-6.2.32.ebuild
+1803052308 ./sys-libs/db/db-5.3.28-r2.ebuild
 1702282250 ./sys-libs/db/db-4.4.20_p4-r1.ebuild
 1801231609 ./sys-libs/db/db-4.7.25_p4.ebuild
-1801231609 ./sys-libs/db/db-6.1.29-r1.ebuild
-1801231609 ./sys-libs/db/db-5.1.29-r1.ebuild
-1801231609 ./sys-libs/db/db-6.2.23-r1.ebuild
+1803052308 ./sys-libs/db/db-6.1.29-r1.ebuild
+1803052308 ./sys-libs/db/db-5.1.29-r1.ebuild
+1803052308 ./sys-libs/db/db-6.2.23-r1.ebuild
 1702282250 ./sys-libs/db/db-4.2.52_p5-r1.ebuild
-1801231609 ./sys-libs/db/db-6.0.35.ebuild
+1803052308 ./sys-libs/db/db-6.0.35.ebuild
 1801231609 ./sys-libs/db/db-4.6.21_p4.ebuild
 1801231609 ./sys-libs/db/db-4.8.30-r2.ebuild
 1702282250 ./sys-libs/db/db-1.85-r3.ebuild
 1702282250 ./sys-libs/db/db-3.2.9_p2.ebuild
 1801231609 ./sys-libs/db/db-4.5.20_p2-r1.ebuild
-1801231609 ./sys-libs/db/db-6.2.32-r1.ebuild
-1801231609 ./sys-libs/db/db-6.2.23.ebuild
-1801231609 ./sys-libs/db/db-6.0.35-r1.ebuild
-1801231609 ./sys-libs/db/db-5.3.28-r3.ebuild
-1801231609 ./sys-libs/db/db-6.1.29.ebuild
+1803052308 ./sys-libs/db/db-6.2.32-r1.ebuild
+1803052308 ./sys-libs/db/db-6.2.23.ebuild
+1803052308 ./sys-libs/db/db-6.0.35-r1.ebuild
+1803052308 ./sys-libs/db/db-5.3.28-r3.ebuild
+1803052308 ./sys-libs/db/db-6.1.29.ebuild
 1801231609 ./sys-libs/db/db-4.3.29_p1-r1.ebuild
 1706151208 ./sys-libs/lib-compat/lib-compat-1.5.ebuild
 1711232348 ./sys-libs/libfaketime/libfaketime-0.9.7.ebuild
@@ -1031,9 +1032,9 @@
 1711100104 ./sys-libs/uid_wrapper/uid_wrapper-1.2.1.ebuild
 1702282250 ./sys-libs/mtdev/mtdev-1.1.4.ebuild
 1702282250 ./sys-libs/mtdev/mtdev-1.1.5.ebuild
+1803052039 ./sys-libs/slang/slang-2.3.2.ebuild
 1801231609 ./sys-libs/slang/slang-2.3.1a.ebuild
 1801231609 ./sys-libs/slang/slang-2.3.0.ebuild
-1802191908 ./sys-libs/slang/slang-2.3.2_pre23.ebuild
 1702282250 ./sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild
 1801072309 ./sys-libs/musl/musl-1.1.18.ebuild
 1803040408 ./sys-libs/musl/musl-1.1.19.ebuild
@@ -1172,7 +1173,7 @@
 1711100103 ./sys-libs/tdb/tdb-1.3.14.ebuild
 1706101803 ./sys-libs/libsmbios/libsmbios-2.3.2.ebuild
 1705270153 ./sys-libs/libsmbios/libsmbios-2.3.3.ebuild
-1705270153 ./sys-libs/libsmbios/libsmbios-2.3.0-r1.ebuild
+1803052039 ./sys-libs/libsmbios/libsmbios-2.4.1.ebuild
 1705292145 ./sys-libs/cracklib/cracklib-2.9.6-r1.ebuild
 1707090225 ./sys-libs/libcxxabi/libcxxabi-3.9.1.ebuild
 1712150139 ./sys-libs/libcxxabi/libcxxabi-4.0.1.ebuild
@@ -1205,7 +1206,7 @@
 1707090225 ./sys-libs/libomp/libomp-3.7.1.ebuild
 1802261708 ./sys-libs/libomp/libomp-6.0.0_rc3.ebuild
 1707090225 ./sys-libs/libomp/libomp-3.9.0.ebuild
-1802021208 ./sys-libs/libomp/libomp-5.0.1.ebuild
+1803052039 ./sys-libs/libomp/libomp-5.0.1.ebuild
 1707090225 ./sys-libs/libomp/libomp-3.9.1.ebuild
 1801302238 ./sys-libs/libomp/libomp-6.0.9999.ebuild
 1707090225 ./sys-libs/libomp/libomp-3.8.1.ebuild
@@ -1233,13 +1234,14 @@
 1801072309 ./sys-libs/glibc/glibc-2.23-r4.ebuild
 1801072309 ./sys-libs/glibc/glibc-2.19-r1.ebuild
 1801101139 ./sys-libs/glibc/glibc-2.25-r9.ebuild
+1803052039 ./sys-libs/glibc/glibc-2.19-r2.ebuild
 1801072309 ./sys-libs/glibc/glibc-2.18-r1.ebuild
 1801072309 ./sys-libs/glibc/glibc-2.24-r4.ebuild
 1802101908 ./sys-libs/glibc/glibc-9999.ebuild
 1801072309 ./sys-libs/glibc/glibc-2.21-r2.ebuild
-1803032108 ./sys-libs/glibc/glibc-2.25-r11.ebuild
+1803052039 ./sys-libs/glibc/glibc-2.25-r11.ebuild
 1802150109 ./sys-libs/glibc/glibc-2.26-r6.ebuild
-1803021308 ./sys-libs/glibc/glibc-2.25-r10.ebuild
+1803052039 ./sys-libs/glibc/glibc-2.25-r10.ebuild
 1712020139 ./sys-libs/libavc1394/libavc1394-0.5.3.ebuild
 1712020139 ./sys-libs/libavc1394/libavc1394-0.5.4.ebuild
 1712020139 ./sys-libs/libavc1394/libavc1394-0.5.4-r1.ebuild
@@ -1651,7 +1653,7 @@
 1702282250 ./sci-libs/btf/btf-1.1.3.ebuild
 1702282250 ./sci-libs/btf/btf-1.2.0.ebuild
 1702282250 ./sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild
-1802212308 ./sci-libs/gdal/gdal-2.2.3-r1.ebuild
+1803052039 ./sci-libs/gdal/gdal-2.2.3-r1.ebuild
 1801222308 ./sci-libs/chemkit/chemkit-0.1-r2.ebuild
 1712221509 ./sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
 1702282250 ./sci-libs/scikits_optimization/scikits_optimization-0.3.ebuild
@@ -1953,12 +1955,11 @@
 1802171038 ./dev-ruby/parser/parser-2.5.0.0.ebuild
 1711180957 ./dev-ruby/parser/parser-2.4.0.2.ebuild
 1702282250 ./dev-ruby/parser/parser-2.3.3.1.ebuild
+1803052038 ./dev-ruby/parser/parser-2.5.0.2.ebuild
 1705101759 ./dev-ruby/rex-encoder/rex-encoder-0.1.3.ebuild
 1706120903 ./dev-ruby/rex-encoder/rex-encoder-0.1.4.ebuild
 1802171038 ./dev-ruby/sigar/sigar-0.7.3.ebuild
 1802070908 ./dev-ruby/spring/spring-2.0.2.ebuild
-1702282250 ./dev-ruby/spring/spring-2.0.1.ebuild
-1702282250 ./dev-ruby/spring/spring-1.7.2.ebuild
 1802070908 ./dev-ruby/nenv/nenv-0.3.0.ebuild
 1802082208 ./dev-ruby/recog/recog-2.1.6-r1.ebuild
 1707090939 ./dev-ruby/mercenary/mercenary-0.3.6.ebuild
@@ -2027,13 +2028,13 @@
 1707170920 ./dev-ruby/delayer-deferred/delayer-deferred-2.0.0.ebuild
 1703280741 ./dev-ruby/delayer-deferred/delayer-deferred-1.1.1.ebuild
 1802032138 ./dev-ruby/hashr/hashr-2.0.1.ebuild
-1708230910 ./dev-ruby/treetop/treetop-1.6.8.ebuild
 1711230952 ./dev-ruby/treetop/treetop-1.6.9.ebuild
 1702282250 ./dev-ruby/net-sftp/net-sftp-2.1.2-r2.ebuild
 1801100939 ./dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.3.ebuild
 1702282250 ./dev-ruby/debugger-linecache/debugger-linecache-1.2.0.ebuild
 1705160807 ./dev-ruby/windows_error/windows_error-0.1.2.ebuild
 1705090608 ./dev-ruby/windows_error/windows_error-0.1.1.ebuild
+1803052038 ./dev-ruby/http-form_data/http-form_data-2.1.0.ebuild
 1710120817 ./dev-ruby/http-form_data/http-form_data-2.0.0.ebuild
 1710211012 ./dev-ruby/http-form_data/http-form_data-1.0.3.ebuild
 1802070908 ./dev-ruby/psych/psych-3.0.1.ebuild
@@ -2092,7 +2093,6 @@
 1712292110 ./dev-ruby/multi_test/multi_test-0.1.2.ebuild
 1801221008 ./dev-ruby/yard/yard-0.9.12.ebuild
 1801212338 ./dev-ruby/yard/yard-0.9.11.ebuild
-1702282250 ./dev-ruby/warden/warden-1.2.6.ebuild
 1802211108 ./dev-ruby/warden/warden-1.2.7.ebuild
 1708130828 ./dev-ruby/i18n/i18n-0.6.11-r1.ebuild
 1801131139 ./dev-ruby/i18n/i18n-0.9.1.ebuild
@@ -2375,6 +2375,7 @@
 1708020742 ./dev-ruby/bindata/bindata-2.4.0.ebuild
 1708300800 ./dev-ruby/bindata/bindata-2.4.1.ebuild
 1802270938 ./dev-ruby/dust/dust-0.1.7-r2.ebuild
+1803052238 ./dev-ruby/faraday/faraday-0.14.0.ebuild
 1707220835 ./dev-ruby/faraday/faraday-0.12.2.ebuild
 1707220835 ./dev-ruby/faraday/faraday-0.11.0.ebuild
 1801241938 ./dev-ruby/faraday/faraday-0.9.2-r2.ebuild
@@ -2382,7 +2383,7 @@
 1802032138 ./dev-ruby/filesize/filesize-0.1.1.ebuild
 1712290939 ./dev-ruby/open4/open4-1.3.4.ebuild
 1712290939 ./dev-ruby/openvas-omp/openvas-omp-0.0.4.ebuild
-1702282250 ./dev-ruby/totoridipjp/totoridipjp-0.1.0.ebuild
+1803052038 ./dev-ruby/totoridipjp/totoridipjp-0.1.0.ebuild
 1802041408 ./dev-ruby/imagesize/imagesize-0.1.1_p20100902-r1.ebuild
 1802041838 ./dev-ruby/mash/mash-0.1.1-r2.ebuild
 1709200904 ./dev-ruby/maruku/maruku-0.7.3.ebuild
@@ -2446,7 +2447,7 @@
 1710010356 ./dev-ruby/asciidoctor/asciidoctor-1.5.5-r1.ebuild
 1710010334 ./dev-ruby/asciidoctor/asciidoctor-1.5.6.ebuild
 1801271038 ./dev-ruby/asciidoctor/asciidoctor-1.5.6.1.ebuild
-1705040730 ./dev-ruby/sparklines/sparklines-0.5.2-r6.ebuild
+1803052238 ./dev-ruby/sparklines/sparklines-0.5.2-r6.ebuild
 1712140839 ./dev-ruby/rash_alt/rash_alt-0.4.5.ebuild
 1707290842 ./dev-ruby/rash_alt/rash_alt-0.4.3.ebuild
 1710180841 ./dev-ruby/rash_alt/rash_alt-0.4.4.ebuild
@@ -2531,7 +2532,6 @@
 1702282250 ./dev-ruby/rake-remote_task/rake-remote_task-2.4.2.ebuild
 1705090608 ./dev-ruby/octokit/octokit-4.7.0.ebuild
 1802192238 ./dev-ruby/text-hyphen/text-hyphen-1.4.1-r2.ebuild
-1702282250 ./dev-ruby/sshkey/sshkey-1.8.0.ebuild
 1802192238 ./dev-ruby/sshkey/sshkey-1.9.0.ebuild
 1802041838 ./dev-ruby/nanotest/nanotest-0.9.4.1.ebuild
 1801211008 ./dev-ruby/text/text-1.3.1.ebuild
@@ -2560,10 +2560,8 @@
 1802120109 ./dev-ruby/net-ssh/net-ssh-4.1.0.ebuild
 1708250851 ./dev-ruby/rack-ssl/rack-ssl-1.3.4.ebuild
 1708250851 ./dev-ruby/rack-ssl/rack-ssl-1.4.1.ebuild
-1710070825 ./dev-ruby/slop/slop-4.6.0.ebuild
 1708221219 ./dev-ruby/slop/slop-3.6.0.ebuild
 1702282250 ./dev-ruby/slop/slop-4.4.1.ebuild
-1705270815 ./dev-ruby/slop/slop-4.5.0.ebuild
 1705030744 ./dev-ruby/slop/slop-4.4.3.ebuild
 1802191008 ./dev-ruby/slop/slop-4.6.1.ebuild
 1712292110 ./dev-ruby/hpricot/hpricot-0.8.6-r5.ebuild
@@ -2582,7 +2580,6 @@
 1712091039 ./dev-ruby/aws-sdk-core/aws-sdk-core-2.10.100.ebuild
 1710310904 ./dev-ruby/aws-sdk-core/aws-sdk-core-2.10.74.ebuild
 1709011014 ./dev-ruby/aws-sdk-core/aws-sdk-core-2.10.37.ebuild
-1702282250 ./dev-ruby/timers/timers-4.1.1.ebuild
 1706250953 ./dev-ruby/timers/timers-4.1.2.ebuild
 1802241038 ./dev-ruby/sexp_processor/sexp_processor-4.10.1.ebuild
 1712212239 ./dev-ruby/sexp_processor/sexp_processor-4.9.0.ebuild
@@ -2695,7 +2692,7 @@
 1801110909 ./dev-ruby/bacon/bacon-1.2.0-r2.ebuild
 1802070908 ./dev-ruby/jeweler/jeweler-2.3.7.ebuild
 1802282108 ./dev-ruby/ruby-glib2/ruby-glib2-3.1.3.ebuild
-1803041008 ./dev-ruby/ruby-glib2/ruby-glib2-3.1.1.ebuild
+1803052038 ./dev-ruby/ruby-glib2/ruby-glib2-3.1.1.ebuild
 1702282250 ./dev-ruby/ruby-glib2/ruby-glib2-3.0.8.ebuild
 1712282109 ./dev-ruby/unf_ext/unf_ext-0.0.7.4.ebuild
 1802070938 ./dev-ruby/unf_ext/unf_ext-0.0.7.5.ebuild
@@ -2728,10 +2725,8 @@
 1802112238 ./dev-ruby/ruby-termios/ruby-termios-1.0.2-r1.ebuild
 1711150907 ./dev-ruby/websocket/websocket-1.2.5.ebuild
 1706192128 ./dev-ruby/websocket/websocket-1.2.4.ebuild
-1702282250 ./dev-ruby/websocket/websocket-1.2.3.ebuild
 1802041408 ./dev-ruby/httpauth/httpauth-0.2.1.ebuild
 1711171008 ./dev-ruby/syslogger/syslogger-1.6.5.ebuild
-1702282250 ./dev-ruby/syslogger/syslogger-1.6.4.ebuild
 1707180945 ./dev-ruby/test_construct/test_construct-2.0.1-r1.ebuild
 1802031108 ./dev-ruby/deep_merge/deep_merge-1.2.1.ebuild
 1712150209 ./dev-ruby/deep_merge/deep_merge-1.0.1.ebuild
@@ -2762,9 +2757,6 @@
 1802121939 ./dev-ruby/loofah/loofah-2.0.3.ebuild
 1802041408 ./dev-ruby/levenshtein/levenshtein-0.2.2-r2.ebuild
 1802070908 ./dev-ruby/sprockets-rails/sprockets-rails-3.2.1.ebuild
-1707011645 ./dev-ruby/sprockets-rails/sprockets-rails-3.2.0.ebuild
-1802070908 ./dev-ruby/sprockets-rails/sprockets-rails-3.2.0-r1.ebuild
-1802070908 ./dev-ruby/sprockets-rails/sprockets-rails-3.1.1.ebuild
 1708230910 ./dev-ruby/sprockets-rails/sprockets-rails-2.3.3-r1.ebuild
 1706281235 ./dev-ruby/syntax/syntax-1.2.1.ebuild
 1801181009 ./dev-ruby/syntax/syntax-1.2.2.ebuild
@@ -2870,7 +2862,7 @@
 1712252009 ./dev-ruby/test-unit/test-unit-3.2.7.ebuild
 1709220821 ./dev-ruby/test-unit/test-unit-3.2.6.ebuild
 1705230811 ./dev-ruby/test-unit/test-unit-3.2.4.ebuild
-1702282250 ./dev-ruby/wirble/wirble-0.1.3-r4.ebuild
+1803052038 ./dev-ruby/wirble/wirble-0.1.3-r4.ebuild
 1802070908 ./dev-ruby/activesupport/activesupport-5.1.3.ebuild
 1802070908 ./dev-ruby/activesupport/activesupport-5.1.2.ebuild
 1802070908 ./dev-ruby/activesupport/activesupport-5.1.4.ebuild
@@ -2972,7 +2964,6 @@
 1707011644 ./dev-ruby/itextomml/itextomml-1.5.6.ebuild
 1712210139 ./dev-ruby/contracts/contracts-0.16.0.ebuild
 1802192238 ./dev-ruby/systemu/systemu-2.6.5.ebuild
-1702282250 ./dev-ruby/temple/temple-0.7.7.ebuild
 1707140930 ./dev-ruby/temple/temple-0.6.10.ebuild
 1710010344 ./dev-ruby/temple/temple-0.8.0.ebuild
 1702282250 ./dev-ruby/facets/facets-3.1.0.ebuild
@@ -3063,7 +3054,7 @@
 1803031138 ./dev-ruby/capistrano/capistrano-3.10.1.ebuild
 1802201008 ./dev-ruby/ttfunk/ttfunk-1.2.1.ebuild
 1707011644 ./dev-ruby/ttfunk/ttfunk-1.5.1.ebuild
-1702282250 ./dev-ruby/ttfunk/ttfunk-1.4.0.ebuild
+1803052038 ./dev-ruby/ttfunk/ttfunk-1.4.0.ebuild
 1702282250 ./dev-ruby/ttfunk/ttfunk-1.5.0.ebuild
 1703290756 ./dev-ruby/nexpose/nexpose-5.3.2.ebuild
 1708250901 ./dev-ruby/pg_array_parser/pg_array_parser-0.0.9-r2.ebuild
@@ -3137,7 +3128,7 @@
 1710141919 ./dev-ruby/elasticsearch-api/elasticsearch-api-5.0.4.ebuild
 1707011644 ./dev-ruby/prawn-table/prawn-table-0.2.2-r1.ebuild
 1802041838 ./dev-ruby/naught/naught-1.1.0.ebuild
-1704152306 ./dev-ruby/axiom-types/axiom-types-0.1.1.ebuild
+1803052238 ./dev-ruby/axiom-types/axiom-types-0.1.1.ebuild
 1705101758 ./dev-ruby/rex-mime/rex-mime-0.1.4.ebuild
 1712282339 ./dev-ruby/http-cookie/http-cookie-1.0.2-r1.ebuild
 1707120740 ./dev-ruby/http-cookie/http-cookie-1.0.3.ebuild
@@ -3155,7 +3146,7 @@
 1702282250 ./media-video/chaplin/chaplin-1.10-r2.ebuild
 1712291539 ./media-video/rovclock/rovclock-0.6e-r1.ebuild
 1801281808 ./media-video/totem/totem-3.24.0.ebuild
-1802031238 ./media-video/mediainfo/mediainfo-17.12.ebuild
+1803052038 ./media-video/mediainfo/mediainfo-17.12.ebuild
 1702282250 ./media-video/dirac/dirac-1.0.2-r1.ebuild
 1702282250 ./media-video/subsync/subsync-0.0.1.ebuild
 1801102209 ./media-video/avidemux/avidemux-2.7.0.ebuild
@@ -3396,7 +3387,7 @@
 1712100239 ./media-video/transcode/transcode-1.1.7-r3.ebuild
 1802061838 ./media-video/mpv/mpv-0.25.0-r2.ebuild
 1802240008 ./media-video/mpv/mpv-9999.ebuild
-1802252138 ./media-video/mpv/mpv-0.27.2.ebuild
+1803052038 ./media-video/mpv/mpv-0.27.2.ebuild
 1802240008 ./media-video/mpv/mpv-0.28.2.ebuild
 1712101340 ./media-video/dcpomatic/dcpomatic-2.11.7.ebuild
 1712101340 ./media-video/dcpomatic/dcpomatic-2.10.5.ebuild
@@ -3494,6 +3485,7 @@
 1801280138 ./www-client/firefox/firefox-52.6.0.ebuild
 1710062321 ./www-client/seamonkey-bin/seamonkey-bin-2.49.1_rc2.ebuild
 1708081533 ./www-client/seamonkey-bin/seamonkey-bin-2.48.ebuild
+1803052039 ./www-client/opera-developer/opera-developer-53.0.2885.0.ebuild
 1803012238 ./www-client/opera-developer/opera-developer-53.0.2880.0.ebuild
 1708121740 ./www-client/dooble/dooble-1.56c.ebuild
 1801300108 ./www-client/firefox-bin/firefox-bin-58.0.1.ebuild
@@ -3511,9 +3503,10 @@
 1802282338 ./www-client/google-chrome-unstable/google-chrome-unstable-66.0.3355.0.ebuild
 1702282250 ./www-client/ck4up/ck4up-1.2.ebuild
 1802161908 ./www-client/chromium/chromium-64.0.3282.167.ebuild
-1802220008 ./www-client/chromium/chromium-65.0.3325.73.ebuild
-1802280208 ./www-client/chromium/chromium-65.0.3325.88.ebuild
-1802280008 ./www-client/chromium/chromium-64.0.3282.186.ebuild
+1803060008 ./www-client/chromium/chromium-65.0.3325.88.ebuild
+1803060008 ./www-client/chromium/chromium-66.0.3355.0.ebuild
+1803052039 ./www-client/chromium/chromium-64.0.3282.186.ebuild
+1803060008 ./www-client/chromium/chromium-65.0.3325.106.ebuild
 1702282250 ./www-client/dillo/dillo-3.0.5.ebuild
 1702282250 ./www-client/dillo/dillo-3.0.5-r1.ebuild
 1702282250 ./www-client/links/links-2.14.ebuild
@@ -3640,7 +3633,7 @@
 1702282250 ./app-emacs/mu-cite/mu-cite-8.1_p201202272330.ebuild
 1702282250 ./app-emacs/quilt-el/quilt-el-0.48.0.ebuild
 1801301108 ./app-emacs/ebuild-mode/ebuild-mode-1.38.ebuild
-1803041008 ./app-emacs/ebuild-mode/ebuild-mode-1.42.ebuild
+1803052038 ./app-emacs/ebuild-mode/ebuild-mode-1.42.ebuild
 1702282250 ./app-emacs/binclock/binclock-1.7-r1.ebuild
 1802210008 ./app-emacs/hexrgb/hexrgb-0_p957.ebuild
 1702282250 ./app-emacs/adaptive-wrap/adaptive-wrap-0.5.ebuild
@@ -3684,8 +3677,7 @@
 1706181624 ./app-emacs/eselect-mode/eselect-mode-1.4.4.ebuild
 1712251439 ./app-emacs/eselect-mode/eselect-mode-9999.ebuild
 1702282250 ./app-emacs/crontab-mode/crontab-mode-1.20.ebuild
-1706181444 ./app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6.ebuild
-1802221208 ./app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild
+1803052038 ./app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild
 1707302338 ./app-emacs/emacs-wiki-blog/emacs-wiki-blog-0.5.ebuild
 1711031238 ./app-emacs/doxymacs/doxymacs-1.8.0-r3.ebuild
 1702282250 ./app-emacs/ghc-mod/ghc-mod-5.4.0.0.ebuild
@@ -3840,26 +3832,26 @@
 1704041505 ./sys-devel/heirloom-devtools/heirloom-devtools-070527-r2.ebuild
 1704041505 ./sys-devel/heirloom-devtools/heirloom-devtools-999999.ebuild
 1801231609 ./sys-devel/automake/automake-1.9.6-r4.ebuild
-1803042238 ./sys-devel/automake/automake-1.11.6-r3.ebuild
+1803052208 ./sys-devel/automake/automake-1.11.6-r3.ebuild
 1801231609 ./sys-devel/automake/automake-1.7.9-r3.ebuild
-1803042238 ./sys-devel/automake/automake-1.13.4-r2.ebuild
+1803052208 ./sys-devel/automake/automake-1.13.4-r2.ebuild
 1803010408 ./sys-devel/automake/automake-9999.ebuild
 1801231609 ./sys-devel/automake/automake-1.11.6-r2.ebuild
-1803042238 ./sys-devel/automake/automake-1.12.6-r2.ebuild
+1803052208 ./sys-devel/automake/automake-1.12.6-r2.ebuild
 1801231609 ./sys-devel/automake/automake-1.12.6.ebuild
-1803042238 ./sys-devel/automake/automake-1.10.3-r3.ebuild
+1803052208 ./sys-devel/automake/automake-1.10.3-r3.ebuild
 1801231609 ./sys-devel/automake/automake-1.5-r2.ebuild
 1801231609 ./sys-devel/automake/automake-1.14.1-r1.ebuild
 1801231609 ./sys-devel/automake/automake-1.8.5-r5.ebuild
-1803042238 ./sys-devel/automake/automake-1.9.6-r5.ebuild
+1803052208 ./sys-devel/automake/automake-1.9.6-r5.ebuild
 1801231609 ./sys-devel/automake/automake-1.15.1-r1.ebuild
 1801231609 ./sys-devel/automake/automake-1.10.3-r2.ebuild
 1801231609 ./sys-devel/automake/automake-1.12.6-r1.ebuild
 1801231609 ./sys-devel/automake/automake-1.6.3-r2.ebuild
 1803010438 ./sys-devel/automake/automake-1.16-r1.ebuild
-1803042238 ./sys-devel/automake/automake-1.14.1-r2.ebuild
+1803052208 ./sys-devel/automake/automake-1.14.1-r2.ebuild
 1801231609 ./sys-devel/automake/automake-1.4_p6-r2.ebuild
-1803042238 ./sys-devel/automake/automake-1.15.1-r2.ebuild
+1803052208 ./sys-devel/automake/automake-1.15.1-r2.ebuild
 1801231609 ./sys-devel/automake/automake-1.13.4-r1.ebuild
 1802261708 ./sys-devel/clang-runtime/clang-runtime-6.0.0_rc3.ebuild
 1801040139 ./sys-devel/clang-runtime/clang-runtime-9999.ebuild
@@ -4045,7 +4037,7 @@
 1801241039 ./sys-devel/gnuconfig/gnuconfig-20180101.ebuild
 1801241039 ./sys-devel/gnuconfig/gnuconfig-99999999.ebuild
 1802071438 ./sys-devel/patch/patch-2.7.5.ebuild
-1802180138 ./sys-devel/patch/patch-2.7.6-r1.ebuild
+1803052039 ./sys-devel/patch/patch-2.7.6-r1.ebuild
 1711290910 ./sys-devel/autoconf-archive/autoconf-archive-2017.03.21.ebuild
 1703211841 ./sys-devel/autoconf-archive/autoconf-archive-2016.09.16.ebuild
 1701292313 ./sys-devel/autoconf-archive/autoconf-archive-2016.03.20-r1.ebuild
@@ -4303,6 +4295,7 @@
 1710040211 ./app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.1.ebuild
 1702282250 ./app-crypt/osslsigncode/osslsigncode-1.4.ebuild
 1801050009 ./app-crypt/xca/xca-1.4.0.ebuild
+1803052038 ./app-crypt/xca/xca-1.4.1.ebuild
 1709230950 ./app-crypt/xca/xca-1.3.2-r2.ebuild
 1707301145 ./app-crypt/eid-mw/eid-mw-4.2.8.ebuild
 1801191710 ./app-crypt/eid-mw/eid-mw-4.3.6.ebuild
@@ -4511,7 +4504,7 @@
 1706160332 ./virtual/perl-Perl-OSType/perl-Perl-OSType-1.10.0.ebuild
 1703211842 ./virtual/ttf-fonts/ttf-fonts-1-r1.ebuild
 1802180308 ./virtual/python-funcsigs/python-funcsigs-0-r1.ebuild
-1802180308 ./virtual/python-funcsigs/python-funcsigs-1.ebuild
+1803060038 ./virtual/python-funcsigs/python-funcsigs-1.ebuild
 1801171609 ./virtual/perl-XSLoader/perl-XSLoader-0.220.0-r3.ebuild
 1706160332 ./virtual/perl-XSLoader/perl-XSLoader-0.270.0.ebuild
 1711190140 ./virtual/perl-Term-ANSIColor/perl-Term-ANSIColor-4.60.0.ebuild
@@ -4542,7 +4535,7 @@
 1801152309 ./virtual/httpd-php/httpd-php-7.2.ebuild
 1802070608 ./virtual/httpd-php/httpd-php-7.1.ebuild
 1801231609 ./virtual/dev-manager/dev-manager-0-r1.ebuild
-1802170009 ./virtual/libgudev/libgudev-232.ebuild
+1803052039 ./virtual/libgudev/libgudev-232.ebuild
 1703291854 ./virtual/libgudev/libgudev-215-r3.ebuild
 1703291854 ./virtual/libgudev/libgudev-230.ebuild
 1703291854 ./virtual/leechcraft-browser/leechcraft-browser-9999.ebuild
@@ -4707,7 +4700,7 @@
 1801231609 ./virtual/mta/mta-1.ebuild
 1801171609 ./virtual/perl-IPC-Cmd/perl-IPC-Cmd-0.920.100_rc-r5.ebuild
 1706160332 ./virtual/perl-IPC-Cmd/perl-IPC-Cmd-0.960.0.ebuild
-1706191413 ./virtual/python-pathlib/python-pathlib-1.0.ebuild
+1803052039 ./virtual/python-pathlib/python-pathlib-1.0.ebuild
 1706160332 ./virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.140.0-r2.ebuild
 1702282250 ./virtual/imap-c-client/imap-c-client-1.ebuild
 1702282250 ./virtual/imap-c-client/imap-c-client-0.ebuild
@@ -4760,7 +4753,7 @@
 1702282250 ./net-irc/xaric/xaric-0.13.6.ebuild
 1702282250 ./net-irc/irc-server/irc-server-2.11.1_p1-r4.ebuild
 1702282250 ./net-irc/muh/muh-2.2a.ebuild
-1802221208 ./net-irc/muh/muh-2.2a-r1.ebuild
+1803052038 ./net-irc/muh/muh-2.2a-r1.ebuild
 1702282250 ./net-irc/redirbot/redirbot-0.0.5-r1.ebuild
 1702282250 ./net-irc/ircii/ircii-20110228.ebuild
 1702282250 ./net-irc/ircii/ircii-20111115.ebuild
@@ -4860,8 +4853,7 @@
 1702282250 ./sys-auth/bioapi/bioapi-1.2.4.ebuild
 1702282250 ./sys-auth/bioapi/bioapi-1.2.3-r2.ebuild
 1702282250 ./sys-auth/ykneo-ccid-tools/ykneo-ccid-tools-0.0.0.ebuild
-1803041338 ./sys-auth/elogind/elogind-235.2-r2.ebuild
-1802020108 ./sys-auth/elogind/elogind-235.2-r1.ebuild
+1803060138 ./sys-auth/elogind/elogind-235.2-r2.ebuild
 1702282250 ./sys-auth/pam_chroot/pam_chroot-0.9.2.ebuild
 1801032209 ./sys-auth/realtime-base/realtime-base-0.1.ebuild
 1702282250 ./sys-auth/pam_krb5/pam_krb5-4.6.ebuild
@@ -5147,7 +5139,7 @@
 1803030308 ./net-libs/mbedtls/mbedtls-2.6.0.ebuild
 1802071638 ./net-libs/mbedtls/mbedtls-2.7.0.ebuild
 1710122145 ./net-libs/mbedtls/mbedtls-2.6.1.ebuild
-1803041338 ./net-libs/mbedtls/mbedtls-2.7.1.ebuild
+1803060038 ./net-libs/mbedtls/mbedtls-2.7.1.ebuild
 1802260238 ./net-libs/ntirpc/ntirpc-1.6.1.ebuild
 1703310744 ./net-libs/quasselc/quasselc-0_p20170111.ebuild
 1702282250 ./net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild
@@ -5194,7 +5186,7 @@
 1802171738 ./net-libs/libpcap/libpcap-9999.ebuild
 1802171738 ./net-libs/libpcap/libpcap-1.8.1.ebuild
 1802171738 ./net-libs/libpcap/libpcap-1.8.1-r2.ebuild
-1703071147 ./net-libs/libtrace/libtrace-4.0.1.ebuild
+1803052038 ./net-libs/libtrace/libtrace-4.0.3.ebuild
 1711181343 ./net-libs/libtrace/libtrace-4.0.2.ebuild
 1702282250 ./net-libs/gsnmp/gsnmp-0.3.0.ebuild
 1707292335 ./net-libs/gupnp/gupnp-1.0.2.ebuild
@@ -5244,7 +5236,7 @@
 1801201508 ./net-libs/ldns/ldns-1.7.0-r2.ebuild
 1712021409 ./net-libs/libflowmanager/libflowmanager-3.0.0-r1.ebuild
 1709242305 ./net-libs/libsoup/libsoup-2.56.1.ebuild
-1802191108 ./net-libs/libsoup/libsoup-2.58.2.ebuild
+1803052038 ./net-libs/libsoup/libsoup-2.58.2.ebuild
 1706201511 ./net-libs/libasyncns/libasyncns-0.8-r4.ebuild
 1702282250 ./net-libs/libasyncns/libasyncns-0.8-r3.ebuild
 1711280310 ./net-libs/jreen/jreen-1.3.0-r1.ebuild
@@ -5269,7 +5261,7 @@
 1708261307 ./net-libs/gnet/gnet-2.0.8-r2.ebuild
 1801222308 ./net-libs/signon-ui/signon-ui-0.15-r1.ebuild
 1702282250 ./net-libs/libident/libident-0.32.ebuild
-1802221208 ./net-libs/libident/libident-0.32-r1.ebuild
+1803052038 ./net-libs/libident/libident-0.32-r1.ebuild
 1707301304 ./net-libs/balde-markdown/balde-markdown-0.1.ebuild
 1702282250 ./net-libs/cvm/cvm-0.76.ebuild
 1702282250 ./net-libs/cvm/cvm-0.96.ebuild
@@ -5296,7 +5288,7 @@
 1708312353 ./net-libs/telepathy-logger-qt/telepathy-logger-qt-15.04.0.ebuild
 1702282250 ./net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0.ebuild
 1706192112 ./net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0-r1.ebuild
-1801270409 ./net-libs/phodav/phodav-2.2.ebuild
+1803052038 ./net-libs/phodav/phodav-2.2.ebuild
 1702282250 ./net-libs/phodav/phodav-2.1.ebuild
 1702282250 ./net-libs/iax/iax-0.2.2-r3.ebuild
 1702282250 ./net-libs/iax/iax-0.2.2.ebuild
@@ -5326,7 +5318,7 @@
 1702282250 ./net-libs/libpcapnav/libpcapnav-0.8.ebuild
 1707292335 ./net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.2.0.ebuild
 1702282250 ./net-libs/libnfsidmap/libnfsidmap-0.25.ebuild
-1702282250 ./net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild
+1803060038 ./net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild
 1702282250 ./net-libs/libnfsidmap/libnfsidmap-0.24.ebuild
 1704100150 ./net-libs/libsrsirc/libsrsirc-0.0.14-r1.ebuild
 1702282250 ./net-libs/libupnp/libupnp-1.6.21.ebuild
@@ -5914,7 +5906,7 @@
 1707301512 ./media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-4.1.0.ebuild
 1702282250 ./media-plugins/ladspa-bs2b/ladspa-bs2b-0.9.1.ebuild
 1705300956 ./media-plugins/live/live-2017.05.24.ebuild
-1802252138 ./media-plugins/live/live-2017.10.28.ebuild
+1803052038 ./media-plugins/live/live-2017.10.28.ebuild
 1704190952 ./media-plugins/live/live-2017.01.26.ebuild
 1710081446 ./media-plugins/live/live-2017.09.12.ebuild
 1707211203 ./media-plugins/live/live-2017.07.18.ebuild
@@ -6239,6 +6231,7 @@
 1702282250 ./x11-misc/light-locker/light-locker-1.7.0.ebuild
 1702282250 ./x11-misc/light-locker/light-locker-1.7.0-r1.ebuild
 1707280223 ./x11-misc/light-locker/light-locker-1.8.0.ebuild
+1803052039 ./x11-misc/util-macros/util-macros-1.19.2.ebuild
 1708161015 ./x11-misc/util-macros/util-macros-1.19.1.ebuild
 1704162111 ./x11-misc/easystroke/easystroke-0.6.0-r2.ebuild
 1712022339 ./x11-misc/easystroke/easystroke-0.6.0-r3.ebuild
@@ -6402,7 +6395,7 @@
 1702282250 ./x11-misc/xcalib/xcalib-0.9.0_p20161210.ebuild
 1705121754 ./x11-misc/idesk/idesk-0.7.5-r3.ebuild
 1703022352 ./x11-misc/xscreensaver/xscreensaver-5.36.ebuild
-1803042238 ./x11-misc/xscreensaver/xscreensaver-5.38.ebuild
+1803060038 ./x11-misc/xscreensaver/xscreensaver-5.38.ebuild
 1707061304 ./x11-misc/xscreensaver/xscreensaver-5.37.ebuild
 1703211733 ./x11-misc/xwit/xwit-3.4_p15.ebuild
 1702282250 ./x11-misc/bbppp/bbppp-0.2.5.ebuild
@@ -7001,7 +6994,7 @@
 1702282250 ./dev-libs/girara/girara-9999.ebuild
 1801281938 ./dev-libs/girara/girara-0.2.8.ebuild
 1710180814 ./dev-libs/libinput/libinput-1.8.3.ebuild
-1802170008 ./dev-libs/libinput/libinput-1.9.4.ebuild
+1803052038 ./dev-libs/libinput/libinput-1.9.4.ebuild
 1802150408 ./dev-libs/libinput/libinput-1.10.0.ebuild
 1803010808 ./dev-libs/libinput/libinput-1.10.1.ebuild
 1712190209 ./dev-libs/libinput/libinput-1.7.3.ebuild
@@ -7065,7 +7058,7 @@
 1702282250 ./dev-libs/libvolume_id/libvolume_id-0.81.1.ebuild
 1702282250 ./dev-libs/libvolume_id/libvolume_id-0.81.0.ebuild
 1801231609 ./dev-libs/libcroco/libcroco-0.6.12-r1.ebuild
-1801201308 ./dev-libs/nss/nss-3.35.ebuild
+1803060008 ./dev-libs/nss/nss-3.35.ebuild
 1803030308 ./dev-libs/nss/nss-3.29.5.ebuild
 1711292040 ./dev-libs/nss/nss-3.34.1.ebuild
 1801280538 ./dev-libs/DirectFB/DirectFB-1.7.6.ebuild
@@ -7252,7 +7245,7 @@
 1801121410 ./dev-libs/libqtxdg/libqtxdg-2.0.0.ebuild
 1801220038 ./dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.3.ebuild
 1801231609 ./dev-libs/libgpg-error/libgpg-error-1.27-r1.ebuild
-1803030508 ./dev-libs/gobject-introspection-common/gobject-introspection-common-1.52.1.ebuild
+1803052038 ./dev-libs/gobject-introspection-common/gobject-introspection-common-1.52.1.ebuild
 1801131009 ./dev-libs/gobject-introspection-common/gobject-introspection-common-1.50.0.ebuild
 1712182139 ./dev-libs/json-c/json-c-0.12.1.ebuild
 1712182139 ./dev-libs/json-c/json-c-0.12.ebuild
@@ -7307,7 +7300,7 @@
 1702282250 ./dev-libs/zookeeper-c/zookeeper-c-3.4.9.ebuild
 1802192308 ./dev-libs/collada-dom/collada-dom-2.5.0.ebuild
 1802192308 ./dev-libs/collada-dom/collada-dom-9999.ebuild
-1802231338 ./dev-libs/mm/mm-1.4.2-r2.ebuild
+1803052038 ./dev-libs/mm/mm-1.4.2-r2.ebuild
 1707072045 ./dev-libs/mm/mm-1.4.2-r1.ebuild
 1702282250 ./dev-libs/intel-common/intel-common-13.1.5.192.ebuild
 1702282250 ./dev-libs/intel-common/intel-common-15.0.6.233.ebuild
@@ -7358,7 +7351,7 @@
 1712252239 ./dev-libs/cloog/cloog-9999.ebuild
 1712252239 ./dev-libs/cloog/cloog-0.18.4.ebuild
 1801231609 ./dev-libs/libxml2/libxml2-2.9.6.ebuild
-1803040938 ./dev-libs/libxml2/libxml2-2.9.7.ebuild
+1803052038 ./dev-libs/libxml2/libxml2-2.9.7.ebuild
 1702282250 ./dev-libs/libvformat/libvformat-1.13-r2.ebuild
 1702282250 ./dev-libs/blitz/blitz-0.10.ebuild
 1702282250 ./dev-libs/blitz/blitz-0.10-r1.ebuild
@@ -7458,7 +7451,7 @@
 1702282250 ./dev-libs/libntru/libntru-0.4.1.ebuild
 1702282250 ./dev-libs/libntru/libntru-0.4.1-r1.ebuild
 1712311610 ./dev-libs/mdsplib/mdsplib-0.11.ebuild
-1803030508 ./dev-libs/glib/glib-2.52.3.ebuild
+1803052038 ./dev-libs/glib/glib-2.52.3.ebuild
 1801231609 ./dev-libs/glib/glib-2.50.3-r1.ebuild
 1702282250 ./dev-libs/libdaemon/libdaemon-0.14-r2.ebuild
 1702282250 ./dev-libs/libdaemon/libdaemon-0.14-r1.ebuild
@@ -7635,7 +7628,7 @@
 1802221208 ./dev-libs/serd/serd-0.28.0-r1.ebuild
 1704271335 ./dev-libs/serd/serd-0.26.0.ebuild
 1802191908 ./dev-libs/xmlwrapp/xmlwrapp-0.8.1.ebuild
-1802221208 ./dev-libs/libunicode/libunicode-0.4-r2.ebuild
+1803052038 ./dev-libs/libunicode/libunicode-0.4-r2.ebuild
 1702282250 ./dev-libs/libunicode/libunicode-0.4-r1.ebuild
 1801130210 ./dev-libs/gecode/gecode-4.4.0-r2.ebuild
 1801130240 ./dev-libs/gecode/gecode-3.7.3-r1.ebuild
@@ -7724,13 +7717,13 @@
 1802222338 ./dev-libs/capnproto/capnproto-0.6.1.ebuild
 1802222338 ./dev-libs/capnproto/capnproto-0.6.0.ebuild
 1712091639 ./dev-libs/libspt/libspt-1.1-r2.ebuild
-1712091639 ./dev-libs/libspt/libspt-1.1-r3.ebuild
+1803052338 ./dev-libs/libspt/libspt-1.1-r3.ebuild
 1712282239 ./dev-libs/urdfdom/urdfdom-1.0.0-r1.ebuild
 1712282239 ./dev-libs/urdfdom/urdfdom-9999.ebuild
 1702282250 ./dev-libs/yaz/yaz-3.0.53.ebuild
 1702282250 ./dev-libs/judy/judy-1.0.5.ebuild
 1702282250 ./dev-libs/judy/judy-1.0.4.ebuild
-1802201738 ./dev-libs/judy/judy-1.0.5-r2.ebuild
+1803060038 ./dev-libs/judy/judy-1.0.5-r2.ebuild
 1702282250 ./dev-libs/libnsutils/libnsutils-0.0.3.ebuild
 1702282250 ./dev-libs/xmlrpc-c/xmlrpc-c-1.32.05-r1.ebuild
 1706101802 ./dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild
@@ -7757,7 +7750,7 @@
 1801301138 ./dev-libs/libbsd/libbsd-0.8.7.ebuild
 1702282250 ./dev-libs/kqoauth/kqoauth-0.98-r2.ebuild
 1707071310 ./dev-libs/atk/atk-2.22.0.ebuild
-1802170008 ./dev-libs/atk/atk-2.24.0.ebuild
+1803052038 ./dev-libs/atk/atk-2.24.0.ebuild
 1702282250 ./dev-libs/eb/eb-4.4.1-r1.ebuild
 1706211511 ./dev-libs/c-blosc/c-blosc-1.11.2.ebuild
 1801231609 ./dev-libs/libedit/libedit-20170329.3.1.ebuild
@@ -7785,13 +7778,13 @@
 1802081138 ./dev-libs/vala-common/vala-common-0.36.11.ebuild
 1712271139 ./dev-libs/vala-common/vala-common-0.34.9.ebuild
 1802081138 ./dev-libs/vala-common/vala-common-0.34.16.ebuild
-1802170008 ./dev-libs/vala-common/vala-common-0.36.7.ebuild
+1803052038 ./dev-libs/vala-common/vala-common-0.36.7.ebuild
 1707141657 ./dev-libs/gom/gom-0.3.2.ebuild
 1702282250 ./dev-libs/libdivsufsort/libdivsufsort-2.0.1.ebuild
 1702282250 ./dev-libs/libdivsufsort/libdivsufsort-9999.ebuild
 1702282250 ./dev-libs/libstroke/libstroke-0.5.1.ebuild
 1801131009 ./dev-libs/gobject-introspection/gobject-introspection-1.50.0.ebuild
-1803030508 ./dev-libs/gobject-introspection/gobject-introspection-1.52.1.ebuild
+1803052038 ./dev-libs/gobject-introspection/gobject-introspection-1.52.1.ebuild
 1802151738 ./dev-libs/ding-libs/ding-libs-0.4.0.ebuild
 1802121338 ./dev-libs/ding-libs/ding-libs-0.6.1.ebuild
 1802151738 ./dev-libs/ding-libs/ding-libs-0.5.0.ebuild
@@ -7806,7 +7799,7 @@
 1702282327 ./dev-libs/cl/cl-1.2.3.ebuild
 1709230000 ./dev-libs/protobuf/protobuf-3.4.1.ebuild
 1705092018 ./dev-libs/protobuf/protobuf-2.6.1-r3.ebuild
-1802240208 ./dev-libs/protobuf/protobuf-3.5.1.1.ebuild
+1803060038 ./dev-libs/protobuf/protobuf-3.5.1.1.ebuild
 1709021803 ./dev-libs/protobuf/protobuf-3.3.0.ebuild
 1705092018 ./dev-libs/protobuf/protobuf-3.0.0_beta3_p1.ebuild
 1705092018 ./dev-libs/protobuf/protobuf-3.0.2.ebuild
@@ -7901,7 +7894,7 @@
 1708231219 ./dev-libs/unibilium/unibilium-1.2.0.ebuild
 1801051439 ./dev-libs/unibilium/unibilium-1.2.1.ebuild
 1702282250 ./dev-libs/unibilium/unibilium-1.1.4.ebuild
-1803022038 ./dev-libs/libxslt/libxslt-1.1.30-r2.ebuild
+1803052138 ./dev-libs/libxslt/libxslt-1.1.30-r2.ebuild
 1702282250 ./dev-libs/libcoyotl/libcoyotl-3.1.0-r2.ebuild
 1702282250 ./dev-libs/libpfm/libpfm-4.4.0.ebuild
 1711140134 ./dev-libs/libpfm/libpfm-4.8.0.ebuild
@@ -8428,7 +8421,7 @@
 1801041709 ./x11-terms/aterm/aterm-1.0.1-r3.ebuild
 1702282250 ./x11-terms/root-tail/root-tail-1.2-r3.ebuild
 1712021609 ./x11-terms/eterm/eterm-9999.ebuild
-1803041008 ./x11-terms/eterm/eterm-0.9.6-r1.ebuild
+1803052039 ./x11-terms/eterm/eterm-0.9.6-r1.ebuild
 1803020208 ./x11-terms/eterm/eterm-0.9.5.ebuild
 1703120615 ./x11-terms/terminology/terminology-0.9.1.ebuild
 1712171539 ./x11-terms/terminology/terminology-9999.ebuild
@@ -8555,7 +8548,7 @@
 1702282250 ./sys-process/xjobs/xjobs-20151016.ebuild
 1802172108 ./sys-process/xjobs/xjobs-20170829.ebuild
 1706191703 ./sys-process/daemontools/daemontools-0.76-r7.ebuild
-1803041008 ./sys-process/audit/audit-2.7.1.ebuild
+1803052338 ./sys-process/audit/audit-2.7.1.ebuild
 1803021408 ./sys-process/audit/audit-2.8.2.ebuild
 1803021408 ./sys-process/audit/audit-2.6.4.ebuild
 1801231609 ./sys-process/pidof-bsd/pidof-bsd-20050501-r4.ebuild
@@ -8630,12 +8623,12 @@
 1710160626 ./sys-process/tini/tini-0.13.2.ebuild
 1710160626 ./sys-process/tini/tini-0.15.0.ebuild
 1711031453 ./sys-process/tini/tini-0.16.1.ebuild
-1702282250 ./app-vim/gist/gist-7.3.ebuild
+1803052038 ./app-vim/gist/gist-7.3.ebuild
 1702282250 ./app-vim/ri-browser/ri-browser-1.2.ebuild
-1702282250 ./app-vim/git-patch-tags/git-patch-tags-0.2.ebuild
-1702282250 ./app-vim/emmet/emmet-0.85.ebuild
+1803052038 ./app-vim/git-patch-tags/git-patch-tags-0.2.ebuild
+1803060108 ./app-vim/emmet/emmet-0.85.ebuild
 1702282250 ./app-vim/vim-flake8/vim-flake8-1.6.ebuild
-1706181817 ./app-vim/gtk-syntax/gtk-syntax-20130716.ebuild
+1803052038 ./app-vim/gtk-syntax/gtk-syntax-20130716.ebuild
 1801041939 ./app-vim/vim2hs/vim2hs-0.1_p20171106.ebuild
 1702282250 ./app-vim/project/project-1.4.1.ebuild
 1711050156 ./app-vim/pfsyntax/pfsyntax-1.3.ebuild
@@ -8650,9 +8643,9 @@
 1710110104 ./app-vim/vim-spell-de/vim-spell-de-20080213-r1.ebuild
 1801071439 ./app-vim/molokai/molokai-0.1_p20151115.ebuild
 1702282250 ./app-vim/thlnk/thlnk-1.2.1-r1.ebuild
-1702282250 ./app-vim/easy-align/easy-align-2.10.0.ebuild
-1702282250 ./app-vim/foldutil/foldutil-3.0-r1.ebuild
-1702282250 ./app-vim/dirdiff/dirdiff-1.1.5.ebuild
+1803060108 ./app-vim/easy-align/easy-align-2.10.0.ebuild
+1803052038 ./app-vim/foldutil/foldutil-3.0-r1.ebuild
+1803060108 ./app-vim/dirdiff/dirdiff-1.1.5.ebuild
 1702282250 ./app-vim/cctree/cctree-1.61-r1.ebuild
 1702282250 ./app-vim/languagetool/languagetool-1.30.ebuild
 1702282250 ./app-vim/languagetool/languagetool-1.29.ebuild
@@ -8679,13 +8672,13 @@
 1702282250 ./app-vim/vim-spell-nl/vim-spell-nl-20051007.ebuild
 1702282250 ./app-vim/nerdtree-tabs/nerdtree-tabs-1.4.7.ebuild
 1702282250 ./app-vim/recover/recover-0.18.ebuild
-1712200139 ./app-vim/extra-syntax/extra-syntax-4-r2.ebuild
-1702282250 ./app-vim/closetag/closetag-0.9.1-r1.ebuild
+1803060108 ./app-vim/extra-syntax/extra-syntax-4-r2.ebuild
+1803060108 ./app-vim/closetag/closetag-0.9.1-r1.ebuild
 1710130049 ./app-vim/vim-spell-es/vim-spell-es-20060208-r1.ebuild
 1702282250 ./app-vim/vim-spell-es/vim-spell-es-20060208.ebuild
-1702282250 ./app-vim/c-support/c-support-6.1.ebuild
-1702282250 ./app-vim/c-support/c-support-6.0.ebuild
-1702282250 ./app-vim/c-support/c-support-6.1.1.ebuild
+1803060108 ./app-vim/c-support/c-support-6.1.ebuild
+1803060108 ./app-vim/c-support/c-support-6.0.ebuild
+1803060108 ./app-vim/c-support/c-support-6.1.1.ebuild
 1706032339 ./app-vim/vimcalc/vimcalc-1.3-r2.ebuild
 1702282250 ./app-vim/yankring/yankring-19.0.ebuild
 1801231609 ./app-vim/gentoo-syntax/gentoo-syntax-20160530.ebuild
@@ -8699,12 +8692,12 @@
 1708172352 ./app-vim/nerdcommenter/nerdcommenter-9999.ebuild
 1710081953 ./app-vim/nerdcommenter/nerdcommenter-2.5.0.ebuild
 1712170239 ./app-vim/udev-syntax/udev-syntax-20051016-r2.ebuild
-1702282250 ./app-vim/errsign/errsign-0.1-r1.ebuild
+1803060108 ./app-vim/errsign/errsign-0.1-r1.ebuild
 1702282250 ./app-vim/vim-rest-console/vim-rest-console-2.4.0.ebuild
 1702282250 ./app-vim/vim-rest-console/vim-rest-console-2.3.0.ebuild
 1702282250 ./app-vim/vim-rest-console/vim-rest-console-2.5.0.ebuild
 1702282250 ./app-vim/vim-rest-console/vim-rest-console-2.6.0.ebuild
-1702282250 ./app-vim/colorschemes/colorschemes-20140623-r1.ebuild
+1803060108 ./app-vim/colorschemes/colorschemes-20140623-r1.ebuild
 1708251130 ./app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild
 1705300224 ./app-vim/vimoutliner/vimoutliner-0.3.6.ebuild
 1702282250 ./app-vim/uptime/uptime-1.3-r1.ebuild
@@ -8715,17 +8708,17 @@
 1710130057 ./app-vim/vim-spell-fr/vim-spell-fr-20060121-r1.ebuild
 1710142008 ./app-vim/vim-spell-pl/vim-spell-pl-20060218-r1.ebuild
 1702282250 ./app-vim/vim-spell-pl/vim-spell-pl-20060218.ebuild
-1702282250 ./app-vim/breakpts/breakpts-4.0-r1.ebuild
+1803060108 ./app-vim/breakpts/breakpts-4.0-r1.ebuild
 1702282250 ./app-vim/slimv/slimv-0.9.12-r1.ebuild
 1801142209 ./app-vim/slimv/slimv-0.9.13_p20170910.ebuild
 1702282250 ./app-vim/toggle/toggle-0.5-r1.ebuild
-1702282250 ./app-vim/eruby-syntax/eruby-syntax-2.0-r1.ebuild
-1709281231 ./app-vim/eruby-syntax/eruby-syntax-2.0-r2.ebuild
-1702282250 ./app-vim/align/align-43.ebuild
+1803060108 ./app-vim/eruby-syntax/eruby-syntax-2.0-r1.ebuild
+1803060108 ./app-vim/eruby-syntax/eruby-syntax-2.0-r2.ebuild
+1803060108 ./app-vim/align/align-43.ebuild
 1702282250 ./app-vim/lustyexplorer/lustyexplorer-4.3.ebuild
 1702282250 ./app-vim/lustyexplorer/lustyexplorer-4.1.ebuild
 1801231609 ./app-vim/securemodelines/securemodelines-20140926.ebuild
-1702282250 ./app-vim/fuzzyfinder/fuzzyfinder-4.2.2.ebuild
+1803052038 ./app-vim/fuzzyfinder/fuzzyfinder-4.2.2.ebuild
 1702282250 ./app-vim/pathogen/pathogen-2.4.ebuild
 1702282250 ./app-vim/scala-syntax/scala-syntax-1.0.ebuild
 1801261238 ./app-vim/rust-vim/rust-vim-1_pre20180125.ebuild
@@ -8735,24 +8728,24 @@
 1709090012 ./app-vim/ctrlp/ctrlp-1.80.ebuild
 1702282250 ./app-vim/vim-r/vim-r-1.2.6.ebuild
 1702282250 ./app-vim/vim-r/vim-r-1.0.ebuild
-1702282250 ./app-vim/csv/csv-0.31-r1.ebuild
-1702282250 ./app-vim/greputils/greputils-2.8-r1.ebuild
+1803060108 ./app-vim/csv/csv-0.31-r1.ebuild
+1803052038 ./app-vim/greputils/greputils-2.8-r1.ebuild
 1702282250 ./app-vim/session/session-2.13.1.ebuild
 1702282250 ./app-vim/repeat/repeat-1.1.ebuild
 1702282250 ./app-vim/syntastic/syntastic-3.8.0.ebuild
 1702282250 ./app-vim/syntastic/syntastic-9999.ebuild
 1709062352 ./app-vim/detectindent/detectindent-1.0_p20150908.ebuild
 1712141809 ./app-vim/jedi/jedi-0.8_p20171015.ebuild
-1710082122 ./app-vim/colorv/colorv-3.0.2-r1.ebuild
+1803060108 ./app-vim/colorv/colorv-3.0.2-r1.ebuild
 1801231609 ./app-vim/eselect-syntax/eselect-syntax-20070506.ebuild
-1703061433 ./app-vim/alternate/alternate-2.18-r2.ebuild
-1702282250 ./app-vim/alternate/alternate-2.18-r1.ebuild
+1803060108 ./app-vim/alternate/alternate-2.18-r2.ebuild
+1803060108 ./app-vim/alternate/alternate-2.18-r1.ebuild
 1712290139 ./app-vim/vimcdoc/vimcdoc-2.1.0.ebuild
 1711251740 ./app-vim/vimcdoc/vimcdoc-1.9.0.ebuild
 1702282250 ./app-vim/xquery-syntax/xquery-syntax-0.1-r2.ebuild
 1707240046 ./app-vim/nagios-syntax/nagios-syntax-1.8.ebuild
 1706181820 ./app-vim/nagios-syntax/nagios-syntax-20050105.ebuild
-1702282250 ./app-vim/checkattach/checkattach-0.17.ebuild
+1803060108 ./app-vim/checkattach/checkattach-0.17.ebuild
 1707071220 ./app-vim/conque/conque-2.3-r1.ebuild
 1702282250 ./app-vim/conque/conque-2.3.ebuild
 1702282250 ./app-vim/vimpress/vimpress-2.1.5.ebuild
@@ -8761,60 +8754,60 @@
 1702282250 ./app-vim/pgn-syntax/pgn-syntax-1.0.ebuild
 1702282250 ./app-vim/neocomplcache/neocomplcache-7.1.ebuild
 1707292329 ./app-vim/neocomplcache/neocomplcache-7.1-r1.ebuild
-1702282250 ./app-vim/cvsmenu/cvsmenu-1.147-r1.ebuild
+1803060108 ./app-vim/cvsmenu/cvsmenu-1.147-r1.ebuild
 1702282250 ./app-vim/vcscommand/vcscommand-1.99.47.ebuild
 1705151532 ./app-vim/vim-multiple-cursors/vim-multiple-cursors-2.2-r1.ebuild
 1705271819 ./app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild
-1709062352 ./app-vim/autoalign/autoalign-14.ebuild
+1803060108 ./app-vim/autoalign/autoalign-14.ebuild
 1702282250 ./app-vim/help-extra-syntax/help-extra-syntax-20050106-r1.ebuild
 1702282250 ./app-vim/reload/reload-0.6.17.ebuild
 1710290957 ./app-vim/vim-go/vim-go-1.13.ebuild
 1702282250 ./app-vim/csscomplete/csscomplete-1.0.ebuild
-1702282250 ./app-vim/genutils/genutils-2.5.ebuild
-1702282250 ./app-vim/ant_menu/ant_menu-0.5.7.1-r1.ebuild
-1711190549 ./app-vim/dbext/dbext-26.00.ebuild
-1708172340 ./app-vim/dbext/dbext-25.0.ebuild
+1803052038 ./app-vim/genutils/genutils-2.5.ebuild
+1803060108 ./app-vim/ant_menu/ant_menu-0.5.7.1-r1.ebuild
+1803060108 ./app-vim/dbext/dbext-26.00.ebuild
+1803060108 ./app-vim/dbext/dbext-25.0.ebuild
 1702282250 ./app-vim/vim-addon-mw-utils/vim-addon-mw-utils-20121105.ebuild
 1702282250 ./app-vim/matrix/matrix-1.10-r1.ebuild
 1705271819 ./app-vim/pyclewn/pyclewn-2.1-r1.ebuild
 1702282250 ./app-vim/pyclewn/pyclewn-2.0.1.ebuild
-1707301147 ./app-vim/fugitive/fugitive-9999.ebuild
-1707301147 ./app-vim/fugitive/fugitive-2.2.ebuild
+1803052038 ./app-vim/fugitive/fugitive-9999.ebuild
+1803052038 ./app-vim/fugitive/fugitive-2.2.ebuild
 1801230108 ./app-vim/vim-tmux/vim-tmux-3.0.0.ebuild
 1702282250 ./app-vim/omnicppcomplete/omnicppcomplete-0.41.ebuild
 1708030058 ./app-vim/unite/unite-4.0-r1.ebuild
-1702282250 ./app-vim/gitlog/gitlog-5.1.0.ebuild
-1708172327 ./app-vim/gitlog/gitlog-6.0.0.ebuild
-1708172327 ./app-vim/gitlog/gitlog-9999.ebuild
+1803052038 ./app-vim/gitlog/gitlog-5.1.0.ebuild
+1803052038 ./app-vim/gitlog/gitlog-6.0.0.ebuild
+1803052038 ./app-vim/gitlog/gitlog-9999.ebuild
 1710082122 ./app-vim/tagbar/tagbar-2.7.ebuild
 1702282250 ./app-vim/tagbar/tagbar-2.6.1.ebuild
-1702282250 ./app-vim/brainfuck-syntax/brainfuck-syntax-1.0.2.ebuild
-1702282250 ./app-vim/brainfuck-syntax/brainfuck-syntax-1.0.3.ebuild
+1803060108 ./app-vim/brainfuck-syntax/brainfuck-syntax-1.0.2.ebuild
+1803060108 ./app-vim/brainfuck-syntax/brainfuck-syntax-1.0.3.ebuild
 1702282250 ./app-vim/zoomwin/zoomwin-24.ebuild
 1703020250 ./app-vim/vimbuddy/vimbuddy-0.9.2-r1.ebuild
 1702282250 ./app-vim/tmpl/tmpl-0.1-r1.ebuild
 1702282250 ./app-vim/vim-misc/vim-misc-1.17.6.ebuild
-1702282250 ./app-vim/colorsel/colorsel-20100406.ebuild
+1803060108 ./app-vim/colorsel/colorsel-20100406.ebuild
 1702282250 ./app-vim/snipmate/snipmate-0.87-r1.ebuild
-1709281231 ./app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
-1706181821 ./app-vim/dhcpd-syntax/dhcpd-syntax-20030825.ebuild
+1803060108 ./app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
+1803060108 ./app-vim/dhcpd-syntax/dhcpd-syntax-20030825.ebuild
 1710141625 ./app-vim/vim-spell-hu/vim-spell-hu-20100312-r1.ebuild
 1702282250 ./app-vim/vim-spell-hu/vim-spell-hu-20100312.ebuild
-1702282250 ./app-vim/enhancedcommentify/enhancedcommentify-2.3-r1.ebuild
-1702282250 ./app-vim/gnupg/gnupg-2.6.ebuild
-1702282250 ./app-vim/bnf-syntax/bnf-syntax-1.2-r2.ebuild
+1803060108 ./app-vim/enhancedcommentify/enhancedcommentify-2.3-r1.ebuild
+1803052038 ./app-vim/gnupg/gnupg-2.6.ebuild
+1803060108 ./app-vim/bnf-syntax/bnf-syntax-1.2-r2.ebuild
 1801150009 ./app-vim/wikipedia-syntax/wikipedia-syntax-20101113-r1.ebuild
 1709281231 ./app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild
 1702282250 ./app-vim/easytags/easytags-3.11.ebuild
 1702282250 ./app-vim/selinux-syntax/selinux-syntax-20041225.ebuild
 1709131753 ./app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild
 1702282250 ./app-vim/searchcomplete/searchcomplete-1.1-r1.ebuild
-1702282250 ./app-vim/bash-support/bash-support-4.2.1.ebuild
+1803060108 ./app-vim/bash-support/bash-support-4.2.1.ebuild
 1702282250 ./app-vim/tlib/tlib-1.20.ebuild
 1702282250 ./app-vim/salt-vim/salt-vim-20151119.ebuild
-1708172359 ./app-vim/bufexplorer/bufexplorer-9999.ebuild
-1709300323 ./app-vim/bufexplorer/bufexplorer-7.4.19.ebuild
-1708172355 ./app-vim/bufexplorer/bufexplorer-7.4.18.ebuild
+1803060108 ./app-vim/bufexplorer/bufexplorer-9999.ebuild
+1803060108 ./app-vim/bufexplorer/bufexplorer-7.4.19.ebuild
+1803060108 ./app-vim/bufexplorer/bufexplorer-7.4.18.ebuild
 1702282250 ./app-vim/vim-spell-da/vim-spell-da-20060116.ebuild
 1710130046 ./app-vim/vim-spell-da/vim-spell-da-20060116-r1.ebuild
 1709140055 ./app-vim/phpdocs/phpdocs-0.26-r1.ebuild
@@ -8824,10 +8817,10 @@
 1702282250 ./app-vim/perlomni/perlomni-2.5.ebuild
 1705290115 ./app-vim/gundo/gundo-2.6.2.ebuild
 1705290115 ./app-vim/gundo/gundo-2.6.1.ebuild
-1702282250 ./app-vim/cmdalias/cmdalias-3.0-r1.ebuild
+1803060108 ./app-vim/cmdalias/cmdalias-3.0-r1.ebuild
 1702282250 ./app-vim/supertab/supertab-2.1.ebuild
 1702282250 ./app-vim/minibufexpl/minibufexpl-6.5.2.ebuild
-1702282250 ./app-vim/cecutil/cecutil-17.ebuild
+1803060108 ./app-vim/cecutil/cecutil-17.ebuild
 1710110104 ./app-vim/vim-spell-cs/vim-spell-cs-20061021-r1.ebuild
 1702282250 ./app-vim/vim-spell-cs/vim-spell-cs-20061021.ebuild
 1702282250 ./app-vim/automatictexplugin/automatictexplugin-12.5-r1.ebuild
@@ -8835,7 +8828,7 @@
 1702282250 ./app-vim/rails/rails-5.2.ebuild
 1711070157 ./app-vim/pydoc/pydoc-2.0-r1.ebuild
 1702282250 ./app-vim/screen/screen-1.5.ebuild
-1702282250 ./app-vim/cfengine-syntax/cfengine-syntax-20141019.ebuild
+1803060108 ./app-vim/cfengine-syntax/cfengine-syntax-20141019.ebuild
 1710082122 ./app-vim/vim-latex/vim-latex-1.9.0.ebuild
 1802050208 ./app-vim/vim-latex/vim-latex-1.10.0.ebuild
 1710082126 ./app-vim/vim-latex/vim-latex-1.8.23.20141116.ebuild
@@ -8846,14 +8839,14 @@
 1702282250 ./app-vim/surround/surround-2.1-r1.ebuild
 1702282250 ./app-vim/vim-spell-it/vim-spell-it-20100312.ebuild
 1710142008 ./app-vim/vim-spell-it/vim-spell-it-20100312-r1.ebuild
-1702282250 ./app-vim/info/info-1.7-r2.ebuild
-1702282250 ./app-vim/indentpython/indentpython-0.3.ebuild
+1803052038 ./app-vim/info/info-1.7-r2.ebuild
+1803052038 ./app-vim/indentpython/indentpython-0.3.ebuild
 1702282250 ./app-vim/vim-spell-ru/vim-spell-ru-20060506.ebuild
 1702282250 ./app-vim/vim-spell-ru/vim-spell-ru-20070506.ebuild
 1710142008 ./app-vim/vim-spell-ru/vim-spell-ru-20070506-r1.ebuild
 1702282250 ./app-vim/multvals/multvals-3.10-r1.ebuild
 1709081629 ./app-vim/command-t/command-t-5.0.2.ebuild
-1708231745 ./app-vim/command-t/command-t-5.0.1.ebuild
+1803060108 ./app-vim/command-t/command-t-5.0.1.ebuild
 1710270027 ./app-vim/ackvim/ackvim-1.0.9-r1.ebuild
 1702282250 ./app-vim/sleuth/sleuth-1.0.ebuild
 1702282250 ./app-vim/sleuth/sleuth-1.1.ebuild
@@ -8862,7 +8855,7 @@
 1702282250 ./app-vim/vimpython/vimpython-1.13-r1.ebuild
 1702282250 ./app-vim/undotree/undotree-5.0.ebuild
 1707301147 ./app-vim/undotree/undotree-9999.ebuild
-1702282250 ./app-vim/calendar/calendar-2.9.ebuild
+1803060108 ./app-vim/calendar/calendar-2.9.ebuild
 1707301147 ./app-vim/youcompleteme/youcompleteme-20130910.ebuild
 1707301147 ./app-vim/youcompleteme/youcompleteme-99999999.ebuild
 1702282250 ./app-vim/gitolite-syntax/gitolite-syntax-20130306.ebuild
@@ -8873,34 +8866,34 @@
 1707220136 ./app-vim/python-mode/python-mode-0.9.0.ebuild
 1705271819 ./app-vim/python-mode/python-mode-0.6.18-r4.ebuild
 1702282250 ./app-vim/python-mode/python-mode-0.6.18-r3.ebuild
-1702282250 ./app-vim/curcmdmode/curcmdmode-1.0-r1.ebuild
-1702282250 ./app-vim/genindent/genindent-1.1-r1.ebuild
-1702282250 ./app-vim/ebnf-syntax/ebnf-syntax-1.1-r1.ebuild
-1702282250 ./app-vim/ebnf-syntax/ebnf-syntax-1.1-r2.ebuild
+1803060108 ./app-vim/curcmdmode/curcmdmode-1.0-r1.ebuild
+1803052038 ./app-vim/genindent/genindent-1.1-r1.ebuild
+1803060108 ./app-vim/ebnf-syntax/ebnf-syntax-1.1-r1.ebuild
+1803060108 ./app-vim/ebnf-syntax/ebnf-syntax-1.1-r2.ebuild
 1702282250 ./app-vim/tt2-syntax/tt2-syntax-1.13.ebuild
 1702282250 ./app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild
 1702282250 ./app-vim/tasklist/tasklist-1.0.1.ebuild
 1709131642 ./app-vim/puppet-syntax/puppet-syntax-3.0.1.ebuild
 1708180026 ./app-vim/vim-hoogle/vim-hoogle-1.3.ebuild
-1711061335 ./app-vim/diffchar/diffchar-7.2.ebuild
-1711061336 ./app-vim/diffchar/diffchar-7.01.ebuild
+1803060108 ./app-vim/diffchar/diffchar-7.2.ebuild
+1803060108 ./app-vim/diffchar/diffchar-7.01.ebuild
 1708220030 ./app-vim/csound-syntax/csound-syntax-20160804.ebuild
 1702282250 ./app-vim/locateopen/locateopen-1.3-r1.ebuild
 1711251740 ./app-vim/pdv/pdv-1.0.1-r1.ebuild
 1702282250 ./app-vim/rainbow_parentheses/rainbow_parentheses-1.0.ebuild
 1702282250 ./app-vim/zenburn/zenburn-2.25.ebuild
-1711032317 ./app-vim/gitv/gitv-1.3.1.ebuild
-1708180004 ./app-vim/gitv/gitv-9999.ebuild
-1702282250 ./app-vim/ansiesc/ansiesc-12.ebuild
+1803052038 ./app-vim/gitv/gitv-1.3.1.ebuild
+1803052038 ./app-vim/gitv/gitv-9999.ebuild
+1803060108 ./app-vim/ansiesc/ansiesc-12.ebuild
 1708181127 ./app-vim/tcomment/tcomment-9999.ebuild
 1710082122 ./app-vim/tcomment/tcomment-3.08.1.ebuild
 1702282250 ./app-vim/vimcommander/vimcommander-0.81.ebuild
 1703071359 ./app-vim/vimagit/vimagit-1.7.1.ebuild
 1708180009 ./app-vim/vimagit/vimagit-1.7.2.ebuild
 1708180009 ./app-vim/vimagit/vimagit-9999.ebuild
-1702282250 ./app-vim/airline/airline-0.8.ebuild
-1702282250 ./app-vim/airline/airline-9999.ebuild
-1702282250 ./app-vim/increment/increment-1.1-r1.ebuild
+1803060108 ./app-vim/airline/airline-0.8.ebuild
+1803060108 ./app-vim/airline/airline-9999.ebuild
+1803052038 ./app-vim/increment/increment-1.1-r1.ebuild
 1702282250 ./app-vim/showmarks/showmarks-2.2-r1.ebuild
 1712050809 ./app-vim/lightline/lightline-9999.ebuild
 1710110104 ./app-vim/vim-spell-en/vim-spell-en-20060123-r1.ebuild
@@ -8929,7 +8922,7 @@
 1709170513 ./app-arch/sharutils/sharutils-4.15.2.ebuild
 1702282250 ./app-arch/sharutils/sharutils-4.14-r1.ebuild
 1702282250 ./app-arch/sharutils/sharutils-4.15.1.ebuild
-1702282250 ./app-arch/zip/zip-3.0-r3.ebuild
+1803052038 ./app-arch/zip/zip-3.0-r3.ebuild
 1707141045 ./app-arch/fastjar/fastjar-0.98-r3.ebuild
 1707141045 ./app-arch/fastjar/fastjar-0.98-r2.ebuild
 1706301419 ./app-arch/pdlzip/pdlzip-1.8.ebuild
@@ -9049,14 +9042,13 @@
 1702282250 ./app-arch/engrampa/engrampa-1.12.0-r1.ebuild
 1703141255 ./app-arch/engrampa/engrampa-1.12.0-r2.ebuild
 1801142039 ./app-arch/engrampa/engrampa-1.16.1.ebuild
-1712261809 ./app-arch/lziprecover/lziprecover-1.20_rc1.ebuild
+1803052038 ./app-arch/lziprecover/lziprecover-1.20.ebuild
 1705151722 ./app-arch/lziprecover/lziprecover-1.19.ebuild
 1702282250 ./app-arch/lziprecover/lziprecover-1.17.ebuild
-1702282250 ./app-arch/lziprecover/lziprecover-1.18.ebuild
 1802120308 ./app-arch/stenc/stenc-1.0.7.ebuild
 1702282250 ./app-arch/lzma/lzma-9.20-r1.ebuild
 1708182211 ./app-arch/rar/rar-5.5.0_p20170811.ebuild
-1801100609 ./app-arch/gnome-autoar/gnome-autoar-0.2.2.ebuild
+1803052338 ./app-arch/gnome-autoar/gnome-autoar-0.2.2.ebuild
 1803022338 ./app-arch/brotli/brotli-1.0.2.ebuild
 1803021938 ./app-arch/brotli/brotli-1.0.3.ebuild
 1803021938 ./app-arch/brotli/brotli-9999.ebuild
@@ -9129,16 +9121,16 @@
 1712300140 ./app-accessibility/sphinx2/sphinx2-0.6.ebuild
 1702282250 ./app-accessibility/speech-dispatcher/speech-dispatcher-0.8.1.ebuild
 1801282338 ./app-accessibility/speech-dispatcher/speech-dispatcher-0.8.3.ebuild
-1802170008 ./app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7.ebuild
+1803052038 ./app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7.ebuild
 1702282250 ./app-accessibility/julius/julius-4.2.2.ebuild
 1702282250 ./app-accessibility/festival-freebsoft-utils/festival-freebsoft-utils-0.2.ebuild
 1702282250 ./app-accessibility/festival-freebsoft-utils/festival-freebsoft-utils-0.10.ebuild
 1707071309 ./app-accessibility/at-spi2-core/at-spi2-core-2.22.1.ebuild
-1802170008 ./app-accessibility/at-spi2-core/at-spi2-core-2.24.1.ebuild
+1803052038 ./app-accessibility/at-spi2-core/at-spi2-core-2.24.1.ebuild
 1705041632 ./app-accessibility/epos/epos-2.5.37-r2.ebuild
 1704191101 ./app-accessibility/sphinxbase/sphinxbase-0.8.ebuild
 1707071309 ./app-accessibility/at-spi2-atk/at-spi2-atk-2.22.0.ebuild
-1802170008 ./app-accessibility/at-spi2-atk/at-spi2-atk-2.24.1.ebuild
+1803052038 ./app-accessibility/at-spi2-atk/at-spi2-atk-2.24.1.ebuild
 1702282250 ./app-accessibility/sphinx3/sphinx3-0.8-r1.ebuild
 1708280025 ./app-accessibility/caribou/caribou-0.4.21.ebuild
 1712300140 ./app-accessibility/festival-hts/festival-hts-2.1.ebuild
@@ -9262,20 +9254,14 @@
 1802221208 ./dev-db/psqlodbc/psqlodbc-10.01.0000.ebuild
 1703232351 ./dev-db/libodbc++/libodbc++-0.2.5-r2.ebuild
 1802030608 ./dev-db/mariadb/mariadb-10.0.34.ebuild
-1801231609 ./dev-db/mariadb/mariadb-10.2.11.ebuild
-1801231609 ./dev-db/mariadb/mariadb-10.2.10.ebuild
 1801231609 ./dev-db/mariadb/mariadb-5.5.59.ebuild
 1801231609 ./dev-db/mariadb/mariadb-10.2.12.ebuild
-1801231609 ./dev-db/mariadb/mariadb-10.1.30.ebuild
 1801231609 ./dev-db/mariadb/mariadb-10.1.24-r1.ebuild
 1803041438 ./dev-db/mariadb/mariadb-10.3.5_rc.ebuild
-1801231609 ./dev-db/mariadb/mariadb-10.0.32-r1.ebuild
 1801231609 ./dev-db/mariadb/mariadb-10.0.33.ebuild
 1802100108 ./dev-db/mariadb/mariadb-10.1.31.ebuild
 1801231609 ./dev-db/mariadb/mariadb-10.0.30-r1.ebuild
 1801231609 ./dev-db/mariadb/mariadb-10.1.29.ebuild
-1801231609 ./dev-db/mariadb/mariadb-10.1.26-r1.ebuild
-1801231609 ./dev-db/mariadb/mariadb-5.5.58.ebuild
 1712111238 ./dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild
 1712181439 ./dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild
 1702282250 ./dev-db/SchemaSync/SchemaSync-0.9.4.ebuild
@@ -9331,7 +9317,7 @@
 1802111538 ./dev-db/postgresql/postgresql-9.2.24.ebuild
 1801061939 ./dev-db/postgresql/postgresql-9999.ebuild
 1803041008 ./dev-db/postgresql/postgresql-9.6.8.ebuild
-1803041008 ./dev-db/postgresql/postgresql-9.5.12.ebuild
+1803052208 ./dev-db/postgresql/postgresql-9.5.12.ebuild
 1802111538 ./dev-db/postgresql/postgresql-9.4.15.ebuild
 1802111538 ./dev-db/postgresql/postgresql-9.6.6.ebuild
 1802111538 ./dev-db/postgresql/postgresql-9.5.10.ebuild
@@ -9342,15 +9328,15 @@
 1802111538 ./dev-db/postgresql/postgresql-10.1.ebuild
 1802170108 ./dev-db/postgresql/postgresql-9.6.7.ebuild
 1802120238 ./dev-db/postgresql/postgresql-9.4.10.ebuild
-1803041008 ./dev-db/postgresql/postgresql-9.4.17.ebuild
+1803052208 ./dev-db/postgresql/postgresql-9.4.17.ebuild
 1802170108 ./dev-db/postgresql/postgresql-9.4.16.ebuild
 1802120238 ./dev-db/postgresql/postgresql-9.2.19.ebuild
 1802120238 ./dev-db/postgresql/postgresql-9.2.22.ebuild
-1803041008 ./dev-db/postgresql/postgresql-10.3.ebuild
+1803052038 ./dev-db/postgresql/postgresql-10.3.ebuild
 1802120238 ./dev-db/postgresql/postgresql-9.3.15.ebuild
 1802170108 ./dev-db/postgresql/postgresql-10.2.ebuild
 1802111538 ./dev-db/postgresql/postgresql-9.3.20.ebuild
-1803041008 ./dev-db/postgresql/postgresql-9.3.22.ebuild
+1803052208 ./dev-db/postgresql/postgresql-9.3.22.ebuild
 1705290735 ./dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild
 1712231309 ./dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild
 1705251034 ./dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild
@@ -9374,7 +9360,7 @@
 1706040026 ./dev-db/xbase/xbase-3.1.2.ebuild
 1712290009 ./dev-db/plr/plr-8.3.0.17.ebuild
 1702282250 ./dev-db/lib_mysqludf_udf/lib_mysqludf_udf-0.0.3.ebuild
-1803041008 ./dev-db/unixODBC/unixODBC-2.3.5-r1.ebuild
+1803052038 ./dev-db/unixODBC/unixODBC-2.3.5-r1.ebuild
 1802280108 ./dev-db/unixODBC/unixODBC-2.3.5.ebuild
 1802062208 ./dev-db/unixODBC/unixODBC-2.3.4-r1.ebuild
 1801250108 ./dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r3.ebuild
@@ -9406,7 +9392,7 @@
 1712260009 ./dev-db/tora/tora-9999.ebuild
 1712281339 ./dev-db/tora/tora-3.2.ebuild
 1702282250 ./dev-db/slony1/slony1-2.1.4.ebuild
-1712292309 ./dev-db/slony1/slony1-2.2.6.ebuild
+1803060308 ./dev-db/slony1/slony1-2.2.6.ebuild
 1707100517 ./dev-db/slony1/slony1-2.2.5-r1.ebuild
 1702282250 ./dev-db/slony1/slony1-2.1.3.ebuild
 1702282250 ./dev-db/lib_mysqludf_preg/lib_mysqludf_preg-1.0.1.ebuild
@@ -9466,7 +9452,7 @@
 1702282250 ./dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.2-r1.ebuild
 1801252338 ./dev-db/phpmyadmin/phpmyadmin-4.7.0.ebuild
 1802091208 ./dev-db/phpmyadmin/phpmyadmin-4.7.7-r1.ebuild
-1802252138 ./dev-db/phpmyadmin/phpmyadmin-4.7.8.ebuild
+1803052038 ./dev-db/phpmyadmin/phpmyadmin-4.7.8.ebuild
 1704271423 ./dev-db/phpmyadmin/phpmyadmin-4.0.10.20.ebuild
 1702282250 ./sys-kernel/linux-headers/linux-headers-4.4.ebuild
 1702282250 ./sys-kernel/linux-headers/linux-headers-2.4.33.3.ebuild
@@ -9479,6 +9465,7 @@
 1802261138 ./sys-kernel/git-sources/git-sources-4.16_rc3.ebuild
 1802191308 ./sys-kernel/git-sources/git-sources-4.16_rc2.ebuild
 1802121138 ./sys-kernel/git-sources/git-sources-4.16_rc1.ebuild
+1803052039 ./sys-kernel/git-sources/git-sources-4.16_rc4.ebuild
 1708152025 ./sys-kernel/linux-docs/linux-docs-4.9.ebuild
 1708152025 ./sys-kernel/linux-docs/linux-docs-4.1.ebuild
 1708152025 ./sys-kernel/linux-docs/linux-docs-4.4.ebuild
@@ -9595,6 +9582,7 @@
 1712201639 ./sys-kernel/gentoo-sources/gentoo-sources-4.4.107.ebuild
 1802132138 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.81.ebuild
 1801122310 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.76.ebuild
+1803052039 ./sys-kernel/gentoo-sources/gentoo-sources-4.14.24.ebuild
 1802230308 ./sys-kernel/gentoo-sources/gentoo-sources-4.14.21.ebuild
 1802172108 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.82.ebuild
 1712051609 ./sys-kernel/gentoo-sources/gentoo-sources-4.4.104.ebuild
@@ -9610,6 +9598,7 @@
 1712201709 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.71.ebuild
 1801041939 ./sys-kernel/gentoo-sources/gentoo-sources-4.14.11-r2.ebuild
 1802261338 ./sys-kernel/gentoo-sources/gentoo-sources-4.15.6.ebuild
+1803052039 ./sys-kernel/gentoo-sources/gentoo-sources-4.4.120.ebuild
 1801312208 ./sys-kernel/gentoo-sources/gentoo-sources-4.14.16.ebuild
 1802040138 ./sys-kernel/gentoo-sources/gentoo-sources-4.15.1.ebuild
 1801312108 ./sys-kernel/gentoo-sources/gentoo-sources-4.4.114.ebuild
@@ -9627,6 +9616,7 @@
 1801030309 ./sys-kernel/gentoo-sources/gentoo-sources-4.4.109.ebuild
 1802081108 ./sys-kernel/gentoo-sources/gentoo-sources-4.15.2.ebuild
 1801290308 ./sys-kernel/gentoo-sources/gentoo-sources-4.15.0.ebuild
+1803052039 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.86.ebuild
 1801240339 ./sys-kernel/gentoo-sources/gentoo-sources-4.4.113.ebuild
 1801080209 ./sys-kernel/gentoo-sources/gentoo-sources-4.1.48.ebuild
 1802040308 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.80.ebuild
@@ -9704,13 +9694,13 @@
 1710151221 ./sys-kernel/raspberrypi-image/raspberrypi-image-9999.ebuild
 1802221208 ./sys-kernel/genkernel-next/genkernel-next-68.ebuild
 1711201710 ./sys-kernel/genkernel-next/genkernel-next-66.ebuild
-1803010008 ./sys-kernel/vanilla-sources/vanilla-sources-4.4.119.ebuild
 1801240109 ./sys-kernel/vanilla-sources/vanilla-sources-4.1.49.ebuild
-1802141638 ./sys-kernel/vanilla-sources/vanilla-sources-3.16.54.ebuild
+1803052039 ./sys-kernel/vanilla-sources/vanilla-sources-4.9.86.ebuild
+1803052039 ./sys-kernel/vanilla-sources/vanilla-sources-4.4.120.ebuild
 1803010008 ./sys-kernel/vanilla-sources/vanilla-sources-4.15.7.ebuild
-1802141638 ./sys-kernel/vanilla-sources/vanilla-sources-3.2.99.ebuild
-1803010008 ./sys-kernel/vanilla-sources/vanilla-sources-4.14.23.ebuild
-1803010008 ./sys-kernel/vanilla-sources/vanilla-sources-4.9.85.ebuild
+1803052039 ./sys-kernel/vanilla-sources/vanilla-sources-3.16.55.ebuild
+1803052039 ./sys-kernel/vanilla-sources/vanilla-sources-4.14.24.ebuild
+1803052039 ./sys-kernel/vanilla-sources/vanilla-sources-3.2.100.ebuild
 1704271330 ./dev-lua/luasystem/luasystem-0.2.0_p0.ebuild
 1706301404 ./dev-lua/lua-zlib/lua-zlib-1.1.ebuild
 1702282250 ./dev-lua/lua-zlib/lua-zlib-0.3.ebuild
@@ -9884,7 +9874,7 @@
 1702282250 ./media-gfx/splashutils/splashutils-1.5.4.4-r7.ebuild
 1708180742 ./media-gfx/gif2apng/gif2apng-1.9-r1.ebuild
 1801210108 ./media-gfx/ufraw/ufraw-0.22-r1.ebuild
-1802261108 ./media-gfx/ufraw/ufraw-0.22-r2.ebuild
+1803052038 ./media-gfx/ufraw/ufraw-0.22-r2.ebuild
 1702282250 ./media-gfx/ufraw/ufraw-0.22.ebuild
 1702282250 ./media-gfx/qingy-themes/qingy-themes-20050816.ebuild
 1709022145 ./media-gfx/exact-image/exact-image-0.8.1-r3.ebuild
@@ -10123,8 +10113,8 @@
 1801060109 ./media-gfx/mypaint/mypaint-1.2.1.ebuild
 1801060109 ./media-gfx/mypaint/mypaint-1.2.0.ebuild
 1801060109 ./media-gfx/mypaint/mypaint-1.1.0-r2.ebuild
-1801071139 ./media-gfx/valentina/valentina-9999.ebuild
-1801231708 ./media-gfx/valentina/valentina-0.5.0-r2.ebuild
+1803052038 ./media-gfx/valentina/valentina-9999.ebuild
+1803052038 ./media-gfx/valentina/valentina-0.5.0-r2.ebuild
 1702282250 ./media-gfx/k3d/k3d-0.8.0.5.ebuild
 1702282250 ./media-gfx/scrot/scrot-0.8_p13.ebuild
 1702282250 ./media-gfx/scrot/scrot-0.8-r1.ebuild
@@ -10187,7 +10177,7 @@
 1702282250 ./media-gfx/duhdraw/duhdraw-2.8.13-r1.ebuild
 1803012138 ./media-gfx/xfig/xfig-3.2.6a-r1.ebuild
 1702282250 ./media-gfx/xfig/xfig-3.2.5c.ebuild
-1803041438 ./media-gfx/xfig/xfig-3.2.6a.ebuild
+1803052338 ./media-gfx/xfig/xfig-3.2.6a.ebuild
 1802042108 ./media-gfx/povray/povray-3.7.0.0-r1.ebuild
 1802042108 ./media-gfx/povray/povray-3.7.0.0.ebuild
 1702282250 ./media-gfx/crwinfo/crwinfo-0.2.ebuild
@@ -10206,8 +10196,8 @@
 1702282327 ./media-gfx/gnuclad/gnuclad-0.2.4.ebuild
 1702282250 ./media-gfx/iscan-data/iscan-data-1.36.0.1.ebuild
 1702282250 ./media-gfx/iscan-data/iscan-data-1.22.0.1.ebuild
-1802252138 ./media-gfx/sane-frontends/sane-frontends-1.0.14-r2.ebuild
 1702282250 ./media-gfx/sane-frontends/sane-frontends-1.0.14.ebuild
+1803052038 ./media-gfx/sane-frontends/sane-frontends-1.0.14-r3.ebuild
 1801211408 ./media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
 1712290339 ./media-gfx/graphicsmagick/graphicsmagick-1.3.27.ebuild
 1710230041 ./media-gfx/graphicsmagick/graphicsmagick-1.3.26.ebuild
@@ -10241,6 +10231,7 @@
 1702282250 ./lxde-base/lxlauncher/lxlauncher-0.2.5.ebuild
 1702282250 ./lxde-base/lxlauncher/lxlauncher-0.2.2.ebuild
 1702282250 ./lxde-base/lxterminal/lxterminal-0.1.11.ebuild
+1803060108 ./lxde-base/lxterminal/lxterminal-0.3.1.ebuild
 1702282250 ./lxde-base/lxterminal/lxterminal-0.2.0-r1.ebuild
 1707031211 ./lxde-base/lxsession/lxsession-0.5.2.ebuild
 1707150007 ./lxde-base/lxpanel/lxpanel-0.8.1.ebuild
@@ -10259,9 +10250,11 @@
 1702282250 ./lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.0.ebuild
 1712021609 ./lxde-base/menu-cache/menu-cache-0.5.1.ebuild
 1702282250 ./lxde-base/menu-cache/menu-cache-1.0.2.ebuild
+1803060108 ./lxde-base/menu-cache/menu-cache-1.1.0.ebuild
 1712021609 ./lxde-base/menu-cache/menu-cache-1.0.0-r1.ebuild
 1712021609 ./lxde-base/menu-cache/menu-cache-0.3.3.ebuild
 1702282250 ./lxde-base/menu-cache/menu-cache-1.0.1.ebuild
+1803060108 ./lxde-base/menu-cache/menu-cache-1.0.2-r1.ebuild
 1702282250 ./lxde-base/lxsession-edit/lxsession-edit-0.2.0.ebuild
 1702282250 ./lxde-base/lxrandr/lxrandr-0.3.1.ebuild
 1702282250 ./lxde-base/lxrandr/lxrandr-0.1.2.ebuild
@@ -10389,7 +10382,7 @@
 1702282250 ./net-mail/checkpassword/checkpassword-0.90-r2.ebuild
 1706191703 ./net-mail/checkpassword/checkpassword-0.90-r3.ebuild
 1803010138 ./net-mail/dovecot/dovecot-2.2.33.2.ebuild
-1803041008 ./net-mail/dovecot/dovecot-2.2.34.ebuild
+1803052038 ./net-mail/dovecot/dovecot-2.2.34.ebuild
 1803010138 ./net-mail/dovecot/dovecot-2.2.33.2-r1.ebuild
 1803010138 ./net-mail/dovecot/dovecot-2.3.0-r3.ebuild
 1803010138 ./net-mail/dovecot/dovecot-2.2.19.ebuild
@@ -10596,7 +10589,7 @@
 1802060138 ./dev-vcs/git/git-2.14.3.ebuild
 1802060138 ./dev-vcs/git/git-2.15.1.ebuild
 1802141638 ./dev-vcs/git/git-9999-r3.ebuild
-1803030308 ./dev-vcs/git/git-2.16.1.ebuild
+1803052038 ./dev-vcs/git/git-2.16.1.ebuild
 1802172108 ./dev-vcs/git/git-2.16.2.ebuild
 1802141638 ./dev-vcs/git/git-9999-r1.ebuild
 1802060138 ./dev-vcs/git/git-2.16.0.ebuild
@@ -10621,7 +10614,7 @@
 1801231609 ./dev-vcs/cvs/cvs-1.12.12-r12.ebuild
 1801231609 ./dev-vcs/cvs/cvs-1.12.12-r11.ebuild
 1702282250 ./dev-vcs/bzr/bzr-2.5.1-r1.ebuild
-1802221208 ./dev-vcs/bzr/bzr-2.7.0.ebuild
+1803052038 ./dev-vcs/bzr/bzr-2.7.0.ebuild
 1702282250 ./dev-vcs/bzr/bzr-2.6.0.ebuild
 1801102139 ./dev-vcs/bzr/bzr-2.7.1_pre.ebuild
 1707301237 ./dev-vcs/gitstats/gitstats-9999.ebuild
@@ -10666,7 +10659,7 @@
 1702282250 ./dev-vcs/easygit/easygit-1.6.5.5.ebuild
 1702282250 ./dev-vcs/git-deploy/git-deploy-6.0.1_p20131024.ebuild
 1702282250 ./dev-vcs/svnmailer/svnmailer-1.0.9-r1.ebuild
-1803021908 ./dev-vcs/subversion/subversion-1.9.7-r1.ebuild
+1803052338 ./dev-vcs/subversion/subversion-1.9.7-r1.ebuild
 1802281738 ./dev-vcs/subversion/subversion-1.10.0_rc1.ebuild
 1712121839 ./dev-vcs/subversion/subversion-1.9.7.ebuild
 1712121839 ./dev-vcs/subversion/subversion-1.8.18.ebuild
@@ -10890,8 +10883,8 @@
 1707202033 ./gnome-base/libgnomekbd/libgnomekbd-3.22.0.1.ebuild
 1801270409 ./gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.3.ebuild
 1706191416 ./gnome-base/libgtop/libgtop-2.34.2.ebuild
-1802170009 ./gnome-base/libgtop/libgtop-2.36.0.ebuild
-1802231338 ./gnome-base/gvfs/gvfs-1.32.1-r1.ebuild
+1803052038 ./gnome-base/libgtop/libgtop-2.36.0.ebuild
+1803052038 ./gnome-base/gvfs/gvfs-1.32.1-r1.ebuild
 1707071311 ./gnome-base/gvfs/gvfs-1.30.4.ebuild
 1702282250 ./gnome-base/gnome-core-apps/gnome-core-apps-3.20.0.ebuild
 1801270409 ./gnome-base/gnome-core-apps/gnome-core-apps-3.24.2.ebuild
@@ -10902,12 +10895,12 @@
 1702282250 ./gnome-base/gnome-menus/gnome-menus-3.13.3.ebuild
 1702282250 ./gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild
 1702282250 ./gnome-base/gnome-menus/gnome-menus-3.10.1-r1.ebuild
-1801270409 ./gnome-base/gnome-shell/gnome-shell-3.24.3.ebuild
+1803052038 ./gnome-base/gnome-shell/gnome-shell-3.24.3.ebuild
 1802040008 ./gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild
 1707021947 ./gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild
 1702282250 ./gnome-base/gnome/gnome-3.20.0.ebuild
 1801270409 ./gnome-base/gnome/gnome-3.24.2.ebuild
-1802170009 ./gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild
+1803052038 ./gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild
 1707071311 ./gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.22.0.ebuild
 1801270409 ./gnome-base/gdm/gdm-3.24.3.ebuild
 1706301547 ./gnome-base/orbit/orbit-2.14.19-r5.ebuild
@@ -11002,7 +10995,7 @@
 1702282250 ./mail-filter/bogofilter/bogofilter-1.2.4-r1.ebuild
 1702282250 ./mail-filter/postfwd/postfwd-1.35-r3.ebuild
 1702282250 ./mail-filter/dcc/dcc-1.3.140-r1.ebuild
-1702282250 ./mail-filter/dcc/dcc-1.3.158.ebuild
+1803060038 ./mail-filter/dcc/dcc-1.3.158.ebuild
 1702282250 ./mail-filter/dcc/dcc-1.3.154.ebuild
 1702282250 ./mail-filter/ask/ask-2.5.3.ebuild
 1702282250 ./mail-filter/ask/ask-2.4.1.ebuild
@@ -11021,7 +11014,7 @@
 1712021609 ./mail-filter/libspf2/libspf2-1.2.10.ebuild
 1712021609 ./mail-filter/libspf2/libspf2-1.2.9-r3.ebuild
 1702282250 ./mail-filter/mailfilter/mailfilter-0.8.2.ebuild
-1803022338 ./mail-filter/mailfilter/mailfilter-0.8.4.ebuild
+1803052038 ./mail-filter/mailfilter/mailfilter-0.8.4.ebuild
 1702282250 ./mail-filter/tmda/tmda-1.1.12-r2.ebuild
 1702282250 ./mail-filter/opensmtpd-extras/opensmtpd-extras-5.9.2.201606062304.ebuild
 1702282250 ./mail-filter/opensmtpd-extras/opensmtpd-extras-5.9.2.201609141255.ebuild
@@ -11184,7 +11177,7 @@
 1702282250 ./app-doc/csound-manual/csound-manual-6.08.ebuild
 1702282250 ./app-doc/autobook/autobook-1.5.ebuild
 1702282250 ./app-doc/jargon/jargon-4.4.7.ebuild
-1802221208 ./app-doc/jargon/jargon-4.4.7-r1.ebuild
+1803052038 ./app-doc/jargon/jargon-4.4.7-r1.ebuild
 1702282250 ./app-doc/linux-device-drivers/linux-device-drivers-3.ebuild
 1702282250 ./app-doc/linux-device-drivers/linux-device-drivers-2.ebuild
 1702282250 ./app-doc/linkers-and-loaders/linkers-and-loaders-1.ebuild
@@ -11204,7 +11197,7 @@
 1802221208 ./app-doc/mkdoxy/mkdoxy-1.0.0-r1.ebuild
 1708230026 ./app-doc/php-docs/php-docs-20101029-r1.ebuild
 1702282250 ./app-doc/linux-kernel-in-a-nutshell/linux-kernel-in-a-nutshell-1.ebuild
-1802151708 ./app-doc/linux-kernel-in-a-nutshell/linux-kernel-in-a-nutshell-1-r1.ebuild
+1803052038 ./app-doc/linux-kernel-in-a-nutshell/linux-kernel-in-a-nutshell-1-r1.ebuild
 1703061235 ./app-doc/linuxfromscratch/linuxfromscratch-8.0.ebuild
 1703061235 ./app-doc/linuxfromscratch/linuxfromscratch-7.10.ebuild
 1801051239 ./app-doc/kicad-doc/kicad-doc-4.0.6.ebuild
@@ -11358,7 +11351,7 @@
 1803041938 ./app-editors/xemacs/xemacs-21.4.24-r1.ebuild
 1712110109 ./app-editors/xemacs/xemacs-21.4.24.ebuild
 1801060139 ./app-editors/xemacs/xemacs-21.5.34-r4.ebuild
-1803041008 ./app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180117.ebuild
+1803052038 ./app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180117.ebuild
 1702282250 ./app-editors/uemacs-pk/uemacs-pk-4.0.15_p20141208.ebuild
 1702282250 ./app-editors/jove/jove-4.16.0.73.ebuild
 1702282250 ./app-editors/emact/emact-2.56.0.ebuild
@@ -11369,8 +11362,7 @@
 1803042038 ./app-editors/mg/mg-20171014.ebuild
 1707091630 ./app-editors/aee/aee-2.2.21.ebuild
 1707091624 ./app-editors/aee/aee-2.2.15b.ebuild
-1702282250 ./app-editors/leo/leo-5.1.ebuild
-1803041008 ./app-editors/leo/leo-5.6.ebuild
+1803052038 ./app-editors/leo/leo-5.6.ebuild
 1801051409 ./app-editors/gvim/gvim-8.0.1428.ebuild
 1710261601 ./app-editors/gvim/gvim-9999.ebuild
 1710261601 ./app-editors/gvim/gvim-8.0.1188.ebuild
@@ -11560,6 +11552,7 @@
 1802020008 ./net-firewall/shorewall/shorewall-5.1.11.2.ebuild
 1802220338 ./net-firewall/shorewall/shorewall-5.1.12.2.ebuild
 1802130238 ./net-firewall/shorewall/shorewall-5.1.12.1.ebuild
+1803052038 ./net-firewall/shorewall/shorewall-5.1.12.3.ebuild
 1702282250 ./net-firewall/nufw/nufw-2.2.22-r1.ebuild
 1704011900 ./net-firewall/nufw/nufw-2.2.22-r2.ebuild
 1702282250 ./net-firewall/ebtables/ebtables-2.0.10.4.ebuild
@@ -11761,7 +11754,7 @@
 1712032339 ./dev-lang/swi-prolog/swi-prolog-7.6.1.ebuild
 1702282250 ./dev-lang/swi-prolog/swi-prolog-6.6.6.ebuild
 1802181508 ./dev-lang/swi-prolog/swi-prolog-7.7.9.ebuild
-1710100146 ./dev-lang/swi-prolog/swi-prolog-7.4.2.ebuild
+1803052038 ./dev-lang/swi-prolog/swi-prolog-7.4.2.ebuild
 1702282250 ./dev-lang/interprolog/interprolog-2.1.2.ebuild
 1802261738 ./dev-lang/nasm/nasm-2.13.01.ebuild
 1703211839 ./dev-lang/nasm/nasm-2.12.01.ebuild
@@ -11863,7 +11856,7 @@
 1802081138 ./dev-lang/vala/vala-0.36.11.ebuild
 1801282308 ./dev-lang/vala/vala-0.34.9.ebuild
 1801282308 ./dev-lang/vala/vala-0.32.1.ebuild
-1802170008 ./dev-lang/vala/vala-0.36.7.ebuild
+1803052038 ./dev-lang/vala/vala-0.36.7.ebuild
 1702282250 ./dev-lang/epic/epic-0.9.3.3-r1.ebuild
 1712260409 ./dev-lang/squirrel/squirrel-3.1.ebuild
 1801051809 ./dev-lang/scala-bin/scala-bin-2.12.4.ebuild
@@ -11954,7 +11947,7 @@
 1801201108 ./dev-lang/perl/perl-5.28.9999.ebuild
 1801071339 ./dev-lang/perl/perl-5.26.1-r1.ebuild
 1802230308 ./dev-lang/perl/perl-5.24.3-r1.ebuild
-1802230308 ./dev-lang/perl/perl-5.26.1-r2.ebuild
+1803052238 ./dev-lang/perl/perl-5.26.1-r2.ebuild
 1801071339 ./dev-lang/perl/perl-5.26.9999.ebuild
 1801120740 ./dev-lang/perl/perl-5.24.3.ebuild
 1712040139 ./dev-lang/perl/perl-5.26.1.ebuild
@@ -12074,14 +12067,14 @@
 1709180009 ./dev-python/pyspf/pyspf-2.0.12.ebuild
 1712110709 ./dev-python/flufl-i18n/flufl-i18n-2.0.1.ebuild
 1703222256 ./dev-python/ttystatus/ttystatus-0.32.ebuild
-1803041238 ./dev-python/ttystatus/ttystatus-0.35.ebuild
+1803052338 ./dev-python/ttystatus/ttystatus-0.35.ebuild
 1702282250 ./dev-python/ttystatus/ttystatus-0.22.ebuild
 1702282250 ./dev-python/ttystatus/ttystatus-0.23.ebuild
 1702282250 ./dev-python/irman-python/irman-python-0.1-r1.ebuild
 1801011710 ./dev-python/PySDL2/PySDL2-0.9.6.ebuild
 1702282250 ./dev-python/storm/storm-0.20-r1.ebuild
 1709300330 ./dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild
-1803041438 ./dev-python/markdown/markdown-2.6.8.ebuild
+1803052038 ./dev-python/markdown/markdown-2.6.8.ebuild
 1706151914 ./dev-python/markdown/markdown-2.6.5.ebuild
 1702282250 ./dev-python/APScheduler/APScheduler-3.2.0.ebuild
 1705041027 ./dev-python/APScheduler/APScheduler-3.3.1.ebuild
@@ -12127,6 +12120,7 @@
 1712030009 ./dev-python/python-editor/python-editor-1.0.3.ebuild
 1712172339 ./dev-python/pexpect/pexpect-4.2.1.ebuild
 1707070316 ./dev-python/tinycss2/tinycss2-0.5.ebuild
+1803052038 ./dev-python/tinycss2/tinycss2-0.6.1.ebuild
 1706271720 ./dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
 1802131908 ./dev-python/oslo-config/oslo-config-4.11.1.ebuild
 1802160938 ./dev-python/oslo-config/oslo-config-5.2.0.ebuild
@@ -12246,6 +12240,7 @@
 1802212038 ./dev-python/webcolors/webcolors-1.5.ebuild
 1704202344 ./dev-python/pSQL/pSQL-1.2.1.ebuild
 1709162127 ./dev-python/awscli/awscli-1.11.154.ebuild
+1803052038 ./dev-python/awscli/awscli-1.14.50.ebuild
 1708230041 ./dev-python/awscli/awscli-1.11.81.ebuild
 1708230041 ./dev-python/awscli/awscli-1.10.59.ebuild
 1708230041 ./dev-python/awscli/awscli-1.10.51.ebuild
@@ -12278,16 +12273,17 @@
 1707151633 ./dev-python/restkit/restkit-4.2.2.ebuild
 1711240208 ./dev-python/ipython/ipython-6.1.0.ebuild
 1802260108 ./dev-python/ipython/ipython-3.2.1-r1.ebuild
-1711240208 ./dev-python/ipython/ipython-5.4.1.ebuild
+1803052038 ./dev-python/ipython/ipython-5.4.1.ebuild
 1706260722 ./dev-python/HeapDict/HeapDict-1.0.0.ebuild
 1710191119 ./dev-python/pyserial/pyserial-3.4.ebuild
-1702282250 ./dev-python/pyserial/pyserial-3.2.1.ebuild
+1803052038 ./dev-python/pyserial/pyserial-3.2.1.ebuild
 1707121740 ./dev-python/mypy/mypy-0.4.5.ebuild
 1702282250 ./dev-python/mypy/mypy-0.4.3.ebuild
 1702282250 ./dev-python/mypy/mypy-0.4.4.ebuild
-1801071439 ./dev-python/neovim-python-client/neovim-python-client-0.1.9.ebuild
-1801071439 ./dev-python/neovim-python-client/neovim-python-client-0.1.13.ebuild
-1801071439 ./dev-python/neovim-python-client/neovim-python-client-0.2.0.ebuild
+1803060138 ./dev-python/neovim-python-client/neovim-python-client-0.1.9.ebuild
+1803060138 ./dev-python/neovim-python-client/neovim-python-client-0.2.1.ebuild
+1803060138 ./dev-python/neovim-python-client/neovim-python-client-0.1.13.ebuild
+1803060138 ./dev-python/neovim-python-client/neovim-python-client-0.2.0.ebuild
 1702282250 ./dev-python/fuse-python/fuse-python-0.2.1-r1.ebuild
 1802240638 ./dev-python/pytest/pytest-3.4.1.ebuild
 1802262038 ./dev-python/pytest/pytest-3.4.1-r1.ebuild
@@ -12611,7 +12607,7 @@
 1702282250 ./dev-python/multidict/multidict-1.3.0_alpha1.ebuild
 1702282250 ./dev-python/multidict/multidict-2.1.4.ebuild
 1702282250 ./dev-python/multidict/multidict-2.1.0.ebuild
-1803041238 ./dev-python/configparser/configparser-3.5.0-r1.ebuild
+1803060038 ./dev-python/configparser/configparser-3.5.0-r1.ebuild
 1801060809 ./dev-python/configparser/configparser-3.5.0.ebuild
 1702282250 ./dev-python/configparser/configparser-3.3.0.2.ebuild
 1702282250 ./dev-python/sphinxtogithub/sphinxtogithub-1.1.0.ebuild
@@ -12648,8 +12644,8 @@
 1702282250 ./dev-python/python-scsi/python-scsi-0_pre160211.ebuild
 1702282250 ./dev-python/python-scsi/python-scsi-9999.ebuild
 1802240908 ./dev-python/os-service-types/os-service-types-1.1.0.ebuild
+1803052038 ./dev-python/sip/sip-4.19.8.ebuild
 1711120005 ./dev-python/sip/sip-4.9999.ebuild
-1711250039 ./dev-python/sip/sip-4.19.6.ebuild
 1801311908 ./dev-python/sip/sip-4.19.7.ebuild
 1801222138 ./dev-python/sip/sip-4.19.3.ebuild
 1708150132 ./dev-python/diskcache/diskcache-2.8.3.ebuild
@@ -12678,7 +12674,7 @@
 1802212038 ./dev-python/path-py/path-py-10.3.1.ebuild
 1802200038 ./dev-python/path-py/path-py-8.1.2.ebuild
 1708200656 ./dev-python/zope-event/zope-event-4.3.0.ebuild
-1705072143 ./dev-python/zope-event/zope-event-4.2.0.ebuild
+1803052038 ./dev-python/zope-event/zope-event-4.2.0.ebuild
 1712030009 ./dev-python/pretty-yaml/pretty-yaml-15.8.2.ebuild
 1702282250 ./dev-python/pretty-yaml/pretty-yaml-15.6.3.ebuild
 1709180009 ./dev-python/pastescript/pastescript-2.0.2-r1.ebuild
@@ -12713,13 +12709,13 @@
 1706192112 ./dev-python/rednose/rednose-0.4.3.ebuild
 1706192112 ./dev-python/rednose/rednose-0.4.1.ebuild
 1703110551 ./dev-python/ipython_genutils/ipython_genutils-0.1.0.ebuild
-1703162211 ./dev-python/ipython_genutils/ipython_genutils-0.2.0.ebuild
+1803052038 ./dev-python/ipython_genutils/ipython_genutils-0.2.0.ebuild
 1802222138 ./dev-python/bcrypt/bcrypt-3.1.4.ebuild
 1802230108 ./dev-python/bcrypt/bcrypt-3.1.3.ebuild
 1702282250 ./dev-python/yolk/yolk-0.4.3-r1.ebuild
 1703120916 ./dev-python/pickleshare/pickleshare-0.7.3.ebuild
-1705221941 ./dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild
-1803041438 ./dev-python/pytidylib/pytidylib-0.2.4.ebuild
+1803052038 ./dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild
+1803052038 ./dev-python/pytidylib/pytidylib-0.2.4.ebuild
 1702282250 ./dev-python/webut/webut-0.1.0.2-r1.ebuild
 1702282250 ./dev-python/optcomplete/optcomplete-1.2-r1.ebuild
 1702282250 ./dev-python/ptpython/ptpython-0.33.ebuild
@@ -12889,7 +12885,7 @@
 1705121517 ./dev-python/cytoolz/cytoolz-0.8.0.ebuild
 1712140139 ./dev-python/hyperframe/hyperframe-4.0.1.ebuild
 1802222008 ./dev-python/hyperframe/hyperframe-5.1.0.ebuild
-1803041238 ./dev-python/flake8/flake8-3.5.0.ebuild
+1803060038 ./dev-python/flake8/flake8-3.5.0.ebuild
 1707071517 ./dev-python/flake8/flake8-2.5.4.ebuild
 1702282250 ./dev-python/flake8/flake8-2.2.5.ebuild
 1707150035 ./dev-python/flake8/flake8-2.1.0.ebuild
@@ -12925,7 +12921,7 @@
 1712170809 ./dev-python/jsonrpclib/jsonrpclib-9999.ebuild
 1712170739 ./dev-python/jsonrpclib/jsonrpclib-0_pre20110820-r1.ebuild
 1712311910 ./dev-python/jsonrpclib/jsonrpclib-0.3.1.ebuild
-1802140108 ./dev-python/scandir/scandir-1.6.ebuild
+1803052038 ./dev-python/scandir/scandir-1.6.ebuild
 1710011714 ./dev-python/scandir/scandir-1.5.ebuild
 1702282250 ./dev-python/apptools/apptools-4.3.0.ebuild
 1702282250 ./dev-python/apptools/apptools-4.2.1.ebuild
@@ -13177,13 +13173,13 @@
 1702282250 ./dev-python/widgetsnbextension/widgetsnbextension-1.2.3.ebuild
 1703121531 ./dev-python/widgetsnbextension/widgetsnbextension-2.0.0.ebuild
 1708200136 ./dev-python/widgetsnbextension/widgetsnbextension-3.0.0.ebuild
-1803041008 ./dev-python/pyqtgraph/pyqtgraph-0.10.0-r1.ebuild
-1704260922 ./dev-python/pyqtgraph/pyqtgraph-0.10.0.ebuild
+1803052038 ./dev-python/pyqtgraph/pyqtgraph-0.10.0-r1.ebuild
 1707121741 ./dev-python/django-formtools/django-formtools-1.0.ebuild
 1705291932 ./dev-python/manuel/manuel-1.8.0.ebuild
 1702282250 ./dev-python/flask-evolution/flask-evolution-0.5-r1.ebuild
 1702282250 ./dev-python/flask-evolution/flask-evolution-0.6.ebuild
 1710161408 ./dev-python/www-authenticate/www-authenticate-0.9.2.ebuild
+1803052038 ./dev-python/qscintilla-python/qscintilla-python-2.10.3.ebuild
 1711250409 ./dev-python/qscintilla-python/qscintilla-python-2.10.2.ebuild
 1711201842 ./dev-python/qscintilla-python/qscintilla-python-2.10.1-r1.ebuild
 1702282250 ./dev-python/simpleparse/simpleparse-2.1.1-r1.ebuild
@@ -13196,7 +13192,7 @@
 1707261240 ./dev-python/astroid/astroid-1.5.3.ebuild
 1802241538 ./dev-python/pid/pid-2.2.0.ebuild
 1702282250 ./dev-python/pid/pid-2.1.1.ebuild
-1709260243 ./dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild
+1803052038 ./dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild
 1712271809 ./dev-python/backports-csv/backports-csv-1.0.5.ebuild
 1802212038 ./dev-python/wheel/wheel-0.30.0.ebuild
 1703161135 ./dev-python/wheel/wheel-0.29.0.ebuild
@@ -13208,7 +13204,7 @@
 1802221908 ./dev-python/process-tests/process-tests-1.2.0.ebuild
 1702282250 ./dev-python/python-urljr/python-urljr-1.0.1-r1.ebuild
 1702282250 ./dev-python/funcsigs/funcsigs-0.4.ebuild
-1802181708 ./dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
+1803060038 ./dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
 1702282250 ./dev-python/pycuda/pycuda-2013.1.1.ebuild
 1702282250 ./dev-python/pycuda/pycuda-2016.1.2.ebuild
 1702282250 ./dev-python/pycuda/pycuda-2012.1.ebuild
@@ -13244,15 +13240,12 @@
 1801131539 ./dev-python/vcstools/vcstools-0.1.40.ebuild
 1702282250 ./dev-python/vcstools/vcstools-9999.ebuild
 1702282250 ./dev-python/envisage/envisage-4.4.0.ebuild
-1702282250 ./dev-python/rtslib-fb/rtslib-fb-2.1.58.ebuild
 1703260624 ./dev-python/rtslib-fb/rtslib-fb-2.1.62.ebuild
-1702282250 ./dev-python/rtslib-fb/rtslib-fb-2.1.57.ebuild
-1702282250 ./dev-python/rtslib-fb/rtslib-fb-2.1.61.ebuild
-1802052038 ./dev-python/rtslib-fb/rtslib-fb-2.1.66.ebuild
+1803060308 ./dev-python/rtslib-fb/rtslib-fb-2.1.66.ebuild
 1702282250 ./dev-python/qpid-python/qpid-python-0.20.ebuild
 1702282250 ./dev-python/editobj/editobj-0.5.7-r2.ebuild
 1704050204 ./dev-python/setuptools_trial/setuptools_trial-0.6.0.ebuild
-1712030009 ./dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild
+1803052038 ./dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild
 1702282250 ./dev-python/wcwidth/wcwidth-0.1.7.ebuild
 1711241352 ./dev-python/uhashring/uhashring-1.0.ebuild
 1802240938 ./dev-python/os-traits/os-traits-0.5.0.ebuild
@@ -13262,7 +13255,7 @@
 1706201124 ./dev-python/pypax/pypax-0.9.2.ebuild
 1706201124 ./dev-python/pypax/pypax-9999.ebuild
 1702282250 ./dev-python/testpath/testpath-0.2.ebuild
-1707301234 ./dev-python/testpath/testpath-0.3.1.ebuild
+1803052038 ./dev-python/testpath/testpath-0.3.1.ebuild
 1706191413 ./dev-python/testpath/testpath-0.3.ebuild
 1707121741 ./dev-python/djangocms-flash/djangocms-flash-0.3.0.ebuild
 1702282250 ./dev-python/djangocms-flash/djangocms-flash-0.2.0.ebuild
@@ -13306,7 +13299,7 @@
 1802241038 ./dev-python/websocket-client/websocket-client-0.40.0.ebuild
 1802140008 ./dev-python/websocket-client/websocket-client-0.37.0.ebuild
 1709011327 ./dev-python/jedi/jedi-0.10.2.ebuild
-1802060508 ./dev-python/jedi/jedi-0.11.1.ebuild
+1803052038 ./dev-python/jedi/jedi-0.11.1.ebuild
 1802210408 ./dev-python/amodem/amodem-1.13.1.ebuild
 1707071220 ./dev-python/amodem/amodem-1.13.ebuild
 1709251644 ./dev-python/django-recaptcha/django-recaptcha-1.0.5.ebuild
@@ -13318,7 +13311,7 @@
 1705291932 ./dev-python/tpg/tpg-3.2.2-r1.ebuild
 1705051756 ./dev-python/httpbin/httpbin-0.4.1.ebuild
 1702282250 ./dev-python/traitlets/traitlets-4.1.0.ebuild
-1703110615 ./dev-python/traitlets/traitlets-4.3.2.ebuild
+1803052038 ./dev-python/traitlets/traitlets-4.3.2.ebuild
 1702282250 ./dev-python/traitlets/traitlets-4.2.2.ebuild
 1702282250 ./dev-python/traitlets/traitlets-4.0.0.ebuild
 1703110615 ./dev-python/traitlets/traitlets-4.3.1.ebuild
@@ -13339,7 +13332,7 @@
 1802180108 ./dev-python/chardet/chardet-3.0.4.ebuild
 1702282250 ./dev-python/zope-interface/zope-interface-4.1.1.ebuild
 1802180108 ./dev-python/zope-interface/zope-interface-4.4.3.ebuild
-1702282250 ./dev-python/zope-interface/zope-interface-4.3.2.ebuild
+1803052038 ./dev-python/zope-interface/zope-interface-4.3.2.ebuild
 1703300025 ./dev-python/pygments/pygments-2.1.1.ebuild
 1802020008 ./dev-python/pygments/pygments-2.2.0.ebuild
 1712210109 ./dev-python/fs/fs-0.5.4.ebuild
@@ -13378,7 +13371,7 @@
 1707051808 ./dev-python/lz4/lz4-0.10.1.ebuild
 1705291932 ./dev-python/pydispatcher/pydispatcher-2.0.5.ebuild
 1704281707 ./dev-python/args/args-0.1.0.ebuild
-1802170008 ./dev-python/pygobject/pygobject-3.24.1.ebuild
+1803052038 ./dev-python/pygobject/pygobject-3.24.1.ebuild
 1707071311 ./dev-python/pygobject/pygobject-3.22.0.ebuild
 1702282250 ./dev-python/pygobject/pygobject-2.28.6-r55.ebuild
 1709141410 ./dev-python/requests-kerberos/requests-kerberos-0.11.0.ebuild
@@ -13678,7 +13671,7 @@
 1702282250 ./dev-python/numpy/numpy-9999.ebuild
 1709300327 ./dev-python/numpy/numpy-1.13.3.ebuild
 1702282250 ./dev-python/numpy/numpy-1.8.2.ebuild
-1712070209 ./dev-python/numpy/numpy-1.10.4.ebuild
+1803052038 ./dev-python/numpy/numpy-1.10.4.ebuild
 1703300018 ./dev-python/numpy/numpy-1.9.2.ebuild
 1702282250 ./dev-python/nagiosplugin/nagiosplugin-1.2.3.ebuild
 1702282250 ./dev-python/nagiosplugin/nagiosplugin-1.2.4.ebuild
@@ -13770,7 +13763,7 @@
 1801052109 ./dev-python/neovim-remote/neovim-remote-9999.ebuild
 1705160507 ./dev-python/blockdiag/blockdiag-1.5.3-r1.ebuild
 1801282008 ./dev-python/protobuf-python/protobuf-python-3.1.0.ebuild
-1802240208 ./dev-python/protobuf-python/protobuf-python-3.5.1.1.ebuild
+1803060038 ./dev-python/protobuf-python/protobuf-python-3.5.1.1.ebuild
 1709220003 ./dev-python/protobuf-python/protobuf-python-3.4.1.ebuild
 1802212338 ./dev-python/pyasn1/pyasn1-0.3.7.ebuild
 1708051155 ./dev-python/pyasn1/pyasn1-0.2.3.ebuild
@@ -13780,7 +13773,7 @@
 1705011756 ./dev-python/atomicwrites/atomicwrites-1.1.5-r2.ebuild
 1702282250 ./dev-python/atomicwrites/atomicwrites-0.1.9.ebuild
 1702282250 ./dev-python/mygpoclient/mygpoclient-1.7-r1.ebuild
-1802200038 ./dev-python/pathlib/pathlib-1.0.1-r1.ebuild
+1803052038 ./dev-python/pathlib/pathlib-1.0.1-r1.ebuild
 1702282250 ./dev-python/flask-login/flask-login-0.3.2-r1.ebuild
 1708051115 ./dev-python/xvfbwrapper/xvfbwrapper-0.2.8.ebuild
 1801091839 ./dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
@@ -13861,6 +13854,7 @@
 1709030403 ./dev-python/pyosd/pyosd-0.2.14-r1.ebuild
 1702282250 ./dev-python/mockldap/mockldap-0.2.3.ebuild
 1705291932 ./dev-python/mockldap/mockldap-0.2.6.ebuild
+1803052038 ./dev-python/aiohttp-cors/aiohttp-cors-0.5.3.ebuild
 1704201640 ./dev-python/aiohttp-cors/aiohttp-cors-0.5.0.ebuild
 1709270130 ./dev-python/aiohttp-cors/aiohttp-cors-0.5.1.ebuild
 1803030538 ./dev-python/aiohttp-cors/aiohttp-cors-0.6.0.ebuild
@@ -13981,7 +13975,7 @@
 1702282250 ./dev-python/feedgenerator/feedgenerator-1.9.ebuild
 1712091739 ./dev-python/mock/mock-1.0.1-r2.ebuild
 1702282250 ./dev-python/mock/mock-1.3.0-r2.ebuild
-1707292337 ./dev-python/mock/mock-2.0.0.ebuild
+1803060038 ./dev-python/mock/mock-2.0.0.ebuild
 1711300010 ./dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild
 1702282250 ./dev-python/gevent-websocket/gevent-websocket-0.9.3.ebuild
 1709300232 ./dev-python/mysqlclient/mysqlclient-1.3.12.ebuild
@@ -14245,12 +14239,12 @@
 1706141442 ./dev-python/django-mptt/django-mptt-0.8.4.ebuild
 1702282250 ./dev-python/django-mptt/django-mptt-0.7.4.ebuild
 1707121741 ./dev-python/jsonfield/jsonfield-1.0.3.ebuild
-1802060508 ./dev-python/parso/parso-0.1.1.ebuild
+1803052038 ./dev-python/parso/parso-0.1.1.ebuild
 1709011330 ./dev-python/ptyprocess/ptyprocess-0.5.2.ebuild
 1712161339 ./dev-python/ptyprocess/ptyprocess-0.5.1.ebuild
 1707101615 ./dev-python/pyflakes/pyflakes-0.8.1.ebuild
 1707071517 ./dev-python/pyflakes/pyflakes-1.0.0.ebuild
-1803041238 ./dev-python/pyflakes/pyflakes-1.6.0.ebuild
+1803060038 ./dev-python/pyflakes/pyflakes-1.6.0.ebuild
 1705182307 ./dev-python/pyflakes/pyflakes-1.2.3.ebuild
 1702282250 ./dev-python/milk/milk-0.5.3.ebuild
 1702282250 ./dev-python/milk/milk-0.5.1.ebuild
@@ -14502,7 +14496,7 @@
 1707162023 ./dev-python/pyquery/pyquery-1.2.13.ebuild
 1705170209 ./dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.1.ebuild
 1702282250 ./dev-python/pycodestyle/pycodestyle-2.0.0.ebuild
-1803030308 ./dev-python/pycodestyle/pycodestyle-2.3.1.ebuild
+1803060038 ./dev-python/pycodestyle/pycodestyle-2.3.1.ebuild
 1702282250 ./dev-python/pycodestyle/pycodestyle-2.1.0.ebuild
 1705112234 ./dev-python/pycodestyle/pycodestyle-2.2.0.ebuild
 1702282250 ./dev-python/ccdproc/ccdproc-1.2.0.ebuild
@@ -14533,7 +14527,7 @@
 1702282250 ./dev-python/httreplay/httreplay-0.2.0.ebuild
 1702282250 ./dev-python/cliapp/cliapp-1.20150305.ebuild
 1702282250 ./dev-python/cliapp/cliapp-1.20140315.ebuild
-1803041238 ./dev-python/cliapp/cliapp-1.20170823.ebuild
+1803052338 ./dev-python/cliapp/cliapp-1.20170823.ebuild
 1706220220 ./dev-python/cliapp/cliapp-1.20160724-r1.ebuild
 1704221256 ./dev-python/termcolor/termcolor-1.1.0-r1.ebuild
 1802240908 ./dev-python/osc-lib/osc-lib-1.9.0.ebuild
@@ -14580,7 +14574,7 @@
 1702282250 ./dev-python/behave/behave-1.2.5-r1.ebuild
 1702282250 ./dev-python/behave/behave-1.2.4.ebuild
 1702282250 ./dev-python/behave/behave-1.2.5.ebuild
-1803041438 ./dev-python/pathlib2/pathlib2-2.3.0.ebuild
+1803052038 ./dev-python/pathlib2/pathlib2-2.3.0.ebuild
 1706230819 ./dev-python/pathlib2/pathlib2-2.1.0.ebuild
 1703110152 ./dev-python/openpyxl/openpyxl-9999.ebuild
 1703110152 ./dev-python/openpyxl/openpyxl-2.3.0.ebuild
@@ -14650,8 +14644,8 @@
 1712021809 ./dev-python/utidylib/utidylib-0.3.ebuild
 1712021809 ./dev-python/utidylib/utidylib-0.2-r2.ebuild
 1702282250 ./dev-python/yapsy/yapsy-1.11.223-r1.ebuild
+1803052038 ./dev-python/PyQt5/PyQt5-5.10.1.ebuild
 1802012238 ./dev-python/PyQt5/PyQt5-5.9.2.ebuild
-1802061638 ./dev-python/PyQt5/PyQt5-5.10.ebuild
 1711250309 ./dev-python/PyQt5/PyQt5-5.7.1.ebuild
 1704292149 ./dev-python/humanfriendly/humanfriendly-2.4.ebuild
 1702282250 ./dev-python/flask-appconfig/flask-appconfig-0.11.1.ebuild
@@ -14680,7 +14674,7 @@
 1702282250 ./dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.0.ebuild
 1702282250 ./dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-9999.ebuild
 1707081654 ./dev-python/mccabe/mccabe-0.2.1.ebuild
-1803041238 ./dev-python/mccabe/mccabe-0.6.1.ebuild
+1803060038 ./dev-python/mccabe/mccabe-0.6.1.ebuild
 1705111605 ./dev-python/markups/markups-2.0.0.ebuild
 1702282250 ./dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
 1708242121 ./dev-python/prov/prov-1.5.1.ebuild
@@ -15031,6 +15025,7 @@
 1705261756 ./dev-python/cheetah/cheetah-2.4.4-r1.ebuild
 1704280715 ./dev-python/python-socketio/python-socketio-1.7.4.ebuild
 1709250208 ./dev-python/python-socketio/python-socketio-1.8.0.ebuild
+1803060138 ./dev-python/msgpack/msgpack-0.5.6.ebuild
 1712281709 ./dev-python/msgpack/msgpack-0.4.8.ebuild
 1802160938 ./dev-python/msgpack/msgpack-0.5.1.ebuild
 1705111508 ./dev-python/wtforms/wtforms-2.1.ebuild
@@ -15917,7 +15912,7 @@
 1712070139 ./net-im/ejabberd/ejabberd-17.01-r2.ebuild
 1709090645 ./net-im/dianara/dianara-1.3.7.ebuild
 1802061938 ./net-im/centerim/centerim-5.0.1.ebuild
-1803011209 ./net-im/signal-desktop-bin/signal-desktop-bin-1.5.0.ebuild
+1803052038 ./net-im/signal-desktop-bin/signal-desktop-bin-1.5.2.ebuild
 1705070119 ./net-im/minbif/minbif-1.0.5-r2.ebuild
 1703220207 ./net-im/mattermost-desktop-bin/mattermost-desktop-bin-3.6.0.ebuild
 1709070038 ./net-im/mattermost-desktop-bin/mattermost-desktop-bin-3.7.1.ebuild
@@ -16021,7 +16016,7 @@
 1702282250 ./dev-cpp/glog/glog-0.3.3-r1.ebuild
 1702282250 ./dev-cpp/glog/glog-0.3.4.ebuild
 1801091939 ./dev-cpp/gtest/gtest-9999.ebuild
-1802180138 ./dev-cpp/gtest/gtest-1.8.0-r1.ebuild
+1803052038 ./dev-cpp/gtest/gtest-1.8.0-r1.ebuild
 1801091939 ./dev-cpp/gtest/gtest-1.7.0-r1.ebuild
 1801091939 ./dev-cpp/gtest/gtest-1.8.0.ebuild
 1702282250 ./dev-cpp/threadpool/threadpool-0.2.5-r1.ebuild
@@ -16054,7 +16049,7 @@
 1712050139 ./dev-cpp/yaml-cpp/yaml-cpp-0.5.3.ebuild
 1707091401 ./dev-cpp/atkmm/atkmm-2.24.2.ebuild
 1702282250 ./dev-cpp/ETL/ETL-0.04.15.ebuild
-1802170008 ./dev-cpp/glibmm/glibmm-2.52.1.ebuild
+1803052038 ./dev-cpp/glibmm/glibmm-2.52.1.ebuild
 1707091340 ./dev-cpp/glibmm/glibmm-2.50.1.ebuild
 1705071610 ./dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r1.ebuild
 1801312108 ./dev-cpp/waylandpp/waylandpp-9999.ebuild
@@ -16141,7 +16136,7 @@
 1702282250 ./app-office/sc/sc-7.16-r2.ebuild
 1702282250 ./app-office/gtg/gtg-0.3.1.ebuild
 1801091709 ./app-office/scribus/scribus-1.4.6.ebuild
-1801170839 ./app-office/scribus/scribus-1.5.3-r1.ebuild
+1803052038 ./app-office/scribus/scribus-1.5.3-r1.ebuild
 1801091709 ./app-office/scribus/scribus-9999.ebuild
 1802120109 ./app-office/calligra/calligra-3.1.0-r1.ebuild
 1708312353 ./app-office/calligra/calligra-3.0.1.ebuild
@@ -16196,6 +16191,7 @@
 1702282250 ./sci-misc/repsnapper/repsnapper-2.3.2a_p3.ebuild
 1702282250 ./sci-misc/pythoncad/pythoncad-1.37-r1.ebuild
 1702282250 ./sci-misc/h5utils/h5utils-1.12.1-r2.ebuild
+1803052039 ./sci-misc/netlogo-bin/netlogo-bin-6.0.2.ebuild
 1702282250 ./sci-misc/netlogo-bin/netlogo-bin-5.0.3-r1.ebuild
 1712280239 ./sci-misc/cdfplayer/cdfplayer-11.2.0.ebuild
 1702282250 ./sci-misc/oww/oww-0.86.5.ebuild
@@ -16739,6 +16735,7 @@
 1711182327 ./games-util/xgamer/xgamer-0.6.2.ebuild
 1702282250 ./games-util/etswitch/etswitch-0.1.14-r1.ebuild
 1712190309 ./games-util/pyfa/pyfa-9999.ebuild
+1803052038 ./games-util/pyfa/pyfa-1.35.1.ebuild
 1802221208 ./games-util/pyfa/pyfa-1.34.0.ebuild
 1802182038 ./games-util/pyfa/pyfa-1.35.0.ebuild
 1711182327 ./games-util/uz2unpack/uz2unpack-0.1.ebuild
@@ -16970,7 +16967,7 @@
 1702282250 ./x11-themes/geramik/geramik-0.27-r1.ebuild
 1801272139 ./x11-themes/solar-backgrounds/solar-backgrounds-0.92.0.5-r1.ebuild
 1702282250 ./x11-themes/gtk-engines-experience/gtk-engines-experience-0.10.5.ebuild
-1802170009 ./x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.24.0.ebuild
+1803052039 ./x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.24.0.ebuild
 1708221857 ./x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.22.0-r2.ebuild
 1702282250 ./x11-themes/icewm-themes/icewm-themes-0.0.2.ebuild
 1702282250 ./x11-themes/icewm-themes/icewm-themes-0.0.1-r1.ebuild
@@ -17325,7 +17322,7 @@
 1702282250 ./app-misc/inputlircd/inputlircd-0.0.1_pre15-r1.ebuild
 1702282250 ./app-misc/inputlircd/inputlircd-0.0.1_pre11-r2.ebuild
 1702282250 ./app-misc/inputlircd/inputlircd-0.0.1_pre11.ebuild
-1802221208 ./app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
+1803052038 ./app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
 1702282250 ./app-misc/ktoblzcheck/ktoblzcheck-1.48.ebuild
 1710031128 ./app-misc/khal/khal-0.9.7.ebuild
 1802151938 ./app-misc/khal/khal-0.9.8.ebuild
@@ -17371,7 +17368,7 @@
 1801231609 ./app-misc/c_rehash/c_rehash-1.0.2g_p8.ebuild
 1801231609 ./app-misc/c_rehash/c_rehash-1.7-r1.ebuild
 1702282250 ./app-misc/calendar/calendar-0.9.1.ebuild
-1802221208 ./app-misc/calendar/calendar-0.9.1-r1.ebuild
+1803052038 ./app-misc/calendar/calendar-0.9.1-r1.ebuild
 1702282250 ./app-misc/cw/cw-1.0.16-r3.ebuild
 1802060108 ./app-misc/vifm/vifm-0.9.1.ebuild
 1702282250 ./app-misc/vifm/vifm-0.7.2.ebuild
@@ -17439,7 +17436,7 @@
 1702282250 ./app-misc/hello/hello-2.9.ebuild
 1702282250 ./app-misc/hello/hello-2.8.ebuild
 1702282250 ./app-misc/dailystrips/dailystrips-1.0.28-r2.ebuild
-1802221208 ./app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild
+1803052038 ./app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild
 1702282250 ./app-misc/joymouse/joymouse-0.5.ebuild
 1702282250 ./app-misc/i2bits/i2bits-0.0.2.ebuild
 1702282250 ./app-misc/i2bits/i2bits-0.1.0.ebuild
@@ -17712,33 +17709,33 @@
 1708042139 ./dev-texlive/texlive-science/texlive-science-2012-r1.ebuild
 1708042139 ./dev-texlive/texlive-science/texlive-science-2014.ebuild
 1702282250 ./dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2015-r1.ebuild
-1802151238 ./dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2017.ebuild
+1803052038 ./dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2017.ebuild
 1707071749 ./dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2016.ebuild
-1802151238 ./dev-texlive/texlive-mathscience/texlive-mathscience-2017.ebuild
+1803052038 ./dev-texlive/texlive-mathscience/texlive-mathscience-2017.ebuild
 1707071749 ./dev-texlive/texlive-mathscience/texlive-mathscience-2016.ebuild
 1707071749 ./dev-texlive/texlive-plainextra/texlive-plainextra-2016.ebuild
 1702282250 ./dev-texlive/texlive-plainextra/texlive-plainextra-2015.ebuild
 1702282250 ./dev-texlive/texlive-metapost/texlive-metapost-2015.ebuild
-1802151238 ./dev-texlive/texlive-metapost/texlive-metapost-2017.ebuild
+1803052038 ./dev-texlive/texlive-metapost/texlive-metapost-2017.ebuild
 1707071749 ./dev-texlive/texlive-metapost/texlive-metapost-2016.ebuild
 1707071749 ./dev-texlive/texlive-langitalian/texlive-langitalian-2016.ebuild
-1802151238 ./dev-texlive/texlive-langitalian/texlive-langitalian-2017.ebuild
+1803052038 ./dev-texlive/texlive-langitalian/texlive-langitalian-2017.ebuild
 1702282250 ./dev-texlive/texlive-langitalian/texlive-langitalian-2015.ebuild
 1707071749 ./dev-texlive/texlive-langarabic/texlive-langarabic-2016.ebuild
-1802151238 ./dev-texlive/texlive-langarabic/texlive-langarabic-2017.ebuild
+1803052038 ./dev-texlive/texlive-langarabic/texlive-langarabic-2017.ebuild
 1702282250 ./dev-texlive/texlive-langarabic/texlive-langarabic-2015.ebuild
 1702282250 ./dev-texlive/texlive-documentation-base/texlive-documentation-base-2012.ebuild
 1707071749 ./dev-texlive/texlive-xetex/texlive-xetex-2016.ebuild
 1710081555 ./dev-texlive/texlive-xetex/texlive-xetex-2015.ebuild
-1802151238 ./dev-texlive/texlive-xetex/texlive-xetex-2017.ebuild
+1803052038 ./dev-texlive/texlive-xetex/texlive-xetex-2017.ebuild
 1707071749 ./dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2016.ebuild
 1702282250 ./dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2015.ebuild
-1802151238 ./dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2017.ebuild
+1803052038 ./dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2017.ebuild
 1708042139 ./dev-texlive/texlive-basic/texlive-basic-2012.ebuild
 1708042139 ./dev-texlive/texlive-basic/texlive-basic-2013.ebuild
 1706091830 ./dev-texlive/texlive-basic/texlive-basic-2015.ebuild
 1707071749 ./dev-texlive/texlive-basic/texlive-basic-2016.ebuild
-1802151238 ./dev-texlive/texlive-basic/texlive-basic-2017-r1.ebuild
+1803052038 ./dev-texlive/texlive-basic/texlive-basic-2017-r1.ebuild
 1708042139 ./dev-texlive/texlive-basic/texlive-basic-2014.ebuild
 1708042139 ./dev-texlive/texlive-mathextra/texlive-mathextra-2014.ebuild
 1702282250 ./dev-texlive/texlive-mathextra/texlive-mathextra-2015.ebuild
@@ -17746,12 +17743,12 @@
 1708042139 ./dev-texlive/texlive-mathextra/texlive-mathextra-2012-r1.ebuild
 1708042139 ./dev-texlive/texlive-mathextra/texlive-mathextra-2013.ebuild
 1707071749 ./dev-texlive/texlive-pictures/texlive-pictures-2016.ebuild
-1802151238 ./dev-texlive/texlive-pictures/texlive-pictures-2017.ebuild
+1803052038 ./dev-texlive/texlive-pictures/texlive-pictures-2017.ebuild
 1702282250 ./dev-texlive/texlive-pictures/texlive-pictures-2015-r2.ebuild
 1708142015 ./dev-texlive/texlive-langjapanese/texlive-langjapanese-2016.ebuild
 1708142015 ./dev-texlive/texlive-langjapanese/texlive-langjapanese-2015.ebuild
-1802151238 ./dev-texlive/texlive-langjapanese/texlive-langjapanese-2017.ebuild
-1802151238 ./dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2017.ebuild
+1803052038 ./dev-texlive/texlive-langjapanese/texlive-langjapanese-2017.ebuild
+1803052038 ./dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2017.ebuild
 1702282250 ./dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2015.ebuild
 1707071749 ./dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2016.ebuild
 1707071749 ./dev-texlive/texlive-langafrican/texlive-langafrican-2016.ebuild
@@ -17759,90 +17756,90 @@
 1706171341 ./dev-texlive/texlive-genericextra/texlive-genericextra-2015.ebuild
 1707071749 ./dev-texlive/texlive-genericextra/texlive-genericextra-2016.ebuild
 1707071749 ./dev-texlive/texlive-fontutils/texlive-fontutils-2016.ebuild
-1802151238 ./dev-texlive/texlive-fontutils/texlive-fontutils-2017.ebuild
+1803052038 ./dev-texlive/texlive-fontutils/texlive-fontutils-2017.ebuild
 1702282250 ./dev-texlive/texlive-fontutils/texlive-fontutils-2015.ebuild
 1707071749 ./dev-texlive/texlive-omega/texlive-omega-2016.ebuild
 1702282250 ./dev-texlive/texlive-omega/texlive-omega-2015.ebuild
-1802151238 ./dev-texlive/texlive-games/texlive-games-2017.ebuild
+1803052038 ./dev-texlive/texlive-games/texlive-games-2017.ebuild
 1702282250 ./dev-texlive/texlive-games/texlive-games-2015.ebuild
 1707071749 ./dev-texlive/texlive-games/texlive-games-2016.ebuild
-1802151238 ./dev-texlive/texlive-latex/texlive-latex-2017.ebuild
+1803052038 ./dev-texlive/texlive-latex/texlive-latex-2017.ebuild
 1707071749 ./dev-texlive/texlive-latex/texlive-latex-2016.ebuild
 1702282250 ./dev-texlive/texlive-latex/texlive-latex-2015.ebuild
 1707071749 ./dev-texlive/texlive-genericrecommended/texlive-genericrecommended-2016.ebuild
 1702282250 ./dev-texlive/texlive-genericrecommended/texlive-genericrecommended-2015.ebuild
-1802151238 ./dev-texlive/texlive-langother/texlive-langother-2017.ebuild
+1803052038 ./dev-texlive/texlive-langother/texlive-langother-2017.ebuild
 1702282250 ./dev-texlive/texlive-langother/texlive-langother-2015.ebuild
 1707071749 ./dev-texlive/texlive-langother/texlive-langother-2016.ebuild
 1707071749 ./dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2016.ebuild
-1802151238 ./dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2017.ebuild
+1803052038 ./dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2017.ebuild
 1702282250 ./dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2015.ebuild
 1702282250 ./dev-texlive/texlive-langspanish/texlive-langspanish-2015.ebuild
-1802151238 ./dev-texlive/texlive-langspanish/texlive-langspanish-2017.ebuild
+1803052038 ./dev-texlive/texlive-langspanish/texlive-langspanish-2017.ebuild
 1707071749 ./dev-texlive/texlive-langspanish/texlive-langspanish-2016.ebuild
-1802151238 ./dev-texlive/texlive-formatsextra/texlive-formatsextra-2017.ebuild
+1803052038 ./dev-texlive/texlive-formatsextra/texlive-formatsextra-2017.ebuild
 1710081555 ./dev-texlive/texlive-formatsextra/texlive-formatsextra-2015.ebuild
 1707071749 ./dev-texlive/texlive-formatsextra/texlive-formatsextra-2016.ebuild
 1707071749 ./dev-texlive/texlive-luatex/texlive-luatex-2016.ebuild
 1710081555 ./dev-texlive/texlive-luatex/texlive-luatex-2015.ebuild
-1802151238 ./dev-texlive/texlive-luatex/texlive-luatex-2017.ebuild
+1803052038 ./dev-texlive/texlive-luatex/texlive-luatex-2017.ebuild
 1707071749 ./dev-texlive/texlive-langindic/texlive-langindic-2016.ebuild
 1702282250 ./dev-texlive/texlive-langindic/texlive-langindic-2015.ebuild
 1710081555 ./dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2015-r1.ebuild
-1802151238 ./dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2017.ebuild
+1803052038 ./dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2017.ebuild
 1707071749 ./dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2016.ebuild
 1707071749 ./dev-texlive/texlive-langenglish/texlive-langenglish-2016.ebuild
 1702282250 ./dev-texlive/texlive-langenglish/texlive-langenglish-2015.ebuild
-1802151238 ./dev-texlive/texlive-langenglish/texlive-langenglish-2017.ebuild
-1802151238 ./dev-texlive/texlive-langkorean/texlive-langkorean-2017.ebuild
+1803052038 ./dev-texlive/texlive-langenglish/texlive-langenglish-2017.ebuild
+1803052038 ./dev-texlive/texlive-langkorean/texlive-langkorean-2017.ebuild
 1702282250 ./dev-texlive/texlive-langkorean/texlive-langkorean-2015.ebuild
 1707071749 ./dev-texlive/texlive-langkorean/texlive-langkorean-2016.ebuild
 1707071749 ./dev-texlive/texlive-pstricks/texlive-pstricks-2016.ebuild
 1702282250 ./dev-texlive/texlive-pstricks/texlive-pstricks-2015.ebuild
-1802151238 ./dev-texlive/texlive-pstricks/texlive-pstricks-2017.ebuild
+1803052038 ./dev-texlive/texlive-pstricks/texlive-pstricks-2017.ebuild
 1702282250 ./dev-texlive/texlive-latexextra/texlive-latexextra-2015-r1.ebuild
 1707071749 ./dev-texlive/texlive-latexextra/texlive-latexextra-2016.ebuild
-1802151238 ./dev-texlive/texlive-latexextra/texlive-latexextra-2017.ebuild
+1803052038 ./dev-texlive/texlive-latexextra/texlive-latexextra-2017.ebuild
 1707071749 ./dev-texlive/texlive-humanities/texlive-humanities-2016.ebuild
 1702282250 ./dev-texlive/texlive-humanities/texlive-humanities-2015.ebuild
-1802151238 ./dev-texlive/texlive-humanities/texlive-humanities-2017.ebuild
+1803052038 ./dev-texlive/texlive-humanities/texlive-humanities-2017.ebuild
 1707071749 ./dev-texlive/texlive-fontsextra/texlive-fontsextra-2016.ebuild
 1702282250 ./dev-texlive/texlive-fontsextra/texlive-fontsextra-2015.ebuild
-1802151238 ./dev-texlive/texlive-fontsextra/texlive-fontsextra-2017.ebuild
-1802151238 ./dev-texlive/texlive-langpolish/texlive-langpolish-2017.ebuild
+1803052038 ./dev-texlive/texlive-fontsextra/texlive-fontsextra-2017.ebuild
+1803052038 ./dev-texlive/texlive-langpolish/texlive-langpolish-2017.ebuild
 1702282250 ./dev-texlive/texlive-langpolish/texlive-langpolish-2015.ebuild
 1707071749 ./dev-texlive/texlive-langpolish/texlive-langpolish-2016.ebuild
 1707071749 ./dev-texlive/texlive-langchinese/texlive-langchinese-2016.ebuild
 1702282250 ./dev-texlive/texlive-langchinese/texlive-langchinese-2015.ebuild
-1802151238 ./dev-texlive/texlive-langchinese/texlive-langchinese-2017.ebuild
+1803052038 ./dev-texlive/texlive-langchinese/texlive-langchinese-2017.ebuild
 1707071749 ./dev-texlive/texlive-publishers/texlive-publishers-2016.ebuild
 1702282250 ./dev-texlive/texlive-publishers/texlive-publishers-2015.ebuild
-1802151238 ./dev-texlive/texlive-publishers/texlive-publishers-2017.ebuild
-1802151238 ./dev-texlive/texlive-langgreek/texlive-langgreek-2017.ebuild
+1803052038 ./dev-texlive/texlive-publishers/texlive-publishers-2017.ebuild
+1803052038 ./dev-texlive/texlive-langgreek/texlive-langgreek-2017.ebuild
 1702282250 ./dev-texlive/texlive-langgreek/texlive-langgreek-2015.ebuild
 1707071749 ./dev-texlive/texlive-langgreek/texlive-langgreek-2016.ebuild
-1802151238 ./dev-texlive/texlive-context/texlive-context-2017.ebuild
+1803052038 ./dev-texlive/texlive-context/texlive-context-2017.ebuild
 1708142015 ./dev-texlive/texlive-context/texlive-context-2016.ebuild
 1710081555 ./dev-texlive/texlive-context/texlive-context-2015.ebuild
 1707071749 ./dev-texlive/texlive-langportuguese/texlive-langportuguese-2016.ebuild
-1802151238 ./dev-texlive/texlive-langportuguese/texlive-langportuguese-2017.ebuild
+1803052038 ./dev-texlive/texlive-langportuguese/texlive-langportuguese-2017.ebuild
 1702282250 ./dev-texlive/texlive-langportuguese/texlive-langportuguese-2015.ebuild
 1707071749 ./dev-texlive/texlive-langgerman/texlive-langgerman-2016.ebuild
 1702282250 ./dev-texlive/texlive-langgerman/texlive-langgerman-2015.ebuild
-1802151238 ./dev-texlive/texlive-langgerman/texlive-langgerman-2017.ebuild
-1802151238 ./dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2017.ebuild
+1803052038 ./dev-texlive/texlive-langgerman/texlive-langgerman-2017.ebuild
+1803052038 ./dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2017.ebuild
 1707071749 ./dev-texlive/texlive-langfrench/texlive-langfrench-2016.ebuild
-1802151238 ./dev-texlive/texlive-langfrench/texlive-langfrench-2017.ebuild
+1803052038 ./dev-texlive/texlive-langfrench/texlive-langfrench-2017.ebuild
 1702282250 ./dev-texlive/texlive-langfrench/texlive-langfrench-2015.ebuild
 1707071749 ./dev-texlive/texlive-music/texlive-music-2016.ebuild
 1702282250 ./dev-texlive/texlive-music/texlive-music-2015.ebuild
-1802151238 ./dev-texlive/texlive-music/texlive-music-2017.ebuild
+1803052038 ./dev-texlive/texlive-music/texlive-music-2017.ebuild
 1702282250 ./dev-texlive/texlive-langeuropean/texlive-langeuropean-2015.ebuild
 1707071749 ./dev-texlive/texlive-langeuropean/texlive-langeuropean-2016.ebuild
 1708042139 ./dev-texlive/texlive-langeuropean/texlive-langeuropean-2013.ebuild
-1802151238 ./dev-texlive/texlive-langeuropean/texlive-langeuropean-2017.ebuild
+1803052038 ./dev-texlive/texlive-langeuropean/texlive-langeuropean-2017.ebuild
 1708042139 ./dev-texlive/texlive-langeuropean/texlive-langeuropean-2014.ebuild
-1802151238 ./dev-texlive/texlive-langcjk/texlive-langcjk-2017.ebuild
+1803052038 ./dev-texlive/texlive-langcjk/texlive-langcjk-2017.ebuild
 1702282250 ./dev-texlive/texlive-langcjk/texlive-langcjk-2015.ebuild
 1707071749 ./dev-texlive/texlive-langcjk/texlive-langcjk-2016.ebuild
 1802192038 ./net-wireless/rtl-sdr/rtl-sdr-0.5.3_p20170919.ebuild
@@ -18370,7 +18367,7 @@
 1707301147 ./app-text/blogc/blogc-9999.ebuild
 1702282250 ./app-text/htag/htag-0.0.24-r1.ebuild
 1702282250 ./app-text/hnb/hnb-1.9.18-r1.ebuild
-1802191138 ./app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild
+1803052038 ./app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild
 1801231609 ./app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r1.ebuild
 1708211202 ./app-text/mandoc/mandoc-1.14.3.ebuild
 1708211202 ./app-text/mandoc/mandoc-1.14.1-r1.ebuild
@@ -18394,7 +18391,7 @@
 1704301226 ./app-text/uudeview/uudeview-0.5.20-r2.ebuild
 1709190924 ./app-text/extract_url/extract_url-1.6.2.ebuild
 1801052139 ./app-text/iso-codes/iso-codes-3.75.ebuild
-1802170008 ./app-text/iso-codes/iso-codes-3.76.ebuild
+1803052038 ./app-text/iso-codes/iso-codes-3.76.ebuild
 1706161424 ./app-text/t1utils/t1utils-1.39.ebuild
 1708241205 ./app-text/t1utils/t1utils-1.41-r1.ebuild
 1801070909 ./app-text/t1utils/t1utils-1.41-r2.ebuild
@@ -18430,7 +18427,7 @@
 1801090509 ./app-text/nfoview/nfoview-1.23.ebuild
 1702282250 ./app-text/wv2/wv2-0.4.2-r2.ebuild
 1702282250 ./app-text/teseq/teseq-1.1.1.ebuild
-1702282250 ./app-text/languagetool/languagetool-3.5-r1.ebuild
+1803060108 ./app-text/languagetool/languagetool-3.5-r1.ebuild
 1801062139 ./app-text/a2ps/a2ps-4.14-r6.ebuild
 1704241230 ./app-text/pastebinit/pastebinit-1.5.ebuild
 1702282250 ./app-text/cutemarked/cutemarked-0.11.3.ebuild
@@ -18494,7 +18491,7 @@
 1801081039 ./app-text/calibre/calibre-2.78.0.ebuild
 1801081039 ./app-text/calibre/calibre-3.8.0.ebuild
 1707071749 ./app-text/texlive-core/texlive-core-2016-r5.ebuild
-1802151238 ./app-text/texlive-core/texlive-core-2017-r3.ebuild
+1803052038 ./app-text/texlive-core/texlive-core-2017-r3.ebuild
 1712261809 ./app-text/texlive-core/texlive-core-2017-r2.ebuild
 1708042139 ./app-text/texlive-core/texlive-core-2012-r3.ebuild
 1802080108 ./app-text/texlive-core/texlive-core-2016-r6.ebuild
@@ -18506,7 +18503,7 @@
 1710160305 ./app-text/ebook-tools/ebook-tools-0.2.2-r1.ebuild
 1702282250 ./app-text/gnopaster/gnopaster-0.0.9.ebuild
 1803011908 ./app-text/libmspub/libmspub-0.1.4.ebuild
-1802192308 ./app-text/libmspub/libmspub-0.1.2.ebuild
+1803052038 ./app-text/libmspub/libmspub-0.1.2.ebuild
 1802192308 ./app-text/libmspub/libmspub-9999.ebuild
 1702282250 ./app-text/groonga/groonga-5.0.3.ebuild
 1702282250 ./app-text/groonga/groonga-5.0.9.ebuild
@@ -18660,7 +18657,7 @@
 1801222238 ./app-text/xhtml1/xhtml1-20020801-r5.ebuild
 1801051609 ./app-text/antixls/antixls-0.3b.ebuild
 1802042138 ./app-text/highlight/highlight-3.17.ebuild
-1803042238 ./app-text/highlight/highlight-3.42-r1.ebuild
+1803060038 ./app-text/highlight/highlight-3.42-r1.ebuild
 1702282250 ./app-text/highlight/highlight-3.34.ebuild
 1702282250 ./app-text/highlight/highlight-3.33.ebuild
 1706271720 ./app-text/highlight/highlight-3.35.ebuild
@@ -18701,7 +18698,7 @@
 1702282250 ./app-text/flpsed/flpsed-0.7.0.ebuild
 1702282250 ./app-text/flpsed/flpsed-0.7.2.ebuild
 1707071749 ./app-text/texlive/texlive-2016.ebuild
-1802151238 ./app-text/texlive/texlive-2017.ebuild
+1803052038 ./app-text/texlive/texlive-2017.ebuild
 1702282250 ./app-text/pdfminer/pdfminer-20140328.ebuild
 1702282250 ./app-text/pdfminer/pdfminer-20140328-r1.ebuild
 1702282250 ./app-text/pdfminer/pdfminer-20131113.ebuild
@@ -18855,7 +18852,7 @@
 1702282250 ./app-text/aiksaurus/aiksaurus-1.2.1.ebuild
 1706171410 ./app-text/ps2eps/ps2eps-1.68.ebuild
 1702282250 ./app-text/freepwing/freepwing-1.4.3.ebuild
-1703222257 ./app-text/htmltidy/htmltidy-20090325-r2.ebuild
+1803052038 ./app-text/htmltidy/htmltidy-20090325-r2.ebuild
 1712171639 ./app-text/sablotron/sablotron-1.0.3-r1.ebuild
 1702282250 ./app-text/unac/unac-1.8.0.ebuild
 1801111909 ./app-text/fbreader/fbreader-0.99.4-r5.ebuild
@@ -19044,7 +19041,7 @@
 1709291807 ./dev-lisp/trivial-gray-streams/trivial-gray-streams-99999999.ebuild
 1702282250 ./dev-lisp/asdf/asdf-3.2.0.ebuild
 1702282250 ./dev-lisp/asdf/asdf-3.1.6.ebuild
-1803032108 ./dev-lisp/asdf/asdf-3.1.5.ebuild
+1803052038 ./dev-lisp/asdf/asdf-3.1.5.ebuild
 1710302240 ./dev-lisp/asdf/asdf-3.3.0.ebuild
 1711152130 ./dev-lisp/asdf/asdf-3.3.1.ebuild
 1702282250 ./dev-lisp/asdf/asdf-3.1.7.ebuild
@@ -19077,7 +19074,7 @@
 1709132224 ./app-i18n/zinnia-tomoe/zinnia-tomoe-0.6.0_p20080911.ebuild
 1709272256 ./app-i18n/fcitx-chewing/fcitx-chewing-4.9999.ebuild
 1711181305 ./app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild
-1709072227 ./app-i18n/canna/canna-3.7_p3-r3.ebuild
+1803052338 ./app-i18n/canna/canna-3.7_p3-r3.ebuild
 1707081213 ./app-i18n/canna/canna-3.7_p3-r2.ebuild
 1707081213 ./app-i18n/canna/canna-3.7_p3-r1.ebuild
 1710232227 ./app-i18n/fcitx-table-extra/fcitx-table-extra-4.9999.ebuild
@@ -19126,7 +19123,7 @@
 1712311640 ./app-i18n/scim-wijesekera/scim-wijesekera-0.3.3-r1.ebuild
 1708161659 ./app-i18n/ibus-table/ibus-table-1.9.18.ebuild
 1708161659 ./app-i18n/ibus-table/ibus-table-1.5.0-r1.ebuild
-1803041008 ./app-i18n/tomoe/tomoe-0.6.0-r3.ebuild
+1803052038 ./app-i18n/tomoe/tomoe-0.6.0-r3.ebuild
 1708051747 ./app-i18n/tomoe/tomoe-0.6.0-r2.ebuild
 1802150208 ./app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild
 1711181310 ./app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild
@@ -19319,7 +19316,7 @@
 1711221149 ./www-apps/ikiwiki/ikiwiki-3.20171001.ebuild
 1702282250 ./www-apps/agendav/agendav-1.2.6.2.ebuild
 1702282250 ./www-apps/rocketwiki-lqfb/rocketwiki-lqfb-0.4.ebuild
-1706180041 ./www-apps/roundup/roundup-1.5.1.ebuild
+1803052338 ./www-apps/roundup/roundup-1.5.1.ebuild
 1802071708 ./www-apps/wordpress/wordpress-4.9.4.ebuild
 1702282250 ./www-apps/webdavcgi/webdavcgi-0.8.3.ebuild
 1702282250 ./www-apps/webdavcgi/webdavcgi-0.8.4.ebuild
@@ -19825,8 +19822,8 @@
 1708142047 ./dev-util/artifactory-bin/artifactory-bin-5.4.6.ebuild
 1712190209 ./dev-util/artifactory-bin/artifactory-bin-5.6.3.ebuild
 1703070322 ./dev-util/artifactory-bin/artifactory-bin-4.16.0-r1.ebuild
-1702282250 ./dev-util/sasm/sasm-2.2.ebuild
-1702282250 ./dev-util/sasm/sasm-9999.ebuild
+1803052038 ./dev-util/sasm/sasm-2.2-r1.ebuild
+1803052038 ./dev-util/sasm/sasm-9999.ebuild
 1702282250 ./dev-util/rosinstall/rosinstall-9999.ebuild
 1702282250 ./dev-util/rosinstall/rosinstall-0.7.8.ebuild
 1707302232 ./dev-util/global/global-6.5.7.ebuild
@@ -19887,7 +19884,7 @@
 1702282250 ./dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.5.18.ebuild
 1705210024 ./dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.19.ebuild
 1706190025 ./dev-util/glade/glade-3.20.0.ebuild
-1802170008 ./dev-util/glade/glade-3.20.2.ebuild
+1803052038 ./dev-util/glade/glade-3.20.2.ebuild
 1708191331 ./dev-util/idea-community/idea-community-2017.2.2.172.3757.52.ebuild
 1801231609 ./dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
 1702282250 ./dev-util/synopsis/synopsis-0.13.ebuild
@@ -20133,7 +20130,7 @@
 1708172004 ./dev-util/cppunit/cppunit-1.13.2-r2.ebuild
 1708172004 ./dev-util/cppunit/cppunit-9999.ebuild
 1708172004 ./dev-util/cppunit/cppunit-1.13.1.ebuild
-1801172109 ./dev-util/cppunit/cppunit-1.14.0.ebuild
+1803052038 ./dev-util/cppunit/cppunit-1.14.0.ebuild
 1702282250 ./dev-util/cscope/cscope-15.8a-r2.ebuild
 1803031738 ./dev-util/cscope/cscope-15.8a-r1.ebuild
 1702282250 ./dev-util/argouml/argouml-0.34.ebuild
@@ -20178,9 +20175,9 @@
 1702282250 ./dev-util/cflow/cflow-1.4.ebuild
 1702282250 ./dev-util/gperf/gperf-3.0.4.ebuild
 1702282250 ./dev-util/gperf/gperf-3.1.ebuild
-1802161938 ./dev-util/geany/geany-9999.ebuild
+1803052038 ./dev-util/geany/geany-9999.ebuild
+1803052038 ./dev-util/geany/geany-1.33.ebuild
 1711200101 ./dev-util/geany/geany-1.32.ebuild
-1707181042 ./dev-util/geany/geany-1.31.ebuild
 1711140118 ./dev-util/geany/geany-1.30.1.ebuild
 1802280208 ./dev-util/conan/conan-1.0.4.ebuild
 1712282239 ./dev-util/mdds/mdds-9999.ebuild
@@ -20256,7 +20253,7 @@
 1708120153 ./dev-util/re2c/re2c-1.0.1.ebuild
 1702282250 ./dev-util/re2c/re2c-0.16.ebuild
 1710272236 ./dev-util/re2c/re2c-1.0.2.ebuild
-1711090014 ./dev-util/re2c/re2c-1.0.3.ebuild
+1803052238 ./dev-util/re2c/re2c-1.0.3.ebuild
 1702282250 ./dev-util/re2c/re2c-0.13.5-r1.ebuild
 1801210538 ./dev-util/howdoi/howdoi-1.1.12.ebuild
 1707121742 ./dev-util/howdoi/howdoi-1.1.9.ebuild
@@ -20275,13 +20272,13 @@
 1801072309 ./dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r2.ebuild
 1801072309 ./dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild
 1801231609 ./dev-util/gdbus-codegen/gdbus-codegen-2.50.3.ebuild
-1803030508 ./dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild
+1803052038 ./dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild
 1702282250 ./dev-util/shunit2/shunit2-2.1.6-r1.ebuild
 1802212338 ./dev-util/meson/meson-9999.ebuild
 1712281609 ./dev-util/meson/meson-0.42.1.ebuild
 1802212338 ./dev-util/meson/meson-0.44.0.ebuild
 1712281609 ./dev-util/meson/meson-0.41.2.ebuild
-1803041438 ./dev-util/meson/meson-0.44.1.ebuild
+1803052238 ./dev-util/meson/meson-0.44.1.ebuild
 1802041838 ./dev-util/meson/meson-0.43.0.ebuild
 1712281609 ./dev-util/meson/meson-0.42.0.ebuild
 1702282250 ./dev-util/amtterm/amtterm-1.3-r1.ebuild
@@ -20329,8 +20326,8 @@
 1801281039 ./dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.0.ebuild
 1712130209 ./dev-util/kdbg/kdbg-3.0.0.ebuild
 1708111614 ./dev-util/rpmdevtools/rpmdevtools-8.10.ebuild
-1707210037 ./dev-util/geany-plugins/geany-plugins-1.31.ebuild
 1711140118 ./dev-util/geany-plugins/geany-plugins-1.30.ebuild
+1803052038 ./dev-util/geany-plugins/geany-plugins-1.33.ebuild
 1712030209 ./dev-util/geany-plugins/geany-plugins-1.32.ebuild
 1712292110 ./dev-util/cucumber-wire/cucumber-wire-0.0.1.ebuild
 1709080654 ./dev-util/byacc/byacc-20170201.ebuild
@@ -20466,7 +20463,7 @@
 1703222258 ./dev-util/cmdtest/cmdtest-0.27.ebuild
 1702282250 ./dev-util/cmdtest/cmdtest-0.18.ebuild
 1702282250 ./dev-util/cmdtest/cmdtest-0.16.ebuild
-1803041238 ./dev-util/cmdtest/cmdtest-0.30.ebuild
+1803052338 ./dev-util/cmdtest/cmdtest-0.30.ebuild
 1702282250 ./dev-util/diffball/diffball-1.0.1.ebuild
 1712261939 ./dev-util/uncrustify/uncrustify-0.66.1.ebuild
 1707301237 ./dev-util/uncrustify/uncrustify-9999.ebuild
@@ -20570,7 +20567,7 @@
 1712021609 ./dev-util/igprof/igprof-5.9.11.ebuild
 1709171929 ./dev-util/ninja/ninja-9999.ebuild
 1709171929 ./dev-util/ninja/ninja-1.7.2.ebuild
-1801131009 ./dev-util/ninja/ninja-1.8.2.ebuild
+1803052238 ./dev-util/ninja/ninja-1.8.2.ebuild
 1707121742 ./dev-util/setconf/setconf-0.6.7.ebuild
 1705050158 ./dev-util/setconf/setconf-0.6.6.ebuild
 1801281039 ./dev-util/cucumber-expressions/cucumber-expressions-5.0.13.ebuild
@@ -22179,7 +22176,7 @@
 1704121929 ./app-admin/profile-cleaner/profile-cleaner-2.36.ebuild
 1702282250 ./app-admin/whowatch/whowatch-1.8.5.ebuild
 1705150103 ./app-admin/filewatcher/filewatcher-2.4.6-r1.ebuild
-1801282138 ./app-admin/conserver/conserver-8.1.18-r1.ebuild
+1803052038 ./app-admin/conserver/conserver-8.1.18-r1.ebuild
 1702282250 ./app-admin/conserver/conserver-8.1.18.ebuild
 1706101810 ./app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild
 1712060109 ./app-admin/salt/salt-2017.7.2-r1.ebuild
@@ -22248,8 +22245,8 @@
 1712292009 ./app-admin/qpage/qpage-3.3.ebuild
 1712300140 ./app-admin/integrit/integrit-4.1-r1.ebuild
 1709020042 ./app-admin/serf/serf-0.8.1-r1.ebuild
-1803011838 ./app-admin/keepassxc/keepassxc-2.3.0.ebuild
-1803011838 ./app-admin/keepassxc/keepassxc-9999.ebuild
+1803052038 ./app-admin/keepassxc/keepassxc-2.3.0-r1.ebuild
+1803052038 ./app-admin/keepassxc/keepassxc-9999.ebuild
 1710201406 ./app-admin/keepassxc/keepassxc-2.1.4-r1.ebuild
 1803041008 ./app-admin/keepassxc/keepassxc-2.2.4.ebuild
 1702282250 ./app-admin/cli53/cli53-9999.ebuild
@@ -22425,7 +22422,7 @@
 1802050338 ./app-admin/clog/clog-1.1.0.ebuild
 1705041006 ./app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r5.ebuild
 1702282250 ./app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild
-1712101740 ./app-admin/webalizer/webalizer-2.23.08.ebuild
+1803060038 ./app-admin/webalizer/webalizer-2.23.08.ebuild
 1709021756 ./app-admin/webalizer/webalizer-2.23.05.ebuild
 1801290538 ./app-admin/paxtest/paxtest-0.9.15-r1.ebuild
 1712032139 ./app-admin/hddtemp/hddtemp-0.3_beta15-r26.ebuild
@@ -22982,7 +22979,7 @@
 1706101808 ./mail-mta/msmtp/msmtp-1.6.6.ebuild
 1702282250 ./mail-mta/qmail-ldap/qmail-ldap-1.03-r8.ebuild
 1802270938 ./mail-mta/postfix/postfix-3.2.5-r1.ebuild
-1801282138 ./mail-mta/postfix/postfix-3.2.4.ebuild
+1803052038 ./mail-mta/postfix/postfix-3.2.4.ebuild
 1706140934 ./mail-mta/postfix/postfix-3.2.2.ebuild
 1802270938 ./mail-mta/postfix/postfix-3.3.0.ebuild
 1802270938 ./mail-mta/postfix/postfix-3.4_pre20180222.ebuild
@@ -23240,6 +23237,7 @@
 1704201939 ./sci-mathematics/kodkod/kodkod-1.5.2.ebuild
 1707212037 ./sci-mathematics/cgal/cgal-4.10.ebuild
 1705161057 ./sci-mathematics/cgal/cgal-4.9.ebuild
+1803052039 ./sci-mathematics/cgal/cgal-4.11.1.ebuild
 1710121518 ./sci-mathematics/rkward/rkward-0.6.5_p20170420.ebuild
 1702282250 ./sci-mathematics/agda-stdlib/agda-stdlib-2.4.2.5.ebuild
 1702282250 ./sci-mathematics/agda-stdlib/agda-stdlib-2.5.2.0.13.ebuild
@@ -23289,7 +23287,6 @@
 1801072009 ./sci-mathematics/maxima/maxima-5.38.1.ebuild
 1801072009 ./sci-mathematics/maxima/maxima-5.41.0.ebuild
 1712311640 ./sci-mathematics/maxima/maxima-5.41.0-r1.ebuild
-1702282250 ./sci-mathematics/octave-epstk/octave-epstk-2.3.ebuild
 1702282250 ./sci-mathematics/octave-epstk/octave-epstk-2.4.ebuild
 1711070009 ./sci-mathematics/why3-for-spark/why3-for-spark-2017.ebuild
 1711191552 ./sci-mathematics/rstudio/rstudio-1.1.368.ebuild
@@ -23332,7 +23329,7 @@
 1801231609 ./app-portage/portage-utils/portage-utils-0.62.ebuild
 1801231609 ./app-portage/portage-utils/portage-utils-0.64-r1.ebuild
 1801231609 ./app-portage/portage-utils/portage-utils-0.63.ebuild
-1803012038 ./app-portage/hashgen/hashgen-1.0.ebuild
+1803052038 ./app-portage/hashgen/hashgen-1.0.ebuild
 1702282250 ./app-portage/getdelta/getdelta-0.7.9-r2.ebuild
 1702282250 ./app-portage/g-octave/g-octave-0.4.1-r5.ebuild
 1704221256 ./app-portage/install-mask/install-mask-0.1.1.ebuild
@@ -23479,7 +23476,7 @@
 1702282250 ./app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.2-r1.ebuild
 1702282250 ./app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.6.2.ebuild
 1702282250 ./app-portage/euses/euses-2.5.9.ebuild
-1702282250 ./app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild
+1803042308 ./app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild
 1704221256 ./app-portage/flaggie/flaggie-0.2.1.ebuild
 1704221256 ./app-portage/flaggie/flaggie-9999.ebuild
 1702282250 ./app-portage/genlop/genlop-0.30.9-r1.ebuild
@@ -23582,7 +23579,7 @@
 1706252238 ./media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1-r1.ebuild
 1706252238 ./media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild
 1702282250 ./media-sound/guimup/guimup-0.3.2.ebuild
-1702282250 ./media-sound/bpmdetect/bpmdetect-0.6.1-r1.ebuild
+1803052038 ./media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810.ebuild
 1702282250 ./media-sound/aylet/aylet-0.5.ebuild
 1704231410 ./media-sound/tunapie/tunapie-2.1.19.ebuild
 1702282250 ./media-sound/tunapie/tunapie-2.1.17-r1.ebuild
@@ -23699,6 +23696,7 @@
 1702282250 ./media-sound/easytag/easytag-2.4.3.ebuild
 1801060539 ./media-sound/supercollider/supercollider-3.8.0-r1.ebuild
 1702282250 ./media-sound/audiotag/audiotag-0.19.ebuild
+1803052238 ./media-sound/deinvert/deinvert-9999.ebuild
 1702282250 ./media-sound/tk707/tk707-0.8-r1.ebuild
 1702282250 ./media-sound/cdstatus/cdstatus-0.97.03.ebuild
 1702282250 ./media-sound/nted/nted-1.10.18-r3.ebuild
@@ -23837,7 +23835,7 @@
 1705191351 ./media-sound/pnmixer/pnmixer-0.7.1.ebuild
 1711251810 ./media-sound/tuxguitar/tuxguitar-1.3.2.ebuild
 1702282250 ./media-sound/twolame/twolame-0.3.13-r1.ebuild
-1802221208 ./media-sound/twolame/twolame-0.3.13-r2.ebuild
+1803052038 ./media-sound/twolame/twolame-0.3.13-r2.ebuild
 1702282250 ./media-sound/vitunes/vitunes-2.3.ebuild
 1702282250 ./media-sound/audicle/audicle-1.0.0.7-r1.ebuild
 1702282250 ./media-sound/denemo/denemo-1.0.2.ebuild
@@ -23992,7 +23990,7 @@
 1803022138 ./media-sound/alsa-tools/alsa-tools-1.1.0.ebuild
 1803022138 ./media-sound/alsa-tools/alsa-tools-1.1.3.ebuild
 1702282250 ./media-sound/mpfc/mpfc-1.3.7-r1.ebuild
-1803041008 ./media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild
+1803052038 ./media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild
 1702282250 ./media-sound/orpheus/orpheus-1.6-r2.ebuild
 1803041338 ./media-sound/orpheus/orpheus-1.6-r3.ebuild
 1702282250 ./media-sound/aumix/aumix-2.9.1.ebuild
@@ -24115,7 +24113,7 @@
 1802040938 ./media-sound/grip/grip-3.6.3.ebuild
 1708111613 ./media-sound/grip/grip-3.5.2.ebuild
 1712011509 ./media-sound/grip/grip-3.6.2.ebuild
-1712011509 ./media-sound/grip/grip-3.4.3.ebuild
+1803052338 ./media-sound/grip/grip-3.4.3.ebuild
 1702282250 ./media-sound/pavucontrol/pavucontrol-3.0.ebuild
 1702282250 ./media-sound/pavucontrol/pavucontrol-2.0-r1.ebuild
 1702282250 ./sci-physics/yoda/yoda-1.4.0.ebuild
@@ -24170,6 +24168,7 @@
 1702282250 ./sci-physics/lammps/lammps-20151207.ebuild
 1702282250 ./sci-physics/lammps/lammps-20160301.ebuild
 1702282250 ./sci-physics/lammps/lammps-20150810.ebuild
+1803052138 ./sci-physics/lammps/lammps-20180222.ebuild
 1702282250 ./sci-physics/lammps/lammps-20150515-r1.ebuild
 1702282250 ./sci-physics/lammps/lammps-20160321.ebuild
 1702282250 ./sci-physics/lammps/lammps-20160115.ebuild
@@ -24392,7 +24391,7 @@
 1702211801 ./sys-fs/ntfs3g/ntfs3g-2016.2.22-r2.ebuild
 1702282250 ./sys-fs/mtools/mtools-4.0.17.ebuild
 1709170341 ./sys-fs/mtools/mtools-4.0.18.ebuild
-1709170341 ./sys-fs/mtools/mtools-4.0.18-r2.ebuild
+1803060038 ./sys-fs/mtools/mtools-4.0.18-r2.ebuild
 1702282250 ./sys-fs/mtools/mtools-4.0.15.ebuild
 1710092038 ./sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild
 1707051459 ./sys-fs/reiserfsprogs/reiserfsprogs-3.6.26.ebuild
@@ -24542,7 +24541,7 @@
 1702282250 ./sys-boot/yaboot/yaboot-1.3.14-r2.ebuild
 1702282250 ./sys-boot/shlilo-lantank/shlilo-lantank-20040408.ebuild
 1802271808 ./sys-boot/plymouth/plymouth-9999.ebuild
-1802271808 ./sys-boot/plymouth/plymouth-0.9.3-r1.ebuild
+1803052338 ./sys-boot/plymouth/plymouth-0.9.3-r1.ebuild
 1708172002 ./sys-boot/plymouth/plymouth-0.9.2-r1.ebuild
 1802271808 ./sys-boot/plymouth/plymouth-0.9.3.ebuild
 1801152109 ./sys-boot/palo/palo-2.00.ebuild
@@ -24655,8 +24654,9 @@
 1708161015 ./x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.14.ebuild
 1703161114 ./x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.9.0.ebuild
 1802222208 ./x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20171018.ebuild
-1803020438 ./x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20180214.ebuild
+1803060608 ./x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20180214.ebuild
 1802222208 ./x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20170313.ebuild
+1803060608 ./x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
 1802222208 ./x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20170216.ebuild
 1706191558 ./x11-drivers/xf86-input-void/xf86-input-void-1.4.1.ebuild
 1702282250 ./x11-drivers/xf86-input-void/xf86-input-void-1.4.0.ebuild
@@ -25460,6 +25460,7 @@
 1702282250 ./dev-perl/Cwd-Guard/Cwd-Guard-0.40.0.ebuild
 1712010010 ./dev-perl/Cwd-Guard/Cwd-Guard-0.50.0.ebuild
 1702282250 ./dev-perl/Shell-EnvImporter/Shell-EnvImporter-1.70.0-r2.ebuild
+1803060708 ./dev-perl/Test-MockModule/Test-MockModule-0.130.0.ebuild
 1702282250 ./dev-perl/Test-MockModule/Test-MockModule-0.50.0-r2.ebuild
 1712041039 ./dev-perl/Test-MockModule/Test-MockModule-0.110.0.ebuild
 1706202312 ./dev-perl/Pod-Elemental-PerlMunger/Pod-Elemental-PerlMunger-0.200.6.ebuild
@@ -25926,7 +25927,7 @@
 1702282250 ./dev-perl/MogileFS-Network/MogileFS-Network-0.060.0-r1.ebuild
 1702282250 ./dev-perl/Perl-Critic/Perl-Critic-1.123.ebuild
 1702282250 ./dev-perl/Perl-Critic/Perl-Critic-1.126.0.ebuild
-1802260108 ./dev-perl/Perl-Critic/Perl-Critic-1.130.0.ebuild
+1803052038 ./dev-perl/Perl-Critic/Perl-Critic-1.130.0.ebuild
 1707030159 ./dev-perl/XML-Atom/XML-Atom-0.410.0-r1.ebuild
 1702282250 ./dev-perl/Test-DistManifest/Test-DistManifest-1.14.0.ebuild
 1710190039 ./dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.80.0-r2.ebuild
@@ -26124,6 +26125,7 @@
 1710201039 ./dev-perl/Data-Serializer/Data-Serializer-0.600.0-r1.ebuild
 1710201039 ./dev-perl/Device-SerialPort/Device-SerialPort-1.40.0-r2.ebuild
 1702282250 ./dev-perl/Device-SerialPort/Device-SerialPort-1.40.0-r1.ebuild
+1803060738 ./dev-perl/Test-Most/Test-Most-0.350.0.ebuild
 1702282250 ./dev-perl/Test-Most/Test-Most-0.310.0-r1.ebuild
 1706032322 ./dev-perl/Test-Most/Test-Most-0.340.0.ebuild
 1702282250 ./dev-perl/Convert-Color/Convert-Color-0.80.0-r1.ebuild
@@ -26198,6 +26200,7 @@
 1705300824 ./dev-perl/Text-CSV/Text-CSV-1.950.0.ebuild
 1706101807 ./dev-perl/Text-CSV/Text-CSV-1.940.0.ebuild
 1707102150 ./dev-perl/Test-Needs/Test-Needs-0.2.2.ebuild
+1803060738 ./dev-perl/Test-Needs/Test-Needs-0.2.5.ebuild
 1702282250 ./dev-perl/UUID/UUID-0.250.0.ebuild
 1702282250 ./dev-perl/UUID/UUID-0.260.0.ebuild
 1705261758 ./dev-perl/DateTime-Format-W3CDTF/DateTime-Format-W3CDTF-0.70.0.ebuild
@@ -26447,6 +26450,7 @@
 1702282250 ./dev-perl/Data-Visitor/Data-Visitor-0.300.0-r1.ebuild
 1802241138 ./dev-perl/Test-MockTime-HiRes/Test-MockTime-HiRes-0.70.0.ebuild
 1703210448 ./dev-perl/Test-MockTime-HiRes/Test-MockTime-HiRes-0.60.0.ebuild
+1803060738 ./dev-perl/Test-MockTime-HiRes/Test-MockTime-HiRes-0.80.0.ebuild
 1702282250 ./dev-perl/Perl-Version/Perl-Version-1.13.0.ebuild
 1703211840 ./dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.20.0-r1.ebuild
 1702282250 ./dev-perl/Time-Stopwatch/Time-Stopwatch-1.0.0.ebuild
@@ -26454,6 +26458,7 @@
 1702282250 ./dev-perl/Unicode-Map8/Unicode-Map8-0.130.0.ebuild
 1712040139 ./dev-perl/Email-Find/Email-Find-0.100.0-r1.ebuild
 1703152147 ./dev-perl/Test-MockTime/Test-MockTime-0.150.0.ebuild
+1803060708 ./dev-perl/Test-MockTime/Test-MockTime-0.160.0.ebuild
 1702282250 ./dev-perl/Statistics-Descriptive-Discrete/Statistics-Descriptive-Discrete-0.70.0-r1.ebuild
 1702282250 ./dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.61.200.ebuild
 1702282250 ./dev-perl/Tk-JPEG-Lite/Tk-JPEG-Lite-2.14.30-r1.ebuild
@@ -27216,7 +27221,7 @@
 1702282250 ./dev-perl/Module-Install-AuthorTests/Module-Install-AuthorTests-0.2.0.ebuild
 1711221213 ./dev-perl/Module-Install-AuthorTests/Module-Install-AuthorTests-0.2.0-r1.ebuild
 1702282250 ./dev-perl/DBD-SQLite/DBD-SQLite-1.500.0.ebuild
-1803030108 ./dev-perl/DBD-SQLite/DBD-SQLite-1.540.0-r1.ebuild
+1803052038 ./dev-perl/DBD-SQLite/DBD-SQLite-1.540.0-r1.ebuild
 1802282338 ./dev-perl/DBD-SQLite/DBD-SQLite-1.560.0.ebuild
 1709181547 ./dev-perl/Sub-Exporter-GlobExporter/Sub-Exporter-GlobExporter-0.5.0.ebuild
 1702282250 ./dev-perl/Net-Patricia/Net-Patricia-1.220.0.ebuild
@@ -27255,7 +27260,7 @@
 1702282250 ./dev-perl/PPIx-Regexp/PPIx-Regexp-0.51.0.ebuild
 1702282250 ./dev-perl/PPIx-Regexp/PPIx-Regexp-0.48.0.ebuild
 1709140706 ./dev-perl/XML-TokeParser/XML-TokeParser-0.50.0.ebuild
-1802260108 ./dev-perl/PadWalker/PadWalker-2.300.0.ebuild
+1803052038 ./dev-perl/PadWalker/PadWalker-2.300.0.ebuild
 1703152147 ./dev-perl/PadWalker/PadWalker-2.200.0.ebuild
 1702282250 ./dev-perl/Sys-Statistics-Linux/Sys-Statistics-Linux-0.660.0-r1.ebuild
 1706141318 ./dev-perl/Audio-FLAC-Header/Audio-FLAC-Header-2.400.0-r1.ebuild
@@ -27350,7 +27355,7 @@
 1702282250 ./net-nntp/tin/tin-2.3.1.ebuild
 1702282250 ./net-nntp/tin/tin-2.2.1.ebuild
 1702282250 ./net-nntp/tin/tin-2.0.1-r1.ebuild
-1803041008 ./net-nntp/tin/tin-2.4.2.ebuild
+1803052038 ./net-nntp/tin/tin-2.4.2.ebuild
 1702282250 ./net-nntp/sn/sn-0.3.8.ebuild
 1702282250 ./net-nntp/ubh/ubh-2.5.ebuild
 1710152137 ./net-nntp/leafnode/leafnode-1.11.11.ebuild
@@ -27638,7 +27643,9 @@
 1703162212 ./x11-apps/xf86dga/xf86dga-1.0.3.ebuild
 1702282250 ./x11-apps/transset/transset-1.0.1.ebuild
 1702282250 ./x11-apps/xwininfo/xwininfo-1.1.3.ebuild
+1803052039 ./x11-apps/appres/appres-1.0.5.ebuild
 1702282250 ./x11-apps/appres/appres-1.0.4.ebuild
+1803052039 ./x11-apps/editres/editres-1.0.7.ebuild
 1702282250 ./x11-apps/editres/editres-1.0.6.ebuild
 1702282250 ./x11-apps/rstart/rstart-1.0.5.ebuild
 1702282250 ./x11-apps/xprop/xprop-1.2.2.ebuild
@@ -27655,6 +27662,7 @@
 1702282250 ./x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild
 1702282250 ./x11-apps/mkfontscale/mkfontscale-1.1.1.ebuild
 1706191626 ./x11-apps/xsm/xsm-1.0.3.ebuild
+1803052039 ./x11-apps/viewres/viewres-1.0.5.ebuild
 1702282250 ./x11-apps/viewres/viewres-1.0.4.ebuild
 1702282250 ./x11-apps/xedit/xedit-1.2.2.ebuild
 1702282250 ./x11-apps/xedit/xedit-1.2.1.ebuild
@@ -27672,6 +27680,7 @@
 1702282250 ./x11-apps/xstdcmap/xstdcmap-1.0.3.ebuild
 1702282250 ./x11-apps/xgamma/xgamma-1.0.5.ebuild
 1702282250 ./x11-apps/xgamma/xgamma-1.0.6.ebuild
+1803052039 ./x11-apps/listres/listres-1.0.4.ebuild
 1702282250 ./x11-apps/listres/listres-1.0.3.ebuild
 1702282250 ./x11-apps/xinput/xinput-1.6.1.ebuild
 1702282250 ./x11-apps/xinput/xinput-1.6.2.ebuild
@@ -27693,6 +27702,7 @@
 1702282250 ./x11-apps/xcalc/xcalc-1.0.6.ebuild
 1702282250 ./x11-apps/fstobdf/fstobdf-1.0.6.ebuild
 1703161114 ./x11-apps/sessreg/sessreg-1.1.1.ebuild
+1803052238 ./x11-apps/iceauth/iceauth-1.0.8.ebuild
 1702282250 ./x11-apps/iceauth/iceauth-1.0.7.ebuild
 1702282250 ./x11-apps/iceauth/iceauth-1.0.6.ebuild
 1702282250 ./x11-apps/xditview/xditview-1.0.3.ebuild
@@ -27844,7 +27854,7 @@
 1708161014 ./x11-libs/libXres/libXres-1.0.7.ebuild
 1705241645 ./x11-libs/liboglappth/liboglappth-1.0.0.ebuild
 1703300018 ./x11-libs/pango/pango-1.40.3.ebuild
-1803030508 ./x11-libs/pango/pango-1.40.14.ebuild
+1803052039 ./x11-libs/pango/pango-1.40.14.ebuild
 1712271139 ./x11-libs/pango/pango-1.40.12.ebuild
 1702282250 ./x11-libs/libxkbfile/libxkbfile-1.0.9-r1.ebuild
 1702282250 ./x11-libs/libxkbfile/libxkbfile-1.0.8.ebuild
@@ -27868,6 +27878,7 @@
 1706171410 ./x11-libs/libdmx/libdmx-1.1.3.ebuild
 1703112004 ./x11-libs/libXvMC/libXvMC-1.0.10.ebuild
 1712271139 ./x11-libs/libgksu/libgksu-2.0.12-r3.ebuild
+1803052308 ./x11-libs/libxcb/libxcb-1.13.ebuild
 1708161014 ./x11-libs/libxcb/libxcb-1.12-r2.ebuild
 1706281341 ./x11-libs/libvdpau/libvdpau-1.1.1.ebuild
 1709021618 ./x11-libs/qwt/qwt-5.2.3-r2.ebuild
@@ -27877,7 +27888,7 @@
 1803021438 ./x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild
 1702282250 ./x11-libs/vte/vte-0.36.5.ebuild
 1712190209 ./x11-libs/vte/vte-0.46.2.ebuild
-1802170009 ./x11-libs/vte/vte-0.48.4.ebuild
+1803052039 ./x11-libs/vte/vte-0.48.4.ebuild
 1704210957 ./x11-libs/vte/vte-0.28.2-r208.ebuild
 1702282250 ./x11-libs/colord-gtk/colord-gtk-0.1.25.ebuild
 1707291732 ./x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild
@@ -27887,6 +27898,7 @@
 1803010908 ./x11-libs/libdrm/libdrm-9999.ebuild
 1801052239 ./x11-libs/libdrm/libdrm-2.4.88.ebuild
 1802280108 ./x11-libs/libdrm/libdrm-2.4.90.ebuild
+1803060238 ./x11-libs/libdrm/libdrm-2.4.91.ebuild
 1801052139 ./x11-libs/libdrm/libdrm-2.4.89.ebuild
 1702282250 ./x11-libs/agg/agg-2.5-r2.ebuild
 1702282250 ./x11-libs/libaosd/libaosd-0.2.7.ebuild
@@ -27910,6 +27922,7 @@
 1702282250 ./x11-libs/fox-wrapper/fox-wrapper-3.ebuild
 1702282250 ./x11-libs/fox-wrapper/fox-wrapper-2.ebuild
 1712140039 ./x11-libs/libXcursor/libXcursor-1.1.15.ebuild
+1803052238 ./x11-libs/gl2ps/gl2ps-1.4.0.ebuild
 1703150850 ./x11-libs/gl2ps/gl2ps-1.3.9.ebuild
 1702282250 ./x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
 1706281345 ./x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r4.ebuild
@@ -27937,7 +27950,7 @@
 1706181158 ./x11-libs/libqxt/libqxt-0.6.2-r2.ebuild
 1707111141 ./x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
 1709181345 ./x11-libs/libwnck/libwnck-3.20.1.ebuild
-1802170009 ./x11-libs/libwnck/libwnck-3.24.1.ebuild
+1803052039 ./x11-libs/libwnck/libwnck-3.24.1.ebuild
 1702282250 ./x11-libs/libwnck/libwnck-2.31.0.ebuild
 1702282250 ./x11-libs/mx/mx-1.4.7-r2.ebuild
 1702282250 ./x11-libs/xpa/xpa-2.1.15.ebuild
@@ -27972,6 +27985,7 @@
 1708191902 ./x11-libs/gtef/gtef-2.0.1.ebuild
 1706171410 ./x11-libs/libXaw3d/libXaw3d-1.6.2.ebuild
 1702282250 ./x11-libs/libXxf86dga/libXxf86dga-1.1.4.ebuild
+1803052039 ./x11-libs/qscintilla/qscintilla-2.10.3.ebuild
 1711262240 ./x11-libs/qscintilla/qscintilla-2.10.1.ebuild
 1711250409 ./x11-libs/qscintilla/qscintilla-2.10.2.ebuild
 1803030508 ./x11-libs/cairo/cairo-1.14.12.ebuild
@@ -28018,7 +28032,7 @@
 1702282250 ./x11-libs/libiterm-mbt/libiterm-mbt-0.5.ebuild
 1707071311 ./x11-libs/gtksourceview/gtksourceview-3.22.2.ebuild
 1702282250 ./x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild
-1802170009 ./x11-libs/gtksourceview/gtksourceview-3.24.6.ebuild
+1803052039 ./x11-libs/gtksourceview/gtksourceview-3.24.6.ebuild
 1702282250 ./x11-libs/libfm-extra/libfm-extra-1.2.3.ebuild
 1702282250 ./x11-libs/libfm-extra/libfm-extra-1.2.4.ebuild
 1803010138 ./x11-libs/libfm-extra/libfm-extra-1.2.5.ebuild
@@ -28064,8 +28078,9 @@
 1702282250 ./app-backup/snapper/snapper-0.3.3.ebuild
 1707301145 ./app-backup/snapper/snapper-9999.ebuild
 1712281839 ./app-backup/cpdup/cpdup-1.18.ebuild
+1803052038 ./app-backup/btrbk/btrbk-0.26.1.ebuild
 1707312128 ./app-backup/btrbk/btrbk-0.24.0-r1.ebuild
-1710122121 ./app-backup/btrbk/btrbk-9999.ebuild
+1803052038 ./app-backup/btrbk/btrbk-9999.ebuild
 1710122121 ./app-backup/btrbk/btrbk-0.26.0.ebuild
 1712161339 ./app-backup/btrbk/btrbk-0.25.1-r1.ebuild
 1710271648 ./app-backup/backuppc/backuppc-3.3.1-r5.ebuild
@@ -28230,6 +28245,7 @@
 1702282250 ./x11-proto/xf86dgaproto/xf86dgaproto-2.1-r2.ebuild
 1703010329 ./x11-proto/recordproto/recordproto-1.14.2-r1.ebuild
 1802262238 ./x11-proto/recordproto/recordproto-1.14.2-r2.ebuild
+1803052308 ./x11-proto/xcb-proto/xcb-proto-1.13.ebuild
 1708161015 ./x11-proto/xcb-proto/xcb-proto-1.12-r2.ebuild
 1702282250 ./x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0-r1.ebuild
 1802262238 ./x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0-r2.ebuild
@@ -28520,7 +28536,7 @@
 1702282250 ./x11-wm/goomwwm/goomwwm-1.0.0.ebuild
 1703111131 ./x11-wm/goomwwm/goomwwm-1.0.0-r1.ebuild
 1703111145 ./x11-wm/goomwwm/goomwwm-9999.ebuild
-1801041639 ./x11-wm/afterstep/afterstep-2.2.12.ebuild
+1803052338 ./x11-wm/afterstep/afterstep-2.2.12.ebuild
 1702282250 ./x11-wm/xmonad/xmonad-0.11.1.ebuild
 1702282250 ./x11-wm/xmonad/xmonad-0.11-r1.ebuild
 1702282250 ./x11-wm/xmonad/xmonad-0.11-r3.ebuild
@@ -28540,7 +28556,6 @@
 1702282250 ./x11-wm/aewm/aewm-1.3.12.ebuild
 1702282250 ./x11-wm/plwm/plwm-2.7_rc1-r1.ebuild
 1710292151 ./x11-wm/stumpwm/stumpwm-1.0.1_rc.ebuild
-1707171158 ./x11-wm/stumpwm/stumpwm-1.0.0.ebuild
 1710160634 ./x11-wm/wmfs/wmfs-201003.ebuild
 1702282250 ./x11-wm/wmfs/wmfs-99999999.ebuild
 1702282250 ./x11-wm/page/page-1.9.8.ebuild
@@ -29167,7 +29182,7 @@
 1803041938 ./net-dns/bind-tools/bind-tools-9.11.2_p1.ebuild
 1803031938 ./net-dns/bind-tools/bind-tools-9.11.1_p3.ebuild
 1702282250 ./net-dns/bind-dns-keygen/bind-dns-keygen-9.3.2.39-r1.ebuild
-1803012338 ./net-dns/idnkit/idnkit-2.3.ebuild
+1803052038 ./net-dns/idnkit/idnkit-2.3.ebuild
 1803012238 ./net-dns/idnkit/idnkit-1.0-r2.ebuild
 1712142339 ./net-dns/pdns-recursor/pdns-recursor-4.0.8.ebuild
 1801221839 ./net-dns/pdns-recursor/pdns-recursor-4.1.1.ebuild
@@ -29206,7 +29221,7 @@
 1702282250 ./dev-scheme/guile/guile-1.8.8-r3.ebuild
 1801151439 ./dev-scheme/guile/guile-2.0.13-r2.ebuild
 1802131108 ./dev-scheme/guile/guile-2.0.14-r3.ebuild
-1802221208 ./dev-scheme/slib/slib-3.2.5-r1.ebuild
+1803052038 ./dev-scheme/slib/slib-3.2.5-r1.ebuild
 1702282250 ./dev-scheme/slib/slib-3.2.2.ebuild
 1702282250 ./dev-scheme/slib/slib-3.2.1.ebuild
 1802102208 ./dev-scheme/guile-gui/guile-gui-0.2-r1.ebuild
@@ -30810,7 +30825,7 @@
 1703071217 ./app-leechcraft/lc-poshuku/lc-poshuku-9999.ebuild
 1702282250 ./app-leechcraft/lc-gmailnotifier/lc-gmailnotifier-9999.ebuild
 1702282250 ./app-leechcraft/lc-rosenthal/lc-rosenthal-9999.ebuild
-1702282250 ./app-leechcraft/lc-popishu/lc-popishu-9999.ebuild
+1803052038 ./app-leechcraft/lc-popishu/lc-popishu-9999.ebuild
 1702282250 ./app-leechcraft/lc-lemon/lc-lemon-9999.ebuild
 1802222238 ./app-leechcraft/leechcraft-meta/leechcraft-meta-9999.ebuild
 1707301146 ./app-leechcraft/laretz/laretz-9999.ebuild
@@ -31074,7 +31089,7 @@
 1704032142 ./app-xemacs/ps-print/ps-print-1.11.ebuild
 1704032142 ./app-xemacs/ps-print/ps-print-1.12.ebuild
 1710292351 ./app-xemacs/ebuild-mode/ebuild-mode-1.38.ebuild
-1803041008 ./app-xemacs/ebuild-mode/ebuild-mode-1.42.ebuild
+1803052038 ./app-xemacs/ebuild-mode/ebuild-mode-1.42.ebuild
 1706211327 ./app-xemacs/debug/debug-1.18.ebuild
 1708091514 ./app-xemacs/xemacs-base/xemacs-base-2.27.ebuild
 1708091514 ./app-xemacs/xemacs-base/xemacs-base-2.10-r1.ebuild
@@ -31244,7 +31259,7 @@
 1704011931 ./net-misc/vino/vino-3.22.0.ebuild
 1801231609 ./net-misc/dhcpcd/dhcpcd-7.0.0.ebuild
 1801231609 ./net-misc/dhcpcd/dhcpcd-9999.ebuild
-1802141638 ./net-misc/dhcpcd/dhcpcd-6.11.5.ebuild
+1803052038 ./net-misc/dhcpcd/dhcpcd-6.11.5.ebuild
 1801231609 ./net-misc/dhcpcd/dhcpcd-6.11.3.ebuild
 1802062108 ./net-misc/dhcpcd/dhcpcd-7.0.1.ebuild
 1702282250 ./net-misc/pyhoca-gui/pyhoca-gui-0.5.0.6.ebuild
@@ -31321,8 +31336,7 @@
 1705261144 ./net-misc/geoipupdate/geoipupdate-2.4.0.ebuild
 1708151233 ./net-misc/rwhoisd/rwhoisd-1.5.9.6.ebuild
 1702282250 ./net-misc/rwhoisd/rwhoisd-1.5.9.5-r3.ebuild
-1702282250 ./net-misc/valve/valve-1.0.ebuild
-1702282250 ./net-misc/valve/valve-1.0-r1.ebuild
+1803052038 ./net-misc/valve/valve-1.0-r1.ebuild
 1702282250 ./net-misc/mulk/mulk-0.7.0.ebuild
 1702282250 ./net-misc/mulk/mulk-0.6.0.ebuild
 1702282250 ./net-misc/tiers/tiers-1.1.ebuild
@@ -31388,8 +31402,8 @@
 1710031905 ./net-misc/asterisk/asterisk-13.17.2.ebuild
 1801251338 ./net-misc/asterisk/asterisk-13.19.0-r1.ebuild
 1702282250 ./net-misc/gns3-server/gns3-server-1.5.3.1.ebuild
+1803052038 ./net-misc/gns3-server/gns3-server-2.1.3-r1.ebuild
 1711131213 ./net-misc/gns3-server/gns3-server-2.0.3-r1.ebuild
-1803030538 ./net-misc/gns3-server/gns3-server-2.1.3.ebuild
 1702282250 ./net-misc/dcetest/dcetest-2.0.ebuild
 1801141909 ./net-misc/uftp/uftp-3.7.1.ebuild
 1802050308 ./net-misc/uftp/uftp-4.9.5.ebuild
@@ -31459,8 +31473,7 @@
 1702282250 ./net-misc/plowshare/plowshare-9999.ebuild
 1704031312 ./net-misc/plowshare/plowshare-2.1.6.ebuild
 1708301356 ./net-misc/plowshare/plowshare-2.1.7.ebuild
-1801261739 ./net-misc/dropbox/dropbox-41.3.76.ebuild
-1801261739 ./net-misc/dropbox/dropbox-43.3.47.ebuild
+1803052038 ./net-misc/dropbox/dropbox-45.3.88.ebuild
 1702282250 ./net-misc/openrdate/openrdate-1.2.ebuild
 1703171656 ./net-misc/networkmanager-openconnect/networkmanager-openconnect-1.2.4.ebuild
 1712161609 ./net-misc/networkmanager-openconnect/networkmanager-openconnect-1.2.4-r1.ebuild
@@ -31543,9 +31556,9 @@
 1704050302 ./net-misc/mosh/mosh-1.3.0.ebuild
 1702282250 ./net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r1.ebuild
 1706071940 ./net-misc/yangcli-pro/yangcli-pro-16.10_p8.ebuild
+1803052038 ./net-misc/gns3-gui/gns3-gui-2.1.3-r1.ebuild
 1702282250 ./net-misc/gns3-gui/gns3-gui-1.5.3.1.ebuild
 1709270124 ./net-misc/gns3-gui/gns3-gui-2.0.3-r1.ebuild
-1803030538 ./net-misc/gns3-gui/gns3-gui-2.1.3.ebuild
 1702282250 ./net-misc/arpsponge/arpsponge-3.12.2.ebuild
 1707070108 ./net-misc/zerotier/zerotier-1.2.4.ebuild
 1702282250 ./net-misc/secpanel/secpanel-0.6.1-r1.ebuild
@@ -31595,12 +31608,13 @@
 1709141505 ./net-misc/sgopherd/sgopherd-17.09.ebuild
 1702282250 ./net-misc/redir/redir-2.2.1.ebuild
 1711130838 ./net-misc/nyx/nyx-2.0.4.ebuild
+1803052138 ./net-misc/dropbear/dropbear-2018.76.ebuild
 1801120840 ./net-misc/dropbear/dropbear-2017.75.ebuild
 1801101239 ./net-misc/dropbear/dropbear-2016.74.ebuild
 1801231609 ./net-misc/rsync/rsync-3.1.2-r2.ebuild
-1803021338 ./net-misc/rsync/rsync-3.1.3.ebuild
+1803052038 ./net-misc/rsync/rsync-3.1.3.ebuild
 1706261137 ./net-misc/libteam/libteam-1.22.ebuild
-1803030538 ./net-misc/ubridge/ubridge-0.9.14.ebuild
+1803052038 ./net-misc/ubridge/ubridge-0.9.14.ebuild
 1702282250 ./net-misc/tn5250/tn5250-0.17.4-r1.ebuild
 1803021408 ./net-misc/tn5250/tn5250-0.17.4-r2.ebuild
 1702282250 ./net-misc/ucarp/ucarp-1.5.2-r5.ebuild
@@ -31686,7 +31700,7 @@
 1801231609 ./net-misc/dhcp/dhcp-4.3.4.ebuild
 1801231609 ./net-misc/dhcp/dhcp-4.3.6-r1.ebuild
 1801231609 ./net-misc/dhcp/dhcp-4.3.5.ebuild
-1803041438 ./net-misc/dhcp/dhcp-4.3.6_p1.ebuild
+1803052038 ./net-misc/dhcp/dhcp-4.3.6_p1.ebuild
 1702282250 ./net-misc/slimrat/slimrat-9999.ebuild
 1702282250 ./net-misc/urlview/urlview-0.9.ebuild
 1702282250 ./net-misc/bird/bird-1.6.3.ebuild
@@ -31774,7 +31788,7 @@
 1801031809 ./net-misc/felix/felix-3.0.1.ebuild
 1802191908 ./net-misc/felix/felix-3.0.2.ebuild
 1702282250 ./net-misc/socat/socat-2.0.0_beta9.ebuild
-1711052106 ./net-misc/socat/socat-1.7.3.2.ebuild
+1803052038 ./net-misc/socat/socat-1.7.3.2.ebuild
 1702282250 ./net-misc/socat/socat-9999.ebuild
 1702282250 ./net-misc/socat/socat-1.7.3.1.ebuild
 1802221338 ./net-misc/x2goserver/x2goserver-4.0.1.22-r1.ebuild
@@ -31819,8 +31833,8 @@
 1710041745 ./net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r4.ebuild
 1702282250 ./net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r2.ebuild
 1702282250 ./net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r3.ebuild
+1803052038 ./net-misc/iperf/iperf-3.5.ebuild
 1702282250 ./net-misc/iperf/iperf-3.1.3.ebuild
-1711082016 ./net-misc/iperf/iperf-3.3.ebuild
 1802151838 ./net-misc/iperf/iperf-3.4.ebuild
 1709111121 ./net-misc/iperf/iperf-2.0.10.ebuild
 1702282250 ./net-misc/iperf/iperf-2.0.9.ebuild
@@ -31851,7 +31865,7 @@
 1702282250 ./net-misc/httpie/httpie-0.9.3.ebuild
 1703171656 ./net-misc/openvpn-auth-ldap/openvpn-auth-ldap-2.0.4_pre20131110.ebuild
 1801280138 ./net-misc/quagga/quagga-1.2.2-r1.ebuild
-1802261038 ./net-misc/quagga/quagga-1.2.4.ebuild
+1803052038 ./net-misc/quagga/quagga-1.2.4.ebuild
 1802201438 ./net-misc/quagga/quagga-1.2.2.ebuild
 1707020011 ./net-misc/seafile-client/seafile-client-6.0.7.ebuild
 1801120210 ./net-misc/seafile-client/seafile-client-6.1.4.ebuild
@@ -31964,7 +31978,7 @@
 1708230040 ./dev-games/aseprite/aseprite-1.1.7.ebuild
 1708230040 ./dev-games/aseprite/aseprite-1.1.6.ebuild
 1702282250 ./dev-games/mercator/mercator-0.3.3.ebuild
-1802262308 ./dev-games/openscenegraph/openscenegraph-3.5.5.ebuild
+1803052038 ./dev-games/openscenegraph/openscenegraph-3.5.5.ebuild
 1802070508 ./dev-games/openscenegraph/openscenegraph-3.5.1-r2.ebuild
 1707090132 ./dev-games/cardpics/cardpics-0.4.ebuild
 1702282250 ./dev-games/ois/ois-1.3.ebuild
@@ -32142,7 +32156,7 @@
 1702282250 ./mail-client/mailx-support/mailx-support-20060102-r1.ebuild
 1702282250 ./mail-client/mailx-support/mailx-support-20060102-r2.ebuild
 1702282250 ./mail-client/hap/hap-3.7-r1.ebuild
-1802260108 ./mail-client/sylpheed/sylpheed-3.6.0.ebuild
+1803052038 ./mail-client/sylpheed/sylpheed-3.6.0.ebuild
 1711140118 ./mail-client/sylpheed/sylpheed-3.5.1.ebuild
 1802221638 ./mail-client/sylpheed/sylpheed-3.7.0.ebuild
 1703190650 ./mail-client/clawsker/clawsker-0.7.10.ebuild
@@ -32206,6 +32220,7 @@
 1702282250 ./sys-apps/fwcrv/fwcrv-0.1.0.ebuild
 1803040938 ./sys-apps/gawk/gawk-4.1.3.ebuild
 1803040938 ./sys-apps/gawk/gawk-4.2.0.ebuild
+1803052208 ./sys-apps/gawk/gawk-4.2.1-r1.ebuild
 1803040938 ./sys-apps/gawk/gawk-4.2.1.ebuild
 1801231609 ./sys-apps/gawk/gawk-3.1.8.ebuild
 1803040938 ./sys-apps/gawk/gawk-4.1.4.ebuild
@@ -32278,7 +32293,7 @@
 1702282250 ./sys-apps/iotools/iotools-1.5.ebuild
 1702282250 ./sys-apps/hwdata-gentoo/hwdata-gentoo-0.4.ebuild
 1802171609 ./sys-apps/shadow/shadow-4.5-r1.ebuild
-1801061839 ./sys-apps/shadow/shadow-4.5.ebuild
+1803052039 ./sys-apps/shadow/shadow-4.5.ebuild
 1801061839 ./sys-apps/shadow/shadow-4.4-r2.ebuild
 1702282250 ./sys-apps/hwdata-redhat/hwdata-redhat-0.217.ebuild
 1801101740 ./sys-apps/acl/acl-2.2.52-r2.ebuild
@@ -32315,7 +32330,7 @@
 1803041138 ./sys-apps/hdparm/hdparm-9.52.ebuild
 1802051838 ./sys-apps/hdparm/hdparm-9.54.ebuild
 1706101759 ./sys-apps/hdparm/hdparm-9.51.ebuild
-1802172339 ./sys-apps/prctl/prctl-1.6.ebuild
+1803052039 ./sys-apps/prctl/prctl-1.6.ebuild
 1702282250 ./sys-apps/prctl/prctl-1.5.ebuild
 1709251512 ./sys-apps/prefix-chain-utils/prefix-chain-utils-0.2-r7.ebuild
 1801221709 ./sys-apps/ipmiutil/ipmiutil-3.0.8.ebuild
@@ -32363,6 +32378,7 @@
 1702282250 ./sys-apps/ucspi-tcp/ucspi-tcp-0.88-r17.ebuild
 1801290338 ./sys-apps/systemd/systemd-233-r6.ebuild
 1803031708 ./sys-apps/systemd/systemd-236-r5.ebuild
+1803052138 ./sys-apps/systemd/systemd-237-r3.ebuild
 1802261938 ./sys-apps/systemd/systemd-9999.ebuild
 1802261938 ./sys-apps/systemd/systemd-237-r2.ebuild
 1702282250 ./sys-apps/dchroot/dchroot-0.12.1.ebuild
@@ -32396,7 +32412,7 @@
 1702282250 ./sys-apps/s6/s6-2.4.0.0.ebuild
 1708312330 ./sys-apps/crazydiskinfo/crazydiskinfo-1.0.2.ebuild
 1702282250 ./sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild
-1803041008 ./sys-apps/qingy/qingy-1.0.0-r3.ebuild
+1803052039 ./sys-apps/qingy/qingy-1.0.0-r3.ebuild
 1702282250 ./sys-apps/qingy/qingy-1.0.0-r2.ebuild
 1706201124 ./sys-apps/elfix/elfix-9999.ebuild
 1706201124 ./sys-apps/elfix/elfix-0.9.2.ebuild
@@ -32447,7 +32463,8 @@
 1702282250 ./sys-apps/edac-utils/edac-utils-0.18.ebuild
 1702282250 ./sys-apps/lkcdutils/lkcdutils-6.2.0.ebuild
 1702282250 ./sys-apps/lkcdutils/lkcdutils-4.1.1.ebuild
-1712180209 ./sys-apps/dbus-broker/dbus-broker-9999.ebuild
+1803052039 ./sys-apps/dbus-broker/dbus-broker-9999.ebuild
+1803052039 ./sys-apps/dbus-broker/dbus-broker-11.ebuild
 1712110040 ./sys-apps/dbus-broker/dbus-broker-9.ebuild
 1712021739 ./sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild
 1710240310 ./sys-apps/elivepatch-client/elivepatch-client-9999.ebuild
@@ -32528,8 +32545,9 @@
 1801231609 ./sys-apps/sed/sed-4.2.2.ebuild
 1801231609 ./sys-apps/sed/sed-4.4.ebuild
 1801231609 ./sys-apps/sed/sed-4.3-r1.ebuild
+1803052208 ./sys-apps/sed/sed-4.4-r1.ebuild
 1801231609 ./sys-apps/man/man-1.6g.ebuild
-1801231609 ./sys-apps/man/man-1.6g-r1.ebuild
+1803060038 ./sys-apps/man/man-1.6g-r1.ebuild
 1803040108 ./sys-apps/miller/miller-5.3.0.ebuild
 1704170059 ./sys-apps/miller/miller-4.2.0.ebuild
 1801061209 ./sys-apps/miller/miller-5.2.2.ebuild
@@ -32658,7 +32676,7 @@
 1801231609 ./sys-apps/debianutils/debianutils-4.7.ebuild
 1712021939 ./sys-apps/audio-entropyd/audio-entropyd-2.0.3-r1.ebuild
 1702282250 ./sys-apps/bleachbit/bleachbit-1.12.ebuild
-1801031439 ./sys-apps/bleachbit/bleachbit-1.19-r1.ebuild
+1803052039 ./sys-apps/bleachbit/bleachbit-2.0.ebuild
 1708301438 ./sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild
 1708301438 ./sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild
 1712082039 ./sys-apps/inxi/inxi-2.3.37.ebuild
@@ -32772,7 +32790,7 @@
 1702282250 ./sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild
 1702282250 ./sys-apps/ucspi-ssl/ucspi-ssl-0.97.ebuild
 1704152306 ./sys-apps/ucspi-ssl/ucspi-ssl-0.99.ebuild
-1802252138 ./sys-apps/hwids/hwids-20171003.ebuild
+1803052039 ./sys-apps/hwids/hwids-20171003.ebuild
 1707151819 ./sys-apps/hwids/hwids-20170715.ebuild
 1710060102 ./sys-apps/hwids/hwids-99999999.ebuild
 1801120740 ./sys-apps/hwids/hwids-20170328.ebuild
@@ -32797,7 +32815,6 @@
 1702282250 ./sys-apps/frandom/frandom-1.1.ebuild
 1802261408 ./sys-apps/habitat/habitat-0.54.0.ebuild
 1707311827 ./sys-apps/habitat/habitat-0.28.0.ebuild
-1702282250 ./sys-apps/qdiskusage/qdiskusage-1.0.4.ebuild
 1708230031 ./sys-apps/adjtime/adjtime-0.4-r2.ebuild
 1702282250 ./sys-apps/netloc/netloc-0.5.ebuild
 1801060139 ./sys-apps/preload/preload-0.6.4-r3.ebuild
@@ -33010,7 +33027,7 @@
 1702282250 ./media-libs/SoXt/SoXt-1.3.0.ebuild
 1702282250 ./media-libs/skstream/skstream-0.3.9.ebuild
 1708311526 ./media-libs/libtheora/libtheora-1.1.1-r1.ebuild
-1802252138 ./media-libs/opus/opus-1.2.1.ebuild
+1803052038 ./media-libs/opus/opus-1.2.1.ebuild
 1708311556 ./media-libs/opus/opus-1.1.3-r1.ebuild
 1709062358 ./media-libs/oyranos/oyranos-0.9.6.ebuild
 1702282250 ./media-libs/oyranos/oyranos-9999.ebuild
@@ -33072,7 +33089,7 @@
 1707280744 ./media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r1.ebuild
 1712241509 ./media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r3.ebuild
 1702282250 ./media-libs/resid/resid-0.16_p2.ebuild
-1704242158 ./media-libs/resid/resid-0.16_p2-r1.ebuild
+1803060038 ./media-libs/resid/resid-0.16_p2-r1.ebuild
 1702282250 ./media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.08.01.ebuild
 1702282250 ./media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.04.ebuild
 1801281738 ./media-libs/openexr/openexr-2.2.0-r2.ebuild
@@ -33083,8 +33100,7 @@
 1702282250 ./media-libs/openexr/openexr-2.2.0.ebuild
 1706161325 ./media-libs/libcaca/libcaca-0.99_beta19.ebuild
 1702282250 ./media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild
-1702282250 ./media-libs/simage/simage-1.7.0.ebuild
-1801170839 ./media-libs/simage/simage-1.7.0-r1.ebuild
+1803052038 ./media-libs/simage/simage-1.7.0-r1.ebuild
 1707291534 ./media-libs/gupnp-dlna/gupnp-dlna-0.10.5.ebuild
 1702282250 ./media-libs/gupnp-dlna/gupnp-dlna-0.10.4.ebuild
 1702282250 ./media-libs/libfishsound/libfishsound-1.0.0.ebuild
@@ -33098,6 +33114,7 @@
 1802131408 ./media-libs/fontconfig-infinality/fontconfig-infinality-20130404.ebuild
 1712092209 ./media-libs/libaacs/libaacs-0.7.1.ebuild
 1712092209 ./media-libs/libaacs/libaacs-0.9.0.ebuild
+1803052038 ./media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild
 1702282250 ./media-libs/sdl2-gfx/sdl2-gfx-1.0.3.ebuild
 1702282250 ./media-libs/sdl2-gfx/sdl2-gfx-1.0.1.ebuild
 1802192308 ./media-libs/elementary/elementary-1.17.0.ebuild
@@ -33107,7 +33124,7 @@
 1702282250 ./media-libs/libshout/libshout-2.3.1-r1.ebuild
 1707081218 ./media-libs/libshout/libshout-2.4.1.ebuild
 1702282250 ./media-libs/libshout/libshout-2.3.1.ebuild
-1803041338 ./media-libs/libshout/libshout-2.4.1-r1.ebuild
+1803052038 ./media-libs/libshout/libshout-2.4.1-r1.ebuild
 1702282250 ./media-libs/sdl2-net/sdl2-net-2.0.1.ebuild
 1710082208 ./media-libs/libzmf/libzmf-9999.ebuild
 1711160433 ./media-libs/libzmf/libzmf-0.0.2.ebuild
@@ -33145,6 +33162,7 @@
 1802260108 ./media-libs/libmatroska/libmatroska-1.4.8.ebuild
 1710251047 ./media-libs/sdl2-image/sdl2-image-2.0.2.ebuild
 1705201043 ./media-libs/sdl2-image/sdl2-image-2.0.1.ebuild
+1803052038 ./media-libs/sdl2-image/sdl2-image-2.0.3.ebuild
 1702282250 ./media-libs/wxsvg/wxsvg-1.5.9.ebuild
 1711072148 ./media-libs/wxsvg/wxsvg-1.5.11.ebuild
 1704260837 ./media-libs/libmpdclient/libmpdclient-2.11.ebuild
@@ -33240,12 +33258,12 @@
 1711070141 ./media-libs/gexiv2/gexiv2-0.10.3.ebuild
 1711070141 ./media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild
 1802112238 ./media-libs/gexiv2/gexiv2-0.10.6.ebuild
-1802221208 ./media-libs/gexiv2/gexiv2-0.10.8.ebuild
+1803052038 ./media-libs/gexiv2/gexiv2-0.10.8.ebuild
 1702282250 ./media-libs/aalib/aalib-1.4_rc5-r7.ebuild
 1707261346 ./media-libs/aalib/aalib-1.4_rc5-r8.ebuild
 1702282250 ./media-libs/aalib/aalib-1.4_rc5-r6.ebuild
 1801231609 ./media-libs/fontconfig/fontconfig-2.12.4.ebuild
-1803030508 ./media-libs/fontconfig/fontconfig-2.12.6.ebuild
+1803052038 ./media-libs/fontconfig/fontconfig-2.12.6.ebuild
 1801231609 ./media-libs/fontconfig/fontconfig-2.11.1-r2.ebuild
 1802221338 ./media-libs/fontconfig/fontconfig-2.12.93.ebuild
 1708312037 ./media-libs/smpeg/smpeg-0.4.4-r10.ebuild
@@ -33302,15 +33320,15 @@
 1711281010 ./media-libs/libdvdcss/libdvdcss-1.4.0.ebuild
 1712092209 ./media-libs/libdvdcss/libdvdcss-1.3.0.ebuild
 1712092209 ./media-libs/x264/x264-0.0.20160712.ebuild
-1802261738 ./media-libs/x264/x264-0.0.20170701.ebuild
+1803052038 ./media-libs/x264/x264-0.0.20170701.ebuild
 1802252308 ./media-libs/x264/x264-9999.ebuild
 1708051454 ./media-libs/libebur128/libebur128-1.2.2.ebuild
 1702282250 ./media-libs/libebur128/libebur128-1.0.2.ebuild
 1702282250 ./media-libs/libebur128/libebur128-1.1.0.ebuild
-1803021908 ./media-libs/libebur128/libebur128-1.2.3.ebuild
+1803052338 ./media-libs/libebur128/libebur128-1.2.3.ebuild
 1706102312 ./media-libs/libebur128/libebur128-1.2.0-r1.ebuild
 1702282250 ./media-libs/libebur128/libebur128-1.0.3.ebuild
-1802221208 ./media-libs/libogg/libogg-1.3.3.ebuild
+1803052038 ./media-libs/libogg/libogg-1.3.3.ebuild
 1708311541 ./media-libs/libogg/libogg-1.3.2.ebuild
 1712162039 ./media-libs/qtav/qtav-1.12.0.ebuild
 1802061938 ./media-libs/partio/partio-1.1.0_p20170829.ebuild
@@ -33320,7 +33338,7 @@
 1710251047 ./media-libs/faac/faac-1.29.8.3.ebuild
 1706192306 ./media-libs/faac/faac-1.28-r4.ebuild
 1711211808 ./media-libs/faac/faac-1.29.9.2.ebuild
-1802221208 ./media-libs/libkate/libkate-0.4.1-r3.ebuild
+1803052038 ./media-libs/libkate/libkate-0.4.1-r3.ebuild
 1712021409 ./media-libs/libkate/libkate-0.4.1-r2.ebuild
 1803031538 ./media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild
 1702282250 ./media-libs/libprojectm-qt/libprojectm-qt-2.1.0-r1.ebuild
@@ -33357,7 +33375,7 @@
 1802192308 ./media-libs/libvisio/libvisio-9999.ebuild
 1802192308 ./media-libs/libvisio/libvisio-0.1.6.ebuild
 1802192308 ./media-libs/libfreehand/libfreehand-9999.ebuild
-1802192308 ./media-libs/libfreehand/libfreehand-0.1.2.ebuild
+1803052038 ./media-libs/libfreehand/libfreehand-0.1.2.ebuild
 1702282250 ./media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild
 1702282250 ./media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild
 1712181939 ./media-libs/libsvgtiny/libsvgtiny-0.1.6.ebuild
@@ -33443,7 +33461,7 @@
 1702282250 ./media-libs/libnjb/libnjb-2.2.6.ebuild
 1712092209 ./media-libs/libdvbpsi/libdvbpsi-1.3.0-r1.ebuild
 1802202238 ./media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild
-1802261108 ./media-libs/libdvbpsi/libdvbpsi-1.3.1.ebuild
+1803052038 ./media-libs/libdvbpsi/libdvbpsi-1.3.1.ebuild
 1702282250 ./media-libs/libxtract/libxtract-0.6.6.ebuild
 1711301710 ./media-libs/zimg/zimg-9999.ebuild
 1711301710 ./media-libs/zimg/zimg-2.6.3.ebuild
@@ -33518,7 +33536,7 @@
 1702282250 ./media-libs/libggimisc/libggimisc-2.2.2.ebuild
 1708231413 ./media-libs/libdvdread/libdvdread-5.0.3.ebuild
 1801211338 ./media-libs/libdvdread/libdvdread-9999.ebuild
-1802261108 ./media-libs/libdvdread/libdvdread-6.0.0.ebuild
+1803052038 ./media-libs/libdvdread/libdvdread-6.0.0.ebuild
 1702282250 ./media-libs/libsdl/libsdl-1.2.15-r9.ebuild
 1712210109 ./media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.2.0.ebuild
 1706181444 ./media-libs/rubberband/rubberband-1.8.1-r1.ebuild
@@ -33540,7 +33558,7 @@
 1702282250 ./media-libs/libjackasyn/libjackasyn-0.13.ebuild
 1712122339 ./media-libs/libgroove/libgroove-4.3.0-r1.ebuild
 1704141927 ./media-libs/giblib/giblib-1.2.4.ebuild
-1704141927 ./media-libs/giblib/giblib-1.2.4-r1.ebuild
+1803060038 ./media-libs/giblib/giblib-1.2.4-r1.ebuild
 1702282250 ./media-libs/gnonlin/gnonlin-1.4.0-r1.ebuild
 1702282250 ./media-libs/gnonlin/gnonlin-0.10.17.ebuild
 1706151723 ./media-libs/lv2/lv2-1.12.0.ebuild
@@ -33561,20 +33579,20 @@
 1708312037 ./media-libs/rtaudio/rtaudio-4.1.2.ebuild
 1708312037 ./media-libs/rtaudio/rtaudio-4.0.12-r1.ebuild
 1708312135 ./media-libs/rtaudio/rtaudio-5.0.0.ebuild
-1803041008 ./media-libs/lensfun/lensfun-0.3.2-r1.ebuild
+1803052038 ./media-libs/lensfun/lensfun-0.3.2-r1.ebuild
 1706181251 ./media-libs/lensfun/lensfun-0.3.2.ebuild
 1704231426 ./media-libs/lensfun/lensfun-0.3.1.ebuild
-1803021538 ./media-libs/libsdl2/libsdl2-2.0.8.ebuild
+1803052338 ./media-libs/libsdl2/libsdl2-2.0.8.ebuild
 1803021538 ./media-libs/libsdl2/libsdl2-2.0.5.ebuild
 1803021538 ./media-libs/libsdl2/libsdl2-2.0.4.ebuild
 1803021538 ./media-libs/libsdl2/libsdl2-2.0.5-r1.ebuild
-1803021538 ./media-libs/libsdl2/libsdl2-2.0.7.ebuild
+1803052338 ./media-libs/libsdl2/libsdl2-2.0.7.ebuild
 1707291534 ./media-libs/libiptcdata/libiptcdata-1.0.4-r1.ebuild
 1702282250 ./media-libs/libjsw/libjsw-1.5.8.ebuild
 1702282250 ./media-libs/varconf/varconf-0.6.6.ebuild
 1702282250 ./media-libs/varconf/varconf-0.6.7-r1.ebuild
 1702282250 ./media-libs/varconf/varconf-0.6.7.ebuild
-1802261108 ./media-libs/libdvdnav/libdvdnav-6.0.0.ebuild
+1803052038 ./media-libs/libdvdnav/libdvdnav-6.0.0.ebuild
 1801211338 ./media-libs/libdvdnav/libdvdnav-9999.ebuild
 1708231414 ./media-libs/libdvdnav/libdvdnav-5.0.3.ebuild
 1704231426 ./media-libs/ganv/ganv-1.4.2.ebuild
@@ -33651,7 +33669,7 @@
 1704132229 ./media-libs/libdv/libdv-1.0.0-r2.ebuild
 1712092209 ./media-libs/libdvdplay/libdvdplay-1.0.1.ebuild
 1702282250 ./media-libs/fluidsynth-dssi/fluidsynth-dssi-1.0.0.ebuild
-1802192308 ./media-libs/libcdr/libcdr-0.1.4.ebuild
+1803052038 ./media-libs/libcdr/libcdr-0.1.4.ebuild
 1802192308 ./media-libs/libcdr/libcdr-9999.ebuild
 1706082108 ./media-libs/audiofile/audiofile-0.3.6-r3.ebuild
 1707301238 ./media-libs/waffle/waffle-1.5.2.ebuild
@@ -33664,7 +33682,7 @@
 1702282250 ./media-libs/libpgf/libpgf-6.11.32.ebuild
 1702282250 ./media-libs/libmkv/libmkv-0.6.5.1.ebuild
 1702282250 ./media-libs/libdc1394/libdc1394-2.2.3.ebuild
-1802252138 ./media-libs/libdc1394/libdc1394-2.2.5-r1.ebuild
+1803052038 ./media-libs/libdc1394/libdc1394-2.2.5-r1.ebuild
 1702282250 ./media-libs/libdc1394/libdc1394-2.2.1.ebuild
 1702282250 ./media-libs/libdc1394/libdc1394-2.2.4.ebuild
 1706201124 ./media-libs/t1lib/t1lib-5.1.2-r1.ebuild
@@ -33773,7 +33791,7 @@
 1706261221 ./media-libs/libggi/libggi-2.2.2.ebuild
 1702282250 ./media-libs/sdlmm/sdlmm-0.1.8-r1.ebuild
 1801092039 ./media-libs/libpagemaker/libpagemaker-9999.ebuild
-1708271834 ./media-libs/libpagemaker/libpagemaker-0.0.3-r1.ebuild
+1803052038 ./media-libs/libpagemaker/libpagemaker-0.0.3-r1.ebuild
 1801092039 ./media-libs/libpagemaker/libpagemaker-0.0.4.ebuild
 1802031238 ./media-libs/libmediainfo/libmediainfo-17.12.ebuild
 1711202150 ./media-libs/opencv/opencv-3.3.0-r4.ebuild
@@ -33785,7 +33803,7 @@
 1711270340 ./media-libs/opencv/opencv-2.4.13-r3.ebuild
 1708271834 ./media-libs/lib3ds/lib3ds-2.0.0_rc1.ebuild
 1702282250 ./media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild
-1802221208 ./media-libs/libtiger/libtiger-0.3.4-r1.ebuild
+1803052038 ./media-libs/libtiger/libtiger-0.3.4-r1.ebuild
 1707081218 ./media-libs/libtiger/libtiger-0.3.4.ebuild
 1704231423 ./games-misc/ponysay/ponysay-3.0.2.ebuild
 1711251810 ./games-misc/fortune-mod-futurama/fortune-mod-futurama-0.2.ebuild
@@ -33909,10 +33927,10 @@
 1709261640 ./kde-misc/rsibreak/rsibreak-0.12.7.ebuild
 1802111508 ./kde-misc/rsibreak/rsibreak-0.12.8.ebuild
 1702282250 ./kde-misc/systemd-kcm/systemd-kcm-1.2.1.ebuild
-1803020208 ./x11-base/xorg-proto/xorg-proto-2018.4.ebuild
+1803052238 ./x11-base/xorg-proto/xorg-proto-2018.4.ebuild
 1802270838 ./x11-base/xorg-proto/xorg-proto-9999.ebuild
 1709020506 ./x11-base/xorg-x11/xorg-x11-7.4-r2.ebuild
-1803012308 ./x11-base/xorg-server/xorg-server-9999.ebuild
+1803060538 ./x11-base/xorg-server/xorg-server-9999.ebuild
 1802271138 ./x11-base/xorg-server/xorg-server-1.19.5-r1.ebuild
 1803020138 ./x11-base/xorg-server/xorg-server-1.19.99.901.ebuild
 1802202108 ./x11-base/xorg-drivers/xorg-drivers-9999.ebuild
@@ -34061,14 +34079,13 @@
 1702282250 ./sci-geosciences/qmapshack/qmapshack-1.6.3.ebuild
 1712281939 ./sci-geosciences/qmapshack/qmapshack-1.10.0.ebuild
 1704021646 ./sci-geosciences/qmapshack/qmapshack-1.8.0-r1.ebuild
-1801170839 ./sci-geosciences/liblas/liblas-1.8.1.ebuild
-1702282250 ./sci-geosciences/liblas/liblas-1.8.0.ebuild
+1803052039 ./sci-geosciences/liblas/liblas-1.8.1.ebuild
 1801071109 ./sci-geosciences/viking/viking-1.6.2-r1.ebuild
-1801210209 ./sci-geosciences/qgis/qgis-2.18.12.ebuild
-1802192108 ./sci-geosciences/qgis/qgis-2.18.16.ebuild
-1802271938 ./sci-geosciences/qgis/qgis-3.0.0.ebuild
-1802271938 ./sci-geosciences/qgis/qgis-9999.ebuild
-1802192108 ./sci-geosciences/qgis/qgis-2.18.14.ebuild
+1803052039 ./sci-geosciences/qgis/qgis-2.18.12.ebuild
+1803052039 ./sci-geosciences/qgis/qgis-2.18.16.ebuild
+1803052039 ./sci-geosciences/qgis/qgis-9999.ebuild
+1803052039 ./sci-geosciences/qgis/qgis-2.18.14.ebuild
+1803052039 ./sci-geosciences/qgis/qgis-3.0.0-r1.ebuild
 1702282250 ./sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-9999.ebuild
 1702282250 ./sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-1.3.ebuild
 1702282250 ./sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-1.2.ebuild
@@ -34155,9 +34172,8 @@
 1702282250 ./sci-geosciences/tcd-utils/tcd-utils-20120115.ebuild
 1702282250 ./sci-geosciences/tcd-utils/tcd-utils-20120115-r1.ebuild
 1708121230 ./sci-geosciences/gpx-viewer/gpx-viewer-0.4.0-r1.ebuild
-1702282250 ./sci-geosciences/grass/grass-7.0.5-r1.ebuild
 1705241006 ./sci-geosciences/grass/grass-7.2.0.ebuild
-1707202357 ./sci-geosciences/laszip/laszip-2.2.0.ebuild
+1803052039 ./sci-geosciences/laszip/laszip-2.2.0.ebuild
 1702282250 ./sci-geosciences/mapserver/mapserver-7.0.3.ebuild
 1705232133 ./sci-geosciences/mapserver/mapserver-7.0.5.ebuild
 1702282250 ./sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-9999.ebuild
@@ -34228,9 +34244,6 @@
 1702282250 ./app-officeext/dmaths/dmaths-3.4.9.0-r1.ebuild
 1702282250 ./app-officeext/ct2n/ct2n-1.4.0-r1.ebuild
 1802221208 ./app-officeext/ooofbtools/ooofbtools-2.52.ebuild
-1702282250 ./app-officeext/ooofbtools/ooofbtools-2.48.ebuild
-1801270238 ./app-officeext/ooofbtools/ooofbtools-2.51.ebuild
-1706080403 ./app-officeext/ooofbtools/ooofbtools-2.50.ebuild
 1702282250 ./app-officeext/ooo2gd/ooo2gd-3.0.0-r1.ebuild
 1712251139 ./sec-policy/selinux-syncthing/selinux-syncthing-2.20170805-r4.ebuild
 1711171439 ./sec-policy/selinux-syncthing/selinux-syncthing-2.20170805-r3.ebuild
@@ -36951,7 +36964,7 @@
 1712280139 ./sys-power/athcool/athcool-0.3.12.ebuild
 1704271331 ./sys-power/acpilight/acpilight-1.0.ebuild
 1708051030 ./sys-power/acpilight/acpilight-1.0-r1.ebuild
-1710300107 ./sys-power/upower/upower-0.99.5.ebuild
+1803052338 ./sys-power/upower/upower-0.99.5.ebuild
 1702282250 ./sys-power/upower/upower-0.99.4.ebuild
 1711281910 ./sys-power/upower/upower-0.99.7.ebuild
 1709142254 ./sys-power/upower/upower-0.99.6.ebuild
@@ -37093,7 +37106,7 @@
 1702282250 ./app-eselect/eselect-mesa/eselect-mesa-0.0.10-r1.ebuild
 1706221447 ./app-eselect/eselect-blas/eselect-blas-0.1.ebuild
 1801131209 ./app-eselect/eselect-rails/eselect-rails-0.23.ebuild
-1802221208 ./app-eselect/eselect-postgresql/eselect-postgresql-2.3.ebuild
+1803052038 ./app-eselect/eselect-postgresql/eselect-postgresql-2.3.ebuild
 1802111538 ./app-eselect/eselect-postgresql/eselect-postgresql-2.2.ebuild
 1702282250 ./app-eselect/eselect-oodict/eselect-oodict-20100228.ebuild
 1702282250 ./app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild
@@ -37305,8 +37318,8 @@
 1803040038 ./app-emulation/virtualbox/virtualbox-5.1.32.ebuild
 1803040038 ./app-emulation/virtualbox/virtualbox-5.1.34.ebuild
 1705252005 ./app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild
-1709150121 ./app-emulation/fuse/fuse-1.4.0.ebuild
 1712151139 ./app-emulation/fuse/fuse-1.5.0.ebuild
+1803052038 ./app-emulation/fuse/fuse-1.5.1.ebuild
 1802281408 ./app-emulation/virtualbox-modules/virtualbox-modules-5.2.8.ebuild
 1802281408 ./app-emulation/virtualbox-modules/virtualbox-modules-5.1.34.ebuild
 1802161638 ./app-emulation/virtualbox-modules/virtualbox-modules-5.2.6.ebuild
@@ -37488,10 +37501,7 @@
 1707141045 ./net-ftp/cmdftp/cmdftp-0.9.8.ebuild
 1801050439 ./net-ftp/ftpbase/ftpbase-0.01-r2.ebuild
 1711181542 ./app-cdr/bchunk/bchunk-1.2.0-r4.ebuild
-1702282250 ./app-cdr/isomaster/isomaster-1.3.5.ebuild
-1702282250 ./app-cdr/isomaster/isomaster-1.3.9-r1.ebuild
 1803041338 ./app-cdr/isomaster/isomaster-1.3.13.ebuild
-1702282250 ./app-cdr/isomaster/isomaster-1.3.11.ebuild
 1801070909 ./app-cdr/b5i2iso/b5i2iso-0.2-r1.ebuild
 1702282250 ./app-cdr/nrg2iso/nrg2iso-0.4-r1.ebuild
 1802212208 ./app-cdr/nrg2iso/nrg2iso-0.4-r2.ebuild
@@ -37828,6 +37838,7 @@
 1803021159 metadata/md5-cache/dev-java/jboss-marshalling-1.3.0
 1801050119 metadata/md5-cache/dev-java/javatoolkit-9999
 1803021159 metadata/md5-cache/dev-java/freehep-graphicsio-tests-2.4
+1803060138 metadata/md5-cache/dev-java/commons-math-2.1-r2
 1803021159 metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.84
 1803021159 metadata/md5-cache/dev-java/picocontainer-1.1-r1
 1803021159 metadata/md5-cache/dev-java/jakarta-regexp-1.4-r2
@@ -38010,7 +38021,7 @@
 1803021159 metadata/md5-cache/dev-java/sun-jms-1.1-r2
 1803021159 metadata/md5-cache/dev-java/cldc-api-1.1-r1
 1803021159 metadata/md5-cache/dev-java/commons-primitives-1.0-r3
-1803040008 metadata/md5-cache/dev-java/Manifest.gz
+1803060138 metadata/md5-cache/dev-java/Manifest.gz
 1803021159 metadata/md5-cache/dev-java/jdbc-mysql-5.1.26
 1803021159 metadata/md5-cache/dev-java/objenesis-1.3
 1803021159 metadata/md5-cache/dev-java/httpcomponents-client-4.5
@@ -38139,7 +38150,7 @@
 1803021159 metadata/md5-cache/dev-java/wsdl4j-1.6.2
 1803021159 metadata/md5-cache/dev-java/stax2-api-4.0.0-r1
 1803021159 metadata/md5-cache/dev-java/jcifs-1.3.17-r2
-1803021159 metadata/md5-cache/dev-java/commons-math-3.2
+1803060138 metadata/md5-cache/dev-java/commons-math-3.2
 1803021159 metadata/md5-cache/dev-java/swarmcache-1.0_pre20050106-r1
 1803021159 metadata/md5-cache/dev-java/bcprov-1.52-r3
 1803021159 metadata/md5-cache/dev-java/treelayout-1.0.2
@@ -38535,9 +38546,10 @@
 1803021159 metadata/md5-cache/sys-libs/glibc-2.27-r1
 1802262111 metadata/md5-cache/sys-libs/mars-1.0.1
 1803021159 metadata/md5-cache/sys-libs/libcap-ng-0.7.9
+1803052038 metadata/md5-cache/sys-libs/slang-2.3.2
 1803021159 metadata/md5-cache/sys-libs/uclibc-0.9.33.9999
 1803021159 metadata/md5-cache/sys-libs/lwp-2.2
-1803021159 metadata/md5-cache/sys-libs/db-6.0.35-r1
+1803052308 metadata/md5-cache/sys-libs/db-6.0.35-r1
 1803021159 metadata/md5-cache/sys-libs/libcxxabi-9999
 1803021159 metadata/md5-cache/sys-libs/db-4.5.20_p2-r1
 1803021159 metadata/md5-cache/sys-libs/libsmbios-2.3.3
@@ -38550,7 +38562,8 @@
 1803021159 metadata/md5-cache/sys-libs/libtermcap-compat-2.0.8-r3
 1803021159 metadata/md5-cache/sys-libs/openipmi-2.0.22
 1801050119 metadata/md5-cache/sys-libs/tevent-0.9.31-r1
-1803032108 metadata/md5-cache/sys-libs/glibc-2.25-r11
+1803052038 metadata/md5-cache/sys-libs/glibc-2.25-r11
+1803052038 metadata/md5-cache/sys-libs/glibc-2.19-r2
 1803021159 metadata/md5-cache/sys-libs/binutils-libs-2.30-r1
 1803021159 metadata/md5-cache/sys-libs/ldb-1.3.2
 1803021159 metadata/md5-cache/sys-libs/libservicelog-1.1.15
@@ -38564,7 +38577,7 @@
 1803021159 metadata/md5-cache/sys-libs/libraw1394-2.1.2
 1803021159 metadata/md5-cache/sys-libs/uid_wrapper-1.2.4
 1803021159 metadata/md5-cache/sys-libs/libcxx-4.0.1
-1803021159 metadata/md5-cache/sys-libs/db-6.1.29-r1
+1803052308 metadata/md5-cache/sys-libs/db-6.1.29-r1
 1803021159 metadata/md5-cache/sys-libs/pam-1.3.0-r2
 1803021159 metadata/md5-cache/sys-libs/libaal-1.0.6
 1801050119 metadata/md5-cache/sys-libs/tdb-1.3.15
@@ -38587,7 +38600,7 @@
 1801041840 metadata/md5-cache/sys-libs/libselinux-2.6
 1803021159 metadata/md5-cache/sys-libs/libcxxabi-4.0.1
 1803021159 metadata/md5-cache/sys-libs/libstatgrab-0.17
-1803021159 metadata/md5-cache/sys-libs/db-6.2.32
+1803052308 metadata/md5-cache/sys-libs/db-6.2.32
 1803021159 metadata/md5-cache/sys-libs/glibc-2.26-r5
 1803021159 metadata/md5-cache/sys-libs/libseccomp-2.3.3
 1803021159 metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.3
@@ -38603,12 +38616,12 @@
 1803021159 metadata/md5-cache/sys-libs/db-4.2.52_p5-r1
 1803021159 metadata/md5-cache/sys-libs/glibc-2.20-r2
 1803021159 metadata/md5-cache/sys-libs/libseccomp-2.3.2
-1803021159 metadata/md5-cache/sys-libs/db-5.3.28-r3
+1803052308 metadata/md5-cache/sys-libs/db-5.3.28-r3
 1803021159 metadata/md5-cache/sys-libs/efivar-32-r1
 1803021159 metadata/md5-cache/sys-libs/libomp-3.8.1
 1702282334 metadata/md5-cache/sys-libs/fortify-headers-9999
 1702282334 metadata/md5-cache/sys-libs/lib-compat-loki-0.2-r1
-1803021159 metadata/md5-cache/sys-libs/db-6.2.32-r1
+1803052308 metadata/md5-cache/sys-libs/db-6.2.32-r1
 1702282334 metadata/md5-cache/sys-libs/mtdev-1.1.4
 1803021159 metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.6
 1803021159 metadata/md5-cache/sys-libs/libunwind-1.2
@@ -38617,7 +38630,6 @@
 1803021159 metadata/md5-cache/sys-libs/glibc-2.18-r1
 1803021159 metadata/md5-cache/sys-libs/binutils-libs-2.25.1-r2
 1801161809 metadata/md5-cache/sys-libs/tevent-0.9.35
-1803021159 metadata/md5-cache/sys-libs/slang-2.3.2_pre23
 1803021159 metadata/md5-cache/sys-libs/libcap-ng-0.7.8
 1803040508 metadata/md5-cache/sys-libs/uclibc-ng-1.0.26
 1803021159 metadata/md5-cache/sys-libs/libcxxrt-0.0_p20150423-r1
@@ -38630,7 +38642,7 @@
 1803021159 metadata/md5-cache/sys-libs/pwdb-0.62-r1
 1803021159 metadata/md5-cache/sys-libs/libstatgrab-0.91
 1803021159 metadata/md5-cache/sys-libs/libkudzu-1.2.57.1
-1803021159 metadata/md5-cache/sys-libs/db-6.2.23-r1
+1803052308 metadata/md5-cache/sys-libs/db-6.2.23-r1
 1801041840 metadata/md5-cache/sys-libs/libieee1284-0.2.11-r6
 1803021159 metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.9
 1702282334 metadata/md5-cache/sys-libs/gwenhywfar-4.15.3
@@ -38657,7 +38669,7 @@
 1803021159 metadata/md5-cache/sys-libs/db-4.8.30-r2
 1803021159 metadata/md5-cache/sys-libs/libapparmor-2.12.0
 1803021159 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9999
-1803021159 metadata/md5-cache/sys-libs/libomp-5.0.1
+1803052038 metadata/md5-cache/sys-libs/libomp-5.0.1
 1801011405 metadata/md5-cache/sys-libs/libixp-0.5_p20110208-r3
 1803021159 metadata/md5-cache/sys-libs/libcxx-3.7.1
 1803021159 metadata/md5-cache/sys-libs/nss_wrapper-1.1.2
@@ -38670,8 +38682,7 @@
 1803021159 metadata/md5-cache/sys-libs/gpm-1.20.7-r2
 1803021159 metadata/md5-cache/sys-libs/libutempter-1.1.6-r2
 1803021159 metadata/md5-cache/sys-libs/zlib-1.2.11-r1
-1803021159 metadata/md5-cache/sys-libs/libsmbios-2.3.0-r1
-1803021159 metadata/md5-cache/sys-libs/db-5.3.28-r2
+1803052308 metadata/md5-cache/sys-libs/db-5.3.28-r2
 1803021159 metadata/md5-cache/sys-libs/librtas-1.3.6
 1803021159 metadata/md5-cache/sys-libs/libosinfo-1.0.0-r1
 1803021159 metadata/md5-cache/sys-libs/libstdc++-v3-3.3.6-r1
@@ -38680,11 +38691,12 @@
 1803021159 metadata/md5-cache/sys-libs/compiler-rt-9999
 1803021159 metadata/md5-cache/sys-libs/glibc-2.19-r1
 1803021159 metadata/md5-cache/sys-libs/libservicelog-1.1.11
-1803041138 metadata/md5-cache/sys-libs/Manifest.gz
+1803052308 metadata/md5-cache/sys-libs/Manifest.gz
 1803040008 metadata/md5-cache/sys-libs/uclibc-ng-1.0.29
 1803021159 metadata/md5-cache/sys-libs/slang-2.3.0
 1803021159 metadata/md5-cache/sys-libs/readline-5.2_p14
 1704132239 metadata/md5-cache/sys-libs/csu-79
+1803052038 metadata/md5-cache/sys-libs/libsmbios-2.4.1
 1803021308 metadata/md5-cache/sys-libs/timezone-data-2018c
 1803021159 metadata/md5-cache/sys-libs/libhugetlbfs-2.18
 1803021159 metadata/md5-cache/sys-libs/zlib-1.2.11
@@ -38741,7 +38753,7 @@
 1803021159 metadata/md5-cache/sys-libs/slang-2.3.1a
 1801041840 metadata/md5-cache/sys-libs/libfaketime-0.9.6-r2
 1803021159 metadata/md5-cache/sys-libs/cracklib-2.9.6-r1
-1803021308 metadata/md5-cache/sys-libs/glibc-2.25-r10
+1803052038 metadata/md5-cache/sys-libs/glibc-2.25-r10
 1803021159 metadata/md5-cache/sys-libs/timezone-data-2017c
 1803011638 metadata/md5-cache/sys-libs/tevent-0.9.36
 1803021159 metadata/md5-cache/sys-libs/llvm-libunwind-3.9.1
@@ -38759,7 +38771,7 @@
 1803021159 metadata/md5-cache/sys-libs/ldb-1.1.29-r1
 1803021159 metadata/md5-cache/sys-libs/libomp-6.0.0_rc3
 1803021159 metadata/md5-cache/sys-libs/db-4.3.29_p1-r1
-1803021159 metadata/md5-cache/sys-libs/db-5.1.29-r1
+1803052308 metadata/md5-cache/sys-libs/db-5.1.29-r1
 1801041840 metadata/md5-cache/sys-libs/libieee1284-0.2.11-r5
 1803021159 metadata/md5-cache/sys-libs/libunwind-1.1-r1
 1801050119 metadata/md5-cache/sys-libs/tdb-1.3.14
@@ -38787,7 +38799,7 @@
 1801280009 metadata/md5-cache/sys-libs/musl-nscd-9999
 1803021159 metadata/md5-cache/sys-libs/freeipmi-1.6.1
 1803021159 metadata/md5-cache/sys-libs/libcxxabi-3.9.1
-1803021159 metadata/md5-cache/sys-libs/db-6.2.23
+1803052308 metadata/md5-cache/sys-libs/db-6.2.23
 1801041840 metadata/md5-cache/sys-libs/libselinux-9999
 1803021159 metadata/md5-cache/sys-libs/system-config-base-1-r1
 1803021159 metadata/md5-cache/sys-libs/freeipmi-1.4.8
@@ -38798,7 +38810,7 @@
 1801011405 metadata/md5-cache/sys-libs/libfaketime-0.9.6-r1
 1803021159 metadata/md5-cache/sys-libs/argp-standalone-1.3-r2
 1803021159 metadata/md5-cache/sys-libs/newlib-2.4.0
-1803021159 metadata/md5-cache/sys-libs/db-6.0.35
+1803052308 metadata/md5-cache/sys-libs/db-6.0.35
 1803021159 metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.8
 1802262111 metadata/md5-cache/sys-libs/libblockdev-2.14-r1
 1803021159 metadata/md5-cache/sys-libs/glibc-2.21-r2
@@ -38808,7 +38820,7 @@
 1803021159 metadata/md5-cache/sys-libs/kpmcore-3.3.0
 1803021159 metadata/md5-cache/sys-libs/uclibc-ng-9999
 1803021159 metadata/md5-cache/sys-libs/musl-1.1.18
-1803021159 metadata/md5-cache/sys-libs/db-6.1.29
+1803052308 metadata/md5-cache/sys-libs/db-6.1.29
 1702282331 metadata/md5-cache/sci-visualization/circos-0.55-r1
 1803021159 metadata/md5-cache/sci-visualization/xd3d-8.3.1-r1
 1803021159 metadata/md5-cache/sci-visualization/fityk-1.3.1
@@ -39288,7 +39300,7 @@
 1803021159 metadata/md5-cache/sci-libs/libcerf-1.3
 1803021159 metadata/md5-cache/sci-libs/libticalcs2-1.1.8
 1803021159 metadata/md5-cache/sci-libs/mkl-10.0.5.025
-1803040008 metadata/md5-cache/sci-libs/Manifest.gz
+1803052038 metadata/md5-cache/sci-libs/Manifest.gz
 1801011404 metadata/md5-cache/sci-libs/lrslib-051
 1803021159 metadata/md5-cache/sci-libs/p4est-1.0
 1803021159 metadata/md5-cache/sci-libs/vtk-8.1.0-r1
@@ -39316,7 +39328,7 @@
 1803021159 metadata/md5-cache/sci-libs/blas-reference-20070226-r4
 1803021159 metadata/md5-cache/sci-libs/plplot-5.12.0-r1
 1801091400 metadata/md5-cache/sci-libs/vtkdata-6.1.0
-1803021159 metadata/md5-cache/sci-libs/gdal-2.2.3-r1
+1803052038 metadata/md5-cache/sci-libs/gdal-2.2.3-r1
 1803021159 metadata/md5-cache/sci-libs/hdf5-1.10.1
 1803021159 metadata/md5-cache/sci-libs/arpack-3.1.5
 1803021159 metadata/md5-cache/sci-libs/spooles-2.2
@@ -39517,7 +39529,6 @@
 1803021159 metadata/md5-cache/dev-ruby/coffee-rails-4.1.1-r2
 1803021159 metadata/md5-cache/dev-ruby/zentest-4.11.1
 1803021159 metadata/md5-cache/dev-ruby/ruby-gio2-3.1.1
-1803021159 metadata/md5-cache/dev-ruby/spring-1.7.2
 1803021159 metadata/md5-cache/dev-ruby/rinku-2.0.4
 1803021159 metadata/md5-cache/dev-ruby/websocket-1.2.5
 1803021159 metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r3
@@ -39610,6 +39621,7 @@
 1803021159 metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1
 1803021159 metadata/md5-cache/dev-ruby/loquacious-1.9.1-r2
 1803021159 metadata/md5-cache/dev-ruby/bindex-0.5.0
+1803052238 metadata/md5-cache/dev-ruby/faraday-0.14.0
 1803021159 metadata/md5-cache/dev-ruby/neovim-ruby-client-0.4.0
 1803021159 metadata/md5-cache/dev-ruby/i18n-0.9.1
 1803021159 metadata/md5-cache/dev-ruby/warden-1.2.7
@@ -39618,7 +39630,6 @@
 1803021159 metadata/md5-cache/dev-ruby/ddplugin-1.0.1
 1803021159 metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r2
 1803021159 metadata/md5-cache/dev-ruby/rack-1.6.7
-1803021159 metadata/md5-cache/dev-ruby/spring-2.0.1
 1803021159 metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.0.8
 1803021159 metadata/md5-cache/dev-ruby/binding_of_caller-0.8.0
 1803021159 metadata/md5-cache/dev-ruby/rspectacular-0.70.7
@@ -39671,7 +39682,6 @@
 1803021159 metadata/md5-cache/dev-ruby/rubygems-2.7.6
 1803021159 metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.5
 1803021159 metadata/md5-cache/dev-ruby/ruby-progressbar-1.9.0
-1803021159 metadata/md5-cache/dev-ruby/sprockets-rails-3.2.0-r1
 1803021159 metadata/md5-cache/dev-ruby/actionview-5.1.2
 1803021159 metadata/md5-cache/dev-ruby/neovim-ruby-client-0.5.1
 1803021159 metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.5.7
@@ -39705,7 +39715,6 @@
 1803021159 metadata/md5-cache/dev-ruby/gh-0.15.1
 1803021159 metadata/md5-cache/dev-ruby/flog-4.6.2
 1803021159 metadata/md5-cache/dev-ruby/gherkin-2.12.0-r3
-1803021159 metadata/md5-cache/dev-ruby/warden-1.2.6
 1803021159 metadata/md5-cache/dev-ruby/patron-0.10.0
 1803021159 metadata/md5-cache/dev-ruby/facter-2.4.6
 1803021159 metadata/md5-cache/dev-ruby/coffee-script-2.4.1
@@ -39771,6 +39780,7 @@
 1803021159 metadata/md5-cache/dev-ruby/arel-8.0.0
 1803021159 metadata/md5-cache/dev-ruby/uglifier-4.1.6
 1803021159 metadata/md5-cache/dev-ruby/rack-test-0.6.3
+1803052038 metadata/md5-cache/dev-ruby/parser-2.5.0.2
 1803021159 metadata/md5-cache/dev-ruby/ruby-gdk3-3.0.8
 1803021159 metadata/md5-cache/dev-ruby/actionmailer-5.1.2
 1803021159 metadata/md5-cache/dev-ruby/roadie-3.2.2
@@ -39790,7 +39800,6 @@
 1803021159 metadata/md5-cache/dev-ruby/httpclient-2.8.2.4
 1803021159 metadata/md5-cache/dev-ruby/amq-protocol-2.3.0
 1803021159 metadata/md5-cache/dev-ruby/hashie-3.5.6
-1803021159 metadata/md5-cache/dev-ruby/websocket-1.2.3
 1803021159 metadata/md5-cache/dev-ruby/certificate_authority-0.1.6-r2
 1803021159 metadata/md5-cache/dev-ruby/rex-bin_tools-0.1.2
 1803021159 metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
@@ -39829,7 +39838,7 @@
 1803021159 metadata/md5-cache/dev-ruby/rex-java-0.1.2
 1803021159 metadata/md5-cache/dev-ruby/trollop-2.1.2
 1803021159 metadata/md5-cache/dev-ruby/rake-12.3.0
-1803021159 metadata/md5-cache/dev-ruby/totoridipjp-0.1.0
+1803052038 metadata/md5-cache/dev-ruby/totoridipjp-0.1.0
 1803021159 metadata/md5-cache/dev-ruby/naught-1.1.0
 1803021159 metadata/md5-cache/dev-ruby/thor-0.19.1
 1803021159 metadata/md5-cache/dev-ruby/sanitize-4.6.0
@@ -39932,7 +39941,6 @@
 1803021159 metadata/md5-cache/dev-ruby/syntax-1.2.2
 1803021159 metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
 1803021159 metadata/md5-cache/dev-ruby/delayer-deferred-2.0.0
-1803021159 metadata/md5-cache/dev-ruby/slop-4.5.0
 1803021159 metadata/md5-cache/dev-ruby/mustache-1.0.5
 1803021159 metadata/md5-cache/dev-ruby/rjb-1.5.5
 1803021159 metadata/md5-cache/dev-ruby/pg-0.21.0
@@ -40045,7 +40053,6 @@
 1803021159 metadata/md5-cache/dev-ruby/ruby-odbc-0.99997-r1
 1803021159 metadata/md5-cache/dev-ruby/log_buddy-0.7.0
 1803021159 metadata/md5-cache/dev-ruby/flexmock-2.3.6
-1803021159 metadata/md5-cache/dev-ruby/slop-4.6.0
 1803040938 metadata/md5-cache/dev-ruby/fattr-2.4.0
 1803021159 metadata/md5-cache/dev-ruby/tzinfo-0.3.53
 1803021159 metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2
@@ -40071,7 +40078,6 @@
 1803021159 metadata/md5-cache/dev-ruby/ffi-1.9.21
 1803021159 metadata/md5-cache/dev-ruby/bindata-2.4.1
 1803021159 metadata/md5-cache/dev-ruby/thread_order-1.1.0
-1803021159 metadata/md5-cache/dev-ruby/syslogger-1.6.4
 1803021159 metadata/md5-cache/dev-ruby/power_assert-1.1.1
 1803021159 metadata/md5-cache/dev-ruby/letter_opener-1.6.0
 1803021159 metadata/md5-cache/dev-ruby/rspec-core-3.7.0
@@ -40109,7 +40115,7 @@
 1803021159 metadata/md5-cache/dev-ruby/hpricot-0.8.6-r5
 1803021159 metadata/md5-cache/dev-ruby/bundler-1.13.7
 1803021159 metadata/md5-cache/dev-ruby/paramesan-0.1.1
-1803021159 metadata/md5-cache/dev-ruby/sparklines-0.5.2-r6
+1803052238 metadata/md5-cache/dev-ruby/sparklines-0.5.2-r6
 1803021159 metadata/md5-cache/dev-ruby/rspec-retry-0.5.6
 1803021159 metadata/md5-cache/dev-ruby/websocket-driver-0.7.0
 1803021159 metadata/md5-cache/dev-ruby/racc-1.4.11
@@ -40177,7 +40183,7 @@
 1803021159 metadata/md5-cache/dev-ruby/sanitize-4.5.0
 1803021159 metadata/md5-cache/dev-ruby/capistrano-3.9.1
 1803021159 metadata/md5-cache/dev-ruby/vcr-1.11.3
-1803041008 metadata/md5-cache/dev-ruby/Manifest.gz
+1803052308 metadata/md5-cache/dev-ruby/Manifest.gz
 1803021159 metadata/md5-cache/dev-ruby/bunny-2.8.1
 1803021159 metadata/md5-cache/dev-ruby/cmdparse-3.0.3
 1803021159 metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2
@@ -40273,6 +40279,7 @@
 1803021159 metadata/md5-cache/dev-ruby/arel-7.1.4
 1803021159 metadata/md5-cache/dev-ruby/rubytest-0.8.1
 1803021159 metadata/md5-cache/dev-ruby/rack-test-0.8.3
+1803052038 metadata/md5-cache/dev-ruby/http-form_data-2.1.0
 1803031208 metadata/md5-cache/dev-ruby/rack-test-0.8.3-r1
 1803021159 metadata/md5-cache/dev-ruby/liquid-2.6.2
 1803021159 metadata/md5-cache/dev-ruby/bindata-2.4.0
@@ -40310,7 +40317,7 @@
 1803021159 metadata/md5-cache/dev-ruby/rash_alt-0.4.3
 1803021159 metadata/md5-cache/dev-ruby/ruby2ruby-2.3.2
 1803021159 metadata/md5-cache/dev-ruby/request_store-1.3.2
-1803021159 metadata/md5-cache/dev-ruby/wirble-0.1.3-r4
+1803052038 metadata/md5-cache/dev-ruby/wirble-0.1.3-r4
 1803021159 metadata/md5-cache/dev-ruby/actionpack-5.1.4
 1803021159 metadata/md5-cache/dev-ruby/redcloth-4.3.2
 1803021159 metadata/md5-cache/dev-ruby/actioncable-5.1.5
@@ -40349,7 +40356,7 @@
 1803021159 metadata/md5-cache/dev-ruby/httparty-0.15.6
 1803021159 metadata/md5-cache/dev-ruby/httparty-0.16.0
 1803021159 metadata/md5-cache/dev-ruby/prawn-table-0.2.2-r1
-1803021159 metadata/md5-cache/dev-ruby/axiom-types-0.1.1
+1803052238 metadata/md5-cache/dev-ruby/axiom-types-0.1.1
 1803021159 metadata/md5-cache/dev-ruby/rmagick-2.15.4
 1803021159 metadata/md5-cache/dev-ruby/path_expander-1.0.2
 1803021159 metadata/md5-cache/dev-ruby/locale-2.1.2-r1
@@ -40373,7 +40380,6 @@
 1803021159 metadata/md5-cache/dev-ruby/activerecord-5.1.3
 1803021159 metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.0
 1803021159 metadata/md5-cache/dev-ruby/octokit-4.7.0
-1803021159 metadata/md5-cache/dev-ruby/sshkey-1.8.0
 1803021159 metadata/md5-cache/dev-ruby/faraday-0.11.0
 1803021159 metadata/md5-cache/dev-ruby/polyglot-0.3.5
 1803021159 metadata/md5-cache/dev-ruby/rack-mount-0.8.3-r2
@@ -40416,7 +40422,6 @@
 1803021159 metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2
 1803021159 metadata/md5-cache/dev-ruby/ruby-gettext-3.2.6
 1803021159 metadata/md5-cache/dev-ruby/ruby-beautify-0.97.4
-1803021159 metadata/md5-cache/dev-ruby/temple-0.7.7
 1803021159 metadata/md5-cache/dev-ruby/zentest-4.11.0
 1803021159 metadata/md5-cache/dev-ruby/pluggaloid-1.1.1
 1803021159 metadata/md5-cache/dev-ruby/multi_json-1.12.1
@@ -40425,7 +40430,7 @@
 1803021159 metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10
 1803021159 metadata/md5-cache/dev-ruby/activejob-5.0.6
 1803021159 metadata/md5-cache/dev-ruby/slim-3.0.7-r1
-1803021159 metadata/md5-cache/dev-ruby/ttfunk-1.4.0
+1803052038 metadata/md5-cache/dev-ruby/ttfunk-1.4.0
 1803021159 metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4-r2
 1803021159 metadata/md5-cache/dev-ruby/fivemat-1.3.5
 1803021159 metadata/md5-cache/dev-ruby/afm-0.2.2
@@ -40458,7 +40463,6 @@
 1803021159 metadata/md5-cache/dev-ruby/http-cookie-1.0.3
 1803021159 metadata/md5-cache/dev-ruby/introspection-0.0.3
 1803021159 metadata/md5-cache/dev-ruby/ruby-termios-1.0.2-r1
-1803021159 metadata/md5-cache/dev-ruby/sprockets-rails-3.2.0
 1803021159 metadata/md5-cache/dev-ruby/semver2-3.4.2
 1803021159 metadata/md5-cache/dev-ruby/serialport-1.3.1
 1803021159 metadata/md5-cache/dev-ruby/pg-0.17.1-r1
@@ -40511,7 +40515,7 @@
 1803021159 metadata/md5-cache/dev-ruby/hiera-3.4.1
 1803021159 metadata/md5-cache/dev-ruby/rbpdf-1.19.3
 1803021159 metadata/md5-cache/dev-ruby/virtus-1.0.5
-1803041008 metadata/md5-cache/dev-ruby/ruby-glib2-3.1.1
+1803052038 metadata/md5-cache/dev-ruby/ruby-glib2-3.1.1
 1803021159 metadata/md5-cache/dev-ruby/simple-rss-1.3.1-r1
 1803021159 metadata/md5-cache/dev-ruby/aws-sdk-resources-2.6.50
 1803021159 metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2
@@ -40615,12 +40619,10 @@
 1803021159 metadata/md5-cache/dev-ruby/actionview-4.2.10
 1803021159 metadata/md5-cache/dev-ruby/actionmailer-5.1.3
 1803021159 metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.0.8
-1803021159 metadata/md5-cache/dev-ruby/timers-4.1.1
 1803021159 metadata/md5-cache/dev-ruby/uglifier-4.1.2
 1803021159 metadata/md5-cache/dev-ruby/shotgun-0.9.2
 1803021159 metadata/md5-cache/dev-ruby/amatch-0.4.0
 1803021159 metadata/md5-cache/dev-ruby/metasploit-concern-2.0.3
-1803021159 metadata/md5-cache/dev-ruby/sprockets-rails-3.1.1
 1803021159 metadata/md5-cache/dev-ruby/temple-0.8.0
 1803021159 metadata/md5-cache/dev-ruby/redis-3.3.5
 1803021159 metadata/md5-cache/dev-ruby/rake-11.3.0
@@ -40642,7 +40644,6 @@
 1803021159 metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r1
 1803021159 metadata/md5-cache/dev-ruby/rbnacl-4.0.2
 1803021159 metadata/md5-cache/dev-ruby/narray-0.6.1.2
-1803021159 metadata/md5-cache/dev-ruby/treetop-1.6.8
 1803021159 metadata/md5-cache/dev-ruby/capistrano-stats-1.1.1
 1803021159 metadata/md5-cache/dev-ruby/will_paginate-3.1.6
 1803021159 metadata/md5-cache/dev-ruby/rspec-3.6.0
@@ -40842,7 +40843,7 @@
 1702282328 metadata/md5-cache/media-video/hasciicam-1.1.2
 1801011404 metadata/md5-cache/media-video/asfrecorder-1.1
 1803021159 metadata/md5-cache/media-video/dvdimagecmp-0.3-r1
-1803021159 metadata/md5-cache/media-video/mediainfo-17.12
+1803052038 metadata/md5-cache/media-video/mediainfo-17.12
 1803021159 metadata/md5-cache/media-video/nvidia-settings-358.16
 1803021159 metadata/md5-cache/media-video/vamps-0.99.2-r1
 1803021159 metadata/md5-cache/media-video/libva-utils-2.0.0-r1
@@ -40881,7 +40882,7 @@
 1702282328 metadata/md5-cache/media-video/mplayer-resume-2.0
 1803021159 metadata/md5-cache/media-video/submux-dvd-0.5.2
 1803021159 metadata/md5-cache/media-video/libav-11.8
-1803021159 metadata/md5-cache/media-video/mpv-0.27.2
+1803052038 metadata/md5-cache/media-video/mpv-0.27.2
 1803021159 metadata/md5-cache/media-video/ushare-1.1a-r6
 1801281908 metadata/md5-cache/media-video/mkvtoolnix-20.0.0
 1803021159 metadata/md5-cache/media-video/peek-1.2.2
@@ -40889,7 +40890,7 @@
 1803021159 metadata/md5-cache/media-video/ffdiaporama-2.2_pre20140701-r1
 1801042109 metadata/md5-cache/media-video/shotcut-18.01
 1803021159 metadata/md5-cache/media-video/atomicparsley-0.9.0
-1803031638 metadata/md5-cache/media-video/Manifest.gz
+1803052038 metadata/md5-cache/media-video/Manifest.gz
 1803021159 metadata/md5-cache/media-video/kino-1.3.4
 1803021159 metadata/md5-cache/media-video/dvdauthor-0.7.2-r2
 1803021159 metadata/md5-cache/media-video/mjpg-streamer-0_pre20120421
@@ -41046,7 +41047,7 @@
 1801011405 metadata/md5-cache/www-client/luakit-9999
 1803021159 metadata/md5-cache/www-client/dooble-1.56c
 1803021159 metadata/md5-cache/www-client/dillo-3.0.5
-1803021159 metadata/md5-cache/www-client/chromium-65.0.3325.88
+1803060008 metadata/md5-cache/www-client/chromium-65.0.3325.88
 1803021159 metadata/md5-cache/www-client/uget-1.10.4
 1803021159 metadata/md5-cache/www-client/otter-9999
 1802221208 metadata/md5-cache/www-client/conkeror-1.0.4
@@ -41054,12 +41055,12 @@
 1803021159 metadata/md5-cache/www-client/surfraw-2.2.9-r1
 1803021159 metadata/md5-cache/www-client/opera-developer-53.0.2880.0
 1803021159 metadata/md5-cache/www-client/vivaldi-snapshot-1.15.1111.3_p1
+1803060008 metadata/md5-cache/www-client/chromium-66.0.3355.0
 1803021159 metadata/md5-cache/www-client/qupzilla-2.2.5
 1803021159 metadata/md5-cache/www-client/chromium-64.0.3282.167
 1803021159 metadata/md5-cache/www-client/seamonkey-2.49.6.0_p0
-1803021159 metadata/md5-cache/www-client/chromium-64.0.3282.186
-1803041438 metadata/md5-cache/www-client/Manifest.gz
-1803021159 metadata/md5-cache/www-client/chromium-65.0.3325.73
+1803052038 metadata/md5-cache/www-client/chromium-64.0.3282.186
+1803060008 metadata/md5-cache/www-client/Manifest.gz
 1801231609 metadata/md5-cache/www-client/lynx-2.8.9_pre11
 1803021159 metadata/md5-cache/www-client/opera-12.16_p1860-r1
 1801231609 metadata/md5-cache/www-client/lynx-2.8.9_pre16
@@ -41076,8 +41077,10 @@
 1803021159 metadata/md5-cache/www-client/otter-0.9.94
 1803021159 metadata/md5-cache/www-client/google-chrome-64.0.3282.186
 1803021159 metadata/md5-cache/www-client/firefox-bin-58.0.1
+1803052038 metadata/md5-cache/www-client/opera-developer-53.0.2885.0
 1803021159 metadata/md5-cache/www-client/jd-2.8.5_p120826
 1803021159 metadata/md5-cache/www-client/httrack-3.49.2-r1
+1803060008 metadata/md5-cache/www-client/chromium-65.0.3325.106
 1803021159 metadata/md5-cache/www-client/midori-0.5.11-r2
 1702282334 metadata/md5-cache/www-client/ck4up-1.2
 1803021159 metadata/md5-cache/www-client/firefox-bin-52.6.0
@@ -41138,7 +41141,7 @@
 1712292010 metadata/md5-cache/app-emacs/proofgeneral-4.2
 1802210008 metadata/md5-cache/app-emacs/color-browser-0.3-r1
 1802060308 metadata/md5-cache/app-emacs/circe-1.3
-1803021159 metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r1
+1803052038 metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r1
 1712292010 metadata/md5-cache/app-emacs/scss-mode-20130215
 1803021159 metadata/md5-cache/app-emacs/twittering-mode-9999
 1712292010 metadata/md5-cache/app-emacs/prom-wl-2.7.0-r1
@@ -41199,7 +41202,7 @@
 1802210008 metadata/md5-cache/app-emacs/crypt++-2.92
 1712292010 metadata/md5-cache/app-emacs/emacs-wiki-blog-0.5
 1712292010 metadata/md5-cache/app-emacs/xslide-0.2.2
-1803041008 metadata/md5-cache/app-emacs/ebuild-mode-1.42
+1803052038 metadata/md5-cache/app-emacs/ebuild-mode-1.42
 1712292010 metadata/md5-cache/app-emacs/apel-10.8-r1
 1802210008 metadata/md5-cache/app-emacs/inform-mode-1.6.2
 1712292010 metadata/md5-cache/app-emacs/csv-mode-1.50
@@ -41261,9 +41264,8 @@
 1802210008 metadata/md5-cache/app-emacs/mic-paren-3.11
 1712292010 metadata/md5-cache/app-emacs/jasmin-1.2-r2
 1712292010 metadata/md5-cache/app-emacs/nxml-docbook5-schemas-20080922
-1803021159 metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6
 1802210008 metadata/md5-cache/app-emacs/inform-mode-1.5.8
-1803041238 metadata/md5-cache/app-emacs/Manifest.gz
+1803052038 metadata/md5-cache/app-emacs/Manifest.gz
 1712292010 metadata/md5-cache/app-emacs/flim-1.14.9-r2
 1712292010 metadata/md5-cache/app-emacs/emacs-daemon-0.22
 1801011404 metadata/md5-cache/app-emacs/mpg123-el-1.59
@@ -41383,7 +41385,7 @@
 1803021159 metadata/md5-cache/sys-devel/prelink-20130503
 1803021159 metadata/md5-cache/sys-devel/kgcc64-4.5.4
 1803021159 metadata/md5-cache/sys-devel/binutils-apple-7.0-r1
-1803042238 metadata/md5-cache/sys-devel/automake-1.14.1-r2
+1803052208 metadata/md5-cache/sys-devel/automake-1.14.1-r2
 1803021159 metadata/md5-cache/sys-devel/bison-2.7.1
 1803021159 metadata/md5-cache/sys-devel/llvm-4.0.1-r1
 1803021159 metadata/md5-cache/sys-devel/make-4.2.1
@@ -41436,12 +41438,12 @@
 1803021159 metadata/md5-cache/sys-devel/make-4.2.1-r2
 1802141638 metadata/md5-cache/sys-devel/dev86-0.16.21-r2
 1702282333 metadata/md5-cache/sys-devel/dwz-0.9
-1803042238 metadata/md5-cache/sys-devel/automake-1.12.6-r2
+1803052208 metadata/md5-cache/sys-devel/automake-1.12.6-r2
 1803021159 metadata/md5-cache/sys-devel/binutils-2.27-r1
 1803021159 metadata/md5-cache/sys-devel/automake-1.10.3-r2
 1711290910 metadata/md5-cache/sys-devel/autoconf-archive-2017.03.21
 1803021159 metadata/md5-cache/sys-devel/native-cctools-4
-1803042238 metadata/md5-cache/sys-devel/automake-1.13.4-r2
+1803052208 metadata/md5-cache/sys-devel/automake-1.13.4-r2
 1801011404 metadata/md5-cache/sys-devel/smatch-9999
 1712020139 metadata/md5-cache/sys-devel/remake-4.1.1.1
 1803021159 metadata/md5-cache/sys-devel/lld-4.0.1
@@ -41487,11 +41489,11 @@
 1803021159 metadata/md5-cache/sys-devel/gdb-8.1
 1803021159 metadata/md5-cache/sys-devel/clang-6.0.0_rc3
 1801011404 metadata/md5-cache/sys-devel/smatch-1.57
-1803042238 metadata/md5-cache/sys-devel/automake-1.9.6-r5
+1803052208 metadata/md5-cache/sys-devel/automake-1.9.6-r5
 1803021159 metadata/md5-cache/sys-devel/flex-2.6.3
 1712020139 metadata/md5-cache/sys-devel/remake-3.82.0.9
 1803021159 metadata/md5-cache/sys-devel/binutils-hppa64-2.24
-1803042238 metadata/md5-cache/sys-devel/automake-1.11.6-r3
+1803052208 metadata/md5-cache/sys-devel/automake-1.11.6-r3
 1803021159 metadata/md5-cache/sys-devel/libtool-2.4.6-r3
 1803021159 metadata/md5-cache/sys-devel/binutils-apple-6.1-r1
 1801040139 metadata/md5-cache/sys-devel/llvmgold-7
@@ -41514,7 +41516,7 @@
 1803021159 metadata/md5-cache/sys-devel/binutils-hppa64-2.19.1
 1803021159 metadata/md5-cache/sys-devel/llvm-3.6.2-r100
 1803021159 metadata/md5-cache/sys-devel/kgcc64-4.9.4
-1803042238 metadata/md5-cache/sys-devel/Manifest.gz
+1803052208 metadata/md5-cache/sys-devel/Manifest.gz
 1801231609 metadata/md5-cache/sys-devel/gcc-config-1.9.1
 1803021159 metadata/md5-cache/sys-devel/binutils-hppa64-2.20.1
 1803021159 metadata/md5-cache/sys-devel/clang-3.6.2-r100
@@ -41522,7 +41524,7 @@
 1803021159 metadata/md5-cache/sys-devel/clang-3.4.2-r100
 1803021159 metadata/md5-cache/sys-devel/byfl-1.5
 1803021159 metadata/md5-cache/sys-devel/flex-2.6.1
-1803042238 metadata/md5-cache/sys-devel/automake-1.10.3-r3
+1803052208 metadata/md5-cache/sys-devel/automake-1.10.3-r3
 1803021159 metadata/md5-cache/sys-devel/binutils-apple-7.3
 1702282333 metadata/md5-cache/sys-devel/boost-m4-0.4
 1803021159 metadata/md5-cache/sys-devel/gcc-4.8.5-r1
@@ -41592,7 +41594,7 @@
 1802021208 metadata/md5-cache/sys-devel/llvmgold-5
 1803021159 metadata/md5-cache/sys-devel/clang-6.0.9999
 1803021159 metadata/md5-cache/sys-devel/binutils-2.26.1
-1803021159 metadata/md5-cache/sys-devel/patch-2.7.6-r1
+1803052038 metadata/md5-cache/sys-devel/patch-2.7.6-r1
 1803021159 metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r1
 1803021159 metadata/md5-cache/sys-devel/gdb-8.0.1
 1803021159 metadata/md5-cache/sys-devel/kgcc64-4.4.6
@@ -41622,7 +41624,7 @@
 1702282333 metadata/md5-cache/sys-devel/cons-2.2.0
 1803021159 metadata/md5-cache/sys-devel/sparse-0.5.1
 1803021159 metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
-1803042238 metadata/md5-cache/sys-devel/automake-1.15.1-r2
+1803052208 metadata/md5-cache/sys-devel/automake-1.15.1-r2
 1803021159 metadata/md5-cache/sys-devel/binutils-hppa64-2.23.2
 1711281241 metadata/md5-cache/sys-devel/parity-9999
 1712020139 metadata/md5-cache/sys-devel/remake-3.81.0.3
@@ -41832,6 +41834,7 @@
 1801011404 metadata/md5-cache/app-crypt/gnupg-2.1.20-r1
 1801280009 metadata/md5-cache/app-crypt/gnupg-2.2.3
 1802222238 metadata/md5-cache/app-crypt/gnupg-2.2.5
+1803052038 metadata/md5-cache/app-crypt/xca-1.4.1
 1803021159 metadata/md5-cache/app-crypt/p11-kit-0.23.2
 1803041138 metadata/md5-cache/app-crypt/gpgme-1.10.0
 1803021159 metadata/md5-cache/app-crypt/ekeyd-1.1.5
@@ -41903,7 +41906,7 @@
 1802261608 metadata/md5-cache/app-crypt/acme-0.21.1
 1803021159 metadata/md5-cache/app-crypt/johntheripper-1.7.9-r6
 1802262111 metadata/md5-cache/app-crypt/onak-0.5.0
-1803041138 metadata/md5-cache/app-crypt/Manifest.gz
+1803052038 metadata/md5-cache/app-crypt/Manifest.gz
 1708210038 metadata/md5-cache/app-crypt/debian-archive-keyring-2014.3
 1802262111 metadata/md5-cache/app-crypt/libu2f-server-1.1.0
 1803021159 metadata/md5-cache/app-crypt/jetring-0.25
@@ -42157,14 +42160,14 @@
 1706160339 metadata/md5-cache/virtual/perl-Module-Load-Conditional-0.680.0
 1706160339 metadata/md5-cache/virtual/perl-MIME-Base64-3.150.0-r3
 1706160339 metadata/md5-cache/virtual/perl-IPC-Cmd-0.960.0
-1802180308 metadata/md5-cache/virtual/python-funcsigs-1
+1803060038 metadata/md5-cache/virtual/python-funcsigs-1
 1709260839 metadata/md5-cache/virtual/perl-Term-ReadLine-1.150.0-r3
 1706160339 metadata/md5-cache/virtual/perl-parent-0.236.0
 1705310138 metadata/md5-cache/virtual/perl-threads-shared-1.510.0-r1
 1801171609 metadata/md5-cache/virtual/perl-Sys-Syslog-0.330.100_rc-r5
 1703291908 metadata/md5-cache/virtual/leechcraft-quark-sideprovider-9999
 1702282334 metadata/md5-cache/virtual/jdk-1.8.0-r3
-1802170009 metadata/md5-cache/virtual/libgudev-232
+1803052038 metadata/md5-cache/virtual/libgudev-232
 1706160339 metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.240.0
 1710151308 metadata/md5-cache/virtual/pypy3-5.9.0
 1706160339 metadata/md5-cache/virtual/perl-XSLoader-0.270.0
@@ -42175,14 +42178,14 @@
 1801120740 metadata/md5-cache/virtual/perl-Data-Dumper-2.160.0-r1
 1802192208 metadata/md5-cache/virtual/bitcoin-leveldb-0-r2
 1703291908 metadata/md5-cache/virtual/leechcraft-task-show-9999
-1803021159 metadata/md5-cache/virtual/python-pathlib-1.0
+1803052038 metadata/md5-cache/virtual/python-pathlib-1.0
 1707241808 metadata/md5-cache/virtual/rust-1.19.0
 1801231609 metadata/md5-cache/virtual/yacc-0
 1705310138 metadata/md5-cache/virtual/perl-Time-HiRes-1.973.300-r1
 1702282334 metadata/md5-cache/virtual/emacs-flim-0
 1706181509 metadata/md5-cache/virtual/emacs-25
 1710230108 metadata/md5-cache/virtual/perl-Time-HiRes-1.974.100-r1
-1803031308 metadata/md5-cache/virtual/Manifest.gz
+1803060038 metadata/md5-cache/virtual/Manifest.gz
 1801231609 metadata/md5-cache/virtual/httpd-basic-0-r2
 1706261608 metadata/md5-cache/virtual/lapack-3.7
 1703291908 metadata/md5-cache/virtual/leechcraft-downloader-http-9999
@@ -42384,7 +42387,7 @@
 1803021159 metadata/md5-cache/net-irc/cgiirc-0.5.10
 1803021159 metadata/md5-cache/net-irc/kvirc-9999
 1803041138 metadata/md5-cache/net-irc/irssi-1.0.6
-1803041138 metadata/md5-cache/net-irc/Manifest.gz
+1803052038 metadata/md5-cache/net-irc/Manifest.gz
 1803021159 metadata/md5-cache/net-irc/ircii-20111115
 1803021159 metadata/md5-cache/net-irc/onis-0.8.2-r1
 1803021159 metadata/md5-cache/net-irc/quassel-0.12.4
@@ -42396,7 +42399,7 @@
 1803021159 metadata/md5-cache/net-irc/iroffer-dinoex-3.29
 1803021159 metadata/md5-cache/net-irc/pisg-0.73-r1
 1803021159 metadata/md5-cache/net-irc/irker-2.16
-1802221208 metadata/md5-cache/net-irc/muh-2.2a-r1
+1803052038 metadata/md5-cache/net-irc/muh-2.2a-r1
 1803021159 metadata/md5-cache/net-irc/weechat-2.0.1
 1803021159 metadata/md5-cache/net-irc/kvirc-5.0_pre20171001143427
 1803021159 metadata/md5-cache/net-irc/irker-2.9
@@ -42443,7 +42446,7 @@
 1803021159 metadata/md5-cache/sys-auth/pam-pgsql-0.7.3.2
 1803021159 metadata/md5-cache/sys-auth/pam_chroot-0.9.2
 1803021159 metadata/md5-cache/sys-auth/consolekit-1.1.0-r1
-1803041338 metadata/md5-cache/sys-auth/elogind-235.2-r2
+1803060138 metadata/md5-cache/sys-auth/elogind-235.2-r2
 1803021159 metadata/md5-cache/sys-auth/pam_dotfile-0.7-r1
 1803011308 metadata/md5-cache/sys-auth/keystone-13.0.0
 1803021159 metadata/md5-cache/sys-auth/nss_ldap-265-r5
@@ -42503,7 +42506,7 @@
 1802262111 metadata/md5-cache/sys-auth/google-authenticator-1.05
 1803021159 metadata/md5-cache/sys-auth/openpam-20140912-r1
 1802262111 metadata/md5-cache/sys-auth/libnss-nis-1.4
-1803041338 metadata/md5-cache/sys-auth/Manifest.gz
+1803060138 metadata/md5-cache/sys-auth/Manifest.gz
 1803021159 metadata/md5-cache/sys-auth/pambase-20120417-r3
 1803021159 metadata/md5-cache/sys-auth/thinkfinger-0.3-r3
 1803021159 metadata/md5-cache/sys-auth/pambase-20150213
@@ -42524,7 +42527,6 @@
 1801231609 metadata/md5-cache/sys-auth/pambase-20150213-r1
 1803021159 metadata/md5-cache/sys-auth/libfprint-0.5.0-r2
 1803041008 metadata/md5-cache/sys-auth/libnss-mysql-1.5_p20060915-r3
-1803021159 metadata/md5-cache/sys-auth/elogind-235.2-r1
 1707202038 metadata/md5-cache/sys-auth/nss-myhostname-0.3
 1803030838 metadata/md5-cache/sys-auth/ykpers-1.18.1
 1803021159 metadata/md5-cache/sys-auth/pam_passwdqc-1.0.5
@@ -42722,7 +42724,7 @@
 1802262111 metadata/md5-cache/net-libs/tox-0.1.10
 1803021159 metadata/md5-cache/net-libs/net6-1.3.14-r2
 1801011404 metadata/md5-cache/net-libs/net6-1.3.14
-1802221208 metadata/md5-cache/net-libs/libident-0.32-r1
+1803052038 metadata/md5-cache/net-libs/libident-0.32-r1
 1802161609 metadata/md5-cache/net-libs/gnutls-3.5.18
 1803021159 metadata/md5-cache/net-libs/libbitcoinconsensus-0.13.1
 1803021159 metadata/md5-cache/net-libs/nfqueue-bindings-0.6
@@ -42735,7 +42737,7 @@
 1803021159 metadata/md5-cache/net-libs/courier-unicode-1.3
 1702282328 metadata/md5-cache/net-libs/libblkmaker-0.4.3
 1803021159 metadata/md5-cache/net-libs/dleyna-connector-dbus-0.2.0
-1803021159 metadata/md5-cache/net-libs/libnfsidmap-0.25-r1
+1803060038 metadata/md5-cache/net-libs/libnfsidmap-0.25-r1
 1803021159 metadata/md5-cache/net-libs/enet-1.3.13
 1802031508 metadata/md5-cache/net-libs/nghttp2-1.30.0
 1803021159 metadata/md5-cache/net-libs/webkit-gtk-2.18.6
@@ -42799,7 +42801,7 @@
 1803021159 metadata/md5-cache/net-libs/ccnet-6.1.4
 1803021159 metadata/md5-cache/net-libs/libsrtp-1.5.2
 1801011404 metadata/md5-cache/net-libs/libmbim-1.6.0
-1803042038 metadata/md5-cache/net-libs/Manifest.gz
+1803060038 metadata/md5-cache/net-libs/Manifest.gz
 1803022138 metadata/md5-cache/net-libs/librsync-2.0.0
 1803021159 metadata/md5-cache/net-libs/courier-unicode-1.4
 1802262111 metadata/md5-cache/net-libs/liquid-dsp-9999
@@ -42887,7 +42889,7 @@
 1803021159 metadata/md5-cache/net-libs/libnatpmp-20140401-r1
 1803021159 metadata/md5-cache/net-libs/libssh2-1.7.0
 1802262111 metadata/md5-cache/net-libs/libsrtp-1.5.4
-1803021159 metadata/md5-cache/net-libs/libsoup-2.58.2
+1803052038 metadata/md5-cache/net-libs/libsoup-2.58.2
 1803021159 metadata/md5-cache/net-libs/libndp-1.6-r1
 1803021159 metadata/md5-cache/net-libs/libhackrf-2014.04.1
 1803021159 metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.4
@@ -42913,6 +42915,7 @@
 1803021159 metadata/md5-cache/net-libs/libgadu-1.12.2
 1708141708 metadata/md5-cache/net-libs/rpc2-2.14
 1801050119 metadata/md5-cache/net-libs/ripe-atlas-sagan-1.1.11
+1803052038 metadata/md5-cache/net-libs/libtrace-4.0.3
 1803021159 metadata/md5-cache/net-libs/libs3-2.0-r1
 1803021159 metadata/md5-cache/net-libs/ccnet-6.1.3
 1803021159 metadata/md5-cache/net-libs/gsoap-2.8.59
@@ -42924,7 +42927,6 @@
 1706101838 metadata/md5-cache/net-libs/libmicrohttpd-0.9.52
 1803021159 metadata/md5-cache/net-libs/loudmouth-1.4.3-r2
 1801011404 metadata/md5-cache/net-libs/libmbim-1.12.4
-1803021159 metadata/md5-cache/net-libs/libtrace-4.0.1
 1803021159 metadata/md5-cache/net-libs/nodejs-8.9.4
 1801011404 metadata/md5-cache/net-libs/miniupnpc-2.0.20170509
 1803021159 metadata/md5-cache/net-libs/libosip-4.0.0
@@ -42950,7 +42952,7 @@
 1803021159 metadata/md5-cache/net-libs/libnatpmp-20130911
 1803021159 metadata/md5-cache/net-libs/telepathy-glib-0.24.1
 1803021159 metadata/md5-cache/net-libs/libhackrf-9999
-1803041338 metadata/md5-cache/net-libs/mbedtls-2.7.1
+1803060038 metadata/md5-cache/net-libs/mbedtls-2.7.1
 1803021159 metadata/md5-cache/net-libs/libhackrf-2014.08.1
 1803021159 metadata/md5-cache/net-libs/libnfsidmap-0.25
 1803021159 metadata/md5-cache/net-libs/ldns-1.7.0-r2
@@ -42993,7 +42995,7 @@
 1802262111 metadata/md5-cache/net-libs/shairplay-0_pre20170118
 1803021159 metadata/md5-cache/net-libs/libwhisker-2.5-r1
 1803021159 metadata/md5-cache/net-libs/libprotoident-9999
-1803021159 metadata/md5-cache/net-libs/phodav-2.2
+1803052038 metadata/md5-cache/net-libs/phodav-2.2
 1803021159 metadata/md5-cache/net-libs/libnids-1.24-r6
 1801231609 metadata/md5-cache/net-libs/gnutls-3.5.15
 1803021159 metadata/md5-cache/games-action/btanks-0.9.8083
@@ -43410,7 +43412,7 @@
 1803021159 metadata/md5-cache/media-plugins/gst-plugins-assrender-1.12.3
 1702282327 metadata/md5-cache/media-plugins/ladspa-bs2b-0.9.1
 1803021159 metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-2.4.8
-1803042038 metadata/md5-cache/media-plugins/Manifest.gz
+1803052038 metadata/md5-cache/media-plugins/Manifest.gz
 1803021159 metadata/md5-cache/media-plugins/gst-plugins-dash-1.12.4
 1803021159 metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.13-r100
 1803021159 metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.12.3
@@ -43553,7 +43555,7 @@
 1803021159 metadata/md5-cache/media-plugins/gst-plugins-srtp-1.12.4
 1803021159 metadata/md5-cache/media-plugins/gst-plugins-wavpack-0.10.31-r1
 1801011404 metadata/md5-cache/media-plugins/mcp-plugins-0.4.0-r1
-1803021159 metadata/md5-cache/media-plugins/live-2017.10.28
+1803052038 metadata/md5-cache/media-plugins/live-2017.10.28
 1803021159 metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0
 1803021159 metadata/md5-cache/media-plugins/vdr-spider-0.2.2
 1803021159 metadata/md5-cache/media-plugins/kodi-audioencoder-wav-9999
@@ -43794,7 +43796,7 @@
 1803021159 metadata/md5-cache/x11-misc/dclock-2.2.2_p9
 1803021159 metadata/md5-cache/x11-misc/safeeyes-2.0.2
 1801011405 metadata/md5-cache/x11-misc/fracplanet-0.5.1
-1803042238 metadata/md5-cache/x11-misc/xscreensaver-5.38
+1803060038 metadata/md5-cache/x11-misc/xscreensaver-5.38
 1703162239 metadata/md5-cache/x11-misc/xpad-4.2
 1801011405 metadata/md5-cache/x11-misc/xdo-0.5
 1803021159 metadata/md5-cache/x11-misc/easystroke-0.6.0-r2
@@ -43961,7 +43963,7 @@
 1803021159 metadata/md5-cache/x11-misc/spacefm-1.0.4-r1
 1803021159 metadata/md5-cache/x11-misc/peksystray-0.4.0
 1803021159 metadata/md5-cache/x11-misc/shutter-0.93.1-r3
-1803042238 metadata/md5-cache/x11-misc/Manifest.gz
+1803060038 metadata/md5-cache/x11-misc/Manifest.gz
 1801042239 metadata/md5-cache/x11-misc/libinput-gestures-2.30
 1803021159 metadata/md5-cache/x11-misc/gccmakedep-1.0.3
 1801091400 metadata/md5-cache/x11-misc/xautolock-2.2_p5_p1
@@ -44068,6 +44070,7 @@
 1803021159 metadata/md5-cache/x11-misc/xnots-9999
 1803021159 metadata/md5-cache/x11-misc/xkeyboard-config-2.21
 1803021159 metadata/md5-cache/x11-misc/icewmcp-3.2-r4
+1803052038 metadata/md5-cache/x11-misc/util-macros-1.19.2
 1802262111 metadata/md5-cache/x11-misc/bbdate-0.2.4-r2
 1803032038 metadata/md5-cache/x11-misc/screen-message-0.24
 1803021159 metadata/md5-cache/x11-misc/lineakd-0.9.0-r2
@@ -44722,13 +44725,13 @@
 1803021159 metadata/md5-cache/dev-libs/libcdio-0.94-r1
 1803021159 metadata/md5-cache/dev-libs/libdynd-0.7.2
 1803021159 metadata/md5-cache/dev-libs/ucommon-6.1.10
-1803030508 metadata/md5-cache/dev-libs/glib-2.52.3
+1803052038 metadata/md5-cache/dev-libs/glib-2.52.3
 1803021159 metadata/md5-cache/dev-libs/log4shib-1.0.1
 1803021159 metadata/md5-cache/dev-libs/libmacaroons-0.2.0-r1
 1803021159 metadata/md5-cache/dev-libs/squareball-0.2.0
 1801011404 metadata/md5-cache/dev-libs/skalibs-2.3.9.0
 1802262111 metadata/md5-cache/dev-libs/http-fetcher-1.1.0-r1
-1802170009 metadata/md5-cache/dev-libs/vala-common-0.36.7
+1803052038 metadata/md5-cache/dev-libs/vala-common-0.36.7
 1803021159 metadata/md5-cache/dev-libs/xmlwrapp-0.8.1
 1803021159 metadata/md5-cache/dev-libs/libdbusmenu-12.10.2-r2
 1801011404 metadata/md5-cache/dev-libs/librdkafka-0.11.0
@@ -44795,7 +44798,7 @@
 1702282313 metadata/md5-cache/dev-libs/libmodbus-3.1.4
 1803021159 metadata/md5-cache/dev-libs/libcdio-paranoia-0.93_p1-r1
 1803021159 metadata/md5-cache/dev-libs/libevent-9999
-1803040938 metadata/md5-cache/dev-libs/libxml2-2.9.7
+1803052038 metadata/md5-cache/dev-libs/libxml2-2.9.7
 1801011404 metadata/md5-cache/dev-libs/syncdir-1.0-r1
 1803021159 metadata/md5-cache/dev-libs/openssl-1.0.2n
 1803021159 metadata/md5-cache/dev-libs/libgit2-0.26.0
@@ -44895,7 +44898,7 @@
 1803021159 metadata/md5-cache/dev-libs/libnl-3.2.28
 1803021159 metadata/md5-cache/dev-libs/rapidxml-1.13
 1802262111 metadata/md5-cache/dev-libs/xmlsec-1.2.24-r1
-1802262111 metadata/md5-cache/dev-libs/libunicode-0.4-r2
+1803052038 metadata/md5-cache/dev-libs/libunicode-0.4-r2
 1803021159 metadata/md5-cache/dev-libs/cyberjack-3.99.5_p10
 1802262111 metadata/md5-cache/dev-libs/libprelude-3.1.0-r1
 1803021159 metadata/md5-cache/dev-libs/icu-58.2-r1
@@ -44931,7 +44934,7 @@
 1803021159 metadata/md5-cache/dev-libs/dbus-glib-0.104
 1802262111 metadata/md5-cache/dev-libs/pslib-0.4.5
 1803021159 metadata/md5-cache/dev-libs/liblognorm-1.1.0
-1803030508 metadata/md5-cache/dev-libs/gobject-introspection-1.52.1
+1803052038 metadata/md5-cache/dev-libs/gobject-introspection-1.52.1
 1803021159 metadata/md5-cache/dev-libs/mapm-4.9.5-r1
 1803021159 metadata/md5-cache/dev-libs/libsass-9999
 1803021159 metadata/md5-cache/dev-libs/injeqt-1.2.0
@@ -45016,7 +45019,7 @@
 1803021159 metadata/md5-cache/dev-libs/unibilium-1.1.4
 1803021159 metadata/md5-cache/dev-libs/zlog-1.2.12
 1801011404 metadata/md5-cache/dev-libs/libassuan-2.4.3-r1
-1803021159 metadata/md5-cache/dev-libs/atk-2.24.0
+1803052038 metadata/md5-cache/dev-libs/atk-2.24.0
 1803021159 metadata/md5-cache/dev-libs/libbson-0.98.0
 1803021159 metadata/md5-cache/dev-libs/protobuf-3.4.1
 1803021159 metadata/md5-cache/dev-libs/newt-0.52.18
@@ -45042,7 +45045,7 @@
 1803021159 metadata/md5-cache/dev-libs/actor-framework-0.14.5
 1803021159 metadata/md5-cache/dev-libs/leatherman-1.3.0
 1802262111 metadata/md5-cache/dev-libs/libuv-1.19.2
-1803021159 metadata/md5-cache/dev-libs/protobuf-3.5.1.1
+1803060038 metadata/md5-cache/dev-libs/protobuf-3.5.1.1
 1803021159 metadata/md5-cache/dev-libs/libpipeline-1.4.0
 1803021159 metadata/md5-cache/dev-libs/libmateweather-1.18.2
 1801011404 metadata/md5-cache/dev-libs/uthash-1.9.9
@@ -45134,7 +45137,7 @@
 1803021159 metadata/md5-cache/dev-libs/link-grammar-5.3.11
 1803021159 metadata/md5-cache/dev-libs/libressl-2.3.10
 1803021159 metadata/md5-cache/dev-libs/boehm-gc-7.2d
-1802170009 metadata/md5-cache/dev-libs/libinput-1.9.4
+1803052038 metadata/md5-cache/dev-libs/libinput-1.9.4
 1802032238 metadata/md5-cache/dev-libs/libixion-0.13.0
 1802081138 metadata/md5-cache/dev-libs/vala-common-0.34.16
 1803021159 metadata/md5-cache/dev-libs/elfutils-0.169-r1
@@ -45162,7 +45165,7 @@
 1803021159 metadata/md5-cache/dev-libs/snowball-stemmer-0.20140325
 1803021159 metadata/md5-cache/dev-libs/cyberjack-3.99.5_p03-r1
 1803021159 metadata/md5-cache/dev-libs/beignet-9999
-1803042238 metadata/md5-cache/dev-libs/Manifest.gz
+1803060038 metadata/md5-cache/dev-libs/Manifest.gz
 1803021159 metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r3
 1803021159 metadata/md5-cache/dev-libs/libcli-1.9.7
 1803021159 metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r2
@@ -45200,7 +45203,7 @@
 1803021159 metadata/md5-cache/dev-libs/tntnet-2.2.1
 1803021159 metadata/md5-cache/dev-libs/ilbc-rfc3951-0-r1
 1803021159 metadata/md5-cache/dev-libs/ace-5.7.2
-1803021159 metadata/md5-cache/dev-libs/nss-3.35
+1803060008 metadata/md5-cache/dev-libs/nss-3.35
 1803021159 metadata/md5-cache/dev-libs/mpfr-3.1.5_p2
 1803021159 metadata/md5-cache/dev-libs/freexl-1.0.1
 1803021159 metadata/md5-cache/dev-libs/g-wrap-1.9.14
@@ -45315,7 +45318,7 @@
 1803021159 metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249-r2
 1803021159 metadata/md5-cache/dev-libs/libffi-3.2.1-r2
 1702282313 metadata/md5-cache/dev-libs/log4shib-1.0.4
-1803022038 metadata/md5-cache/dev-libs/libxslt-1.1.30-r2
+1803052138 metadata/md5-cache/dev-libs/libxslt-1.1.30-r2
 1803021159 metadata/md5-cache/dev-libs/libcgroup-0.41-r4
 1803021159 metadata/md5-cache/dev-libs/libwacom-0.25
 1803021159 metadata/md5-cache/dev-libs/libtommath-0.42.0-r1
@@ -45335,7 +45338,7 @@
 1803021159 metadata/md5-cache/dev-libs/libixion-0.12.2
 1803021159 metadata/md5-cache/dev-libs/libatasmart-0.19-r2
 1803021159 metadata/md5-cache/dev-libs/libfmt-4.1.0
-1803030508 metadata/md5-cache/dev-libs/gobject-introspection-common-1.52.1
+1803052038 metadata/md5-cache/dev-libs/gobject-introspection-common-1.52.1
 1803021159 metadata/md5-cache/dev-libs/ferrisloki-3.0.13-r2
 1803021159 metadata/md5-cache/dev-libs/libsecp256k1-0.0.0_pre20161213
 1702282312 metadata/md5-cache/dev-libs/bcm2835-1.46
@@ -45454,7 +45457,7 @@
 1801011404 metadata/md5-cache/dev-libs/librdkafka-0.9.5
 1801050119 metadata/md5-cache/dev-libs/libcxml-0.15.4
 1803021159 metadata/md5-cache/dev-libs/qrosscore-0.3.2
-1802231338 metadata/md5-cache/dev-libs/mm-1.4.2-r2
+1803052038 metadata/md5-cache/dev-libs/mm-1.4.2-r2
 1801042009 metadata/md5-cache/dev-libs/libpqxx-5.1.0
 1803021159 metadata/md5-cache/dev-libs/keybinder-0.3.1-r300
 1709221308 metadata/md5-cache/dev-libs/libmowgli-2.1.3
@@ -45477,7 +45480,7 @@
 1803021159 metadata/md5-cache/dev-libs/libgdata-0.17.9-r1
 1803021159 metadata/md5-cache/dev-libs/libgcrypt-1.8.1
 1802262111 metadata/md5-cache/dev-libs/volume_key-0.3.9
-1802262111 metadata/md5-cache/dev-libs/judy-1.0.5-r2
+1803060038 metadata/md5-cache/dev-libs/judy-1.0.5-r2
 1802262111 metadata/md5-cache/dev-libs/librelp-1.2.12
 1803021159 metadata/md5-cache/dev-libs/rremove-1.0.5
 1802262111 metadata/md5-cache/dev-libs/wayland-9999
@@ -45640,7 +45643,7 @@
 1801131009 metadata/md5-cache/dev-libs/gobject-introspection-common-1.50.0
 1803021159 metadata/md5-cache/dev-libs/double-conversion-2.0.1
 1803021159 metadata/md5-cache/dev-libs/libflatarray-0.1.1
-1802262111 metadata/md5-cache/dev-libs/libspt-1.1-r3
+1803052338 metadata/md5-cache/dev-libs/libspt-1.1-r3
 1803021159 metadata/md5-cache/dev-libs/libplatform-2.0.1
 1801091400 metadata/md5-cache/dev-libs/skalibs-2.4.0.2
 1801011404 metadata/md5-cache/dev-libs/botan-2.3.0
@@ -45999,7 +46002,7 @@
 1707071239 metadata/md5-cache/x11-terms/xfce4-terminal-0.8.5.1
 1803021159 metadata/md5-cache/x11-terms/rxvt-unicode-9.22-r1
 1803021159 metadata/md5-cache/x11-terms/qterminal-9999
-1803041008 metadata/md5-cache/x11-terms/eterm-0.9.6-r1
+1803052038 metadata/md5-cache/x11-terms/eterm-0.9.6-r1
 1803021159 metadata/md5-cache/x11-terms/sakura-3.5.0
 1803012238 metadata/md5-cache/x11-terms/kitty-9999
 1803021159 metadata/md5-cache/x11-terms/gnome-terminal-3.24.2
@@ -46012,7 +46015,7 @@
 1803021159 metadata/md5-cache/x11-terms/guake-0.8.13
 1803021159 metadata/md5-cache/x11-terms/cool-retro-term-1.0.1
 1803021159 metadata/md5-cache/x11-terms/rxvt-unicode-9.21
-1803041008 metadata/md5-cache/x11-terms/Manifest.gz
+1803052038 metadata/md5-cache/x11-terms/Manifest.gz
 1803021159 metadata/md5-cache/x11-terms/sakura-3.4.0
 1803021159 metadata/md5-cache/x11-terms/kterm-6.2.0-r5
 1801050119 metadata/md5-cache/x11-terms/terminology-9999
@@ -46111,7 +46114,7 @@
 1803021159 metadata/md5-cache/games-emulation/ppsspp-1.4.2
 1803021159 metadata/md5-cache/sys-process/memwatch-0.3.0
 1801280009 metadata/md5-cache/sys-process/atop-2.3.0-r1
-1803041008 metadata/md5-cache/sys-process/audit-2.7.1
+1803052338 metadata/md5-cache/sys-process/audit-2.7.1
 1702282334 metadata/md5-cache/sys-process/tiptop-2.2
 1801011405 metadata/md5-cache/sys-process/cronutils-1.9
 1803021159 metadata/md5-cache/sys-process/systemd-cron-1.5.12-r1
@@ -46164,7 +46167,7 @@
 1802031238 metadata/md5-cache/sys-process/parallel-20171222
 1803021159 metadata/md5-cache/sys-process/prll-0.6.2
 1803021159 metadata/md5-cache/sys-process/time-1.7-r3
-1803041008 metadata/md5-cache/sys-process/Manifest.gz
+1803052338 metadata/md5-cache/sys-process/Manifest.gz
 1803021159 metadata/md5-cache/sys-process/latencytop-0.5-r1
 1803021159 metadata/md5-cache/sys-process/memwatch-0.3.1
 1803021159 metadata/md5-cache/sys-process/memwatch-0.3.2
@@ -46224,12 +46227,12 @@
 1711060039 metadata/md5-cache/app-vim/snipmate-0.87-r1
 1711060039 metadata/md5-cache/app-vim/multvals-3.10-r1
 1711060039 metadata/md5-cache/app-vim/gitolite-syntax-20130306
-1711060039 metadata/md5-cache/app-vim/gitlog-6.0.0
+1803052038 metadata/md5-cache/app-vim/gitlog-6.0.0
 1801071439 metadata/md5-cache/app-vim/molokai-0.1_p20151115
 1801011404 metadata/md5-cache/app-vim/python-mode-0.9.0-r1
 1711060039 metadata/md5-cache/app-vim/sleuth-1.1
 1711281241 metadata/md5-cache/app-vim/undotree-9999
-1711060039 metadata/md5-cache/app-vim/ansiesc-12
+1803060108 metadata/md5-cache/app-vim/ansiesc-12
 1803021159 metadata/md5-cache/app-vim/vimpress-3.2.0
 1711060039 metadata/md5-cache/app-vim/txtfmt-3.1
 1803021159 metadata/md5-cache/app-vim/taglist-4.6
@@ -46238,13 +46241,13 @@
 1803021159 metadata/md5-cache/app-vim/vim-spell-nl-20051007-r1
 1803021159 metadata/md5-cache/app-vim/vim-spell-nl-20051007
 1711060039 metadata/md5-cache/app-vim/pfsyntax-1.3
-1712200139 metadata/md5-cache/app-vim/extra-syntax-4-r2
+1803060108 metadata/md5-cache/app-vim/extra-syntax-4-r2
 1712252239 metadata/md5-cache/app-vim/exheres-syntax-20090310
 1803021159 metadata/md5-cache/app-vim/vim-latex-1.8.23.20141116
 1711060039 metadata/md5-cache/app-vim/vimclojure-2.3.6-r2
 1711060039 metadata/md5-cache/app-vim/vimpython-1.13-r1
 1711060039 metadata/md5-cache/app-vim/ferret-1.4
-1711060039 metadata/md5-cache/app-vim/gitlog-5.1.0
+1803052038 metadata/md5-cache/app-vim/gitlog-5.1.0
 1803021159 metadata/md5-cache/app-vim/vim-spell-he-20100312
 1711060039 metadata/md5-cache/app-vim/l9-1.1
 1801011404 metadata/md5-cache/app-vim/pydoc-2.0-r1
@@ -46256,7 +46259,7 @@
 1711060039 metadata/md5-cache/app-vim/vimclojure-2.3.6-r3
 1801231609 metadata/md5-cache/app-vim/securemodelines-20140926
 1711061409 metadata/md5-cache/app-vim/merginal-2.1.0
-1711060039 metadata/md5-cache/app-vim/indentpython-0.3
+1803052038 metadata/md5-cache/app-vim/indentpython-0.3
 1803021159 metadata/md5-cache/app-vim/vim-spell-el-20080402
 1711060039 metadata/md5-cache/app-vim/matrix-1.10-r1
 1801231609 metadata/md5-cache/app-vim/gentoo-syntax-20160530
@@ -46275,46 +46278,46 @@
 1711060039 metadata/md5-cache/app-vim/yankring-19.0
 1803021159 metadata/md5-cache/app-vim/vim-spell-pt-20100312-r1
 1801011404 metadata/md5-cache/app-vim/jedi-0.8_p20171015
-1711060039 metadata/md5-cache/app-vim/easy-align-2.10.0
+1803060108 metadata/md5-cache/app-vim/easy-align-2.10.0
 1803021159 metadata/md5-cache/app-vim/vim-spell-he-20100312-r1
 1711060039 metadata/md5-cache/app-vim/vim-rest-console-2.5.0
-1711060039 metadata/md5-cache/app-vim/fugitive-2.2
-1711060039 metadata/md5-cache/app-vim/cmdalias-3.0-r1
-1803021159 metadata/md5-cache/app-vim/dhcpd-syntax-20030825
+1803052038 metadata/md5-cache/app-vim/fugitive-2.2
+1803060108 metadata/md5-cache/app-vim/cmdalias-3.0-r1
+1803060108 metadata/md5-cache/app-vim/dhcpd-syntax-20030825
 1801231609 metadata/md5-cache/app-vim/pam-syntax-20060424
-1711281241 metadata/md5-cache/app-vim/gitlog-9999
+1803052038 metadata/md5-cache/app-vim/gitlog-9999
 1711060039 metadata/md5-cache/app-vim/languagetool-1.29
-1711060039 metadata/md5-cache/app-vim/c-support-6.1
+1803060108 metadata/md5-cache/app-vim/c-support-6.1
 1711060039 metadata/md5-cache/app-vim/toggle-0.5-r1
-1711060039 metadata/md5-cache/app-vim/fuzzyfinder-4.2.2
+1803052038 metadata/md5-cache/app-vim/fuzzyfinder-4.2.2
 1803021159 metadata/md5-cache/app-vim/vim-spell-hu-20100312-r1
 1711060039 metadata/md5-cache/app-vim/json-20150511
-1711281241 metadata/md5-cache/app-vim/airline-9999
+1803060108 metadata/md5-cache/app-vim/airline-9999
 1711060039 metadata/md5-cache/app-vim/rails-5.2
 1803021159 metadata/md5-cache/app-vim/splice-1.0.1
-1711060039 metadata/md5-cache/app-vim/checkattach-0.17
+1803060108 metadata/md5-cache/app-vim/checkattach-0.17
 1711190609 metadata/md5-cache/app-vim/gitgutter-20171101
 1803021159 metadata/md5-cache/app-vim/notes-0.33.4
 1711060039 metadata/md5-cache/app-vim/fluxbox-syntax-1.5
 1711060039 metadata/md5-cache/app-vim/omnicppcomplete-0.41
-1711060039 metadata/md5-cache/app-vim/airline-0.8
+1803060108 metadata/md5-cache/app-vim/airline-0.8
 1711060039 metadata/md5-cache/app-vim/detectindent-1.0_p20150908
 1711060039 metadata/md5-cache/app-vim/nerdcommenter-2.5.0
 1712170239 metadata/md5-cache/app-vim/udev-syntax-20051016-r2
 1711060039 metadata/md5-cache/app-vim/locateopen-1.3-r1
 1711060039 metadata/md5-cache/app-vim/help-extra-syntax-20050106-r1
 1803021159 metadata/md5-cache/app-vim/vim-spell-cs-20061021-r1
-1711060039 metadata/md5-cache/app-vim/c-support-6.1.1
+1803060108 metadata/md5-cache/app-vim/c-support-6.1.1
 1711060039 metadata/md5-cache/app-vim/surround-2.1-r1
 1711060039 metadata/md5-cache/app-vim/tlib-1.20
-1711060039 metadata/md5-cache/app-vim/gtk-syntax-20130716
-1801011404 metadata/md5-cache/app-vim/colorv-3.0.2-r1
+1803052038 metadata/md5-cache/app-vim/gtk-syntax-20130716
+1803060108 metadata/md5-cache/app-vim/colorv-3.0.2-r1
 1711060039 metadata/md5-cache/app-vim/zenburn-2.25
-1711060039 metadata/md5-cache/app-vim/increment-1.1-r1
-1711060039 metadata/md5-cache/app-vim/csv-0.31-r1
+1803052038 metadata/md5-cache/app-vim/increment-1.1-r1
+1803060108 metadata/md5-cache/app-vim/csv-0.31-r1
 1803021159 metadata/md5-cache/app-vim/youcompleteme-20130910
 1711281241 metadata/md5-cache/app-vim/airline-themes-9999
-1803021159 metadata/md5-cache/app-vim/alternate-2.18-r1
+1803060108 metadata/md5-cache/app-vim/alternate-2.18-r1
 1711060039 metadata/md5-cache/app-vim/vim-r-1.2.6
 1803021159 metadata/md5-cache/app-vim/python-mode-0.6.18-r3
 1711060039 metadata/md5-cache/app-vim/ctrlp-1.80
@@ -46322,14 +46325,14 @@
 1801011404 metadata/md5-cache/app-vim/python-mode-0.6.18-r4
 1711060039 metadata/md5-cache/app-vim/ntp-syntax-20031001-r1
 1711060039 metadata/md5-cache/app-vim/pgn-syntax-1.0
-1711060039 metadata/md5-cache/app-vim/curcmdmode-1.0-r1
+1803060108 metadata/md5-cache/app-vim/curcmdmode-1.0-r1
 1711060039 metadata/md5-cache/app-vim/uptime-1.3-r1
-1711060039 metadata/md5-cache/app-vim/colorsel-20100406
+1803060108 metadata/md5-cache/app-vim/colorsel-20100406
 1711060039 metadata/md5-cache/app-vim/tt2-syntax-1.13
-1711060039 metadata/md5-cache/app-vim/ebnf-syntax-1.1-r2
-1711060039 metadata/md5-cache/app-vim/dbext-25.0
+1803060108 metadata/md5-cache/app-vim/ebnf-syntax-1.1-r2
+1803060108 metadata/md5-cache/app-vim/dbext-25.0
 1711060039 metadata/md5-cache/app-vim/vim-r-1.0
-1711060039 metadata/md5-cache/app-vim/brainfuck-syntax-1.0.2
+1803060108 metadata/md5-cache/app-vim/brainfuck-syntax-1.0.2
 1803021159 metadata/md5-cache/app-vim/vimbuddy-0.9.2-r1
 1711060039 metadata/md5-cache/app-vim/vim-hoogle-1.3
 1803021159 metadata/md5-cache/app-vim/slimv-0.9.12-r1
@@ -46338,52 +46341,52 @@
 1803021159 metadata/md5-cache/app-vim/vim-spell-ru-20060506
 1711060039 metadata/md5-cache/app-vim/ri-browser-1.2
 1711060039 metadata/md5-cache/app-vim/nerdtree-tabs-1.4.7
-1711190609 metadata/md5-cache/app-vim/dbext-26.00
+1803060108 metadata/md5-cache/app-vim/dbext-26.00
 1803021159 metadata/md5-cache/app-vim/cream-0.43
 1801011404 metadata/md5-cache/app-vim/vim-latex-1.9.0
 1802050208 metadata/md5-cache/app-vim/vim-latex-1.10.0
 1711060039 metadata/md5-cache/app-vim/ackvim-1.0.9-r1
 1711060039 metadata/md5-cache/app-vim/csound-syntax-20160804
 1711060039 metadata/md5-cache/app-vim/vim-flake8-1.6
-1711060039 metadata/md5-cache/app-vim/info-1.7-r2
+1803052038 metadata/md5-cache/app-vim/info-1.7-r2
 1711060039 metadata/md5-cache/app-vim/vim-autoclose-2.0
-1711060039 metadata/md5-cache/app-vim/errsign-0.1-r1
+1803060108 metadata/md5-cache/app-vim/errsign-0.1-r1
 1803021159 metadata/md5-cache/app-vim/conque-2.3-r1
-1711281241 metadata/md5-cache/app-vim/bufexplorer-9999
+1803060108 metadata/md5-cache/app-vim/bufexplorer-9999
 1711281241 metadata/md5-cache/app-vim/syntastic-9999
 1711060039 metadata/md5-cache/app-vim/vim-addon-mw-utils-20121105
-1711060039 metadata/md5-cache/app-vim/genindent-1.1-r1
-1711060039 metadata/md5-cache/app-vim/gnupg-2.6
+1803052038 metadata/md5-cache/app-vim/genindent-1.1-r1
+1803052038 metadata/md5-cache/app-vim/gnupg-2.6
 1711060039 metadata/md5-cache/app-vim/vcscommand-1.99.47
 1711060039 metadata/md5-cache/app-vim/rainbow_parentheses-1.0
 1711060039 metadata/md5-cache/app-vim/vimagit-1.7.1
-1711060039 metadata/md5-cache/app-vim/ebnf-syntax-1.1-r1
+1803060108 metadata/md5-cache/app-vim/ebnf-syntax-1.1-r1
 1711060039 metadata/md5-cache/app-vim/ferret-1.5
-1711060039 metadata/md5-cache/app-vim/gitv-1.3.1
+1803052038 metadata/md5-cache/app-vim/gitv-1.3.1
 1803021159 metadata/md5-cache/app-vim/vim-spell-pt-20100312
 1712252239 metadata/md5-cache/app-vim/exheres-syntax-99999999
 1711060039 metadata/md5-cache/app-vim/rails-5.1
 1711060039 metadata/md5-cache/app-vim/neocomplcache-7.1
-1711060039 metadata/md5-cache/app-vim/align-43
+1803060108 metadata/md5-cache/app-vim/align-43
 1711060039 metadata/md5-cache/app-vim/csscomplete-1.0
 1711060039 metadata/md5-cache/app-vim/webapi-0.2
 1803021159 metadata/md5-cache/app-vim/vim-spell-es-20060208
-1711060039 metadata/md5-cache/app-vim/cecutil-17
+1803060108 metadata/md5-cache/app-vim/cecutil-17
 1803021159 metadata/md5-cache/app-vim/vim-spell-fr-20060121-r1
 1711060039 metadata/md5-cache/app-vim/recover-0.18
-1711060039 metadata/md5-cache/app-vim/genutils-2.5
-1711060039 metadata/md5-cache/app-vim/calendar-2.9
-1803021159 metadata/md5-cache/app-vim/command-t-5.0.1
+1803052038 metadata/md5-cache/app-vim/genutils-2.5
+1803060108 metadata/md5-cache/app-vim/calendar-2.9
+1803060108 metadata/md5-cache/app-vim/command-t-5.0.1
 1711060039 metadata/md5-cache/app-vim/tt2-syntax-1.13-r1
 1803031738 metadata/md5-cache/app-vim/gentoo-syntax-20170225
 1711060039 metadata/md5-cache/app-vim/vimcommander-0.81
 1803021159 metadata/md5-cache/app-vim/vimcalc-1.3-r2
-1711060039 metadata/md5-cache/app-vim/eruby-syntax-2.0-r2
+1803060108 metadata/md5-cache/app-vim/eruby-syntax-2.0-r2
 1711281241 metadata/md5-cache/app-vim/vimagit-9999
 1711060039 metadata/md5-cache/app-vim/lustyexplorer-4.1
-1711060039 metadata/md5-cache/app-vim/git-patch-tags-0.2
+1803052038 metadata/md5-cache/app-vim/git-patch-tags-0.2
 1711060039 metadata/md5-cache/app-vim/tmpl-0.1-r1
-1803031738 metadata/md5-cache/app-vim/Manifest.gz
+1803060108 metadata/md5-cache/app-vim/Manifest.gz
 1803021159 metadata/md5-cache/app-vim/vim-spell-it-20100312-r1
 1711060039 metadata/md5-cache/app-vim/sleuth-1.0
 1803021159 metadata/md5-cache/app-vim/vim-spell-de-20080213-r1
@@ -46395,7 +46398,7 @@
 1801230108 metadata/md5-cache/app-vim/vim-tmux-3.0.0
 1803021159 metadata/md5-cache/app-vim/vim-spell-hu-20100312
 1803021159 metadata/md5-cache/app-vim/vim-spell-ru-20070506-r1
-1711060039 metadata/md5-cache/app-vim/dirdiff-1.1.5
+1803060108 metadata/md5-cache/app-vim/dirdiff-1.1.5
 1803021159 metadata/md5-cache/app-vim/vim-spell-fr-20060121
 1803021159 metadata/md5-cache/app-vim/pyclewn-2.0.1
 1711060039 metadata/md5-cache/app-vim/xquery-syntax-0.1-r2
@@ -46403,33 +46406,33 @@
 1801011404 metadata/md5-cache/app-vim/gundo-2.6.2
 1711060039 metadata/md5-cache/app-vim/tasklist-1.0.1
 1801011404 metadata/md5-cache/app-vim/pydiction-1.2.3-r2
-1711060039 metadata/md5-cache/app-vim/breakpts-4.0-r1
+1803060108 metadata/md5-cache/app-vim/breakpts-4.0-r1
 1711060039 metadata/md5-cache/app-vim/vimagit-1.7.2
-1711061409 metadata/md5-cache/app-vim/diffchar-7.2
+1803060108 metadata/md5-cache/app-vim/diffchar-7.2
 1801011404 metadata/md5-cache/app-vim/vimpython-1.13-r2
 1711060039 metadata/md5-cache/app-vim/perlomni-2.5
 1711251740 metadata/md5-cache/app-vim/vimcdoc-1.9.0
 1711060039 metadata/md5-cache/app-vim/screen-1.5
 1711060039 metadata/md5-cache/app-vim/puppet-syntax-3.0.1
 1803021159 metadata/md5-cache/app-vim/easytags-3.11
-1711060039 metadata/md5-cache/app-vim/cfengine-syntax-20141019
-1711060039 metadata/md5-cache/app-vim/gist-7.3
-1711060039 metadata/md5-cache/app-vim/ant_menu-0.5.7.1-r1
+1803060108 metadata/md5-cache/app-vim/cfengine-syntax-20141019
+1803052038 metadata/md5-cache/app-vim/gist-7.3
+1803060108 metadata/md5-cache/app-vim/ant_menu-0.5.7.1-r1
 1711281241 metadata/md5-cache/app-vim/nerdcommenter-9999
 1711060039 metadata/md5-cache/app-vim/vim-misc-1.17.6
 1803021159 metadata/md5-cache/app-vim/vim-spell-pl-20060218
-1711060039 metadata/md5-cache/app-vim/closetag-0.9.1-r1
+1803060108 metadata/md5-cache/app-vim/closetag-0.9.1-r1
 1711060039 metadata/md5-cache/app-vim/showmarks-2.2-r1
 1711060039 metadata/md5-cache/app-vim/lustyexplorer-4.3
 1803021159 metadata/md5-cache/app-vim/python-mode-0.9.0
 1711060039 metadata/md5-cache/app-vim/unite-4.0-r1
-1711061409 metadata/md5-cache/app-vim/diffchar-7.01
+1803060108 metadata/md5-cache/app-vim/diffchar-7.01
 1711060039 metadata/md5-cache/app-vim/vim-rest-console-2.4.0
 1711060039 metadata/md5-cache/app-vim/cctree-1.61-r1
 1801011404 metadata/md5-cache/app-vim/voom-5.1-r1
 1711060039 metadata/md5-cache/app-vim/ferret-1.4-r1
 1711060039 metadata/md5-cache/app-vim/tagbar-2.6.1
-1711060039 metadata/md5-cache/app-vim/dhcpd-syntax-20030825-r1
+1803060108 metadata/md5-cache/app-vim/dhcpd-syntax-20030825-r1
 1801011404 metadata/md5-cache/app-vim/editorconfig-vim-0.3.3-r2
 1803021159 metadata/md5-cache/app-vim/automatictexplugin-12.5-r1
 1712290139 metadata/md5-cache/app-vim/vimcdoc-2.1.0
@@ -46437,8 +46440,8 @@
 1803021159 metadata/md5-cache/app-vim/pyclewn-2.1-r1
 1803021159 metadata/md5-cache/app-vim/vim-spell-ru-20070506
 1711060039 metadata/md5-cache/app-vim/pushpop-4.0-r1
-1711060039 metadata/md5-cache/app-vim/alternate-2.18-r2
-1711281241 metadata/md5-cache/app-vim/gitv-9999
+1803060108 metadata/md5-cache/app-vim/alternate-2.18-r2
+1803052038 metadata/md5-cache/app-vim/gitv-9999
 1711060039 metadata/md5-cache/app-vim/reload-0.6.17
 1803021159 metadata/md5-cache/app-vim/vim-spell-da-20060116
 1803021159 metadata/md5-cache/app-vim/vim-spell-es-20060208-r1
@@ -46447,29 +46450,29 @@
 1711100239 metadata/md5-cache/app-vim/perl-support-5.4
 1711060039 metadata/md5-cache/app-vim/scala-syntax-1.0
 1803021159 metadata/md5-cache/app-vim/vim-spell-pl-20060218-r1
-1803021159 metadata/md5-cache/app-vim/colorschemes-20140623-r1
-1711060039 metadata/md5-cache/app-vim/greputils-2.8-r1
-1711060039 metadata/md5-cache/app-vim/brainfuck-syntax-1.0.3
+1803060108 metadata/md5-cache/app-vim/colorschemes-20140623-r1
+1803052038 metadata/md5-cache/app-vim/greputils-2.8-r1
+1803060108 metadata/md5-cache/app-vim/brainfuck-syntax-1.0.3
 1801011404 metadata/md5-cache/app-vim/splice-1.1.0
 1803021159 metadata/md5-cache/app-vim/vim-spell-it-20100312
 1711060039 metadata/md5-cache/app-vim/syntastic-3.8.0
 1801140339 metadata/md5-cache/app-vim/ctx-1.17-r1
-1711060039 metadata/md5-cache/app-vim/bufexplorer-7.4.18
-1711060039 metadata/md5-cache/app-vim/eruby-syntax-2.0-r1
+1803060108 metadata/md5-cache/app-vim/bufexplorer-7.4.18
+1803060108 metadata/md5-cache/app-vim/eruby-syntax-2.0-r1
 1711060039 metadata/md5-cache/app-vim/nagios-syntax-20050105
 1711060039 metadata/md5-cache/app-vim/selinux-syntax-20041225
 1711060039 metadata/md5-cache/app-vim/searchcomplete-1.1-r1
 1711060039 metadata/md5-cache/app-vim/pathogen-2.4
 1711060039 metadata/md5-cache/app-vim/nginx-syntax-0.3.3
-1711060039 metadata/md5-cache/app-vim/bnf-syntax-1.2-r2
+1803060108 metadata/md5-cache/app-vim/bnf-syntax-1.2-r2
 1711281241 metadata/md5-cache/app-vim/gitgutter-99999999
 1801150009 metadata/md5-cache/app-vim/haskellmode-20101118-r1
 1711060039 metadata/md5-cache/app-vim/txtfmt-2.4-r1
-1711060039 metadata/md5-cache/app-vim/enhancedcommentify-2.3-r1
+1803060108 metadata/md5-cache/app-vim/enhancedcommentify-2.3-r1
 1711060039 metadata/md5-cache/app-vim/gitgutter-20170222
-1711060039 metadata/md5-cache/app-vim/bash-support-4.2.1
-1711060039 metadata/md5-cache/app-vim/c-support-6.0
-1711060039 metadata/md5-cache/app-vim/foldutil-3.0-r1
+1803060108 metadata/md5-cache/app-vim/bash-support-4.2.1
+1803060108 metadata/md5-cache/app-vim/c-support-6.0
+1803052038 metadata/md5-cache/app-vim/foldutil-3.0-r1
 1801011404 metadata/md5-cache/app-vim/vimoutliner-0.3.6-r1
 1711060039 metadata/md5-cache/app-vim/nerdtree-5.0.0
 1711060039 metadata/md5-cache/app-vim/xsl-syntax-0.3.11-r2
@@ -46482,23 +46485,23 @@
 1711060039 metadata/md5-cache/app-vim/thlnk-1.2.1-r1
 1711060039 metadata/md5-cache/app-vim/vim-go-1.13
 1711060039 metadata/md5-cache/app-vim/phpdocs-0.26-r1
-1711060039 metadata/md5-cache/app-vim/emmet-0.85
+1803060108 metadata/md5-cache/app-vim/emmet-0.85
 1803021159 metadata/md5-cache/app-vim/vim-spell-en-20060123-r1
-1711060039 metadata/md5-cache/app-vim/autoalign-14
+1803060108 metadata/md5-cache/app-vim/autoalign-14
 1711060039 metadata/md5-cache/app-vim/ferret-3.0
 1711060039 metadata/md5-cache/app-vim/vimpress-2.1.5
 1711060039 metadata/md5-cache/app-vim/conque-2.3
 1801261238 metadata/md5-cache/app-vim/rust-vim-1_pre20180125
 1711060039 metadata/md5-cache/app-vim/vim-rest-console-2.3.0
-1711060039 metadata/md5-cache/app-vim/cvsmenu-1.147-r1
+1803060108 metadata/md5-cache/app-vim/cvsmenu-1.147-r1
 1711060039 metadata/md5-cache/app-vim/zoomwin-24
 1711281241 metadata/md5-cache/app-vim/tcomment-9999
 1711060039 metadata/md5-cache/app-vim/voom-5.1
-1711281241 metadata/md5-cache/app-vim/fugitive-9999
+1803052038 metadata/md5-cache/app-vim/fugitive-9999
 1711281241 metadata/md5-cache/app-vim/nerdtree-9999
 1711060039 metadata/md5-cache/app-vim/languagetool-1.30
 1803021159 metadata/md5-cache/app-vim/vim-spell-en-20060123
-1711060039 metadata/md5-cache/app-vim/bufexplorer-7.4.19
+1803060108 metadata/md5-cache/app-vim/bufexplorer-7.4.19
 1801142209 metadata/md5-cache/app-vim/slimv-0.9.13_p20170910
 1711060039 metadata/md5-cache/app-vim/sudoedit-0.21
 1801011404 metadata/md5-cache/app-arch/zstd-1.1.0
@@ -46530,13 +46533,14 @@
 1803021159 metadata/md5-cache/app-arch/engrampa-1.12.0-r2
 1803021159 metadata/md5-cache/app-arch/lrzip-0.631
 1801011404 metadata/md5-cache/app-arch/zstd-1.3.0
+1803052038 metadata/md5-cache/app-arch/lziprecover-1.20
 1803021159 metadata/md5-cache/app-arch/pixz-9999
 1803021159 metadata/md5-cache/app-arch/xar-1.5.2-r1
 1803021159 metadata/md5-cache/app-arch/rpm-4.11.1
 1803021159 metadata/md5-cache/app-arch/tar-1.30
 1803042038 metadata/md5-cache/app-arch/p7zip-16.02-r2
 1803021159 metadata/md5-cache/app-arch/unzip-6.0_p21
-1803021159 metadata/md5-cache/app-arch/zip-3.0-r3
+1803052038 metadata/md5-cache/app-arch/zip-3.0-r3
 1803021159 metadata/md5-cache/app-arch/unrpa-1.4.1
 1803021159 metadata/md5-cache/app-arch/unp-2.0_pre7
 1803021159 metadata/md5-cache/app-arch/unzip-6.0_p20
@@ -46552,7 +46556,6 @@
 1802262111 metadata/md5-cache/app-arch/lcab-1.0_beta12
 1801011404 metadata/md5-cache/app-arch/lziprecover-1.17
 1803021159 metadata/md5-cache/app-arch/innoextract-1.5
-1801011404 metadata/md5-cache/app-arch/lziprecover-1.18
 1801290538 metadata/md5-cache/app-arch/upx-bin-3.91
 1803021159 metadata/md5-cache/app-arch/dpkg-1.19.0.4
 1801011404 metadata/md5-cache/app-arch/plzip-1.6
@@ -46603,13 +46606,12 @@
 1802272308 metadata/md5-cache/app-arch/afio-2.5.1-r1
 1803021159 metadata/md5-cache/app-arch/cfv-1.18.3-r1
 1803021159 metadata/md5-cache/app-arch/engrampa-1.14.1-r1
-1803042038 metadata/md5-cache/app-arch/Manifest.gz
+1803052338 metadata/md5-cache/app-arch/Manifest.gz
 1801011404 metadata/md5-cache/app-arch/zstd-1.1.3
 1803021159 metadata/md5-cache/app-arch/pbzip2-1.1.12
 1801011404 metadata/md5-cache/app-arch/zopfli-1.0.1-r2
 1803021159 metadata/md5-cache/app-arch/vimball-9999
 1803021159 metadata/md5-cache/app-arch/pdv-1.5.1-r2
-1801011404 metadata/md5-cache/app-arch/lziprecover-1.20_rc1
 1803021159 metadata/md5-cache/app-arch/cpio-2.12-r1
 1803021159 metadata/md5-cache/app-arch/deb2targz-1-r2
 1803021159 metadata/md5-cache/app-arch/bzip2-1.0.6-r8
@@ -46684,7 +46686,7 @@
 1803021159 metadata/md5-cache/app-arch/bloscpack-0.5.0
 1802120308 metadata/md5-cache/app-arch/stenc-1.0.7
 1803021159 metadata/md5-cache/app-arch/makeself-2.2.0-r2
-1803021159 metadata/md5-cache/app-arch/gnome-autoar-0.2.2
+1803052338 metadata/md5-cache/app-arch/gnome-autoar-0.2.2
 1801231609 metadata/md5-cache/app-arch/rpm2targz-9.0.0.5g
 1803021159 metadata/md5-cache/app-arch/lha-114i-r8
 1803021159 metadata/md5-cache/app-arch/mscompress-0.3-r1
@@ -46716,22 +46718,22 @@
 1712300140 metadata/md5-cache/app-accessibility/festival-fi-20041119
 1712300140 metadata/md5-cache/app-accessibility/festival-hts-2.1
 1702282308 metadata/md5-cache/app-accessibility/festival-freebsoft-utils-0.10
-1803021159 metadata/md5-cache/app-accessibility/Manifest.gz
+1803052038 metadata/md5-cache/app-accessibility/Manifest.gz
 1803021159 metadata/md5-cache/app-accessibility/sphinx3-0.8-r1
 1803021159 metadata/md5-cache/app-accessibility/festival-2.1-r1
-1803021159 metadata/md5-cache/app-accessibility/at-spi2-atk-2.24.1
+1803052038 metadata/md5-cache/app-accessibility/at-spi2-atk-2.24.1
 1803021159 metadata/md5-cache/app-accessibility/flite-1.4-r4
 1803021159 metadata/md5-cache/app-accessibility/at-spi2-atk-2.22.0
 1803021159 metadata/md5-cache/app-accessibility/caribou-0.4.21
 1803021159 metadata/md5-cache/app-accessibility/nfbtrans-7.74-r2
 1803021159 metadata/md5-cache/app-accessibility/epos-2.5.37-r2
 1801011404 metadata/md5-cache/app-accessibility/espeak-1.48.04-r1
-1803021159 metadata/md5-cache/app-accessibility/speech-dispatcher-0.8.7
+1803052038 metadata/md5-cache/app-accessibility/speech-dispatcher-0.8.7
 1803021159 metadata/md5-cache/app-accessibility/freetts-1.2.1-r2
 1712300140 metadata/md5-cache/app-accessibility/pidgin-festival-2.4
 1803021159 metadata/md5-cache/app-accessibility/speech-dispatcher-0.8.3
 1803021159 metadata/md5-cache/app-accessibility/brltty-5.2-r1
-1803021159 metadata/md5-cache/app-accessibility/at-spi2-core-2.24.1
+1803052038 metadata/md5-cache/app-accessibility/at-spi2-core-2.24.1
 1803021159 metadata/md5-cache/app-accessibility/SphinxTrain-1.0.8
 1803021159 metadata/md5-cache/app-accessibility/powiedz-1.0-r2
 1803021159 metadata/md5-cache/app-accessibility/emacspeak-39.0-r2
@@ -46810,14 +46812,14 @@
 1801050119 metadata/md5-cache/dev-db/percona-toolkit-2.2.20
 1801050119 metadata/md5-cache/dev-db/percona-toolkit-2.2.17
 1710300239 metadata/md5-cache/dev-db/xtrabackup-bin-2.4.8
-1803041008 metadata/md5-cache/dev-db/unixODBC-2.3.5-r1
+1803052038 metadata/md5-cache/dev-db/unixODBC-2.3.5-r1
 1803021159 metadata/md5-cache/dev-db/opendbx-1.4.5-r1
 1803021159 metadata/md5-cache/dev-db/sqlcipher-3.4.2
 1803021159 metadata/md5-cache/dev-db/percona-xtrabackup-2.4.8
 1803021159 metadata/md5-cache/dev-db/tora-9999
-1803021159 metadata/md5-cache/dev-db/slony1-2.2.6
+1803060308 metadata/md5-cache/dev-db/slony1-2.2.6
 1803021159 metadata/md5-cache/dev-db/oracle-instantclient-odbc-11.2.0.2-r1
-1803041008 metadata/md5-cache/dev-db/postgresql-9.3.22
+1803052208 metadata/md5-cache/dev-db/postgresql-9.3.22
 1803021159 metadata/md5-cache/dev-db/redis-3.0.7-r1
 1702282310 metadata/md5-cache/dev-db/oracle-instantclient-jdbc-12
 1803021159 metadata/md5-cache/dev-db/sqlitestudio-3.1.1
@@ -46827,7 +46829,7 @@
 1803021159 metadata/md5-cache/dev-db/oracle-instantclient-basic-10.2.0.3-r1
 1803021159 metadata/md5-cache/dev-db/postgresql-9.3.20
 1803021159 metadata/md5-cache/dev-db/libdbi-0.9.0
-1803041008 metadata/md5-cache/dev-db/postgresql-10.3
+1803052038 metadata/md5-cache/dev-db/postgresql-10.3
 1707051608 metadata/md5-cache/dev-db/m17n-contrib-1.1.13
 1703170309 metadata/md5-cache/dev-db/mysqltuner-1.6.18
 1803021159 metadata/md5-cache/dev-db/libzdb-2.12
@@ -46875,10 +46877,9 @@
 1803041938 metadata/md5-cache/dev-db/mysql-5.6.39
 1803042038 metadata/md5-cache/dev-db/aerospike-server-community-3.16.0.6
 1803021159 metadata/md5-cache/dev-db/oracle-instantclient-jdbc-11.2.0.2
-1803021159 metadata/md5-cache/dev-db/phpmyadmin-4.7.8
+1803052038 metadata/md5-cache/dev-db/phpmyadmin-4.7.8
 1803021159 metadata/md5-cache/dev-db/wxsqlite3-3.2.1-r1
 1803021159 metadata/md5-cache/dev-db/apgdiff-2.2.1
-1803021159 metadata/md5-cache/dev-db/mariadb-10.2.11
 1803042038 metadata/md5-cache/dev-db/aerospike-server-community-3.13.0.9
 1707051509 metadata/md5-cache/dev-db/m17n-db-1.6.4
 1803021159 metadata/md5-cache/dev-db/qt5-sqlcipher-1.0.1
@@ -46888,7 +46889,6 @@
 1801191240 metadata/md5-cache/dev-db/cockroach-1.0
 1702282310 metadata/md5-cache/dev-db/spatialite-tools-4.3.0-r1
 1803021159 metadata/md5-cache/dev-db/mysql-connector-c++-1.1.8
-1803021159 metadata/md5-cache/dev-db/mariadb-5.5.58
 1803021159 metadata/md5-cache/dev-db/mariadb-10.0.33
 1803021159 metadata/md5-cache/dev-db/firebird-3.0.2.32703.0-r2
 1801050119 metadata/md5-cache/dev-db/mycli-1.15.0-r2
@@ -46919,7 +46919,7 @@
 1803021159 metadata/md5-cache/dev-db/go-etcd-2.0.0
 1803021159 metadata/md5-cache/dev-db/sqldeveloper-4.2.0.17.089.1709
 1803021159 metadata/md5-cache/dev-db/percona-toolkit-2.2.11
-1803042038 metadata/md5-cache/dev-db/Manifest.gz
+1803060308 metadata/md5-cache/dev-db/Manifest.gz
 1803021159 metadata/md5-cache/dev-db/sqldeveloper-4.1.5.21.78
 1802262111 metadata/md5-cache/dev-db/freetds-9999
 1707051608 metadata/md5-cache/dev-db/m17n-db-1.6.3
@@ -46932,7 +46932,6 @@
 1803021159 metadata/md5-cache/dev-db/tokyocabinet-1.4.48-r1
 1801051739 metadata/md5-cache/dev-db/pspg-0.9.0
 1802262111 metadata/md5-cache/dev-db/freetds-1.00.54-r1
-1803021159 metadata/md5-cache/dev-db/mariadb-10.1.30
 1803021159 metadata/md5-cache/dev-db/mariadb-10.0.30-r1
 1803021159 metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-11.2.0.3
 1803021159 metadata/md5-cache/dev-db/henplus-0.9.8-r1
@@ -46972,7 +46971,6 @@
 1803021159 metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r2
 1803021159 metadata/md5-cache/dev-db/sqlite-3.20.0
 1803021159 metadata/md5-cache/dev-db/postgresql-9.2.23
-1803021159 metadata/md5-cache/dev-db/mariadb-10.2.10
 1803021159 metadata/md5-cache/dev-db/mysql-5.6.37-r1
 1803021159 metadata/md5-cache/dev-db/redis-4.0.1
 1702282310 metadata/md5-cache/dev-db/mysqltuner-1.2.0
@@ -46994,12 +46992,11 @@
 1803021159 metadata/md5-cache/dev-db/libzdb-2.11.2
 1801232009 metadata/md5-cache/dev-db/pgbouncer-1.8.1
 1803021159 metadata/md5-cache/dev-db/postgresql-9999
-1803041008 metadata/md5-cache/dev-db/postgresql-9.5.12
+1803052208 metadata/md5-cache/dev-db/postgresql-9.5.12
 1803021159 metadata/md5-cache/dev-db/pgxnclient-1.2-r1
 1803021159 metadata/md5-cache/dev-db/mariadb-10.2.12
 1803021159 metadata/md5-cache/dev-db/phpmyadmin-4.7.7-r1
 1803021159 metadata/md5-cache/dev-db/mongodb-3.2.17
-1803021159 metadata/md5-cache/dev-db/mariadb-10.0.32-r1
 1803021159 metadata/md5-cache/dev-db/phpmyadmin-4.0.10.20
 1711171438 metadata/md5-cache/dev-db/m17n-db-1.7.0
 1702282310 metadata/md5-cache/dev-db/vbisam-2.0
@@ -47018,11 +47015,10 @@
 1801191240 metadata/md5-cache/dev-db/cockroach-1.0.3
 1803021159 metadata/md5-cache/dev-db/maatkit-7540-r1
 1803021159 metadata/md5-cache/dev-db/mysql-cluster-7.4.17
-1803021159 metadata/md5-cache/dev-db/mariadb-10.1.26-r1
 1803021159 metadata/md5-cache/dev-db/lib_mysqludf_ta-0.1
 1803021159 metadata/md5-cache/dev-db/mysql++-3.2.3
 1803021159 metadata/md5-cache/dev-db/lib_mysqludf_log-0.0.2
-1803041008 metadata/md5-cache/dev-db/postgresql-9.4.17
+1803052208 metadata/md5-cache/dev-db/postgresql-9.4.17
 1803021159 metadata/md5-cache/dev-db/lib_mysqludf_sys-0.0.3
 1802262111 metadata/md5-cache/dev-db/ocp-9999
 1803021159 metadata/md5-cache/dev-db/mysql-workbench-6.3.10
@@ -47065,7 +47061,6 @@
 1802020208 metadata/md5-cache/dev-db/etcd-3.3.0
 1801011405 metadata/md5-cache/sys-kernel/linux-docs-4.9
 1803021159 metadata/md5-cache/sys-kernel/hardened-sources-4.9.23
-1803021159 metadata/md5-cache/sys-kernel/vanilla-sources-4.14.23
 1803021159 metadata/md5-cache/sys-kernel/aufs-sources-4.14.14
 1803021159 metadata/md5-cache/sys-kernel/ck-sources-4.9.69
 1801011405 metadata/md5-cache/sys-kernel/linux-docs-4.1
@@ -47078,6 +47073,7 @@
 1803021159 metadata/md5-cache/sys-kernel/hardened-sources-4.8.17-r2
 1803041438 metadata/md5-cache/sys-kernel/dracut-046-r1
 1803021159 metadata/md5-cache/sys-kernel/spl-9999
+1803052038 metadata/md5-cache/sys-kernel/vanilla-sources-3.2.100
 1803021159 metadata/md5-cache/sys-kernel/aufs-sources-4.4.110
 1803021159 metadata/md5-cache/sys-kernel/dracut-9999
 1803021159 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.22
@@ -47096,7 +47092,6 @@
 1803021159 metadata/md5-cache/sys-kernel/aufs-sources-4.14.10-r1
 1803021159 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.112
 1803021159 metadata/md5-cache/sys-kernel/genkernel-3.4.52.4-r1
-1803021159 metadata/md5-cache/sys-kernel/vanilla-sources-3.2.99
 1803021159 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.105
 1803041138 metadata/md5-cache/sys-kernel/linux-firmware-20180103-r1
 1803021159 metadata/md5-cache/sys-kernel/ck-sources-4.9.68
@@ -47111,6 +47106,7 @@
 1803021159 metadata/md5-cache/sys-kernel/ck-sources-4.9.67
 1803021159 metadata/md5-cache/sys-kernel/aufs-sources-4.14.12
 1803021159 metadata/md5-cache/sys-kernel/kergen-0.1.3
+1803052038 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.86
 1803021159 metadata/md5-cache/sys-kernel/git-sources-4.16_rc1
 1803041438 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.111-r1
 1803021159 metadata/md5-cache/sys-kernel/aufs-sources-4.14.10
@@ -47121,6 +47117,7 @@
 1803021159 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.74
 1803021159 metadata/md5-cache/sys-kernel/pf-sources-4.4_p8
 1803021159 metadata/md5-cache/sys-kernel/zen-sources-3.10.9999
+1803052038 metadata/md5-cache/sys-kernel/vanilla-sources-4.9.86
 1803021159 metadata/md5-cache/sys-kernel/ck-sources-4.9.76-r1
 1803021159 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.72
 1803021159 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.116
@@ -47131,6 +47128,7 @@
 1803021159 metadata/md5-cache/sys-kernel/raspberrypi-sources-4.14.9999
 1803021159 metadata/md5-cache/sys-kernel/zen-sources-3.13.9999
 1803021159 metadata/md5-cache/sys-kernel/pf-sources-4.11_p3
+1803052038 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.120
 1803021159 metadata/md5-cache/sys-kernel/ck-sources-4.14.4
 1803021159 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.67
 1803021159 metadata/md5-cache/sys-kernel/zen-sources-3.9.9999
@@ -47172,6 +47170,7 @@
 1803021159 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.13
 1803021159 metadata/md5-cache/sys-kernel/aufs-sources-4.12.12
 1803021159 metadata/md5-cache/sys-kernel/rt-sources-4.9.68_p60
+1803052038 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.24
 1803021159 metadata/md5-cache/sys-kernel/kpatch-9999
 1803021159 metadata/md5-cache/sys-kernel/hardened-sources-4.9.21
 1803021159 metadata/md5-cache/sys-kernel/ck-sources-4.9.70
@@ -47182,14 +47181,13 @@
 1803021159 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.83
 1803021159 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.104
 1803021159 metadata/md5-cache/sys-kernel/linux-headers-3.18
-1803041438 metadata/md5-cache/sys-kernel/Manifest.gz
+1803052038 metadata/md5-cache/sys-kernel/Manifest.gz
 1803021159 metadata/md5-cache/sys-kernel/ck-sources-4.15.4
 1803021159 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.18
 1803021159 metadata/md5-cache/sys-kernel/linux-headers-4.9
 1711281241 metadata/md5-cache/sys-kernel/linux-firmware-99999999
 1803021159 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.82
 1803021159 metadata/md5-cache/sys-kernel/genkernel-3.5.2.5
-1803021159 metadata/md5-cache/sys-kernel/vanilla-sources-3.16.54
 1802161538 metadata/md5-cache/sys-kernel/linux-firmware-20180213
 1803021159 metadata/md5-cache/sys-kernel/ck-sources-4.14.5
 1803021159 metadata/md5-cache/sys-kernel/ck-sources-4.14.13
@@ -47255,11 +47253,14 @@
 1803021159 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.111
 1803021159 metadata/md5-cache/sys-kernel/gentoo-sources-4.15.6
 1803021159 metadata/md5-cache/sys-kernel/ck-sources-4.9.81
+1803052038 metadata/md5-cache/sys-kernel/vanilla-sources-4.4.120
+1803052038 metadata/md5-cache/sys-kernel/vanilla-sources-4.14.24
 1803021159 metadata/md5-cache/sys-kernel/aufs-sources-4.9.49-r1
 1803021159 metadata/md5-cache/sys-kernel/raspberrypi-image-4.1.19_p20160309
 1803021159 metadata/md5-cache/sys-kernel/hardened-sources-4.9.24
 1803021159 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.79
 1803021159 metadata/md5-cache/sys-kernel/aufs-sources-4.9.75
+1803052038 metadata/md5-cache/sys-kernel/git-sources-4.16_rc4
 1803021159 metadata/md5-cache/sys-kernel/aufs-sources-4.14.13
 1803021159 metadata/md5-cache/sys-kernel/ck-sources-4.14.9
 1803021159 metadata/md5-cache/sys-kernel/raspberrypi-sources-4.10.9999
@@ -47267,10 +47268,10 @@
 1803021159 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.110
 1803021159 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.85
 1803021159 metadata/md5-cache/sys-kernel/genkernel-9999
-1803021159 metadata/md5-cache/sys-kernel/vanilla-sources-4.4.119
 1803021159 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.76
 1803021159 metadata/md5-cache/sys-kernel/ck-sources-4.9.71
 1803021159 metadata/md5-cache/sys-kernel/aufs-sources-4.4.112
+1803052038 metadata/md5-cache/sys-kernel/vanilla-sources-3.16.55
 1803021159 metadata/md5-cache/sys-kernel/aufs-sources-4.12.14
 1803021159 metadata/md5-cache/sys-kernel/spl-0.7.5
 1803021159 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.49-r1
@@ -47282,7 +47283,6 @@
 1803021159 metadata/md5-cache/sys-kernel/aufs-sources-4.12.13
 1803021159 metadata/md5-cache/sys-kernel/aufs-sources-4.14.11-r2
 1803021159 metadata/md5-cache/sys-kernel/hardened-sources-4.9.22
-1803021159 metadata/md5-cache/sys-kernel/vanilla-sources-4.9.85
 1803021159 metadata/md5-cache/sys-kernel/raspberrypi-sources-4.12.9999
 1803021159 metadata/md5-cache/sys-kernel/ck-sources-4.9.74
 1803021159 metadata/md5-cache/sys-kernel/ck-sources-4.14.11
@@ -47401,7 +47401,7 @@
 1803021159 metadata/md5-cache/media-gfx/sxiv-9999
 1803021159 metadata/md5-cache/media-gfx/nomacs-3.8.0
 1702282325 metadata/md5-cache/media-gfx/cellwriter-1.3.4
-1803021159 metadata/md5-cache/media-gfx/valentina-9999
+1803052038 metadata/md5-cache/media-gfx/valentina-9999
 1803021159 metadata/md5-cache/media-gfx/jpeg2ps-1.9-r1
 1706300138 metadata/md5-cache/media-gfx/pixels2pgf-0.1
 1803021159 metadata/md5-cache/media-gfx/darktable-2.4.0
@@ -47487,7 +47487,6 @@
 1803021159 metadata/md5-cache/media-gfx/structure-synth-1.5.0
 1803021159 metadata/md5-cache/media-gfx/gnome-screenshot-3.22.0
 1801130709 metadata/md5-cache/media-gfx/qvv-4.04
-1802252138 metadata/md5-cache/media-gfx/sane-frontends-1.0.14-r2
 1803021159 metadata/md5-cache/media-gfx/mirage-0.9.5.2-r1
 1702282326 metadata/md5-cache/media-gfx/psftools-1.0.7
 1803021159 metadata/md5-cache/media-gfx/dawn-3.90b
@@ -47548,7 +47547,7 @@
 1803021159 metadata/md5-cache/media-gfx/fotoxx-15.04.1
 1702282325 metadata/md5-cache/media-gfx/gpicview-0.2.4
 1801050119 metadata/md5-cache/media-gfx/img2pdf-0.2.4
-1803021159 metadata/md5-cache/media-gfx/ufraw-0.22-r2
+1803052038 metadata/md5-cache/media-gfx/ufraw-0.22-r2
 1803021159 metadata/md5-cache/media-gfx/gliv-1.9.7
 1801011404 metadata/md5-cache/media-gfx/feh-2.22
 1803021159 metadata/md5-cache/media-gfx/rawtherapee-5.2
@@ -47612,7 +47611,7 @@
 1801011404 metadata/md5-cache/media-gfx/curaengine-0.15.04.6
 1803021159 metadata/md5-cache/media-gfx/nvidia-texture-tools-2.0.8-r3
 1803021159 metadata/md5-cache/media-gfx/openexr_viewers-2.2.0
-1803041438 metadata/md5-cache/media-gfx/Manifest.gz
+1803052338 metadata/md5-cache/media-gfx/Manifest.gz
 1801050119 metadata/md5-cache/media-gfx/xdot-0.7
 1802031238 metadata/md5-cache/media-gfx/feh-2.23.1
 1803012238 metadata/md5-cache/media-gfx/feh-2.24
@@ -47710,7 +47709,7 @@
 1803021159 metadata/md5-cache/media-gfx/fim-0.4_rc3-r2
 1803021159 metadata/md5-cache/media-gfx/librecad-9999
 1702282325 metadata/md5-cache/media-gfx/figurine-1.0.5
-1803041438 metadata/md5-cache/media-gfx/xfig-3.2.6a
+1803052338 metadata/md5-cache/media-gfx/xfig-3.2.6a
 1803021159 metadata/md5-cache/media-gfx/gimmage-0.2.3-r1
 1803021159 metadata/md5-cache/media-gfx/simple-scan-3.24.1
 1801050119 metadata/md5-cache/media-gfx/printrun-20150310-r3
@@ -47799,7 +47798,7 @@
 1803021159 metadata/md5-cache/media-gfx/displaycal-3.4.0.0
 1803021159 metadata/md5-cache/media-gfx/aview-1.3.0_rc1-r3
 1802262111 metadata/md5-cache/media-gfx/gozer-0.7-r3
-1803021159 metadata/md5-cache/media-gfx/valentina-0.5.0-r2
+1803052038 metadata/md5-cache/media-gfx/valentina-0.5.0-r2
 1702282325 metadata/md5-cache/media-gfx/gphotofs-0.5
 1803021159 metadata/md5-cache/media-gfx/xsane-0.999-r2
 1801011404 metadata/md5-cache/media-gfx/metapixel-1.0.2-r1
@@ -47827,10 +47826,12 @@
 1702282326 metadata/md5-cache/media-gfx/jp2a-1.0.6-r1
 1803021159 metadata/md5-cache/media-gfx/pycam-0.5.1
 1801142139 metadata/md5-cache/media-gfx/raw-thumbnailer-0.2.1
+1803052038 metadata/md5-cache/media-gfx/sane-frontends-1.0.14-r3
 1803021159 metadata/md5-cache/media-gfx/graphviz-2.40.1
 1803021159 metadata/md5-cache/media-gfx/iscan-plugin-gt-f500-1.0.0.1-r1
 1803021159 metadata/md5-cache/media-gfx/fondu-20060102-r1
 1803021159 metadata/md5-cache/media-gfx/arss-0.2.3
+1803060108 metadata/md5-cache/lxde-base/menu-cache-1.1.0
 1803021159 metadata/md5-cache/lxde-base/lxde-icon-theme-0.5.1
 1803021159 metadata/md5-cache/lxde-base/lxsession-0.5.2
 1702282325 metadata/md5-cache/lxde-base/lxde-icon-theme-0.5.0
@@ -47838,6 +47839,7 @@
 1702282325 metadata/md5-cache/lxde-base/lxterminal-0.1.11
 1702282325 metadata/md5-cache/lxde-base/lxterminal-0.2.0-r1
 1801282008 metadata/md5-cache/lxde-base/lxtask-0.1.7
+1803060108 metadata/md5-cache/lxde-base/lxterminal-0.3.1
 1707150038 metadata/md5-cache/lxde-base/lxpanel-0.8.2
 1803021159 metadata/md5-cache/lxde-base/lxappearance-obconf-0.2.3
 1707150038 metadata/md5-cache/lxde-base/lxpanel-0.9.2
@@ -47854,7 +47856,7 @@
 1702282325 metadata/md5-cache/lxde-base/lxrandr-0.3.1
 1702282325 metadata/md5-cache/lxde-base/menu-cache-1.0.2
 1702282325 metadata/md5-cache/lxde-base/lxappearance-obconf-0.2.1
-1803041338 metadata/md5-cache/lxde-base/Manifest.gz
+1803060108 metadata/md5-cache/lxde-base/Manifest.gz
 1802221208 metadata/md5-cache/lxde-base/lxde-meta-0.5.5-r5
 1712021609 metadata/md5-cache/lxde-base/menu-cache-0.5.1
 1702282325 metadata/md5-cache/lxde-base/lxinput-0.3.2
@@ -47869,6 +47871,7 @@
 1801282008 metadata/md5-cache/lxde-base/lxtask-0.1.8
 1803021159 metadata/md5-cache/lxde-base/lxdm-0.4.1-r9
 1702282325 metadata/md5-cache/lxde-base/lxmenu-data-0.1.5
+1803060108 metadata/md5-cache/lxde-base/menu-cache-1.0.2-r1
 1702282325 metadata/md5-cache/lxde-base/lxmenu-data-0.1.2
 1803021159 metadata/md5-cache/lxde-base/lxrandr-0.1.2
 1803021159 metadata/md5-cache/lxde-base/lxde-common-0.5.5-r3
@@ -47979,7 +47982,7 @@
 1803021159 metadata/md5-cache/net-mail/asmail-2.1
 1711271440 metadata/md5-cache/net-mail/signify-1.14
 1706191709 metadata/md5-cache/net-mail/checkpassword-pam-0.99
-1803041008 metadata/md5-cache/net-mail/Manifest.gz
+1803052038 metadata/md5-cache/net-mail/Manifest.gz
 1803021159 metadata/md5-cache/net-mail/popa3d-1.0.2-r1
 1802262111 metadata/md5-cache/net-mail/gnubiff-2.2.17
 1803021159 metadata/md5-cache/net-mail/autorespond-2.0.5
@@ -48031,7 +48034,7 @@
 1803021159 metadata/md5-cache/net-mail/poppassd_ceti-1.8.5-r1
 1803021159 metadata/md5-cache/net-mail/list-remote-forwards-0.0.1-r1
 1801091400 metadata/md5-cache/net-mail/lbdb-0.42.1
-1803041008 metadata/md5-cache/net-mail/dovecot-2.2.34
+1803052038 metadata/md5-cache/net-mail/dovecot-2.2.34
 1803021159 metadata/md5-cache/net-mail/maildirtree-0.6-r1
 1702282329 metadata/md5-cache/net-mail/t-prot-3.4
 1803021159 metadata/md5-cache/net-mail/checkpassword-0.90-r3
@@ -48249,7 +48252,7 @@
 1803021159 metadata/md5-cache/dev-vcs/darcs-2.12.0
 1801142239 metadata/md5-cache/dev-vcs/svn2git-9999
 1803021159 metadata/md5-cache/dev-vcs/gitolite-gentoo-3.5.3.1
-1803040038 metadata/md5-cache/dev-vcs/Manifest.gz
+1803052338 metadata/md5-cache/dev-vcs/Manifest.gz
 1803021159 metadata/md5-cache/dev-vcs/git-mailz-0.12
 1801011404 metadata/md5-cache/dev-vcs/cvs-fast-export-1.38
 1705101908 metadata/md5-cache/dev-vcs/mr-1.20170129
@@ -48264,7 +48267,7 @@
 1803021159 metadata/md5-cache/dev-vcs/git-tools-2015_p20160201-r1
 1803021159 metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.1
 1803021159 metadata/md5-cache/dev-vcs/bzr-git-0.6.8-r1
-1803021908 metadata/md5-cache/dev-vcs/subversion-1.9.7-r1
+1803052338 metadata/md5-cache/dev-vcs/subversion-1.9.7-r1
 1803021159 metadata/md5-cache/dev-vcs/subversion-1.10.0_rc1
 1803021159 metadata/md5-cache/dev-vcs/mercurial-server-9999
 1803021159 metadata/md5-cache/dev-vcs/tortoisehg-9999
@@ -48273,7 +48276,7 @@
 1803021159 metadata/md5-cache/dev-vcs/bzr-rewrite-0.6.3
 1702282322 metadata/md5-cache/dev-vcs/git-merge-changelog-20140223
 1803021159 metadata/md5-cache/dev-vcs/svn2cl-0.12
-1803030308 metadata/md5-cache/dev-vcs/git-2.16.1
+1803052038 metadata/md5-cache/dev-vcs/git-2.16.1
 1803021159 metadata/md5-cache/dev-vcs/bzr-2.6.0
 1803021159 metadata/md5-cache/dev-vcs/gitolite-3.6.2-r1
 1803021159 metadata/md5-cache/dev-vcs/cvsspam-0.2.12
@@ -48281,7 +48284,7 @@
 1801050119 metadata/md5-cache/dev-vcs/hgview-1.9.0-r1
 1803021159 metadata/md5-cache/dev-vcs/kdesvn-2.0.0
 1803021159 metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.3-r1
-1803021159 metadata/md5-cache/dev-vcs/bzr-2.7.0
+1803052038 metadata/md5-cache/dev-vcs/bzr-2.7.0
 1802092308 metadata/md5-cache/dev-vcs/hg-git-0.8.10-r1
 1803021159 metadata/md5-cache/dev-vcs/pwclient-20141110122616
 1803021159 metadata/md5-cache/dev-vcs/subversion-1.9.7
@@ -48486,7 +48489,7 @@
 1803021159 metadata/md5-cache/gnome-base/gnome-menus-3.13.3-r1
 1801270409 metadata/md5-cache/gnome-base/gnome-light-3.24.2
 1803021159 metadata/md5-cache/gnome-base/dconf-0.26.1
-1803021159 metadata/md5-cache/gnome-base/gnome-shell-3.24.3
+1803052038 metadata/md5-cache/gnome-base/gnome-shell-3.24.3
 1803021159 metadata/md5-cache/gnome-base/dconf-editor-3.24.3
 1803021159 metadata/md5-cache/gnome-base/gnome-desktop-2.32.1-r2
 1803021159 metadata/md5-cache/gnome-base/libbonobo-2.24.3-r1
@@ -48494,20 +48497,20 @@
 1801091400 metadata/md5-cache/gnome-base/gnome-light-3.22.0
 1803021159 metadata/md5-cache/gnome-base/orbit-2.14.19-r5
 1803021159 metadata/md5-cache/gnome-base/gdm-3.24.3
-1803021159 metadata/md5-cache/gnome-base/gvfs-1.32.1-r1
+1803052038 metadata/md5-cache/gnome-base/gvfs-1.32.1-r1
 1803021159 metadata/md5-cache/gnome-base/libgtop-2.34.2
 1803021159 metadata/md5-cache/gnome-base/gnome-shell-3.22.3
 1801270409 metadata/md5-cache/gnome-base/gnome-extra-apps-3.24.2
 1702282323 metadata/md5-cache/gnome-base/gnome-core-apps-3.20.0
 1803021159 metadata/md5-cache/gnome-base/gnome-menus-3.10.1-r1
-1803031308 metadata/md5-cache/gnome-base/Manifest.gz
+1803052038 metadata/md5-cache/gnome-base/Manifest.gz
 1803021159 metadata/md5-cache/gnome-base/nautilus-3.24.2.1
 1803021159 metadata/md5-cache/gnome-base/librsvg-2.40.18
 1803021159 metadata/md5-cache/gnome-base/libgnome-keyring-3.12.0-r1
 1803021159 metadata/md5-cache/gnome-base/gnome-vfs-2.24.4-r5
 1803021159 metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.22.0
 1801270409 metadata/md5-cache/gnome-base/gnome-core-apps-3.24.2
-1803021159 metadata/md5-cache/gnome-base/libgtop-2.36.0
+1803052038 metadata/md5-cache/gnome-base/libgtop-2.36.0
 1803021159 metadata/md5-cache/gnome-base/libbonoboui-2.24.5-r1
 1803021159 metadata/md5-cache/gnome-base/libgnomekbd-3.22.0.1
 1803021159 metadata/md5-cache/gnome-base/gnome-common-3.18.0-r1
@@ -48516,7 +48519,7 @@
 1803021159 metadata/md5-cache/gnome-base/libgnomeprint-2.18.8-r1
 1803021159 metadata/md5-cache/gnome-base/libgnomeui-2.24.5-r1
 1803021159 metadata/md5-cache/gnome-base/libgnome-2.32.1-r1
-1803021159 metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.24.1
+1803052038 metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.24.1
 1803021159 metadata/md5-cache/gnome-base/gnome-keyring-3.20.1
 1803021159 metadata/md5-cache/gnome-base/gnome-session-3.24.2-r1
 1803021159 metadata/md5-cache/gnome-base/gnome-menus-3.13.3
@@ -48569,7 +48572,7 @@
 1803021159 metadata/md5-cache/mail-filter/policyd-1.82-r2
 1803021159 metadata/md5-cache/mail-filter/postsrsd-1.4
 1803021159 metadata/md5-cache/mail-filter/rmilter-1.10.0
-1803021159 metadata/md5-cache/mail-filter/dcc-1.3.158
+1803060038 metadata/md5-cache/mail-filter/dcc-1.3.158
 1702282325 metadata/md5-cache/mail-filter/spamprobe-1.4d-r1
 1803021159 metadata/md5-cache/mail-filter/sid-milter-1.0.0-r6
 1803021159 metadata/md5-cache/mail-filter/qmail-scanner-2.05
@@ -48588,7 +48591,7 @@
 1801050119 metadata/md5-cache/mail-filter/pypolicyd-spf-2.0.1
 1802151738 metadata/md5-cache/mail-filter/afew-1.3.0
 1803021159 metadata/md5-cache/mail-filter/rmilter-1.10.0-r1
-1803022338 metadata/md5-cache/mail-filter/mailfilter-0.8.4
+1803052038 metadata/md5-cache/mail-filter/mailfilter-0.8.4
 1803021159 metadata/md5-cache/mail-filter/qmail-scanner-2.08
 1801011404 metadata/md5-cache/mail-filter/imapfilter-2.5.6
 1702282325 metadata/md5-cache/mail-filter/sieve-connect-0.87
@@ -48630,7 +48633,7 @@
 1803021159 metadata/md5-cache/mail-filter/libsrs_alt-1.0
 1803021159 metadata/md5-cache/mail-filter/assp-1.8.5.9
 1803021159 metadata/md5-cache/mail-filter/dspam-3.10.2-r1
-1803041438 metadata/md5-cache/mail-filter/Manifest.gz
+1803060038 metadata/md5-cache/mail-filter/Manifest.gz
 1803021159 metadata/md5-cache/mail-filter/qmail-scanner-2.06
 1803021159 metadata/md5-cache/mail-filter/amavisd-new-2.10.1
 1803021159 metadata/md5-cache/mail-filter/libsrs2-1.0.18
@@ -48749,7 +48752,7 @@
 1803021159 metadata/md5-cache/app-doc/kicad-doc-4.0.4
 1702282308 metadata/md5-cache/app-doc/phrack-08
 1702282308 metadata/md5-cache/app-doc/phrack-04
-1803021159 metadata/md5-cache/app-doc/linux-kernel-in-a-nutshell-1-r1
+1803052038 metadata/md5-cache/app-doc/linux-kernel-in-a-nutshell-1-r1
 1702282308 metadata/md5-cache/app-doc/phrack-all-68
 1702282308 metadata/md5-cache/app-doc/phrack-21
 1702282308 metadata/md5-cache/app-doc/phrack-15
@@ -48771,7 +48774,7 @@
 1702282308 metadata/md5-cache/app-doc/phrack-45
 1702282308 metadata/md5-cache/app-doc/phrack-57
 1702282308 metadata/md5-cache/app-doc/phrack-18
-1803021159 metadata/md5-cache/app-doc/Manifest.gz
+1803052038 metadata/md5-cache/app-doc/Manifest.gz
 1702282308 metadata/md5-cache/app-doc/phrack-17
 1703061238 metadata/md5-cache/app-doc/linuxfromscratch-7.10
 1702282308 metadata/md5-cache/app-doc/phrack-22
@@ -48831,7 +48834,7 @@
 1702282308 metadata/md5-cache/app-doc/phrack-31
 1702282308 metadata/md5-cache/app-doc/phrack-13
 1702282308 metadata/md5-cache/app-doc/phrack-27
-1802221208 metadata/md5-cache/app-doc/jargon-4.4.7-r1
+1803052038 metadata/md5-cache/app-doc/jargon-4.4.7-r1
 1702282308 metadata/md5-cache/app-doc/phrack-29
 1803021159 metadata/md5-cache/app-doc/doxygen-1.8.14
 1702282308 metadata/md5-cache/app-doc/phrack-51
@@ -48925,7 +48928,6 @@
 1803021159 metadata/md5-cache/app-editors/sandy-0.4
 1802262111 metadata/md5-cache/app-editors/joe-4.3-r1
 1803021159 metadata/md5-cache/app-editors/gvim-8.0.1188
-1803021159 metadata/md5-cache/app-editors/leo-5.1
 1803021159 metadata/md5-cache/app-editors/vim-core-8.0.1428
 1802090038 metadata/md5-cache/app-editors/zile-2.4.14
 1803021159 metadata/md5-cache/app-editors/atom-1.23.3
@@ -48967,14 +48969,14 @@
 1803031738 metadata/md5-cache/app-editors/vim-8.0.1298
 1803021159 metadata/md5-cache/app-editors/pluma-1.16.2
 1803021159 metadata/md5-cache/app-editors/latexila-3.22.1
-1803041008 metadata/md5-cache/app-editors/leo-5.6
+1803052038 metadata/md5-cache/app-editors/leo-5.6
 1702282308 metadata/md5-cache/app-editors/le-1.14.3
 1803021159 metadata/md5-cache/app-editors/kile-2.9.91_p20171209
 1801011404 metadata/md5-cache/app-editors/ee-1.5.2
 1803021159 metadata/md5-cache/app-editors/moe-1.7
 1802210008 metadata/md5-cache/app-editors/mg-20170828
 1803042038 metadata/md5-cache/app-editors/zile-2.4.13
-1803042038 metadata/md5-cache/app-editors/Manifest.gz
+1803052038 metadata/md5-cache/app-editors/Manifest.gz
 1702282308 metadata/md5-cache/app-editors/emact-2.56.0
 1801091400 metadata/md5-cache/app-editors/elvis-2.2.0-r5
 1803021159 metadata/md5-cache/app-editors/nano-2.9.2
@@ -49040,7 +49042,7 @@
 1803021159 metadata/md5-cache/app-editors/vim-core-8.0.1188
 1803021159 metadata/md5-cache/app-editors/qemacs-0.4.1_pre20150916
 1801011404 metadata/md5-cache/app-editors/aee-2.2.21
-1803041008 metadata/md5-cache/app-editors/uemacs-pk-4.0.15_p20180117
+1803052038 metadata/md5-cache/app-editors/uemacs-pk-4.0.15_p20180117
 1803021159 metadata/md5-cache/app-editors/emacs-25.3-r3
 1803021159 metadata/md5-cache/app-editors/uemacs-pk-4.0.15_p20141208
 1803021159 metadata/md5-cache/app-editors/emacs-vcs-26.0.90
@@ -49178,7 +49180,7 @@
 1803021159 metadata/md5-cache/net-firewall/conntrack-tools-1.4.4
 1803021159 metadata/md5-cache/net-firewall/arptables-0.0.3.4-r2
 1802262111 metadata/md5-cache/net-firewall/nftables-0.8.1
-1803021159 metadata/md5-cache/net-firewall/Manifest.gz
+1803052038 metadata/md5-cache/net-firewall/Manifest.gz
 1801091400 metadata/md5-cache/net-firewall/nfacct-1.0.1
 1803021159 metadata/md5-cache/net-firewall/iptables-1.6.1-r3
 1801050119 metadata/md5-cache/net-firewall/psad-2.4.5
@@ -49190,6 +49192,7 @@
 1803021159 metadata/md5-cache/net-firewall/rtsp-conntrack-3.7
 1803021159 metadata/md5-cache/net-firewall/psad-2.2.5
 1803021159 metadata/md5-cache/net-firewall/xtables-addons-2.14
+1803052038 metadata/md5-cache/net-firewall/shorewall-5.1.12.3
 1803021159 metadata/md5-cache/net-firewall/firewalld-0.4.3.3
 1803021159 metadata/md5-cache/net-firewall/iptables-1.4.21-r1
 1803021159 metadata/md5-cache/net-firewall/pftop-0.7-r2
@@ -49378,7 +49381,7 @@
 1801290538 metadata/md5-cache/dev-lang/ekopath-6.0.756_p20160409-r1
 1803021159 metadata/md5-cache/dev-lang/rakudo-2018.02
 1702282312 metadata/md5-cache/dev-lang/snobol-0.99.44
-1803021159 metadata/md5-cache/dev-lang/perl-5.26.1-r2
+1803052238 metadata/md5-cache/dev-lang/perl-5.26.1-r2
 1702282312 metadata/md5-cache/dev-lang/inform-6.33.1_p2
 1803021159 metadata/md5-cache/dev-lang/nqp-2018.01
 1803021159 metadata/md5-cache/dev-lang/luajit-2.0.3
@@ -49450,7 +49453,7 @@
 1803021159 metadata/md5-cache/dev-lang/perl-5.26.1
 1803021159 metadata/md5-cache/dev-lang/gforth-0.7.3
 1803021159 metadata/md5-cache/dev-lang/python-3.4.5-r1
-1803021159 metadata/md5-cache/dev-lang/vala-0.36.7
+1803052038 metadata/md5-cache/dev-lang/vala-0.36.7
 1708302239 metadata/md5-cache/dev-lang/duktape-2.1.1
 1803021159 metadata/md5-cache/dev-lang/ifc-15.0.6.233
 1803021159 metadata/md5-cache/dev-lang/ghc-8.2.1
@@ -49489,13 +49492,13 @@
 1801091400 metadata/md5-cache/dev-lang/rust-1.19.0
 1801011404 metadata/md5-cache/dev-lang/tcc-0.9.27
 1803021159 metadata/md5-cache/dev-lang/gnat-gpl-2016
-1803021159 metadata/md5-cache/dev-lang/swi-prolog-7.4.2
+1803052038 metadata/md5-cache/dev-lang/swi-prolog-7.4.2
 1803021159 metadata/md5-cache/dev-lang/tcl-8.6.7
 1803021159 metadata/md5-cache/dev-lang/xsb-3.6.0
 1803021159 metadata/md5-cache/dev-lang/nqp-9999
 1803021159 metadata/md5-cache/dev-lang/tuprolog-3.1.0
 1803021159 metadata/md5-cache/dev-lang/whitespace-0.4
-1803042038 metadata/md5-cache/dev-lang/Manifest.gz
+1803052238 metadata/md5-cache/dev-lang/Manifest.gz
 1803021159 metadata/md5-cache/dev-lang/moarvm-2018.01
 1803021159 metadata/md5-cache/dev-lang/ghc-7.10.3
 1803021159 metadata/md5-cache/dev-lang/qu-prolog-10.0
@@ -49674,7 +49677,7 @@
 1803021159 metadata/md5-cache/dev-python/shiboken-1.2.2
 1801050119 metadata/md5-cache/dev-python/nose_fixes-1.3
 1803012238 metadata/md5-cache/dev-python/pyfakefs-3.3
-1803021159 metadata/md5-cache/dev-python/pygobject-3.24.1
+1803052038 metadata/md5-cache/dev-python/pygobject-3.24.1
 1802180109 metadata/md5-cache/dev-python/chardet-3.0.4
 1801050119 metadata/md5-cache/dev-python/txAMQP-0.7.0
 1803021159 metadata/md5-cache/dev-python/netlib-0.10
@@ -49759,7 +49762,7 @@
 1803040008 metadata/md5-cache/dev-python/argh-0.26.2-r1
 1803021159 metadata/md5-cache/dev-python/whisper-0.9.13
 1801050119 metadata/md5-cache/dev-python/setuptools-9999
-1803030308 metadata/md5-cache/dev-python/pycodestyle-2.3.1
+1803060038 metadata/md5-cache/dev-python/pycodestyle-2.3.1
 1803021159 metadata/md5-cache/dev-python/os-diskconfig-python-novaclient-ext-9999
 1803030408 metadata/md5-cache/dev-python/gql-0.1.0
 1803021159 metadata/md5-cache/dev-python/python-digest-1.7-r1
@@ -49767,7 +49770,6 @@
 1802192038 metadata/md5-cache/dev-python/simplesoapy-1.5.1-r1
 1801050119 metadata/md5-cache/dev-python/xlwt-1.2.0
 1803021159 metadata/md5-cache/dev-python/catkin_pkg-9999
-1802061638 metadata/md5-cache/dev-python/PyQt5-5.10
 1801050119 metadata/md5-cache/dev-python/python-stdnum-1.7
 1803021159 metadata/md5-cache/dev-python/arrayterator-1.0.1-r1
 1803021159 metadata/md5-cache/dev-python/dbus-python-1.2.4
@@ -49780,7 +49782,7 @@
 1802262038 metadata/md5-cache/dev-python/pytest-3.4.1-r1
 1803021159 metadata/md5-cache/dev-python/guppy-0.1.10-r1
 1801050119 metadata/md5-cache/dev-python/tinycss2-0.5
-1803021159 metadata/md5-cache/dev-python/ipython-5.4.1
+1803052038 metadata/md5-cache/dev-python/ipython-5.4.1
 1803021159 metadata/md5-cache/dev-python/supervisor-quick-0.1.4
 1801050119 metadata/md5-cache/dev-python/pytest-html-1.10.1
 1802222308 metadata/md5-cache/dev-python/psutil-5.4.3
@@ -49860,7 +49862,7 @@
 1801050119 metadata/md5-cache/dev-python/oslo-i18n-3.17.1
 1803021159 metadata/md5-cache/dev-python/gevent-websocket-0.9.3
 1801011404 metadata/md5-cache/dev-python/pythonmagick-0.9.17
-1801050119 metadata/md5-cache/dev-python/mock-2.0.0
+1803060038 metadata/md5-cache/dev-python/mock-2.0.0
 1801050119 metadata/md5-cache/dev-python/aiotest-0.3
 1803021159 metadata/md5-cache/dev-python/progress-1.2
 1803021159 metadata/md5-cache/dev-python/httmock-1.2.2
@@ -49872,7 +49874,7 @@
 1803021159 metadata/md5-cache/dev-python/pid-2.2.0
 1803021159 metadata/md5-cache/dev-python/django-evolution-0.7.4
 1803021159 metadata/md5-cache/dev-python/extremes-1.1.1
-1801050119 metadata/md5-cache/dev-python/ipython_genutils-0.2.0
+1803052038 metadata/md5-cache/dev-python/ipython_genutils-0.2.0
 1803021159 metadata/md5-cache/dev-python/graphy-1.0-r1
 1803021159 metadata/md5-cache/dev-python/pyopenssl-17.4.0
 1803021159 metadata/md5-cache/dev-python/autobahn-17.9.2
@@ -49994,7 +49996,7 @@
 1801050119 metadata/md5-cache/dev-python/xarray-0.9.6
 1803021159 metadata/md5-cache/dev-python/easy-thumbnails-2.4.1
 1802131908 metadata/md5-cache/dev-python/oslo-service-1.25.1
-1803021159 metadata/md5-cache/dev-python/wcwidth-0.1.7-r1
+1803052038 metadata/md5-cache/dev-python/wcwidth-0.1.7-r1
 1801050119 metadata/md5-cache/dev-python/tempora-1.6.1
 1803021159 metadata/md5-cache/dev-python/h5py-2.7.0
 1801050119 metadata/md5-cache/dev-python/pypcap-1.2.0
@@ -50062,7 +50064,7 @@
 1801011404 metadata/md5-cache/dev-python/clang-python-5.0.1
 1803021159 metadata/md5-cache/dev-python/python-troveclient-1.3.0
 1802220138 metadata/md5-cache/dev-python/incremental-17.5.0
-1803041438 metadata/md5-cache/dev-python/pathlib2-2.3.0
+1803052038 metadata/md5-cache/dev-python/pathlib2-2.3.0
 1801050119 metadata/md5-cache/dev-python/rebulk-0.9.0
 1801050119 metadata/md5-cache/dev-python/pygpu-0.6.0
 1801050119 metadata/md5-cache/dev-python/kafka-python-1.1.1
@@ -50082,7 +50084,7 @@
 1801050119 metadata/md5-cache/dev-python/pytest-pep8-1.0.6
 1802070408 metadata/md5-cache/dev-python/faulthandler-3.0
 1803021159 metadata/md5-cache/dev-python/djangocms-teaser-0.1
-1803041238 metadata/md5-cache/dev-python/ttystatus-0.35
+1803052338 metadata/md5-cache/dev-python/ttystatus-0.35
 1803021159 metadata/md5-cache/dev-python/twisted-news-13.2.0
 1801050119 metadata/md5-cache/dev-python/line_profiler-2.0
 1803021159 metadata/md5-cache/dev-python/pyrax-1.9.7
@@ -50290,10 +50292,11 @@
 1801052109 metadata/md5-cache/dev-python/neovim-remote-9999
 1803021159 metadata/md5-cache/dev-python/phonenumbers-8.3.1
 1803021159 metadata/md5-cache/dev-python/python-distutils-extra-2.38
-1802181708 metadata/md5-cache/dev-python/funcsigs-1.0.2-r1
+1803060038 metadata/md5-cache/dev-python/funcsigs-1.0.2-r1
 1802212038 metadata/md5-cache/dev-python/contextlib2-0.5.5
 1803021159 metadata/md5-cache/dev-python/pygeocoder-1.2.5
 1802051938 metadata/md5-cache/dev-python/prometheus_client-0.1.1
+1803052038 metadata/md5-cache/dev-python/PyQt5-5.10.1
 1803021159 metadata/md5-cache/dev-python/ujson-1.33
 1803021159 metadata/md5-cache/dev-python/simplekv-0.9.2
 1801050119 metadata/md5-cache/dev-python/unittest-mixins-1.3
@@ -50335,7 +50338,7 @@
 1803021159 metadata/md5-cache/dev-python/egenix-mx-base-3.2.9
 1803021159 metadata/md5-cache/dev-python/chaco-4.5.0
 1801050119 metadata/md5-cache/dev-python/CommonMark-0.5.4
-1803021159 metadata/md5-cache/dev-python/pathlib-1.0.1-r1
+1803052038 metadata/md5-cache/dev-python/pathlib-1.0.1-r1
 1803021159 metadata/md5-cache/dev-python/pycryptopp-0.7.1
 1803021159 metadata/md5-cache/dev-python/httpretty-0.8.6
 1801050119 metadata/md5-cache/dev-python/sdnotify-0.3.1
@@ -50466,10 +50469,10 @@
 1803021159 metadata/md5-cache/dev-python/eliot-0.4.0
 1802160938 metadata/md5-cache/dev-python/Babel-2.5.3
 1802061038 metadata/md5-cache/dev-python/backports-lzma-0.0.8
-1802240208 metadata/md5-cache/dev-python/protobuf-python-3.5.1.1
+1803060038 metadata/md5-cache/dev-python/protobuf-python-3.5.1.1
 1801050119 metadata/md5-cache/dev-python/pyasn1-0.2.3
 1801050119 metadata/md5-cache/dev-python/python-gnupg-0.4.0
-1801050119 metadata/md5-cache/dev-python/prompt_toolkit-1.0.15
+1803052038 metadata/md5-cache/dev-python/prompt_toolkit-1.0.15
 1801050119 metadata/md5-cache/dev-python/ply-3.9
 1803021159 metadata/md5-cache/dev-python/pandas-0.17.0
 1803021159 metadata/md5-cache/dev-python/python-daemon-1.6-r1
@@ -50683,7 +50686,7 @@
 1803021159 metadata/md5-cache/dev-python/django-discover-runner-1.0
 1803021159 metadata/md5-cache/dev-python/markupsafe-0.23
 1803021159 metadata/md5-cache/dev-python/hachoir-regex-1.0.5-r1
-1801071439 metadata/md5-cache/dev-python/neovim-python-client-0.1.13
+1803060138 metadata/md5-cache/dev-python/neovim-python-client-0.1.13
 1803021159 metadata/md5-cache/dev-python/fudge-0.9.6-r1
 1801050119 metadata/md5-cache/dev-python/ipyparallel-6.0.2-r1
 1803021159 metadata/md5-cache/dev-python/odfpy-1.3.2
@@ -50703,7 +50706,7 @@
 1801050119 metadata/md5-cache/dev-python/pelican-minify-0.9
 1803021159 metadata/md5-cache/dev-python/monotonic-0.5
 1801050119 metadata/md5-cache/dev-python/mysql-connector-python-2.1.4
-1802060508 metadata/md5-cache/dev-python/jedi-0.11.1
+1803052038 metadata/md5-cache/dev-python/jedi-0.11.1
 1803021159 metadata/md5-cache/dev-python/sudsds-1.0.1-r1
 1802151738 metadata/md5-cache/dev-python/kitchen-1.2.4
 1803021159 metadata/md5-cache/dev-python/libextractor-python-0.6-r1
@@ -50892,7 +50895,6 @@
 1803021159 metadata/md5-cache/dev-python/kid-0.9.6-r1
 1803021159 metadata/md5-cache/dev-python/jsonschema-2.5.1-r2
 1801050119 metadata/md5-cache/dev-python/iso3166-0.8
-1803021159 metadata/md5-cache/dev-python/rtslib-fb-2.1.57
 1801050119 metadata/md5-cache/dev-python/sphinxcontrib-newsfeed-0.1.4
 1801231609 metadata/md5-cache/dev-python/python-docs-3.6.3
 1801090339 metadata/md5-cache/dev-python/cairocffi-0.8.0
@@ -50946,12 +50948,12 @@
 1803021159 metadata/md5-cache/dev-python/configobj-5.0.6
 1802212038 metadata/md5-cache/dev-python/python-dateutil-2.6.1
 1802192038 metadata/md5-cache/dev-python/pyFFTW-9999
-1803041238 metadata/md5-cache/dev-python/flake8-3.5.0
+1803060038 metadata/md5-cache/dev-python/flake8-3.5.0
 1803021159 metadata/md5-cache/dev-python/python-ethtool-0.11
 1803021159 metadata/md5-cache/dev-python/djangocms-admin-style-1.2.7
 1803021159 metadata/md5-cache/dev-python/glueviz-0.10.4
 1803021159 metadata/md5-cache/dev-python/subunit-1.2.0-r1
-1801050119 metadata/md5-cache/dev-python/zope-event-4.2.0
+1803052038 metadata/md5-cache/dev-python/zope-event-4.2.0
 1803021159 metadata/md5-cache/dev-python/pystdf-1.3.1-r1
 1803021159 metadata/md5-cache/dev-python/click-log-0.1.3
 1803021159 metadata/md5-cache/dev-python/mockldap-0.2.6
@@ -50980,6 +50982,7 @@
 1801102009 metadata/md5-cache/dev-python/html2text-2018.1.9
 1801050119 metadata/md5-cache/dev-python/MechanicalSoup-0.6.0
 1802240908 metadata/md5-cache/dev-python/ovsdbapp-0.9.1
+1803060138 metadata/md5-cache/dev-python/neovim-python-client-0.2.1
 1803021159 metadata/md5-cache/dev-python/celery-3.1.24-r1
 1801050119 metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r1
 1803021159 metadata/md5-cache/dev-python/python-fastcgi-1.1-r1
@@ -51103,7 +51106,7 @@
 1803021159 metadata/md5-cache/dev-python/pychecker-0.8.19-r1
 1803021159 metadata/md5-cache/dev-python/mox-0.5.3-r1
 1803021159 metadata/md5-cache/dev-python/python-daap-0.7.1-r1
-1803021159 metadata/md5-cache/dev-python/numpy-1.10.4
+1803052038 metadata/md5-cache/dev-python/numpy-1.10.4
 1801050119 metadata/md5-cache/dev-python/pyusb-1.0.2
 1803021159 metadata/md5-cache/dev-python/redis-py-2.10.5
 1802190408 metadata/md5-cache/dev-python/os-brick-2.3.0
@@ -51121,7 +51124,6 @@
 1803021159 metadata/md5-cache/dev-python/libwnck-python-2.32.0-r1
 1801011404 metadata/md5-cache/dev-python/rootpy-0.8.3
 1803021159 metadata/md5-cache/dev-python/pymtp-0.0.6
-1801050119 metadata/md5-cache/dev-python/rtslib-fb-2.1.58
 1802071008 metadata/md5-cache/dev-python/weasyprint-0.41
 1801120510 metadata/md5-cache/dev-python/aiosmtpd-1.0
 1802222308 metadata/md5-cache/dev-python/oslo-versionedobjects-1.31.2
@@ -51138,7 +51140,7 @@
 1801050119 metadata/md5-cache/dev-python/pysaml2-4.5.0
 1803021159 metadata/md5-cache/dev-python/netaddr-0.7.18
 1801050119 metadata/md5-cache/dev-python/pdfrw-0.4
-1801050119 metadata/md5-cache/dev-python/traitlets-4.3.2
+1803052038 metadata/md5-cache/dev-python/traitlets-4.3.2
 1803021159 metadata/md5-cache/dev-python/python-ldap-2.4.32
 1801050119 metadata/md5-cache/dev-python/graphviz-0.7.1
 1803021159 metadata/md5-cache/dev-python/demjson-2.2.4
@@ -51191,7 +51193,7 @@
 1803021159 metadata/md5-cache/dev-python/mysql-python-1.2.5-r1
 1801050119 metadata/md5-cache/dev-python/widgetsnbextension-1.2.3
 1803021159 metadata/md5-cache/dev-python/livereload-2.4.0
-1803041238 metadata/md5-cache/dev-python/configparser-3.5.0-r1
+1803060038 metadata/md5-cache/dev-python/configparser-3.5.0-r1
 1803021159 metadata/md5-cache/dev-python/carbon-0.9.14-r1
 1801050119 metadata/md5-cache/dev-python/pytest-aiohttp-0.1.3
 1801050119 metadata/md5-cache/dev-python/python-keystoneclient-3.13.0
@@ -51214,7 +51216,7 @@
 1801050119 metadata/md5-cache/dev-python/djangocms-text-ckeditor-3.5.0
 1801050119 metadata/md5-cache/dev-python/cgroup-utils-0.6
 1803021159 metadata/md5-cache/dev-python/python-poppler-0.12.1-r4
-1803041238 metadata/md5-cache/dev-python/cliapp-1.20170823
+1803052338 metadata/md5-cache/dev-python/cliapp-1.20170823
 1803021159 metadata/md5-cache/dev-python/python-bugzilla-1.2.2
 1801050119 metadata/md5-cache/dev-python/QtPy-1.2.1
 1803021159 metadata/md5-cache/dev-python/PyRSS2Gen-1.0.0-r1
@@ -51227,7 +51229,7 @@
 1801061640 metadata/md5-cache/dev-python/qtconsole-4.3.1
 1803021159 metadata/md5-cache/dev-python/soya-0.14-r1
 1803021159 metadata/md5-cache/dev-python/docutils-0.12
-1803041238 metadata/md5-cache/dev-python/mccabe-0.6.1
+1803060038 metadata/md5-cache/dev-python/mccabe-0.6.1
 1803021159 metadata/md5-cache/dev-python/django-openid-auth-0.5
 1801050119 metadata/md5-cache/dev-python/datashape-0.5.4
 1803021159 metadata/md5-cache/dev-python/python-etcd-0.4.4
@@ -51319,7 +51321,7 @@
 1801050119 metadata/md5-cache/dev-python/mailmanclient-3.1.1
 1803021159 metadata/md5-cache/dev-python/watchdog-0.8.3-r1
 1801091400 metadata/md5-cache/dev-python/theano-0.9.0
-1803041738 metadata/md5-cache/dev-python/Manifest.gz
+1803060308 metadata/md5-cache/dev-python/Manifest.gz
 1803021159 metadata/md5-cache/dev-python/mamba-0.8.6
 1803021159 metadata/md5-cache/dev-python/spyder-3.2.4
 1802170509 metadata/md5-cache/dev-python/pycadf-2.7.0
@@ -51409,7 +51411,7 @@
 1803021159 metadata/md5-cache/dev-python/maintboot-0.1.0
 1803021159 metadata/md5-cache/dev-python/qpid-python-0.20
 1801050119 metadata/md5-cache/dev-python/uhashring-1.0
-1801050119 metadata/md5-cache/dev-python/pyserial-3.2.1
+1803052038 metadata/md5-cache/dev-python/pyserial-3.2.1
 1802171708 metadata/md5-cache/dev-python/sphinxcontrib-asyncio-0.2.0-r2
 1802160938 metadata/md5-cache/dev-python/debtcollector-1.19.0
 1801050119 metadata/md5-cache/dev-python/aodhclient-0.8.0
@@ -51426,14 +51428,13 @@
 1803021159 metadata/md5-cache/dev-python/pylint-1.7.2
 1801050119 metadata/md5-cache/dev-python/columnize-0.3.9
 1801050119 metadata/md5-cache/dev-python/widgetsnbextension-2.0.0
-1801050119 metadata/md5-cache/dev-python/pyqtgraph-0.10.0
 1803021159 metadata/md5-cache/dev-python/urlgrabber-3.9.1-r2
 1803021159 metadata/md5-cache/dev-python/jaraco-classes-1.4
 1801050119 metadata/md5-cache/dev-python/partd-0.3.8
 1801050119 metadata/md5-cache/dev-python/incremental-16.10.1
 1801011404 metadata/md5-cache/dev-python/PythonQt-3.2
 1803021159 metadata/md5-cache/dev-python/pyml-0.7.13.3
-1803021159 metadata/md5-cache/dev-python/neovim-python-client-0.2.0
+1803060138 metadata/md5-cache/dev-python/neovim-python-client-0.2.0
 1803012238 metadata/md5-cache/dev-python/pycairo-1.16.2
 1803021159 metadata/md5-cache/dev-python/Numdifftools-0.9.12
 1802212338 metadata/md5-cache/dev-python/nose-exclude-0.5.0
@@ -51445,6 +51446,7 @@
 1803021159 metadata/md5-cache/dev-python/jaraco-itertools-1.7.1
 1801050119 metadata/md5-cache/dev-python/txaio-2.7.1
 1803021159 metadata/md5-cache/dev-python/python-poppler-qt5-0.24.2_p20170214
+1803052038 metadata/md5-cache/dev-python/aiohttp-cors-0.5.3
 1803021159 metadata/md5-cache/dev-python/hgtools-6.5.1
 1802220138 metadata/md5-cache/dev-python/flaky-3.4.0
 1801050119 metadata/md5-cache/dev-python/python-bugzilla-2.1.0
@@ -51460,7 +51462,8 @@
 1802221938 metadata/md5-cache/dev-python/lit-3.9.0
 1801050119 metadata/md5-cache/dev-python/slackclient-1.1.0
 1801050119 metadata/md5-cache/dev-python/jaraco-stream-1.1
-1803021159 metadata/md5-cache/dev-python/zope-interface-4.3.2
+1803052038 metadata/md5-cache/dev-python/zope-interface-4.3.2
+1803052038 metadata/md5-cache/dev-python/sip-4.19.8
 1801050119 metadata/md5-cache/dev-python/click-log-0.1.8
 1803021159 metadata/md5-cache/dev-python/kaa-imlib2-0.2.3-r2
 1803021159 metadata/md5-cache/dev-python/pyenchant-1.6.8
@@ -51476,6 +51479,7 @@
 1803021159 metadata/md5-cache/dev-python/flask-openid-1.2.4
 1803021159 metadata/md5-cache/dev-python/formencode-1.3.0-r2
 1801191240 metadata/md5-cache/dev-python/pymongo-3.4.0
+1803052038 metadata/md5-cache/dev-python/awscli-1.14.50
 1803021159 metadata/md5-cache/dev-python/raven-5.3.0
 1801050119 metadata/md5-cache/dev-python/pycodestyle-2.0.0
 1801050119 metadata/md5-cache/dev-python/requests-2.11.1
@@ -51533,7 +51537,6 @@
 1802121608 metadata/md5-cache/dev-python/grafanalib-0.4.0
 1802222308 metadata/md5-cache/dev-python/cliff-2.11.0
 1801050119 metadata/md5-cache/dev-python/flask-sqlalchemy-2.1
-1801050119 metadata/md5-cache/dev-python/rtslib-fb-2.1.61
 1801050119 metadata/md5-cache/dev-python/pydecomp-0.2
 1801050119 metadata/md5-cache/dev-python/guzzle_sphinx_theme-0.7.11
 1803021159 metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.0
@@ -51561,7 +51564,7 @@
 1801050119 metadata/md5-cache/dev-python/simplebayes-1.5.7
 1803021159 metadata/md5-cache/dev-python/pyodbc-3.0.7-r1
 1802160938 metadata/md5-cache/dev-python/webob-1.7.4
-1802060508 metadata/md5-cache/dev-python/parso-0.1.1
+1803052038 metadata/md5-cache/dev-python/parso-0.1.1
 1801050119 metadata/md5-cache/dev-python/jsonrpclib-9999
 1803021159 metadata/md5-cache/dev-python/pyside-1.2.2-r2
 1801050119 metadata/md5-cache/dev-python/jsonmerge-1.4.0
@@ -51672,7 +51675,7 @@
 1802061938 metadata/md5-cache/dev-python/joblib-0.11
 1801050119 metadata/md5-cache/dev-python/multipledispatch-0.4.9
 1803021159 metadata/md5-cache/dev-python/traitlets-4.0.0
-1803041008 metadata/md5-cache/dev-python/pyqtgraph-0.10.0-r1
+1803052038 metadata/md5-cache/dev-python/pyqtgraph-0.10.0-r1
 1801050119 metadata/md5-cache/dev-python/xdis-3.3.1
 1801050119 metadata/md5-cache/dev-python/flask-bootstrap-3.3.7.1
 1802240908 metadata/md5-cache/dev-python/ryu-4.21
@@ -51686,7 +51689,7 @@
 1803021159 metadata/md5-cache/dev-python/pychef-0.2.3
 1801050119 metadata/md5-cache/dev-python/os-vif-1.7.0
 1803021159 metadata/md5-cache/dev-python/rfc3986-0.3.1
-1802052038 metadata/md5-cache/dev-python/rtslib-fb-2.1.66
+1803060308 metadata/md5-cache/dev-python/rtslib-fb-2.1.66
 1803021159 metadata/md5-cache/dev-python/matplotlib-1.4.3
 1802170509 metadata/md5-cache/dev-python/keystonemiddleware-4.21.0
 1801050119 metadata/md5-cache/dev-python/dominate-2.2.1
@@ -51737,7 +51740,7 @@
 1803021159 metadata/md5-cache/dev-python/pyGPG-0.2
 1803021159 metadata/md5-cache/dev-python/openpyxl-2.3.3
 1803021159 metadata/md5-cache/dev-python/crumbs-2.1.0
-1803041438 metadata/md5-cache/dev-python/pytidylib-0.2.4
+1803052038 metadata/md5-cache/dev-python/pytidylib-0.2.4
 1803021159 metadata/md5-cache/dev-python/pybloomfiltermmap-0.3.15
 1801050119 metadata/md5-cache/dev-python/virtualenv-clone-0.2.6
 1803021159 metadata/md5-cache/dev-python/pytest-cache-1.0-r1
@@ -51885,7 +51888,7 @@
 1801050119 metadata/md5-cache/dev-python/PySDL2-0.9.6
 1803021159 metadata/md5-cache/dev-python/gdmodule-0.56-r2
 1801050119 metadata/md5-cache/dev-python/symengine-0.3.0
-1801050119 metadata/md5-cache/dev-python/pickleshare-0.7.4-r1
+1803052038 metadata/md5-cache/dev-python/pickleshare-0.7.4-r1
 1803021159 metadata/md5-cache/dev-python/simpy-3.0.8
 1803021159 metadata/md5-cache/dev-python/cryptography-2.1.4
 1803021159 metadata/md5-cache/dev-python/django-ldapdb-0.4.0
@@ -52031,6 +52034,7 @@
 1802250038 metadata/md5-cache/dev-python/pycryptodome-3.4.7
 1803021159 metadata/md5-cache/dev-python/rax-scheduled-images-python-novaclient-ext-0.3.1
 1801080139 metadata/md5-cache/dev-python/html2text-2017.10.4
+1803052038 metadata/md5-cache/dev-python/qscintilla-python-2.10.3
 1803021159 metadata/md5-cache/dev-python/vertex-0.3.1-r1
 1802240638 metadata/md5-cache/dev-python/pluggy-0.6.0
 1802112138 metadata/md5-cache/dev-python/ebuildtester-0.1.3
@@ -52121,7 +52125,7 @@
 1803021159 metadata/md5-cache/dev-python/pycuda-2012.1
 1803021159 metadata/md5-cache/dev-python/morbid-0.8.7.3-r1
 1803021159 metadata/md5-cache/dev-python/llvmlite-0.12.1
-1801050119 metadata/md5-cache/dev-python/testpath-0.3.1
+1803052038 metadata/md5-cache/dev-python/testpath-0.3.1
 1802020238 metadata/md5-cache/dev-python/brython-3.3.4
 1801050119 metadata/md5-cache/dev-python/pycountry-16.11.8
 1801050119 metadata/md5-cache/dev-python/flask-socketio-2.9.2
@@ -52161,7 +52165,7 @@
 1803021159 metadata/md5-cache/dev-python/waitress-1.0.1
 1801290538 metadata/md5-cache/dev-python/pypy3-5.9.0-r1
 1801050119 metadata/md5-cache/dev-python/wrapt-1.10.11
-1803041238 metadata/md5-cache/dev-python/pyflakes-1.6.0
+1803060038 metadata/md5-cache/dev-python/pyflakes-1.6.0
 1801050119 metadata/md5-cache/dev-python/pylibmc-1.5.1-r1
 1801050119 metadata/md5-cache/dev-python/pygcrypt-1.0.0
 1803021159 metadata/md5-cache/dev-python/configparser-3.3.0.2
@@ -52246,7 +52250,6 @@
 1801050119 metadata/md5-cache/dev-python/python-socketio-1.8.0
 1803021159 metadata/md5-cache/dev-python/sphinx-1.6.7
 1803021159 metadata/md5-cache/dev-python/django-annoying-0.7.7
-1801011404 metadata/md5-cache/dev-python/sip-4.19.6
 1801050119 metadata/md5-cache/dev-python/texttable-0.9.1
 1803021159 metadata/md5-cache/dev-python/django-standard-form-1.1.1
 1803021159 metadata/md5-cache/dev-python/pyte-0.5.2-r2
@@ -52270,6 +52273,7 @@
 1803021159 metadata/md5-cache/dev-python/hcs-utils-1.5
 1801050119 metadata/md5-cache/dev-python/PyGithub-1.28
 1803021159 metadata/md5-cache/dev-python/simplekv-0.11.5
+1803060138 metadata/md5-cache/dev-python/msgpack-0.5.6
 1802212038 metadata/md5-cache/dev-python/path-py-10.3.1
 1802052208 metadata/md5-cache/dev-python/backports-functools-lru-cache-1.5
 1801050119 metadata/md5-cache/dev-python/pafy-9999
@@ -52399,6 +52403,7 @@
 1803021159 metadata/md5-cache/dev-python/python-fchksum-1.7.1-r1
 1801050119 metadata/md5-cache/dev-python/click-threading-0.3.0
 1803040008 metadata/md5-cache/dev-python/BitVector-3.4.7
+1803052038 metadata/md5-cache/dev-python/tinycss2-0.6.1
 1803021159 metadata/md5-cache/dev-python/larch-1.20130808
 1801050119 metadata/md5-cache/dev-python/guessit-9999
 1801050119 metadata/md5-cache/dev-python/nbval-0.7
@@ -52435,7 +52440,7 @@
 1801050119 metadata/md5-cache/dev-python/socketpool-0.5.3
 1803021159 metadata/md5-cache/dev-python/nbformat-4.0.1
 1801050119 metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4
-1802140108 metadata/md5-cache/dev-python/scandir-1.6
+1803052038 metadata/md5-cache/dev-python/scandir-1.6
 1801050119 metadata/md5-cache/dev-python/fasteners-0.14.1
 1801282008 metadata/md5-cache/dev-python/protobuf-python-3.1.0
 1801050119 metadata/md5-cache/dev-python/oslo-reports-1.22.1
@@ -52538,7 +52543,7 @@
 1803021159 metadata/md5-cache/dev-python/wheel-0.29.0
 1803021159 metadata/md5-cache/dev-python/qtawesome-0.4.4
 1803021159 metadata/md5-cache/dev-python/falcon-0.1.7
-1803021159 metadata/md5-cache/dev-python/neovim-python-client-0.1.9
+1803060138 metadata/md5-cache/dev-python/neovim-python-client-0.1.9
 1801050119 metadata/md5-cache/dev-python/partd-0.3.2
 1801050119 metadata/md5-cache/dev-python/lit-9999
 1801200208 metadata/md5-cache/dev-python/py-ubjson-0.11.0
@@ -52605,7 +52610,7 @@
 1803021159 metadata/md5-cache/dev-python/regendoc-0.6.1
 1803021159 metadata/md5-cache/dev-python/pyid3lib-0.5.1-r2
 1803041038 metadata/md5-cache/dev-python/multidict-4.1.0
-1803041438 metadata/md5-cache/dev-python/markdown-2.6.8
+1803052038 metadata/md5-cache/dev-python/markdown-2.6.8
 1801050119 metadata/md5-cache/dev-python/blosc-1.4.4
 1803021159 metadata/md5-cache/dev-python/multidict-1.3.0_alpha1
 1801050119 metadata/md5-cache/dev-python/pycairo-1.15.4
@@ -53553,7 +53558,7 @@
 1803021159 metadata/md5-cache/net-im/mattermost-desktop-bin-3.6.0
 1803021159 metadata/md5-cache/net-im/slack-bin-2.8.2
 1801050119 metadata/md5-cache/net-im/hangups-9999
-1803032038 metadata/md5-cache/net-im/Manifest.gz
+1803052038 metadata/md5-cache/net-im/Manifest.gz
 1803021159 metadata/md5-cache/net-im/prosody-0.9.11
 1803021159 metadata/md5-cache/net-im/cpop-0.0.4-r1
 1803021159 metadata/md5-cache/net-im/openfire-4.1.0
@@ -53569,9 +53574,9 @@
 1803021159 metadata/md5-cache/net-im/turses-0.2.23
 1803021159 metadata/md5-cache/net-im/corebird-1.0
 1702282328 metadata/md5-cache/net-im/purple-events-0.2
+1803052038 metadata/md5-cache/net-im/signal-desktop-bin-1.5.2
 1803021159 metadata/md5-cache/net-im/coccinella-0.96.20
 1803021159 metadata/md5-cache/net-im/openmittsu-0.9.11.0
-1803021159 metadata/md5-cache/net-im/signal-desktop-bin-1.5.0
 1803021159 metadata/md5-cache/net-im/prosody-0.10.0-r1
 1803021159 metadata/md5-cache/net-im/mattermost-desktop-bin-3.7.0
 1802061938 metadata/md5-cache/net-im/centerim-5.0.1
@@ -53617,7 +53622,7 @@
 1803021159 metadata/md5-cache/dev-cpp/libgnomemm-2.30.0-r1
 1803021159 metadata/md5-cache/dev-cpp/gccxml-0.9.0_pre20131217
 1803021159 metadata/md5-cache/dev-cpp/glog-0.3.3-r1
-1803021159 metadata/md5-cache/dev-cpp/glibmm-2.52.1
+1803052038 metadata/md5-cache/dev-cpp/glibmm-2.52.1
 1803021159 metadata/md5-cache/dev-cpp/libjson-rpc-cpp-9999
 1803021159 metadata/md5-cache/dev-cpp/tbb-2017.20161128
 1803021159 metadata/md5-cache/dev-cpp/muParser-2.2.3
@@ -53657,9 +53662,9 @@
 1802262111 metadata/md5-cache/dev-cpp/commoncpp2-1.8.1-r2
 1803021159 metadata/md5-cache/dev-cpp/waylandpp-0.1.4
 1802262111 metadata/md5-cache/dev-cpp/sparsehash-2.0.3-r1
-1803021159 metadata/md5-cache/dev-cpp/gtest-1.8.0-r1
+1803052038 metadata/md5-cache/dev-cpp/gtest-1.8.0-r1
 1803021159 metadata/md5-cache/dev-cpp/glibmm-2.50.1
-1803031308 metadata/md5-cache/dev-cpp/Manifest.gz
+1803052038 metadata/md5-cache/dev-cpp/Manifest.gz
 1803021159 metadata/md5-cache/dev-cpp/libjson-rpc-cpp-1.1.0-r1
 1803021159 metadata/md5-cache/dev-cpp/gtksourceviewmm-2.10.3-r1
 1803021159 metadata/md5-cache/dev-cpp/catch-1.9999
@@ -53757,7 +53762,7 @@
 1802161508 metadata/md5-cache/app-office/libreoffice-bin-debug-5.4.5.1
 1803021159 metadata/md5-cache/app-office/multitalk-1.4-r1
 1803021159 metadata/md5-cache/app-office/QtBitcoinTrader-1.10.01
-1803032238 metadata/md5-cache/app-office/Manifest.gz
+1803052038 metadata/md5-cache/app-office/Manifest.gz
 1803021159 metadata/md5-cache/app-office/hamster-time-tracker-9999
 1803021159 metadata/md5-cache/app-office/gnumeric-1.12.35
 1803021159 metadata/md5-cache/app-office/gnumeric-1.12.38
@@ -53793,7 +53798,7 @@
 1803021159 metadata/md5-cache/app-office/scribus-1.4.6
 1803021159 metadata/md5-cache/app-office/kmymoney-4.8.1.1-r1
 1803021159 metadata/md5-cache/app-office/libreoffice-9999
-1803021159 metadata/md5-cache/app-office/scribus-1.5.3-r1
+1803052038 metadata/md5-cache/app-office/scribus-1.5.3-r1
 1803021159 metadata/md5-cache/app-office/sc-7.16-r2
 1803021159 metadata/md5-cache/app-office/abiword-3.0.2-r1
 1803021159 metadata/md5-cache/app-office/libreoffice-bin-5.4.5.1
@@ -53812,7 +53817,8 @@
 1801011404 metadata/md5-cache/sci-misc/fitsverify-4.17
 1803021159 metadata/md5-cache/sci-misc/repsnapper-2.4a_p3
 1801050119 metadata/md5-cache/sci-misc/gato-1.2.2
-1803021159 metadata/md5-cache/sci-misc/Manifest.gz
+1803052038 metadata/md5-cache/sci-misc/netlogo-bin-6.0.2
+1803052038 metadata/md5-cache/sci-misc/Manifest.gz
 1702282331 metadata/md5-cache/sci-misc/flashdot-1.1.4-r1
 1803021159 metadata/md5-cache/sci-misc/nco-4.5.1-r2
 1803021159 metadata/md5-cache/sci-misc/boinc-7.8.4
@@ -54376,13 +54382,14 @@
 1803021159 metadata/md5-cache/games-util/gtkevemon-1.10
 1803021159 metadata/md5-cache/games-util/umodpack-0.5_beta16-r2
 1702282323 metadata/md5-cache/games-util/etswitch-0.1.14-r1
+1803052038 metadata/md5-cache/games-util/pyfa-1.35.1
 1803021159 metadata/md5-cache/games-util/lutris-0.4.14
 1803021159 metadata/md5-cache/games-util/deutex-4.4.0
 1801050119 metadata/md5-cache/games-util/nml-0.4.4-r1
 1803021159 metadata/md5-cache/games-util/fteqcc-2501
 1803021159 metadata/md5-cache/games-util/qjoypad-4.3.0
 1801011404 metadata/md5-cache/games-util/datutil-2.46
-1803021159 metadata/md5-cache/games-util/Manifest.gz
+1803052038 metadata/md5-cache/games-util/Manifest.gz
 1707090139 metadata/md5-cache/games-util/xgame-1.7.1-r1
 1803021159 metadata/md5-cache/games-util/pyfa-1.34.0
 1803021159 metadata/md5-cache/games-util/wxchtdecoder-1.5a-r1
@@ -54430,7 +54437,7 @@
 1801011405 metadata/md5-cache/x11-themes/QGnomePlatform-0.3-r1
 1803021159 metadata/md5-cache/x11-themes/leonidas-backgrounds-11.0.0.2-r1
 1803021159 metadata/md5-cache/x11-themes/mate-backgrounds-1.16.0
-1803021159 metadata/md5-cache/x11-themes/adwaita-icon-theme-3.24.0
+1803052038 metadata/md5-cache/x11-themes/adwaita-icon-theme-3.24.0
 1803021159 metadata/md5-cache/x11-themes/gtk-engines-unico-1.0.3_pre20121212
 1702282336 metadata/md5-cache/x11-themes/commonbox-styles-0.6
 1702282336 metadata/md5-cache/x11-themes/blueglass-xcursors-0.4
@@ -54525,7 +54532,7 @@
 1706191539 metadata/md5-cache/x11-themes/sound-theme-freedesktop-0.8
 1709181109 metadata/md5-cache/x11-themes/clearlooks-phenix-5.0.7
 1702282336 metadata/md5-cache/x11-themes/zukitwo-2016.08.08
-1803041008 metadata/md5-cache/x11-themes/Manifest.gz
+1803052038 metadata/md5-cache/x11-themes/Manifest.gz
 1803021159 metadata/md5-cache/x11-themes/mate-icon-theme-faenza-1.14.0
 1803021159 metadata/md5-cache/x11-themes/gtk-engines-xfce-3.2.0-r300
 1803021159 metadata/md5-cache/x11-themes/mate-icon-theme-1.18.2
@@ -54630,7 +54637,7 @@
 1710212038 metadata/md5-cache/app-misc/nullmodem-0.0.6-r1
 1803021159 metadata/md5-cache/app-misc/ca-certificates-20161130.3.30.2
 1803021159 metadata/md5-cache/app-misc/smtm-1.6.10-r1
-1802221208 metadata/md5-cache/app-misc/calendar-0.9.1-r1
+1803052038 metadata/md5-cache/app-misc/calendar-0.9.1-r1
 1801011404 metadata/md5-cache/app-misc/bgrep-0_p20110121
 1803021159 metadata/md5-cache/app-misc/lcd4linux-0.10.1_rc2-r4
 1803021159 metadata/md5-cache/app-misc/vit-1.2-r1
@@ -54717,7 +54724,7 @@
 1801011404 metadata/md5-cache/app-misc/datovka-4.7.1
 1803021159 metadata/md5-cache/app-misc/tmux-2.2
 1803021159 metadata/md5-cache/app-misc/media-player-info-22
-1802221208 metadata/md5-cache/app-misc/dailystrips-1.0.28-r3
+1803052038 metadata/md5-cache/app-misc/dailystrips-1.0.28-r3
 1801011404 metadata/md5-cache/app-misc/inputlircd-0.0.1_pre11-r2
 1801091400 metadata/md5-cache/app-misc/lcdproc-0.5.5
 1803021159 metadata/md5-cache/app-misc/trash-cli-0.16.12.29
@@ -54856,7 +54863,7 @@
 1711281241 metadata/md5-cache/app-misc/screenfetch-9999
 1803021159 metadata/md5-cache/app-misc/lcdproc-0.5.2-r1
 1801050119 metadata/md5-cache/app-misc/asciinema-1.4.0
-1803042038 metadata/md5-cache/app-misc/Manifest.gz
+1803052038 metadata/md5-cache/app-misc/Manifest.gz
 1803021159 metadata/md5-cache/app-misc/socnetv-2.2
 1803021159 metadata/md5-cache/app-misc/pdfpc-3.1.1
 1803021159 metadata/md5-cache/app-misc/mmv-1.01b_p18
@@ -55021,7 +55028,7 @@
 1803021159 metadata/md5-cache/app-misc/glimpse-4.18.6-r1
 1803021159 metadata/md5-cache/app-misc/fslint-2.46
 1711251740 metadata/md5-cache/app-misc/interceptty-0.6-r1
-1803021159 metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r2
+1803052038 metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r2
 1803021159 metadata/md5-cache/app-misc/fslurp-2.1.4
 1803021159 metadata/md5-cache/app-misc/zisofs-tools-1.0.8
 1803021159 metadata/md5-cache/app-misc/bfr-1.6-r2
@@ -55348,53 +55355,53 @@
 1803021159 metadata/md5-cache/dev-texlive/texlive-mathextra-2014
 1803021159 metadata/md5-cache/dev-texlive/texlive-langcjk-2016
 1803021159 metadata/md5-cache/dev-texlive/texlive-langchinese-2016
-1803021159 metadata/md5-cache/dev-texlive/texlive-latexrecommended-2017
-1803021159 metadata/md5-cache/dev-texlive/texlive-langkorean-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-latexrecommended-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-langkorean-2017
 1803021159 metadata/md5-cache/dev-texlive/texlive-humanities-2015
 1803021159 metadata/md5-cache/dev-texlive/texlive-latexrecommended-2016
 1803021159 metadata/md5-cache/dev-texlive/texlive-langkorean-2015
 1803021159 metadata/md5-cache/dev-texlive/texlive-genericextra-2016
 1803021159 metadata/md5-cache/dev-texlive/texlive-pictures-2016
 1803021159 metadata/md5-cache/dev-texlive/texlive-games-2016
-1803021159 metadata/md5-cache/dev-texlive/texlive-publishers-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-publishers-2017
 1803021159 metadata/md5-cache/dev-texlive/texlive-langpolish-2015
 1803021159 metadata/md5-cache/dev-texlive/texlive-langgreek-2015
-1803021159 metadata/md5-cache/dev-texlive/texlive-pictures-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-pictures-2017
 1803021159 metadata/md5-cache/dev-texlive/texlive-mathextra-2013
-1803021159 metadata/md5-cache/dev-texlive/texlive-latexextra-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-latexextra-2017
 1803021159 metadata/md5-cache/dev-texlive/texlive-langafrican-2015
 1803021159 metadata/md5-cache/dev-texlive/texlive-science-2013
 1803021159 metadata/md5-cache/dev-texlive/texlive-langpolish-2016
 1803021159 metadata/md5-cache/dev-texlive/texlive-pstricks-2016
 1803021159 metadata/md5-cache/dev-texlive/texlive-langcyrillic-2016
-1803021159 metadata/md5-cache/dev-texlive/texlive-langpolish-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-langpolish-2017
 1803021159 metadata/md5-cache/dev-texlive/texlive-fontsextra-2015
 1803021159 metadata/md5-cache/dev-texlive/texlive-music-2015
 1803021159 metadata/md5-cache/dev-texlive/texlive-science-2015
-1803021159 metadata/md5-cache/dev-texlive/texlive-langgerman-2017
-1803021159 metadata/md5-cache/dev-texlive/texlive-plaingeneric-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-langgerman-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-plaingeneric-2017
 1803021159 metadata/md5-cache/dev-texlive/texlive-publishers-2015
 1803021159 metadata/md5-cache/dev-texlive/texlive-luatex-2015
-1803021159 metadata/md5-cache/dev-texlive/texlive-langenglish-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-langenglish-2017
 1803021159 metadata/md5-cache/dev-texlive/texlive-context-2016
 1803021159 metadata/md5-cache/dev-texlive/texlive-langeuropean-2014
 1803021159 metadata/md5-cache/dev-texlive/texlive-langother-2016
 1803021159 metadata/md5-cache/dev-texlive/texlive-science-2012
-1803021159 metadata/md5-cache/dev-texlive/texlive-pstricks-2017
-1803021159 metadata/md5-cache/dev-texlive/texlive-latex-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-pstricks-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-latex-2017
 1803021159 metadata/md5-cache/dev-texlive/texlive-basic-2014
-1803021159 metadata/md5-cache/dev-texlive/texlive-xetex-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-xetex-2017
 1803021159 metadata/md5-cache/dev-texlive/texlive-mathextra-2012-r1
 1803021159 metadata/md5-cache/dev-texlive/texlive-langeuropean-2015
-1803021159 metadata/md5-cache/dev-texlive/texlive-langcjk-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-langcjk-2017
 1803021159 metadata/md5-cache/dev-texlive/texlive-langspanish-2015
-1803021159 metadata/md5-cache/dev-texlive/texlive-metapost-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-metapost-2017
 1803021159 metadata/md5-cache/dev-texlive/texlive-bibtexextra-2016
 1803021159 metadata/md5-cache/dev-texlive/texlive-documentation-base-2012
 1803021159 metadata/md5-cache/dev-texlive/texlive-langgerman-2016
 1803021159 metadata/md5-cache/dev-texlive/texlive-langportuguese-2015
 1803021159 metadata/md5-cache/dev-texlive/texlive-langcyrillic-2015
-1803021159 metadata/md5-cache/dev-texlive/texlive-langjapanese-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-langjapanese-2017
 1803021159 metadata/md5-cache/dev-texlive/texlive-genericrecommended-2015
 1803021159 metadata/md5-cache/dev-texlive/texlive-langchinese-2015
 1803021159 metadata/md5-cache/dev-texlive/texlive-context-2015
@@ -55402,25 +55409,25 @@
 1803021159 metadata/md5-cache/dev-texlive/texlive-langczechslovak-2016
 1803021159 metadata/md5-cache/dev-texlive/texlive-basic-2016
 1803021159 metadata/md5-cache/dev-texlive/texlive-genericrecommended-2016
-1803021159 metadata/md5-cache/dev-texlive/texlive-basic-2017-r1
+1803052038 metadata/md5-cache/dev-texlive/texlive-basic-2017-r1
 1803021159 metadata/md5-cache/dev-texlive/texlive-basic-2012
-1803021159 metadata/md5-cache/dev-texlive/texlive-langgreek-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-langgreek-2017
 1803021159 metadata/md5-cache/dev-texlive/texlive-pstricks-2015
 1803021159 metadata/md5-cache/dev-texlive/texlive-omega-2016
 1803021159 metadata/md5-cache/dev-texlive/texlive-mathextra-2012
-1803021159 metadata/md5-cache/dev-texlive/texlive-langportuguese-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-langportuguese-2017
 1803021159 metadata/md5-cache/dev-texlive/texlive-formatsextra-2016
 1803021159 metadata/md5-cache/dev-texlive/texlive-science-2014
 1803021159 metadata/md5-cache/dev-texlive/texlive-langother-2015
-1803021159 metadata/md5-cache/dev-texlive/texlive-fontsextra-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-fontsextra-2017
 1803021159 metadata/md5-cache/dev-texlive/texlive-mathextra-2015
 1803021159 metadata/md5-cache/dev-texlive/texlive-langeuropean-2016
 1803021159 metadata/md5-cache/dev-texlive/texlive-basic-2015
 1803021159 metadata/md5-cache/dev-texlive/texlive-langfrench-2016
-1803021159 metadata/md5-cache/dev-texlive/texlive-context-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-context-2017
 1803021159 metadata/md5-cache/dev-texlive/texlive-latexextra-2016
 1803021159 metadata/md5-cache/dev-texlive/texlive-langkorean-2016
-1803021159 metadata/md5-cache/dev-texlive/Manifest.gz
+1803052038 metadata/md5-cache/dev-texlive/Manifest.gz
 1803021159 metadata/md5-cache/dev-texlive/texlive-bibtexextra-2015
 1803021159 metadata/md5-cache/dev-texlive/texlive-langindic-2015
 1803021159 metadata/md5-cache/dev-texlive/texlive-mathscience-2016
@@ -55428,35 +55435,35 @@
 1803021159 metadata/md5-cache/dev-texlive/texlive-langafrican-2016
 1803021159 metadata/md5-cache/dev-texlive/texlive-basic-2013
 1803021159 metadata/md5-cache/dev-texlive/texlive-humanities-2016
-1803021159 metadata/md5-cache/dev-texlive/texlive-langarabic-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-langarabic-2017
 1803021159 metadata/md5-cache/dev-texlive/texlive-langarabic-2015
 1803021159 metadata/md5-cache/dev-texlive/texlive-luatex-2016
 1803021159 metadata/md5-cache/dev-texlive/texlive-langjapanese-2015
 1803021159 metadata/md5-cache/dev-texlive/texlive-science-2012-r1
 1803021159 metadata/md5-cache/dev-texlive/texlive-omega-2015
-1803021159 metadata/md5-cache/dev-texlive/texlive-formatsextra-2017
-1803021159 metadata/md5-cache/dev-texlive/texlive-langeuropean-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-formatsextra-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-langeuropean-2017
 1803021159 metadata/md5-cache/dev-texlive/texlive-langeuropean-2013
 1803021159 metadata/md5-cache/dev-texlive/texlive-langczechslovak-2015-r1
-1803021159 metadata/md5-cache/dev-texlive/texlive-fontutils-2017
-1803021159 metadata/md5-cache/dev-texlive/texlive-langspanish-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-fontutils-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-langspanish-2017
 1803021159 metadata/md5-cache/dev-texlive/texlive-xetex-2015
 1803021159 metadata/md5-cache/dev-texlive/texlive-publishers-2016
 1803021159 metadata/md5-cache/dev-texlive/texlive-langgerman-2015
-1803021159 metadata/md5-cache/dev-texlive/texlive-luatex-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-luatex-2017
 1803021159 metadata/md5-cache/dev-texlive/texlive-langspanish-2016
 1803021159 metadata/md5-cache/dev-texlive/texlive-latexrecommended-2015-r1
-1803021159 metadata/md5-cache/dev-texlive/texlive-humanities-2017
-1803021159 metadata/md5-cache/dev-texlive/texlive-langchinese-2017
-1803021159 metadata/md5-cache/dev-texlive/texlive-bibtexextra-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-humanities-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-langchinese-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-bibtexextra-2017
 1803021159 metadata/md5-cache/dev-texlive/texlive-plainextra-2015
 1803021159 metadata/md5-cache/dev-texlive/texlive-latex-2016
 1803021159 metadata/md5-cache/dev-texlive/texlive-metapost-2016
 1803021159 metadata/md5-cache/dev-texlive/texlive-langitalian-2015
 1803021159 metadata/md5-cache/dev-texlive/texlive-langenglish-2015
-1803021159 metadata/md5-cache/dev-texlive/texlive-langfrench-2017
-1803021159 metadata/md5-cache/dev-texlive/texlive-music-2017
-1803021159 metadata/md5-cache/dev-texlive/texlive-langczechslovak-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-langfrench-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-music-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-langczechslovak-2017
 1803021159 metadata/md5-cache/dev-texlive/texlive-latexextra-2015-r1
 1803021159 metadata/md5-cache/dev-texlive/texlive-langarabic-2016
 1803021159 metadata/md5-cache/dev-texlive/texlive-langitalian-2016
@@ -55468,18 +55475,18 @@
 1803021159 metadata/md5-cache/dev-texlive/texlive-langcjk-2015
 1803021159 metadata/md5-cache/dev-texlive/texlive-fontutils-2015
 1803021159 metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2016
-1803021159 metadata/md5-cache/dev-texlive/texlive-langother-2017
-1803021159 metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-langother-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2017
 1803021159 metadata/md5-cache/dev-texlive/texlive-music-2016
 1803021159 metadata/md5-cache/dev-texlive/texlive-langjapanese-2016
-1803021159 metadata/md5-cache/dev-texlive/texlive-langitalian-2017
-1803021159 metadata/md5-cache/dev-texlive/texlive-langcyrillic-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-langitalian-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-langcyrillic-2017
 1803021159 metadata/md5-cache/dev-texlive/texlive-formatsextra-2015
 1803021159 metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2015
 1803021159 metadata/md5-cache/dev-texlive/texlive-langindic-2016
-1803021159 metadata/md5-cache/dev-texlive/texlive-games-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-games-2017
 1803021159 metadata/md5-cache/dev-texlive/texlive-xetex-2016
-1803021159 metadata/md5-cache/dev-texlive/texlive-mathscience-2017
+1803052038 metadata/md5-cache/dev-texlive/texlive-mathscience-2017
 1803021159 metadata/md5-cache/dev-texlive/texlive-langgreek-2016
 1803021159 metadata/md5-cache/dev-texlive/texlive-metapost-2015
 1803021159 metadata/md5-cache/dev-texlive/texlive-fontutils-2016
@@ -56014,11 +56021,11 @@
 1803021159 metadata/md5-cache/app-text/pstotext-1.9-r4
 1803021159 metadata/md5-cache/app-text/wv2-0.4.2-r2
 1803021159 metadata/md5-cache/app-text/bibclean-2.11.4
-1803021159 metadata/md5-cache/app-text/libmspub-0.1.2
+1803052038 metadata/md5-cache/app-text/libmspub-0.1.2
 1803021159 metadata/md5-cache/app-text/zpspell-0.4.3-r1
 1803021159 metadata/md5-cache/app-text/kbibtex-0.8_pre20180222
 1803021159 metadata/md5-cache/app-text/pylize-1.3b-r1
-1803021159 metadata/md5-cache/app-text/texlive-core-2017-r3
+1803052038 metadata/md5-cache/app-text/texlive-core-2017-r3
 1803021159 metadata/md5-cache/app-text/xdvik-22.87.03
 1803021159 metadata/md5-cache/app-text/jabref-bin-4.0
 1712292110 metadata/md5-cache/app-text/libwps-0.4.8
@@ -56088,7 +56095,7 @@
 1801011404 metadata/md5-cache/app-text/rnv-1.7.11
 1803021159 metadata/md5-cache/app-text/poppler-9999
 1801071309 metadata/md5-cache/app-text/libqxp-0.0.1
-1803021159 metadata/md5-cache/app-text/htmltidy-20090325-r2
+1803052038 metadata/md5-cache/app-text/htmltidy-20090325-r2
 1702282309 metadata/md5-cache/app-text/gocr-0.50
 1803021159 metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.8
 1803021159 metadata/md5-cache/app-text/dvipsk-5.997_p20170524
@@ -56146,7 +56153,7 @@
 1803021159 metadata/md5-cache/app-text/docbook-sgml-dtd-3.0-r3
 1803021159 metadata/md5-cache/app-text/tree-1.7.0
 1803021159 metadata/md5-cache/app-text/teckit-2.5.3
-1803021159 metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r2
+1803052038 metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r2
 1803021159 metadata/md5-cache/app-text/jabref-bin-3.8.1
 1803021159 metadata/md5-cache/app-text/djvu-3.5.27
 1803021159 metadata/md5-cache/app-text/passivetex-1.25
@@ -56280,7 +56287,7 @@
 1803021159 metadata/md5-cache/app-text/jadetex-3.13-r7
 1712292110 metadata/md5-cache/app-text/libstaroffice-0.0.5
 1711262240 metadata/md5-cache/app-text/xapian-omega-1.4.4
-1803021159 metadata/md5-cache/app-text/iso-codes-3.76
+1803052038 metadata/md5-cache/app-text/iso-codes-3.76
 1803021159 metadata/md5-cache/app-text/gspell-1.4.2
 1803021159 metadata/md5-cache/app-text/reed-5.4
 1803021159 metadata/md5-cache/app-text/docbook-xml-dtd-4.2-r2
@@ -56304,7 +56311,7 @@
 1712292110 metadata/md5-cache/app-text/libmwaw-0.3.13
 1803021159 metadata/md5-cache/app-text/ding-1.8.1
 1803021159 metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.7
-1803042238 metadata/md5-cache/app-text/Manifest.gz
+1803060108 metadata/md5-cache/app-text/Manifest.gz
 1707071808 metadata/md5-cache/app-text/texlive-2016
 1803021159 metadata/md5-cache/app-text/atril-1.14.2-r2
 1702282310 metadata/md5-cache/app-text/writerperfect-0.9.5
@@ -56387,7 +56394,7 @@
 1802050208 metadata/md5-cache/app-text/html-xml-utils-7.5
 1711141838 metadata/md5-cache/app-text/libwpd-0.10.2
 1803021159 metadata/md5-cache/app-text/active-dvi-1.10.2-r1
-1803042238 metadata/md5-cache/app-text/highlight-3.42-r1
+1803060038 metadata/md5-cache/app-text/highlight-3.42-r1
 1803021159 metadata/md5-cache/app-text/libgepub-0.4
 1801011404 metadata/md5-cache/app-text/mftrace-1.2.19-r1
 1803021159 metadata/md5-cache/app-text/poppler-0.61.1
@@ -56471,7 +56478,7 @@
 1803021159 metadata/md5-cache/app-text/cmark-0.28.3
 1803021159 metadata/md5-cache/app-text/jist-1.5.1-r1
 1801011404 metadata/md5-cache/app-text/manpager-1
-1803021159 metadata/md5-cache/app-text/languagetool-3.5-r1
+1803060108 metadata/md5-cache/app-text/languagetool-3.5-r1
 1803021159 metadata/md5-cache/app-text/ots-0.5.0-r1
 1803021159 metadata/md5-cache/app-text/editorconfig-core-c-0.12.1
 1803021159 metadata/md5-cache/app-text/epspdf-0.6.2
@@ -56551,7 +56558,7 @@
 1803021159 metadata/md5-cache/app-text/dvisvgm-2.2.3
 1803021159 metadata/md5-cache/app-text/docbook-sgml-dtd-4.4
 1803021159 metadata/md5-cache/app-text/evince-3.24.2
-1802151238 metadata/md5-cache/app-text/texlive-2017
+1803052038 metadata/md5-cache/app-text/texlive-2017
 1803021159 metadata/md5-cache/app-text/an-1.2-r1
 1803021159 metadata/md5-cache/app-text/lv-4.51-r4
 1803021159 metadata/md5-cache/app-text/expander-2.0.5-r2
@@ -56672,14 +56679,14 @@
 1803021159 metadata/md5-cache/dev-lisp/clisp-2.49.90
 1803021159 metadata/md5-cache/dev-lisp/sbcl-1.4.4
 1803021159 metadata/md5-cache/dev-lisp/asdf-3.2.0-r1
-1803042238 metadata/md5-cache/dev-lisp/Manifest.gz
+1803052038 metadata/md5-cache/dev-lisp/Manifest.gz
 1803021159 metadata/md5-cache/dev-lisp/asdf-3.1.7
 1803021159 metadata/md5-cache/dev-lisp/uiop-3.1.6
 1803021159 metadata/md5-cache/dev-lisp/clx-0.7.5
 1803021159 metadata/md5-cache/dev-lisp/asdf-3.1.6
 1803021159 metadata/md5-cache/dev-lisp/flexi-streams-1.0.16
 1803032108 metadata/md5-cache/dev-lisp/uiop-3.1.5
-1803032108 metadata/md5-cache/dev-lisp/asdf-3.1.5
+1803052038 metadata/md5-cache/dev-lisp/asdf-3.1.5
 1803021159 metadata/md5-cache/dev-lisp/asdf-3.2.0
 1803021159 metadata/md5-cache/dev-lisp/sbcl-1.3.17
 1803021159 metadata/md5-cache/dev-lisp/asdf-3.3.0
@@ -56839,7 +56846,7 @@
 1803021159 metadata/md5-cache/app-i18n/xvnkb-0.2.9a-r1
 1803021159 metadata/md5-cache/app-i18n/fcitx-table-extra-0.3.8
 1803021159 metadata/md5-cache/app-i18n/fcitx-configtool-0.4.10
-1803041008 metadata/md5-cache/app-i18n/Manifest.gz
+1803052338 metadata/md5-cache/app-i18n/Manifest.gz
 1712311440 metadata/md5-cache/app-i18n/scim-sayura-0.3.3
 1706121438 metadata/md5-cache/app-i18n/man-pages-fr-3.40.1
 1803021159 metadata/md5-cache/app-i18n/xcin-2.5.3_pre3-r2
@@ -56896,14 +56903,14 @@
 1803021159 metadata/md5-cache/app-i18n/fcitx-4.2.9.4
 1803021159 metadata/md5-cache/app-i18n/fcitx-sayura-4.9999
 1803021159 metadata/md5-cache/app-i18n/zinnia-0.06-r3
-1803021159 metadata/md5-cache/app-i18n/canna-3.7_p3-r3
+1803052338 metadata/md5-cache/app-i18n/canna-3.7_p3-r3
 1801090039 metadata/md5-cache/app-i18n/mozc-2.20.2673.102
 1711181338 metadata/md5-cache/app-i18n/rime-data-0.35
 1803021159 metadata/md5-cache/app-i18n/canna-3.7_p3-r1
 1803021159 metadata/md5-cache/app-i18n/dbskkd-cdb-2.00
 1702282309 metadata/md5-cache/app-i18n/scim-m17n-0.2.3
 1803021159 metadata/md5-cache/app-i18n/fcitx-rime-4.9999
-1803041008 metadata/md5-cache/app-i18n/tomoe-0.6.0-r3
+1803052038 metadata/md5-cache/app-i18n/tomoe-0.6.0-r3
 1803021159 metadata/md5-cache/app-i18n/fcitx-unikey-0.2.6
 1803021159 metadata/md5-cache/app-i18n/nkf-2.1.3
 1803021159 metadata/md5-cache/app-i18n/atokx3-3.0.0-r12
@@ -57029,7 +57036,7 @@
 1803021159 metadata/md5-cache/www-apps/mypictures-20040202-r1
 1803021159 metadata/md5-cache/www-apps/postfixadmin-3.1
 1706301438 metadata/md5-cache/www-apps/ampache-3.8.3
-1803021159 metadata/md5-cache/www-apps/Manifest.gz
+1803052338 metadata/md5-cache/www-apps/Manifest.gz
 1801050119 metadata/md5-cache/www-apps/scgi-1.14-r1
 1803021159 metadata/md5-cache/www-apps/davical-1.1.3.1-r2
 1802241838 metadata/md5-cache/www-apps/drupal-7.57
@@ -57087,7 +57094,7 @@
 1702282334 metadata/md5-cache/www-apps/browser-config-1.1
 1702282334 metadata/md5-cache/www-apps/phprojekt-6.1.2
 1801280009 metadata/md5-cache/www-apps/grafana-bin-4.6.3
-1801050119 metadata/md5-cache/www-apps/roundup-1.5.1
+1803052338 metadata/md5-cache/www-apps/roundup-1.5.1
 1702282334 metadata/md5-cache/www-apps/baikal-0.3.5
 1803021159 metadata/md5-cache/www-apps/liquid_feedback_core-2.2.6
 1801162139 metadata/md5-cache/www-apps/davical-1.1.7
@@ -57362,7 +57369,7 @@
 1803021159 metadata/md5-cache/sys-freebsd/freebsd-pam-modules-9.1-r1
 1803021159 metadata/md5-cache/sys-freebsd/freebsd-usbin-11.1
 1803021159 metadata/md5-cache/sys-freebsd/freebsd-sources-9.1-r9
-1803042238 metadata/md5-cache/Manifest.gz
+1803060738 metadata/md5-cache/Manifest.gz
 1801011405 metadata/md5-cache/www-apache/mod_macro-1.1.10
 1803021159 metadata/md5-cache/www-apache/mod_wsgi-4.5.17
 1803021159 metadata/md5-cache/www-apache/mod_perl-2.0.10
@@ -57486,8 +57493,9 @@
 1803021159 metadata/md5-cache/dev-util/catfish-1.2.2
 1803021159 metadata/md5-cache/dev-util/catalyst-3.0.1
 1803021159 metadata/md5-cache/dev-util/idutils-4.6
+1803052038 metadata/md5-cache/dev-util/geany-1.33
 1801011404 metadata/md5-cache/dev-util/rebar-2.6.2
-1803021159 metadata/md5-cache/dev-util/geany-9999
+1803052038 metadata/md5-cache/dev-util/geany-9999
 1801011404 metadata/md5-cache/dev-util/ninja-9999
 1803021159 metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.61
 1803021159 metadata/md5-cache/dev-util/mingw-runtime-3.20
@@ -57508,7 +57516,7 @@
 1803021159 metadata/md5-cache/dev-util/xfce4-dev-tools-4.12.0
 1803021159 metadata/md5-cache/dev-util/bitcoin-tx-0.13.1
 1803021159 metadata/md5-cache/dev-util/coccinelle-1.0.5
-1803030508 metadata/md5-cache/dev-util/gdbus-codegen-2.52.3
+1803052038 metadata/md5-cache/dev-util/gdbus-codegen-2.52.3
 1803021159 metadata/md5-cache/dev-util/kcov-33
 1801011404 metadata/md5-cache/dev-util/trinity-9999
 1803031238 metadata/md5-cache/dev-util/shadowman-2
@@ -57574,7 +57582,7 @@
 1803021159 metadata/md5-cache/dev-util/edb-debugger-0.9.21
 1803021159 metadata/md5-cache/dev-util/dwdiff-2.1.0
 1803021159 metadata/md5-cache/dev-util/dwarves-1.10_p20160519
-1803021159 metadata/md5-cache/dev-util/cppunit-1.14.0
+1803052038 metadata/md5-cache/dev-util/cppunit-1.14.0
 1803021159 metadata/md5-cache/dev-util/rosinstall_generator-0.1.13
 1706051108 metadata/md5-cache/dev-util/patchutils-0.3.4
 1803021159 metadata/md5-cache/dev-util/android-sdk-update-manager-22.2.1
@@ -57619,6 +57627,7 @@
 1803021159 metadata/md5-cache/dev-util/ccache-3.2.4
 1803021159 metadata/md5-cache/dev-util/creduce-2.7.0
 1803021159 metadata/md5-cache/dev-util/cunit-2.1_p3
+1803052038 metadata/md5-cache/dev-util/geany-plugins-1.33
 1802262111 metadata/md5-cache/dev-util/ald-0.1.7-r2
 1803021159 metadata/md5-cache/dev-util/suse-build-9999
 1707050109 metadata/md5-cache/dev-util/vbindiff-3.0_beta4-r1
@@ -57671,12 +57680,11 @@
 1803021159 metadata/md5-cache/dev-util/osc-0.154.0
 1803021159 metadata/md5-cache/dev-util/makepp-2.0.98.4
 1803021159 metadata/md5-cache/dev-util/cmake-3.10.2
-1803021159 metadata/md5-cache/dev-util/geany-1.31
 1803021159 metadata/md5-cache/dev-util/fatrace-0.11
 1704112339 metadata/md5-cache/dev-util/cloc-1.72
 1803021159 metadata/md5-cache/dev-util/dwarves-9999
 1801191240 metadata/md5-cache/dev-util/android-ndk-11c
-1803021159 metadata/md5-cache/dev-util/sasm-9999
+1803052038 metadata/md5-cache/dev-util/sasm-9999
 1803021159 metadata/md5-cache/dev-util/indent-2.2.11-r1
 1803021159 metadata/md5-cache/dev-util/suse-build-2015.11.05
 1801050119 metadata/md5-cache/dev-util/gertty-1.3.2
@@ -57758,6 +57766,7 @@
 1801231609 metadata/md5-cache/dev-util/unifdef-2.11
 1801050119 metadata/md5-cache/dev-util/gcovr-3.2
 1803021159 metadata/md5-cache/dev-util/android-sdk-update-manager-22.3
+1803052038 metadata/md5-cache/dev-util/sasm-2.2-r1
 1711260441 metadata/md5-cache/dev-util/artifactory-bin-5.4.6
 1803021159 metadata/md5-cache/dev-util/ccache-3.3.4
 1803021159 metadata/md5-cache/dev-util/cmdtest-0.16
@@ -57804,7 +57813,7 @@
 1801041840 metadata/md5-cache/dev-util/cgdb-0.6.8
 1803021159 metadata/md5-cache/dev-util/geany-plugins-1.32
 1803021159 metadata/md5-cache/dev-util/aruba-0.5.4-r1
-1803041438 metadata/md5-cache/dev-util/meson-0.44.1
+1803052238 metadata/md5-cache/dev-util/meson-0.44.1
 1803021159 metadata/md5-cache/dev-util/amtterm-1.6
 1706211508 metadata/md5-cache/dev-util/bcpp-20150811-r1
 1801050119 metadata/md5-cache/dev-util/buildbot-www-0.9.13
@@ -57812,7 +57821,7 @@
 1803021159 metadata/md5-cache/dev-util/electron-1.6.16
 1803021159 metadata/md5-cache/dev-util/kbuild-0.1.9998_pre20131130-r1
 1803021159 metadata/md5-cache/dev-util/shellcheck-0.4.6
-1803021159 metadata/md5-cache/dev-util/glade-3.20.2
+1803052038 metadata/md5-cache/dev-util/glade-3.20.2
 1803021159 metadata/md5-cache/dev-util/valgrind-3.13.0-r1
 1802262111 metadata/md5-cache/dev-util/numdiff-5.9.0
 1803032108 metadata/md5-cache/dev-util/xfce4-dev-tools-4.12.0-r1
@@ -57873,7 +57882,7 @@
 1803021159 metadata/md5-cache/dev-util/ragel-6.9
 1803040138 metadata/md5-cache/dev-util/cargo-0.16.0
 1803021159 metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.44-r1
-1803041738 metadata/md5-cache/dev-util/Manifest.gz
+1803052338 metadata/md5-cache/dev-util/Manifest.gz
 1802262111 metadata/md5-cache/dev-util/xdelta-3.1.0
 1803021159 metadata/md5-cache/dev-util/dmake-4.12.2
 1801011404 metadata/md5-cache/dev-util/dissembler-0.9-r1
@@ -57924,7 +57933,7 @@
 1803021159 metadata/md5-cache/dev-util/crash-7.1.8
 1803021159 metadata/md5-cache/dev-util/android-tools-6.0.1_p79
 1803021159 metadata/md5-cache/dev-util/gdbus-codegen-2.50.3
-1803021159 metadata/md5-cache/dev-util/re2c-1.0.3
+1803052238 metadata/md5-cache/dev-util/re2c-1.0.3
 1803021159 metadata/md5-cache/dev-util/rosdep-9999
 1803021159 metadata/md5-cache/dev-util/squashdelta-0.1
 1803021159 metadata/md5-cache/dev-util/strace-9999
@@ -57972,7 +57981,6 @@
 1706300908 metadata/md5-cache/dev-util/dbus-test-runner-12.10.1
 1803021159 metadata/md5-cache/dev-util/lsuio-0.2.0
 1702282322 metadata/md5-cache/dev-util/obs-service-source_validator-0.3
-1803021159 metadata/md5-cache/dev-util/geany-plugins-1.31
 1803021159 metadata/md5-cache/dev-util/webstorm-2016.2.2.162.1628.41
 1702282322 metadata/md5-cache/dev-util/shards-0.6.2
 1803021159 metadata/md5-cache/dev-util/premake-4.3-r1
@@ -58003,7 +58011,6 @@
 1802262111 metadata/md5-cache/dev-util/lttng-ust-2.8.1
 1707121109 metadata/md5-cache/dev-util/colm-0.13.0.4
 1801091400 metadata/md5-cache/dev-util/lttng-tools-2.6.1
-1803021159 metadata/md5-cache/dev-util/sasm-2.2
 1803021159 metadata/md5-cache/dev-util/mpatch-0.8-r1
 1711061309 metadata/md5-cache/dev-util/checkbashisms-2.17.10
 1801050119 metadata/md5-cache/dev-util/cmdtest-0.27
@@ -58147,7 +58154,7 @@
 1803021159 metadata/md5-cache/dev-util/valgrind-3.13.0-r2
 1803021159 metadata/md5-cache/dev-util/boost-build-1.62.0-r1
 1803021159 metadata/md5-cache/dev-util/coccinelle-1.0.6
-1801131009 metadata/md5-cache/dev-util/ninja-1.8.2
+1803052238 metadata/md5-cache/dev-util/ninja-1.8.2
 1801011404 metadata/md5-cache/dev-util/editorconfig-geany-0.1_p20160725
 1803021159 metadata/md5-cache/dev-util/omake-0.10.2
 1803021159 metadata/md5-cache/dev-util/wstool-9999
@@ -58240,7 +58247,7 @@
 1801280009 metadata/md5-cache/dev-util/buildbot-0.9.15_p1
 1803021159 metadata/md5-cache/dev-util/bakefile-0.2.9-r1
 1803021159 metadata/md5-cache/dev-util/ltrace-0.7.3_p4
-1803041238 metadata/md5-cache/dev-util/cmdtest-0.30
+1803052338 metadata/md5-cache/dev-util/cmdtest-0.30
 1803021159 metadata/md5-cache/dev-util/hadolint-1.5.0
 1801091400 metadata/md5-cache/dev-util/skipfish-2.10_beta
 1801091400 metadata/md5-cache/dev-util/rbtools-0.7.10
@@ -59808,7 +59815,7 @@
 1803021159 metadata/md5-cache/app-admin/aerospike-amc-community-3.6.11
 1803021159 metadata/md5-cache/app-admin/packagekit-base-1.0.11
 1801050119 metadata/md5-cache/app-admin/dxf-7.1.0
-1803021159 metadata/md5-cache/app-admin/keepassxc-9999
+1803052038 metadata/md5-cache/app-admin/keepassxc-9999
 1801011404 metadata/md5-cache/app-admin/github-backup-utils-2.11.2-r1
 1801011404 metadata/md5-cache/app-admin/github-backup-utils-2.8.2
 1711260441 metadata/md5-cache/app-admin/logcheck-1.3.18
@@ -59860,7 +59867,7 @@
 1702282308 metadata/md5-cache/app-admin/systemrescuecd-x86-4.8.3
 1801011404 metadata/md5-cache/app-admin/github-backup-utils-2.7.1
 1710262338 metadata/md5-cache/app-admin/cli53-0.8.12
-1803021159 metadata/md5-cache/app-admin/webalizer-2.23.08
+1803060038 metadata/md5-cache/app-admin/webalizer-2.23.08
 1803021159 metadata/md5-cache/app-admin/aerospike-amc-community-3.6.12
 1801011404 metadata/md5-cache/app-admin/lnav-0.8.2
 1705182238 metadata/md5-cache/app-admin/mktwpol-1.0.0
@@ -59893,7 +59900,7 @@
 1803021159 metadata/md5-cache/app-admin/watchfolder-0.3.3-r1
 1803021159 metadata/md5-cache/app-admin/gamin-0.1.10-r1
 1803021159 metadata/md5-cache/app-admin/syslog-ng-3.13.2
-1803021159 metadata/md5-cache/app-admin/conserver-8.1.18-r1
+1803052038 metadata/md5-cache/app-admin/conserver-8.1.18-r1
 1803021159 metadata/md5-cache/app-admin/webapp-config-1.52-r1
 1802190408 metadata/md5-cache/app-admin/glance-2018.1.9999
 1802150238 metadata/md5-cache/app-admin/vault-0.9.3
@@ -60045,7 +60052,7 @@
 1803021159 metadata/md5-cache/app-admin/puppet-4.10.10-r1
 1711260441 metadata/md5-cache/app-admin/graylog2-2.2.3
 1803021159 metadata/md5-cache/app-admin/jinit-0.1.12-r1
-1803041638 metadata/md5-cache/app-admin/Manifest.gz
+1803060038 metadata/md5-cache/app-admin/Manifest.gz
 1801271708 metadata/md5-cache/app-admin/filebeat-6.1.1
 1703071908 metadata/md5-cache/app-admin/systemrescuecd-x86-4.9.3
 1803021159 metadata/md5-cache/app-admin/diamond-9999
@@ -60076,7 +60083,6 @@
 1802082008 metadata/md5-cache/app-admin/kube-bench-0.0.8
 1801280009 metadata/md5-cache/app-admin/vault-0.9.0
 1704231508 metadata/md5-cache/app-admin/systemrescuecd-x86-4.9.5
-1803021159 metadata/md5-cache/app-admin/keepassxc-2.3.0
 1803021159 metadata/md5-cache/app-admin/syslog-summary-1.14-r1
 1702282308 metadata/md5-cache/app-admin/systemrescuecd-x86-4.8.0
 1803021159 metadata/md5-cache/app-admin/chroot_safe-1.4
@@ -60175,6 +60181,7 @@
 1803021159 metadata/md5-cache/app-admin/supernova-2.2.0
 1803021159 metadata/md5-cache/app-admin/testdisk-7.0-r3
 1712300140 metadata/md5-cache/app-admin/diradm-2.9.7.1
+1803052038 metadata/md5-cache/app-admin/keepassxc-2.3.0-r1
 1711260441 metadata/md5-cache/app-admin/tenshi-0.16-r1
 1803021159 metadata/md5-cache/app-admin/gtkdiskfree-2.0.1-r1
 1802262111 metadata/md5-cache/app-admin/apachetop-0.17.4
@@ -60633,7 +60640,7 @@
 1803021159 metadata/md5-cache/mail-mta/netqmail-1.06-r5
 1803021159 metadata/md5-cache/mail-mta/postfix-3.3.0
 1803021159 metadata/md5-cache/mail-mta/nullmailer-1.13-r5
-1803021159 metadata/md5-cache/mail-mta/postfix-3.2.4
+1803052038 metadata/md5-cache/mail-mta/postfix-3.2.4
 1803021159 metadata/md5-cache/mail-mta/opensmtpd-6.0.2_p1-r1
 1803021159 metadata/md5-cache/mail-mta/courier-0.75.0
 1803021159 metadata/md5-cache/mail-mta/nullmailer-2.0
@@ -60641,7 +60648,7 @@
 1803021159 metadata/md5-cache/mail-mta/courier-0.76.4
 1803021159 metadata/md5-cache/mail-mta/postfix-3.2.5
 1803021159 metadata/md5-cache/mail-mta/opensmtpd-6.0.2_p1-r2
-1803021159 metadata/md5-cache/mail-mta/Manifest.gz
+1803052038 metadata/md5-cache/mail-mta/Manifest.gz
 1803021159 metadata/md5-cache/mail-mta/nullmailer-2.0-r1
 1803021159 metadata/md5-cache/mail-mta/postfix-3.2.3
 1803021159 metadata/md5-cache/mail-mta/exim-4.90
@@ -60858,7 +60865,6 @@
 1801011404 metadata/md5-cache/sci-mathematics/fricas-1.3.1
 1803021159 metadata/md5-cache/sci-mathematics/spin-6.4.5
 1801290538 metadata/md5-cache/sci-mathematics/gimps-28.10-r1
-1803021159 metadata/md5-cache/sci-mathematics/octave-epstk-2.3
 1803021159 metadata/md5-cache/sci-mathematics/dataplot-20090821
 1803021159 metadata/md5-cache/sci-mathematics/pspp-0.10.2
 1803021159 metadata/md5-cache/sci-mathematics/wxmaxima-16.04.2
@@ -60922,7 +60928,7 @@
 1803021159 metadata/md5-cache/sci-mathematics/polymake-3.0_p2
 1801011404 metadata/md5-cache/sci-mathematics/factmsieve-76-r1
 1801011404 metadata/md5-cache/sci-mathematics/fricas-1.3.0-r1
-1803032108 metadata/md5-cache/sci-mathematics/Manifest.gz
+1803052038 metadata/md5-cache/sci-mathematics/Manifest.gz
 1803021159 metadata/md5-cache/sci-mathematics/jags-4.0.0
 1801091400 metadata/md5-cache/sci-mathematics/nauty-2.5.9
 1803021159 metadata/md5-cache/sci-mathematics/yacas-1.6.1-r1
@@ -60939,6 +60945,7 @@
 1801091400 metadata/md5-cache/sci-mathematics/spass-3.9
 1803021159 metadata/md5-cache/sci-mathematics/num-utils-0.5-r1
 1803021159 metadata/md5-cache/sci-mathematics/agda-lib-ffi-0.0.2-r2
+1803052038 metadata/md5-cache/sci-mathematics/cgal-4.11.1
 1702282331 metadata/md5-cache/sci-mathematics/e-1.6
 1803021159 metadata/md5-cache/sci-mathematics/pari-2.3.5
 1803021159 metadata/md5-cache/sci-mathematics/ginac-1.6.6
@@ -61025,7 +61032,7 @@
 1803021159 metadata/md5-cache/app-portage/unsandbox-2
 1803021159 metadata/md5-cache/app-portage/esearch-1.3-r1
 1803021159 metadata/md5-cache/app-portage/cfg-update-1.8.9
-1803021159 metadata/md5-cache/app-portage/etc-proposals-1.4.3-r3
+1803042308 metadata/md5-cache/app-portage/etc-proposals-1.4.3-r3
 1702282309 metadata/md5-cache/app-portage/epkg-0.3
 1803021159 metadata/md5-cache/app-portage/portage-utils-0.62
 1803021159 metadata/md5-cache/app-portage/overlint-0.5.3
@@ -61086,7 +61093,7 @@
 1803020138 metadata/md5-cache/app-portage/repoman-2.3.6
 1803021159 metadata/md5-cache/app-portage/grs-0.5
 1803021159 metadata/md5-cache/app-portage/gentoopm-0.2.9
-1803031838 metadata/md5-cache/app-portage/Manifest.gz
+1803052038 metadata/md5-cache/app-portage/Manifest.gz
 1803021159 metadata/md5-cache/app-portage/g-cpan-0.16.5
 1803021159 metadata/md5-cache/app-portage/elogv-0.7.6.5
 1803021159 metadata/md5-cache/app-portage/metagen-0.6.4.2
@@ -61119,7 +61126,7 @@
 1801011404 metadata/md5-cache/app-portage/unsymlink-lib-9999
 1803021159 metadata/md5-cache/app-portage/g-cpan-0.16.6
 1803021159 metadata/md5-cache/app-portage/getdelta-0.7.9-r2
-1803012038 metadata/md5-cache/app-portage/hashgen-1.0
+1803052038 metadata/md5-cache/app-portage/hashgen-1.0
 1803021159 metadata/md5-cache/app-portage/g-sorcery-0.1-r1
 1803021159 metadata/md5-cache/app-portage/porticron-0.7.1
 1803021159 metadata/md5-cache/app-portage/gentoolkit-dev-0.3.0
@@ -61221,6 +61228,7 @@
 1702282327 metadata/md5-cache/media-sound/moc-2.6_alpha3
 1801011404 metadata/md5-cache/media-sound/split2flac-122
 1803021159 metadata/md5-cache/media-sound/audacious-9999
+1803052038 metadata/md5-cache/media-sound/bpmdetect-0.7.0_pre20170810
 1802262111 metadata/md5-cache/media-sound/amsynth-1.3.2-r1
 1801011404 metadata/md5-cache/media-sound/split2flac-9999
 1803021159 metadata/md5-cache/media-sound/sexypsf-0.4.7
@@ -61286,6 +61294,7 @@
 1803021159 metadata/md5-cache/media-sound/mixxx-2.0.0-r4
 1803021159 metadata/md5-cache/media-sound/ardour-5.6-r1
 1803021159 metadata/md5-cache/media-sound/patchage-0.5.0-r1
+1803052238 metadata/md5-cache/media-sound/deinvert-9999
 1803021159 metadata/md5-cache/media-sound/spek-0.8.3-r1
 1803021159 metadata/md5-cache/media-sound/volumeicon-0.4.6
 1801011404 metadata/md5-cache/media-sound/id3-0.15
@@ -61515,13 +61524,13 @@
 1803021159 metadata/md5-cache/media-sound/denemo-1.0.2
 1702282327 metadata/md5-cache/media-sound/ogg2mp3-0.6.1
 1803021159 metadata/md5-cache/media-sound/grip-3.6.3
-1803041008 metadata/md5-cache/media-sound/mpfc-1.3.8.1-r2
+1803052038 metadata/md5-cache/media-sound/mpfc-1.3.8.1-r2
 1803021159 metadata/md5-cache/media-sound/substract_wave-0.3-r1
 1803021159 metadata/md5-cache/media-sound/lingot-0.9.1
 1803021159 metadata/md5-cache/media-sound/mpfc-1.3.7-r1
 1801011404 metadata/md5-cache/media-sound/gom-0.29.103-r1
 1702282327 metadata/md5-cache/media-sound/gst123-0.3.4
-1803041338 metadata/md5-cache/media-sound/Manifest.gz
+1803052338 metadata/md5-cache/media-sound/Manifest.gz
 1803021159 metadata/md5-cache/media-sound/neutrino-0.8.4
 1801011404 metadata/md5-cache/media-sound/id3ed-1.10.4
 1803021159 metadata/md5-cache/media-sound/jaaa-0.4.2
@@ -61698,7 +61707,7 @@
 1803021159 metadata/md5-cache/media-sound/volti-0.2.3-r1
 1803021159 metadata/md5-cache/media-sound/cmusfm-0.2.5
 1801011404 metadata/md5-cache/media-sound/imp3sh-0.2.4
-1803021159 metadata/md5-cache/media-sound/grip-3.4.3
+1803052338 metadata/md5-cache/media-sound/grip-3.4.3
 1803021159 metadata/md5-cache/media-sound/lltag-0.14.5
 1801090539 metadata/md5-cache/media-sound/bempc-0.11_p20160207
 1803021308 metadata/md5-cache/media-sound/ecasound-2.9.1-r1
@@ -61749,7 +61758,7 @@
 1702282327 metadata/md5-cache/media-sound/mhwaveedit-1.4.23
 1803021159 metadata/md5-cache/media-sound/qastools-0.21.0
 1803021159 metadata/md5-cache/media-sound/projectm-pulseaudio-2.1.0
-1803021159 metadata/md5-cache/media-sound/twolame-0.3.13-r2
+1803052038 metadata/md5-cache/media-sound/twolame-0.3.13-r2
 1803021159 metadata/md5-cache/media-sound/sc2mpd-1.1.4
 1803021159 metadata/md5-cache/media-sound/mumble-1.2.18
 1803021159 metadata/md5-cache/media-sound/pithos-1.1.2
@@ -61780,7 +61789,6 @@
 1803021159 metadata/md5-cache/media-sound/gmusicbrowser-9999
 1803021159 metadata/md5-cache/media-sound/vbrfixc-0.24
 1702282327 metadata/md5-cache/media-sound/id3tool-1.2a
-1803021159 metadata/md5-cache/media-sound/bpmdetect-0.6.1-r1
 1802262111 metadata/md5-cache/media-sound/jamin-0.95.0-r3
 1803021159 metadata/md5-cache/media-sound/mp3splt-gtk-0.9.2
 1803012238 metadata/md5-cache/media-sound/abcmidi-2018.02.22
@@ -61829,7 +61837,7 @@
 1803021159 metadata/md5-cache/sci-physics/clhep-2.3.1.0
 1803021159 metadata/md5-cache/sci-physics/lammps-20151120
 1803021159 metadata/md5-cache/sci-physics/cernlib-2006-r7
-1803021159 metadata/md5-cache/sci-physics/Manifest.gz
+1803052138 metadata/md5-cache/sci-physics/Manifest.gz
 1803021159 metadata/md5-cache/sci-physics/xfoil-6.99
 1803021159 metadata/md5-cache/sci-physics/rivet-2.3.0
 1803021159 metadata/md5-cache/sci-physics/lammps-20151207
@@ -61872,6 +61880,7 @@
 1803021159 metadata/md5-cache/sci-physics/bullet-2.83.4
 1801050119 metadata/md5-cache/sci-physics/qutip-4.2.0
 1803021159 metadata/md5-cache/sci-physics/cernlib-montecarlo-2006-r3
+1803052138 metadata/md5-cache/sci-physics/lammps-20180222
 1803021159 metadata/md5-cache/sci-physics/fastjet-3.0.3-r1
 1803021159 metadata/md5-cache/sci-physics/vgm-4.4
 1803021159 metadata/md5-cache/sci-physics/sassena-1.4.2
@@ -62069,7 +62078,7 @@
 1803021159 metadata/md5-cache/sys-fs/dd-rescue-1.46
 1803021159 metadata/md5-cache/sys-fs/ntfs3g-2017.3.23
 1802262111 metadata/md5-cache/sys-fs/snapraid-11.0-r1
-1803041938 metadata/md5-cache/sys-fs/Manifest.gz
+1803060038 metadata/md5-cache/sys-fs/Manifest.gz
 1803021159 metadata/md5-cache/sys-fs/zerofree-1.0.1
 1803021159 metadata/md5-cache/sys-fs/aufs3-3_p20160627
 1803021159 metadata/md5-cache/sys-fs/libeatmydata-82
@@ -62115,7 +62124,7 @@
 1801011405 metadata/md5-cache/sys-fs/vzquota-3.1
 1803021159 metadata/md5-cache/sys-fs/lvm2-2.02.116-r6
 1803021159 metadata/md5-cache/sys-fs/pytagsfs-0.9.2
-1803021159 metadata/md5-cache/sys-fs/mtools-4.0.18-r2
+1803060038 metadata/md5-cache/sys-fs/mtools-4.0.18-r2
 1803021159 metadata/md5-cache/sys-fs/lvm2-2.02.166-r2
 1803021159 metadata/md5-cache/sys-fs/lvm2-2.02.116-r5
 1803021159 metadata/md5-cache/sys-fs/lvm2-2.02.145-r2
@@ -62208,7 +62217,7 @@
 1803021159 metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20160209
 1702282333 metadata/md5-cache/sys-boot/makebootfat-1.4
 1803021159 metadata/md5-cache/sys-boot/syslinux-4.07
-1802271808 metadata/md5-cache/sys-boot/plymouth-0.9.3-r1
+1803052338 metadata/md5-cache/sys-boot/plymouth-0.9.3-r1
 1801050119 metadata/md5-cache/sys-boot/systemd-boot-235
 1803021159 metadata/md5-cache/sys-boot/getdvhoff-0.12-r1
 1803021159 metadata/md5-cache/sys-boot/arcload-0.50-r1
@@ -62252,7 +62261,7 @@
 1803021159 metadata/md5-cache/sys-boot/yaboot-static-1.3.17-r1
 1801050119 metadata/md5-cache/sys-boot/raspberrypi-mkimage-0_p20120201
 1803021159 metadata/md5-cache/sys-boot/raincoat-0.11
-1803021159 metadata/md5-cache/sys-boot/Manifest.gz
+1803052338 metadata/md5-cache/sys-boot/Manifest.gz
 1803021159 metadata/md5-cache/sys-boot/gnu-efi-3.0.3
 1802271808 metadata/md5-cache/sys-boot/plymouth-0.9.3
 1803021159 metadata/md5-cache/sys-boot/unetbootin-647
@@ -62343,7 +62352,7 @@
 1803021159 metadata/md5-cache/x11-drivers/xf86-video-ati-7.9.0
 1803021159 metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.3.1
 1803021159 metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.15
-1803022138 metadata/md5-cache/x11-drivers/Manifest.gz
+1803060608 metadata/md5-cache/x11-drivers/Manifest.gz
 1803021159 metadata/md5-cache/x11-drivers/xf86-input-void-1.4.1
 1803021159 metadata/md5-cache/x11-drivers/xf86-video-openchrome-0.6.0
 1803021159 metadata/md5-cache/x11-drivers/xf86-video-newport-0.2.3
@@ -62356,7 +62365,7 @@
 1803021159 metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.14
 1803021159 metadata/md5-cache/x11-drivers/xf86-video-newport-0.2.4
 1803021159 metadata/md5-cache/x11-drivers/xf86-video-amdgpu-1.3.0
-1803021159 metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20180214
+1803060608 metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20180214
 1803021159 metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.1.0-r1
 1803021159 metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5
 1803021159 metadata/md5-cache/x11-drivers/xf86-input-wacom-0.36.0
@@ -62373,6 +62382,7 @@
 1803021159 metadata/md5-cache/x11-drivers/nvidia-drivers-384.111
 1803021159 metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.3
 1803021159 metadata/md5-cache/x11-drivers/xf86-video-ati-7.10.0
+1803060608 metadata/md5-cache/x11-drivers/xf86-video-intel-9999
 1803021159 metadata/md5-cache/x11-drivers/nvidia-drivers-384.90
 1803021159 metadata/md5-cache/x11-drivers/xf86-video-amdgpu-1.4.0
 1803021159 metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.9.0
@@ -62552,7 +62562,7 @@
 1803021159 metadata/md5-cache/dev-perl/Text-Shellwords-1.80.0-r1
 1801050119 metadata/md5-cache/dev-perl/WWW-Mechanize-1.790.0
 1801050119 metadata/md5-cache/dev-perl/local-lib-2.0.19
-1802260108 metadata/md5-cache/dev-perl/Perl-Critic-1.130.0
+1803052038 metadata/md5-cache/dev-perl/Perl-Critic-1.130.0
 1803021159 metadata/md5-cache/dev-perl/Fatal-Exception-0.50.0-r1
 1801050119 metadata/md5-cache/dev-perl/HTML-Tree-5.70.0
 1801050119 metadata/md5-cache/dev-perl/Module-Starter-1.720.0
@@ -62619,7 +62629,7 @@
 1801050119 metadata/md5-cache/dev-perl/File-Scan-ClamAV-1.930.0
 1803021159 metadata/md5-cache/dev-perl/FileHandle-Unget-0.162.800
 1801050119 metadata/md5-cache/dev-perl/Mail-Sendmail-0.800.0
-1803030108 metadata/md5-cache/dev-perl/DBD-SQLite-1.540.0-r1
+1803052038 metadata/md5-cache/dev-perl/DBD-SQLite-1.540.0-r1
 1801050119 metadata/md5-cache/dev-perl/MooseX-Types-DateTime-ButMaintained-0.160.0
 1803021159 metadata/md5-cache/dev-perl/Lingua-EN-NameCase-1.190.0
 1803021159 metadata/md5-cache/dev-perl/Apache-Session-1.930.0
@@ -63619,7 +63629,7 @@
 1803021159 metadata/md5-cache/dev-perl/Socket6-0.270.0
 1803021159 metadata/md5-cache/dev-perl/XML-Parser-2.440.0
 1801050119 metadata/md5-cache/dev-perl/Date-Manip-6.580.0
-1802260108 metadata/md5-cache/dev-perl/PadWalker-2.300.0
+1803052038 metadata/md5-cache/dev-perl/PadWalker-2.300.0
 1803021159 metadata/md5-cache/dev-perl/IO-BufferedSelect-1.0.0-r1
 1801050119 metadata/md5-cache/dev-perl/Net-SFTP-Foreign-1.810.0
 1801050119 metadata/md5-cache/dev-perl/Proc-Simple-1.320.0
@@ -63829,6 +63839,7 @@
 1803021159 metadata/md5-cache/dev-perl/Lingua-Stem-It-0.20.0-r1
 1803021159 metadata/md5-cache/dev-perl/Term-ReadLine-Perl-1.30.300-r1
 1801050119 metadata/md5-cache/dev-perl/Goo-Canvas-0.60.0-r2
+1803060738 metadata/md5-cache/dev-perl/Test-Needs-0.2.5
 1803021159 metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r1
 1801050119 metadata/md5-cache/dev-perl/Pod-Tests-1.190.0-r1
 1803021159 metadata/md5-cache/dev-perl/Mail-ListDetector-1.40.0-r1
@@ -63936,7 +63947,7 @@
 1801050119 metadata/md5-cache/dev-perl/String-Flogger-1.101.245
 1803021159 metadata/md5-cache/dev-perl/Data-Dump-1.230.0
 1803021159 metadata/md5-cache/dev-perl/RTF-Writer-1.110.0-r2
-1803041138 metadata/md5-cache/dev-perl/Manifest.gz
+1803060738 metadata/md5-cache/dev-perl/Manifest.gz
 1803021159 metadata/md5-cache/dev-perl/Crypt-OpenSSL-Bignum-0.40.0-r2
 1801050119 metadata/md5-cache/dev-perl/MooseX-FollowPBP-0.50.0-r1
 1803021159 metadata/md5-cache/dev-perl/HTML-Mason-1.560.0
@@ -64157,6 +64168,7 @@
 1801050119 metadata/md5-cache/dev-perl/MooX-late-0.15.0-r1
 1803021159 metadata/md5-cache/dev-perl/JSON-XS-VersionOneAndTwo-0.310.0-r1
 1803021159 metadata/md5-cache/dev-perl/DBIx-DBSchema-0.450.0
+1803060708 metadata/md5-cache/dev-perl/Test-MockTime-0.160.0
 1801050119 metadata/md5-cache/dev-perl/Readonly-2.50.0
 1803021159 metadata/md5-cache/dev-perl/Parse-Syslog-1.100.0-r1
 1803021159 metadata/md5-cache/dev-perl/File-NCopy-0.360.0-r1
@@ -64535,6 +64547,7 @@
 1801050119 metadata/md5-cache/dev-perl/UUID-0.260.0
 1803021159 metadata/md5-cache/dev-perl/Data-Hexify-1.0.0-r1
 1801050119 metadata/md5-cache/dev-perl/Date-Manip-6.520.0
+1803060738 metadata/md5-cache/dev-perl/Test-Most-0.350.0
 1801050119 metadata/md5-cache/dev-perl/VM-EC2-1.280.0
 1801050119 metadata/md5-cache/dev-perl/Proc-Guard-0.70.0
 1803021159 metadata/md5-cache/dev-perl/POE-XS-Queue-Array-0.6.0-r1
@@ -64598,6 +64611,7 @@
 1801050119 metadata/md5-cache/dev-perl/Class-DBI-mysql-1.0.0-r2
 1801061640 metadata/md5-cache/dev-perl/Clipboard-0.130.0-r3
 1801050119 metadata/md5-cache/dev-perl/PerlIO-gzip-0.190.0
+1803060738 metadata/md5-cache/dev-perl/Test-MockTime-HiRes-0.80.0
 1801050119 metadata/md5-cache/dev-perl/MooseX-SimpleConfig-0.110.0
 1801050119 metadata/md5-cache/dev-perl/Class-Unload-0.110.0
 1803021159 metadata/md5-cache/dev-perl/Class-Trigger-0.140.0-r1
@@ -64880,6 +64894,7 @@
 1803021159 metadata/md5-cache/dev-perl/Getopt-Tabular-0.3
 1803021159 metadata/md5-cache/dev-perl/HTML-HTMLDoc-0.100.0-r1
 1801050119 metadata/md5-cache/dev-perl/DateTime-1.280.0
+1803060708 metadata/md5-cache/dev-perl/Test-MockModule-0.130.0
 1803021159 metadata/md5-cache/dev-perl/MooseX-Aliases-0.110.0-r1
 1801152209 metadata/md5-cache/dev-perl/MusicBrainz-DiscID-0.40.0
 1801050119 metadata/md5-cache/dev-perl/Params-Classify-0.15.0
@@ -65007,7 +65022,7 @@
 1801050119 metadata/md5-cache/dev-perl/LaTeX-Encode-0.92.0
 1803021159 metadata/md5-cache/dev-perl/Lingua-Stem-Fr-0.20.0-r1
 1710152208 metadata/md5-cache/net-nntp/leafnode-1.11.11
-1803041008 metadata/md5-cache/net-nntp/tin-2.4.2
+1803052038 metadata/md5-cache/net-nntp/tin-2.4.2
 1803021159 metadata/md5-cache/net-nntp/tin-2.0.1-r1
 1803021159 metadata/md5-cache/net-nntp/inn-2.5.5-r1
 1803021159 metadata/md5-cache/net-nntp/slrn-1.0.2
@@ -65019,7 +65034,7 @@
 1803021159 metadata/md5-cache/net-nntp/nzbget-19.1
 1803021159 metadata/md5-cache/net-nntp/pan-0.142
 1803021159 metadata/md5-cache/net-nntp/newspost-2.1.1-r3
-1803041008 metadata/md5-cache/net-nntp/Manifest.gz
+1803052038 metadata/md5-cache/net-nntp/Manifest.gz
 1801280009 metadata/md5-cache/net-nntp/sabnzbd-2.3.2
 1702282329 metadata/md5-cache/net-nntp/ubh-2.5
 1702282329 metadata/md5-cache/net-nntp/brag-1.4.3
@@ -65283,6 +65298,7 @@
 1802262111 metadata/md5-cache/sys-cluster/corosync-2.3.5
 1803021159 metadata/md5-cache/x11-apps/xprop-1.2.2
 1803021159 metadata/md5-cache/x11-apps/xinput-1.6.1
+1803052238 metadata/md5-cache/x11-apps/iceauth-1.0.8
 1803021159 metadata/md5-cache/x11-apps/xlsfonts-1.0.4
 1803021159 metadata/md5-cache/x11-apps/listres-1.0.3
 1803021159 metadata/md5-cache/x11-apps/xstdcmap-1.0.3
@@ -65348,7 +65364,7 @@
 1803021159 metadata/md5-cache/x11-apps/xrandr-1.4.3
 1803021159 metadata/md5-cache/x11-apps/xmag-1.0.5
 1803021159 metadata/md5-cache/x11-apps/xcursorgen-1.0.6
-1803021159 metadata/md5-cache/x11-apps/Manifest.gz
+1803052238 metadata/md5-cache/x11-apps/Manifest.gz
 1803021159 metadata/md5-cache/x11-apps/xload-1.1.2
 1803021159 metadata/md5-cache/x11-apps/beforelight-1.0.5
 1803021159 metadata/md5-cache/x11-apps/smproxy-1.0.5
@@ -65373,11 +65389,13 @@
 1803021159 metadata/md5-cache/x11-apps/xdpyinfo-1.3.1
 1803021159 metadata/md5-cache/x11-apps/xauth-1.0.10
 1803021159 metadata/md5-cache/x11-apps/showfont-1.0.5
+1803052038 metadata/md5-cache/x11-apps/editres-1.0.7
 1803021159 metadata/md5-cache/x11-apps/xconsole-1.0.7
 1803021159 metadata/md5-cache/x11-apps/mesa-progs-8.3.0
 1803021159 metadata/md5-cache/x11-apps/showfont-1.0.4
 1803021159 metadata/md5-cache/x11-apps/bdftopcf-1.0.4
 1803021159 metadata/md5-cache/x11-apps/mkfontscale-1.1.2
+1803052038 metadata/md5-cache/x11-apps/appres-1.0.5
 1803021159 metadata/md5-cache/x11-apps/xdbedizzy-1.1.0
 1803021159 metadata/md5-cache/x11-apps/xcmsdb-1.0.5
 1803021159 metadata/md5-cache/x11-apps/xf86dga-1.0.3
@@ -65388,11 +65406,13 @@
 1802262111 metadata/md5-cache/x11-apps/xrectsel-0.3.2
 1803021159 metadata/md5-cache/x11-apps/xman-1.1.3-r1
 1803021159 metadata/md5-cache/x11-apps/bitmap-1.0.8
+1803052038 metadata/md5-cache/x11-apps/listres-1.0.4
 1803021159 metadata/md5-cache/x11-apps/xkbcomp-1.4.0
 1803021159 metadata/md5-cache/x11-apps/fslsfonts-1.0.5
 1803021159 metadata/md5-cache/x11-apps/xdm-1.1.11-r3
 1803021159 metadata/md5-cache/x11-apps/xkbevd-1.1.4
 1803021159 metadata/md5-cache/x11-apps/ico-1.0.4
+1803052038 metadata/md5-cache/x11-apps/viewres-1.0.5
 1803021159 metadata/md5-cache/x11-apps/xkbprint-1.0.4
 1803021159 metadata/md5-cache/x11-apps/mkfontscale-1.1.1
 1803021159 metadata/md5-cache/x11-apps/xclock-1.0.7
@@ -65510,7 +65530,7 @@
 1803021159 metadata/md5-cache/x11-libs/libast-9999
 1803021159 metadata/md5-cache/x11-libs/mx-1.4.7-r2
 1803021159 metadata/md5-cache/x11-libs/pangox-compat-0.0.2
-1803021159 metadata/md5-cache/x11-libs/libwnck-3.24.1
+1803052038 metadata/md5-cache/x11-libs/libwnck-3.24.1
 1803021159 metadata/md5-cache/x11-libs/libXmu-1.1.2
 1803021159 metadata/md5-cache/x11-libs/libXxf86misc-1.0.3-r1
 1803021159 metadata/md5-cache/x11-libs/c++-gtk-utils-2.0.27
@@ -65535,7 +65555,7 @@
 1803021159 metadata/md5-cache/x11-libs/libXcursor-1.1.15
 1803021159 metadata/md5-cache/x11-libs/libgksu-2.0.12-r3
 1803021159 metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.3-r1
-1803030508 metadata/md5-cache/x11-libs/pango-1.40.14
+1803052038 metadata/md5-cache/x11-libs/pango-1.40.14
 1803021159 metadata/md5-cache/x11-libs/libfontenc-1.1.3
 1803021159 metadata/md5-cache/x11-libs/vte-0.36.5
 1803021159 metadata/md5-cache/x11-libs/cairo-1.14.10
@@ -65545,8 +65565,9 @@
 1803021159 metadata/md5-cache/x11-libs/libdesktop-agnostic-0.3.92-r1
 1803021159 metadata/md5-cache/x11-libs/gtkdatabox-0.9.3.0
 1803021159 metadata/md5-cache/x11-libs/cairo-9999
-1803021159 metadata/md5-cache/x11-libs/vte-0.48.4
+1803052038 metadata/md5-cache/x11-libs/vte-0.48.4
 1803021159 metadata/md5-cache/x11-libs/libfakekey-0.1-r1
+1803052238 metadata/md5-cache/x11-libs/gl2ps-1.4.0
 1803021159 metadata/md5-cache/x11-libs/goffice-0.10.38
 1803021159 metadata/md5-cache/x11-libs/gtef-2.0.1
 1803021159 metadata/md5-cache/x11-libs/libnotify-0.7.6-r3
@@ -65622,6 +65643,7 @@
 1803021159 metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.11
 1803021159 metadata/md5-cache/x11-libs/libwnck-2.31.0
 1710241709 metadata/md5-cache/x11-libs/neXtaw-0.15.1-r2
+1803052038 metadata/md5-cache/x11-libs/qscintilla-2.10.3
 1803021159 metadata/md5-cache/x11-libs/libXScrnSaver-1.2.2-r1
 1803021159 metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.9-r1
 1803021159 metadata/md5-cache/x11-libs/libdmx-1.1.3
@@ -65631,7 +65653,7 @@
 1803021159 metadata/md5-cache/x11-libs/libXxf86vm-1.1.3
 1803021159 metadata/md5-cache/x11-libs/libfm-9999
 1803021159 metadata/md5-cache/x11-libs/motif-2.3.8-r1
-1803041008 metadata/md5-cache/x11-libs/Manifest.gz
+1803060238 metadata/md5-cache/x11-libs/Manifest.gz
 1803021159 metadata/md5-cache/x11-libs/xapps-1.0.2-r1
 1803021159 metadata/md5-cache/x11-libs/xapps-1.0.3
 1702282335 metadata/md5-cache/x11-libs/fox-wrapper-2
@@ -65653,7 +65675,7 @@
 1803021159 metadata/md5-cache/x11-libs/libXaw3dXft-1.6.2c
 1803021159 metadata/md5-cache/x11-libs/libXres-1.2.0
 1803021159 metadata/md5-cache/x11-libs/libXext-1.3.2
-1803021159 metadata/md5-cache/x11-libs/gtksourceview-3.24.6
+1803052038 metadata/md5-cache/x11-libs/gtksourceview-3.24.6
 1803021159 metadata/md5-cache/x11-libs/gnome-pty-helper-0.36.3
 1801011405 metadata/md5-cache/x11-libs/qwtpolar-1.1.1-r1
 1803021159 metadata/md5-cache/x11-libs/colord-gtk-0.1.26
@@ -65682,6 +65704,7 @@
 1803021159 metadata/md5-cache/x11-libs/libXaw3d-1.6.2
 1803021159 metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.2
 1802262111 metadata/md5-cache/x11-libs/libtinynotify-9999
+1803052308 metadata/md5-cache/x11-libs/libxcb-1.13
 1803021159 metadata/md5-cache/x11-libs/libcryptui-3.12.2-r1
 1803040208 metadata/md5-cache/x11-libs/libyui-qt-2.46.21
 1803021159 metadata/md5-cache/x11-libs/libXfixes-5.0.3
@@ -65731,6 +65754,7 @@
 1803021159 metadata/md5-cache/x11-libs/libxklavier-5.3
 1803021159 metadata/md5-cache/x11-libs/fox-1.6.49
 1803021159 metadata/md5-cache/x11-libs/xosd-2.2.14-r1
+1803060238 metadata/md5-cache/x11-libs/libdrm-2.4.91
 1803021159 metadata/md5-cache/x11-libs/libva-1.7.3
 1803021159 metadata/md5-cache/x11-libs/libva-intel-driver-1.8.3
 1803021159 metadata/md5-cache/x11-libs/gtksourceview-3.22.2
@@ -65785,7 +65809,7 @@
 1802262111 metadata/md5-cache/app-backup/amanda-3.4.1
 1803021159 metadata/md5-cache/app-backup/duply-1.9.2
 1803021159 metadata/md5-cache/app-backup/backintime-1.1.24
-1801280009 metadata/md5-cache/app-backup/btrbk-9999
+1803052038 metadata/md5-cache/app-backup/btrbk-9999
 1801050119 metadata/md5-cache/app-backup/borgbackup-1.1.4
 1803021159 metadata/md5-cache/app-backup/snapper-0.2.8-r1
 1803021159 metadata/md5-cache/app-backup/kbackup-1.0.1
@@ -65811,9 +65835,10 @@
 1803021159 metadata/md5-cache/app-backup/rdiff-backup-1.3.3-r2
 1702282308 metadata/md5-cache/app-backup/rsnapshot-1.4.2
 1803021159 metadata/md5-cache/app-backup/holland-backup-sqlite-1.0.10
+1803052038 metadata/md5-cache/app-backup/btrbk-0.26.1
 1802262111 metadata/md5-cache/app-backup/amanda-3.5-r1
 1803040138 metadata/md5-cache/app-backup/rdedup-1.0.2
-1803040138 metadata/md5-cache/app-backup/Manifest.gz
+1803052038 metadata/md5-cache/app-backup/Manifest.gz
 1801260238 metadata/md5-cache/app-backup/luckybackup-0.4.9
 1801011404 metadata/md5-cache/app-backup/cdbackup-0.7.1-r1
 1803021159 metadata/md5-cache/app-backup/rear-1.15-r1
@@ -65869,6 +65894,7 @@
 1803021159 metadata/md5-cache/x11-proto/xcmiscproto-1.2.2
 1803021159 metadata/md5-cache/x11-proto/recordproto-1.14.2-r1
 1803021159 metadata/md5-cache/x11-proto/compositeproto-0.4.2-r1
+1803052308 metadata/md5-cache/x11-proto/xcb-proto-1.13
 1803021159 metadata/md5-cache/x11-proto/fontcacheproto-0.1.3
 1802262238 metadata/md5-cache/x11-proto/bigreqsproto-1.1.2-r1
 1803021159 metadata/md5-cache/x11-proto/dmxproto-2.3.1-r1
@@ -65909,7 +65935,7 @@
 1803021159 metadata/md5-cache/x11-proto/dri2proto-2.8-r1
 1803021159 metadata/md5-cache/x11-proto/damageproto-1.2.1-r1
 1803021159 metadata/md5-cache/x11-proto/fixesproto-5.0-r1
-1803021159 metadata/md5-cache/x11-proto/Manifest.gz
+1803052308 metadata/md5-cache/x11-proto/Manifest.gz
 1803021159 metadata/md5-cache/x11-proto/kbproto-1.0.7
 1802262238 metadata/md5-cache/x11-proto/dri2proto-2.8-r2
 1803021159 metadata/md5-cache/x11-proto/bigreqsproto-1.1.2
@@ -66210,7 +66236,6 @@
 1803021159 metadata/md5-cache/x11-wm/aewm-1.3.12
 1801011405 metadata/md5-cache/x11-wm/lwm-1.2.2
 1803021159 metadata/md5-cache/x11-wm/xmonad-0.11-r3
-1803021159 metadata/md5-cache/x11-wm/stumpwm-1.0.0
 1803021159 metadata/md5-cache/x11-wm/enlightenment-0.21.7
 1801011405 metadata/md5-cache/x11-wm/goomwwm-9999
 1803021159 metadata/md5-cache/x11-wm/twm-1.0.8
@@ -66250,7 +66275,7 @@
 1801011405 metadata/md5-cache/x11-wm/lumina-9999
 1803021159 metadata/md5-cache/x11-wm/fvwm-2.6.5-r1
 1803021159 metadata/md5-cache/x11-wm/windowlab-1.34
-1803041008 metadata/md5-cache/x11-wm/Manifest.gz
+1803052338 metadata/md5-cache/x11-wm/Manifest.gz
 1803021159 metadata/md5-cache/x11-wm/muffin-3.6.0
 1712042339 metadata/md5-cache/x11-wm/page-1.9.9-r1
 1803021159 metadata/md5-cache/x11-wm/qtile-0.10.5
@@ -66274,7 +66299,7 @@
 1801011405 metadata/md5-cache/x11-wm/goomwwm-1.0.0-r1
 1803021159 metadata/md5-cache/x11-wm/amiwm-0.21_p2
 1803021159 metadata/md5-cache/x11-wm/aewm++-1.1.5-r2
-1803021159 metadata/md5-cache/x11-wm/afterstep-2.2.12
+1803052338 metadata/md5-cache/x11-wm/afterstep-2.2.12
 1803021159 metadata/md5-cache/x11-wm/musca-0.9.24_p20100226-r3
 1803021159 metadata/md5-cache/x11-wm/awesome-4.0
 1801011405 metadata/md5-cache/x11-wm/herbstluftwm-0.7.0
@@ -66794,7 +66819,7 @@
 1803021159 metadata/md5-cache/net-dns/dnssec-tools-2.1
 1803021159 metadata/md5-cache/net-dns/bind-dns-keygen-9.3.2.39-r1
 1803021159 metadata/md5-cache/net-dns/fpdns-0.10.0_pre20130404-r1
-1803012338 metadata/md5-cache/net-dns/idnkit-2.3
+1803052038 metadata/md5-cache/net-dns/idnkit-2.3
 1803021159 metadata/md5-cache/net-dns/libidn2-2.0.4
 1801280009 metadata/md5-cache/net-dns/ddclient-3.8.2
 1801201508 metadata/md5-cache/net-dns/ldns-utils-1.7.0-r1
@@ -66832,7 +66857,7 @@
 1702282328 metadata/md5-cache/net-dns/dnswalk-2.0.2
 1710271508 metadata/md5-cache/net-dns/coredns-0.9.9
 1803021159 metadata/md5-cache/net-dns/opendnssec-2.0.1-r1
-1803041938 metadata/md5-cache/net-dns/Manifest.gz
+1803052038 metadata/md5-cache/net-dns/Manifest.gz
 1803041638 metadata/md5-cache/net-dns/libidn-1.33-r2
 1803021159 metadata/md5-cache/net-dns/dnssec-validator-2.2-r1
 1803021159 metadata/md5-cache/net-dns/unbound-1.5.1-r2
@@ -66895,7 +66920,7 @@
 1802032338 metadata/md5-cache/dev-scheme/racket-6.11
 1801071809 metadata/md5-cache/dev-scheme/guile-lib-0.2.5.1
 1708030039 metadata/md5-cache/dev-scheme/stklos-1.10-r1
-1802221208 metadata/md5-cache/dev-scheme/slib-3.2.5-r1
+1803052038 metadata/md5-cache/dev-scheme/slib-3.2.5-r1
 1803021159 metadata/md5-cache/dev-scheme/gauche-0.9.5
 1803021159 metadata/md5-cache/dev-scheme/guile-2.0.14-r3
 1803021159 metadata/md5-cache/dev-scheme/gauche-0.9.4-r1
@@ -66911,7 +66936,7 @@
 1702282321 metadata/md5-cache/dev-scheme/guile-lib-0.1.9
 1708031509 metadata/md5-cache/dev-scheme/sigscheme-0.8.5-r1
 1803021159 metadata/md5-cache/dev-scheme/slib-3.2.1
-1803021159 metadata/md5-cache/dev-scheme/Manifest.gz
+1803052038 metadata/md5-cache/dev-scheme/Manifest.gz
 1803021159 metadata/md5-cache/dev-scheme/gambit-4.8.8-r1
 1803021159 metadata/md5-cache/dev-scheme/guile-gnome-platform-2.16.1-r1
 1802122238 metadata/md5-cache/dev-scheme/goosh-1.3-r1
@@ -68504,7 +68529,7 @@
 1803021159 metadata/md5-cache/app-leechcraft/liblaretz-0.1.0
 1803021159 metadata/md5-cache/app-leechcraft/lc-dolozhee-9999
 1803021159 metadata/md5-cache/app-leechcraft/lc-kbswitch-9999
-1803021159 metadata/md5-cache/app-leechcraft/Manifest.gz
+1803052038 metadata/md5-cache/app-leechcraft/Manifest.gz
 1803021159 metadata/md5-cache/app-leechcraft/lc-intermutko-9999
 1803021159 metadata/md5-cache/app-leechcraft/lc-hotsensors-9999
 1803021159 metadata/md5-cache/app-leechcraft/lc-tpi-9999
@@ -68531,7 +68556,7 @@
 1803021159 metadata/md5-cache/app-leechcraft/lc-qrosp-9999
 1803021159 metadata/md5-cache/app-leechcraft/lc-blogique-9999
 1803021159 metadata/md5-cache/app-leechcraft/lc-pogooglue-9999
-1803021159 metadata/md5-cache/app-leechcraft/lc-popishu-9999
+1803052038 metadata/md5-cache/app-leechcraft/lc-popishu-9999
 1803021159 metadata/md5-cache/app-leechcraft/lc-nacheku-9999
 1803021159 metadata/md5-cache/app-leechcraft/lc-musiczombie-9999
 1803021159 metadata/md5-cache/app-leechcraft/lc-pintab-9999
@@ -68751,7 +68776,7 @@
 1704032208 metadata/md5-cache/app-xemacs/oo-browser-1.05
 1704032208 metadata/md5-cache/app-xemacs/slider-1.16
 1704032208 metadata/md5-cache/app-xemacs/escreen-1.01
-1803041008 metadata/md5-cache/app-xemacs/ebuild-mode-1.42
+1803052038 metadata/md5-cache/app-xemacs/ebuild-mode-1.42
 1704032208 metadata/md5-cache/app-xemacs/sh-script-1.22
 1704032208 metadata/md5-cache/app-xemacs/cc-mode-1.45
 1704032208 metadata/md5-cache/app-xemacs/perl-modes-1.14
@@ -68794,7 +68819,7 @@
 1704032208 metadata/md5-cache/app-xemacs/xetla-1.01
 1704032208 metadata/md5-cache/app-xemacs/eshell-1.18
 1704032208 metadata/md5-cache/app-xemacs/bbdb-1.32
-1803041008 metadata/md5-cache/app-xemacs/Manifest.gz
+1803052038 metadata/md5-cache/app-xemacs/Manifest.gz
 1704032208 metadata/md5-cache/app-xemacs/sounds-au-1.12
 1704032208 metadata/md5-cache/app-xemacs/xemacs-devel-1.80
 1704032208 metadata/md5-cache/app-xemacs/viper-1.55
@@ -68903,6 +68928,7 @@
 1803021159 metadata/md5-cache/net-misc/dhcp-4.3.5
 1803021159 metadata/md5-cache/net-misc/wicd-1.7.4-r3
 1803021159 metadata/md5-cache/net-misc/netifrc-0.4.0
+1803052038 metadata/md5-cache/net-misc/dropbox-45.3.88
 1803021159 metadata/md5-cache/net-misc/ofono-1.20
 1803021159 metadata/md5-cache/net-misc/ices-2.0.1-r1
 1705171708 metadata/md5-cache/net-misc/unix2tcp-0.8.2-r1
@@ -68922,7 +68948,6 @@
 1802262111 metadata/md5-cache/net-misc/cadaver-0.23.3
 1702282329 metadata/md5-cache/net-misc/bird-1.6.3
 1803021159 metadata/md5-cache/net-misc/smb4k-2.0.2
-1803021159 metadata/md5-cache/net-misc/iperf-3.3
 1803021159 metadata/md5-cache/net-misc/shout-0.8.0-r2
 1803021159 metadata/md5-cache/net-misc/srf-ip-conn-srv-9999
 1801011404 metadata/md5-cache/net-misc/htpdate-1.2.0
@@ -68930,7 +68955,6 @@
 1709111508 metadata/md5-cache/net-misc/calicoctl-1.5.0
 1803021159 metadata/md5-cache/net-misc/ofono-1.18
 1801280009 metadata/md5-cache/net-misc/igmpproxy-0.2
-1803021159 metadata/md5-cache/net-misc/dropbox-41.3.76
 1710031639 metadata/md5-cache/net-misc/spiped-1.6.0-r1
 1803021159 metadata/md5-cache/net-misc/grive-0.4.0_pre20150905
 1712010010 metadata/md5-cache/net-misc/iprange-1.0.3
@@ -68961,7 +68985,7 @@
 1712221239 metadata/md5-cache/net-misc/knock-0.7
 1801050119 metadata/md5-cache/net-misc/pyhoca-gui-0.5.0.6
 1801071509 metadata/md5-cache/net-misc/asterisk-extra-sounds-1.4.11
-1803021159 metadata/md5-cache/net-misc/dhcpcd-6.11.5
+1803052038 metadata/md5-cache/net-misc/dhcpcd-6.11.5
 1803021159 metadata/md5-cache/net-misc/lksctp-tools-1.0.16
 1803021159 metadata/md5-cache/net-misc/dahdi-tools-2.9.0.1
 1803021159 metadata/md5-cache/net-misc/omniORB-4.1.4-r2
@@ -68973,7 +68997,6 @@
 1802161938 metadata/md5-cache/net-misc/rclone-1.39
 1803021159 metadata/md5-cache/net-misc/x11-ssh-askpass-1.2.4.1-r1
 1803021159 metadata/md5-cache/net-misc/ncp-1.2.4
-1702282329 metadata/md5-cache/net-misc/valve-1.0
 1803021159 metadata/md5-cache/net-misc/networkmanager-sstp-1.2.0
 1803021159 metadata/md5-cache/net-misc/fatrat-1.2.0_beta2_p20161204
 1801091400 metadata/md5-cache/net-misc/ifenslave-1.1.0-r6
@@ -68984,7 +69007,7 @@
 1803021159 metadata/md5-cache/net-misc/redir-2.2.1
 1803021159 metadata/md5-cache/net-misc/mosh-1.3.0
 1803021159 metadata/md5-cache/net-misc/bfgminer-5.4.2
-1803021159 metadata/md5-cache/net-misc/socat-1.7.3.2
+1803052038 metadata/md5-cache/net-misc/socat-1.7.3.2
 1702282329 metadata/md5-cache/net-misc/pcapfix-0.7
 1803021159 metadata/md5-cache/net-misc/whois-5.2.12
 1802262111 metadata/md5-cache/net-misc/axel-2.14.1
@@ -69043,7 +69066,7 @@
 1803021159 metadata/md5-cache/net-misc/seafile-client-6.1.3
 1801011404 metadata/md5-cache/net-misc/fakeidentd-2.6-r1
 1803021159 metadata/md5-cache/net-misc/netifrc-0.3.1
-1702282329 metadata/md5-cache/net-misc/valve-1.0-r1
+1803052038 metadata/md5-cache/net-misc/valve-1.0-r1
 1803021159 metadata/md5-cache/net-misc/kafka-bin-1.0.0
 1803021408 metadata/md5-cache/net-misc/tn5250-0.17.4-r2
 1803021159 metadata/md5-cache/net-misc/modemmanager-1.6.12
@@ -69056,7 +69079,6 @@
 1801280009 metadata/md5-cache/net-misc/dhcp-4.3.6-r1
 1803021159 metadata/md5-cache/net-misc/clusterssh-4.30.600
 1801050119 metadata/md5-cache/net-misc/streamlink-0.9.0
-1803021159 metadata/md5-cache/net-misc/dropbox-43.3.47
 1708061709 metadata/md5-cache/net-misc/netprofiles-ims-0.1.0134
 1803021159 metadata/md5-cache/net-misc/ipsvd-1.0.0-r2
 1803021159 metadata/md5-cache/net-misc/megatools-1.9.97
@@ -69075,6 +69097,7 @@
 1803021159 metadata/md5-cache/net-misc/ntp-4.2.8_p10-r1
 1803021159 metadata/md5-cache/net-misc/dropbear-2017.75
 1803021159 metadata/md5-cache/net-misc/ntpsec-9999
+1803052038 metadata/md5-cache/net-misc/gns3-server-2.1.3-r1
 1803021159 metadata/md5-cache/net-misc/grive-0.5.1_pre20161004
 1803021159 metadata/md5-cache/net-misc/suite3270-3.5_p10
 1803021159 metadata/md5-cache/net-misc/npapi-sdk-0.27.2
@@ -69135,7 +69158,7 @@
 1803021159 metadata/md5-cache/net-misc/seafile-6.1.3
 1803021159 metadata/md5-cache/net-misc/rdate-1.4-r3
 1801011404 metadata/md5-cache/net-misc/geomyidae-0.29
-1803021159 metadata/md5-cache/net-misc/quagga-1.2.4
+1803052038 metadata/md5-cache/net-misc/quagga-1.2.4
 1803021159 metadata/md5-cache/net-misc/hath-0.3.0
 1702282329 metadata/md5-cache/net-misc/sshpass-1.06
 1803021159 metadata/md5-cache/net-misc/networkmanager-fortisslvpn-1.2.6
@@ -69265,7 +69288,7 @@
 1702282329 metadata/md5-cache/net-misc/dhcpd-pools-2.21
 1802212208 metadata/md5-cache/net-misc/x2goserver-4.0.1.22
 1803021159 metadata/md5-cache/net-misc/netkit-bootparamd-0.17-r3
-1803042038 metadata/md5-cache/net-misc/Manifest.gz
+1803052138 metadata/md5-cache/net-misc/Manifest.gz
 1803021159 metadata/md5-cache/net-misc/kafka-bin-0.10.2.1-r1
 1803021159 metadata/md5-cache/net-misc/haeredes-0.4.4
 1803021159 metadata/md5-cache/net-misc/networkmanager-openswan-1.0.8
@@ -69323,7 +69346,6 @@
 1803021159 metadata/md5-cache/net-misc/grive-0.5.1_pre20160706
 1802220808 metadata/md5-cache/net-misc/openntpd-6.2_p3
 1801011404 metadata/md5-cache/net-misc/plowshare-2.1.7
-1803030538 metadata/md5-cache/net-misc/gns3-server-2.1.3
 1803021159 metadata/md5-cache/net-misc/hylafaxplus-5.5.5
 1801011404 metadata/md5-cache/net-misc/whatmask-1.2-r1
 1803021159 metadata/md5-cache/net-misc/netifrc-0.2.4
@@ -69358,7 +69380,7 @@
 1802262111 metadata/md5-cache/net-misc/shmux-1.0.2-r1
 1803021159 metadata/md5-cache/net-misc/iputils-20160308
 1803021159 metadata/md5-cache/net-misc/pavuk-0.9.36_pre20120215-r2
-1803021338 metadata/md5-cache/net-misc/rsync-3.1.3
+1803052038 metadata/md5-cache/net-misc/rsync-3.1.3
 1803021159 metadata/md5-cache/net-misc/youtube-viewer-9999
 1702282329 metadata/md5-cache/net-misc/pmsvn-1.0.6
 1702282329 metadata/md5-cache/net-misc/ndisc6-1.0.2-r1
@@ -69394,6 +69416,7 @@
 1801231609 metadata/md5-cache/net-misc/keychain-2.8.3
 1803021159 metadata/md5-cache/net-misc/wget-1.19.1-r2
 1802262111 metadata/md5-cache/net-misc/icecast-2.4.3
+1803052138 metadata/md5-cache/net-misc/dropbear-2018.76
 1803021159 metadata/md5-cache/net-misc/autoupnp-9999
 1803021159 metadata/md5-cache/net-misc/iaxmodem-1.3.0-r1
 1802262111 metadata/md5-cache/net-misc/portspoof-9999
@@ -69426,7 +69449,7 @@
 1803021159 metadata/md5-cache/net-misc/rdate-1.4-r4
 1803021159 metadata/md5-cache/net-misc/rclone-9999
 1803031638 metadata/md5-cache/net-misc/iputils-20171016_pre
-1803030538 metadata/md5-cache/net-misc/ubridge-0.9.14
+1803052038 metadata/md5-cache/net-misc/ubridge-0.9.14
 1803021159 metadata/md5-cache/net-misc/bridge-utils-1.5
 1803021159 metadata/md5-cache/net-misc/putty-9999
 1802221208 metadata/md5-cache/net-misc/wput-0.6.1-r1
@@ -69455,7 +69478,6 @@
 1803021159 metadata/md5-cache/net-misc/tn5250-0.17.4-r1
 1803021159 metadata/md5-cache/net-misc/sslh-1.18-r2
 1706061538 metadata/md5-cache/net-misc/cbqinit-0.7.3-r3
-1803030538 metadata/md5-cache/net-misc/gns3-gui-2.1.3
 1803021159 metadata/md5-cache/net-misc/switzerland-0.1.0
 1803042038 metadata/md5-cache/net-misc/curl-7.58.0
 1803021159 metadata/md5-cache/net-misc/sipsak-0.9.6_p1-r1
@@ -69467,7 +69489,7 @@
 1803021159 metadata/md5-cache/net-misc/libteam-1.22
 1803021159 metadata/md5-cache/net-misc/fmirror-0.8.4-r2
 1803021159 metadata/md5-cache/net-misc/radvd-2.17-r1
-1803041438 metadata/md5-cache/net-misc/dhcp-4.3.6_p1
+1803052038 metadata/md5-cache/net-misc/dhcp-4.3.6_p1
 1803021159 metadata/md5-cache/net-misc/mico-2.3.13-r10
 1801291608 metadata/md5-cache/net-misc/dropbox-cli-1.6.0-r1
 1803021159 metadata/md5-cache/net-misc/ofono-1.17
@@ -69520,6 +69542,7 @@
 1803021159 metadata/md5-cache/net-misc/asterisk-11.25.3
 1803021159 metadata/md5-cache/net-misc/vino-3.22.0
 1803021159 metadata/md5-cache/net-misc/gofish-1.2
+1803052038 metadata/md5-cache/net-misc/gns3-gui-2.1.3-r1
 1803021159 metadata/md5-cache/net-misc/knemo-0.8.0_pre20161211
 1803021159 metadata/md5-cache/net-misc/rygel-0.34.0
 1803021159 metadata/md5-cache/net-misc/grive-0.4.0_pre20150905-r1
@@ -69533,6 +69556,7 @@
 1803021159 metadata/md5-cache/net-misc/gns3-server-1.5.3.1
 1702282329 metadata/md5-cache/net-misc/cbugzilla-0.2.1
 1801011404 metadata/md5-cache/net-misc/getdate-1.2-r1
+1803052038 metadata/md5-cache/net-misc/iperf-3.5
 1801141909 metadata/md5-cache/net-misc/uftp-3.7.1
 1803021159 metadata/md5-cache/net-misc/iputils-20121221-r1
 1801011404 metadata/md5-cache/net-misc/aria2-1.30.0
@@ -69645,7 +69669,7 @@
 1803021159 metadata/md5-cache/dev-games/poker-eval-138.0
 1803021159 metadata/md5-cache/dev-games/simgear-2017.1.3
 1803021159 metadata/md5-cache/dev-games/openscenegraph-3.5.1-r2
-1803021159 metadata/md5-cache/dev-games/openscenegraph-3.5.5
+1803052038 metadata/md5-cache/dev-games/openscenegraph-3.5.5
 1803021159 metadata/md5-cache/dev-games/cegui-0.8.7
 1803021159 metadata/md5-cache/dev-games/vamos-0.7.1
 1803021159 metadata/md5-cache/dev-games/mercator-0.3.3
@@ -69653,7 +69677,7 @@
 1803021159 metadata/md5-cache/dev-games/simgear-2017.3.1
 1803021159 metadata/md5-cache/dev-games/simgear-2016.4.4
 1803021159 metadata/md5-cache/dev-games/mygui-3.2.2
-1803021159 metadata/md5-cache/dev-games/Manifest.gz
+1803052038 metadata/md5-cache/dev-games/Manifest.gz
 1803021159 metadata/md5-cache/dev-games/ode-0.12
 1803021159 metadata/md5-cache/dev-games/higan-ananke-094
 1803021159 metadata/md5-cache/dev-games/aseprite-1.1.7
@@ -69851,11 +69875,11 @@
 1803021159 metadata/md5-cache/mail-client/trojita-9999
 1803021159 metadata/md5-cache/mail-client/nail-12.4-r3
 1712041539 metadata/md5-cache/mail-client/roundcube-1.2.7
-1803031708 metadata/md5-cache/mail-client/Manifest.gz
+1803052038 metadata/md5-cache/mail-client/Manifest.gz
 1803021159 metadata/md5-cache/mail-client/sylpheed-3.7.0
 1803021159 metadata/md5-cache/mail-client/neomutt-20171215-r2
 1803021159 metadata/md5-cache/mail-client/kube-0.5.0
-1803021159 metadata/md5-cache/mail-client/sylpheed-3.6.0
+1803052038 metadata/md5-cache/mail-client/sylpheed-3.6.0
 1803021159 metadata/md5-cache/mail-client/neomutt-20180223
 1803021159 metadata/md5-cache/mail-client/evolution-3.22.4
 1803021159 metadata/md5-cache/mail-client/thunderbird-45.8.0
@@ -69880,6 +69904,7 @@
 1803021159 metadata/md5-cache/sys-apps/dtc-1.4.3
 1802021238 metadata/md5-cache/sys-apps/ethtool-4.15
 1803021159 metadata/md5-cache/sys-apps/sed-4.4
+1803052038 metadata/md5-cache/sys-apps/dbus-broker-11
 1803021159 metadata/md5-cache/sys-apps/epoch-1.2.1
 1803021159 metadata/md5-cache/sys-apps/smartmontools-6.4
 1801291338 metadata/md5-cache/sys-apps/fwupd-1.0.4
@@ -69898,7 +69923,7 @@
 1803021159 metadata/md5-cache/sys-apps/entropy-server-302
 1802262111 metadata/md5-cache/sys-apps/pick-2.0.1
 1801231609 metadata/md5-cache/sys-apps/less-487
-1803021159 metadata/md5-cache/sys-apps/shadow-4.5
+1803052038 metadata/md5-cache/sys-apps/shadow-4.5
 1803021159 metadata/md5-cache/sys-apps/idle3-tools-0.9.1
 1803021159 metadata/md5-cache/sys-apps/usbredir-0.7.1_p20180211
 1803021159 metadata/md5-cache/sys-apps/systemd-237-r2
@@ -69915,12 +69940,13 @@
 1803021159 metadata/md5-cache/sys-apps/thunderbolt-software-user-space-0.9.2
 1803021159 metadata/md5-cache/sys-apps/baselayout-2.4.1-r2
 1803021159 metadata/md5-cache/sys-apps/ipmitool-1.8.17-r1
+1803052138 metadata/md5-cache/sys-apps/systemd-237-r3
 1803021159 metadata/md5-cache/sys-apps/rescan-scsi-bus-1.57-r1
 1803021159 metadata/md5-cache/sys-apps/iproute2-4.9.0
 1803021159 metadata/md5-cache/sys-apps/nix-1.11.16
 1803040938 metadata/md5-cache/sys-apps/gawk-4.1.4
 1803021159 metadata/md5-cache/sys-apps/lmctfy-0.2.0
-1803021159 metadata/md5-cache/sys-apps/man-1.6g-r1
+1803060038 metadata/md5-cache/sys-apps/man-1.6g-r1
 1803021159 metadata/md5-cache/sys-apps/usb_modeswitch-2.2.6
 1803021159 metadata/md5-cache/sys-apps/firejail-0.9.44.8
 1712020139 metadata/md5-cache/sys-apps/collectl-4.1.3
@@ -69955,10 +69981,11 @@
 1803021159 metadata/md5-cache/sys-apps/qingy-1.0.0-r2
 1803021159 metadata/md5-cache/sys-apps/grep-2.27-r1
 1801050119 metadata/md5-cache/sys-apps/kcheck-9999
-1802172339 metadata/md5-cache/sys-apps/prctl-1.6
+1803052038 metadata/md5-cache/sys-apps/prctl-1.6
 1702282332 metadata/md5-cache/sys-apps/cciss_vol_status-1.10
 1803021159 metadata/md5-cache/sys-apps/ucspi-unix-0.36-r2
 1803021159 metadata/md5-cache/sys-apps/colorized-logs-2.1
+1803052038 metadata/md5-cache/sys-apps/bleachbit-2.0
 1801011404 metadata/md5-cache/sys-apps/intel-sa-00075-tools-1.0
 1803021159 metadata/md5-cache/sys-apps/ibm-powerpc-utils-1.2.2
 1803021159 metadata/md5-cache/sys-apps/gptfdisk-1.0.3
@@ -69995,10 +70022,11 @@
 1801011404 metadata/md5-cache/sys-apps/ucspi-proxy-0.99
 1801011404 metadata/md5-cache/sys-apps/netboot-base-20050110
 1704270038 metadata/md5-cache/sys-apps/s6-linux-init-0.3.0.0
+1803052208 metadata/md5-cache/sys-apps/sed-4.4-r1
 1801280009 metadata/md5-cache/sys-apps/pcsc-lite-1.8.21
 1801091400 metadata/md5-cache/sys-apps/s6-rc-0.3.0.0
 1801011404 metadata/md5-cache/sys-apps/memtester-4.3.0
-1802252138 metadata/md5-cache/sys-apps/hwids-20171003
+1803052038 metadata/md5-cache/sys-apps/hwids-20171003
 1801091400 metadata/md5-cache/sys-apps/intel-performance-counter-monitor-2.8
 1803021159 metadata/md5-cache/sys-apps/osinfo-db-tools-1.1.0
 1803021159 metadata/md5-cache/sys-apps/ucspi-ssl-0.99
@@ -70079,7 +70107,7 @@
 1803021159 metadata/md5-cache/sys-apps/sandbox-2.10-r4
 1801122240 metadata/md5-cache/sys-apps/s390-tools-1.36.1-r1
 1803021159 metadata/md5-cache/sys-apps/proot-3.2.2-r1
-1801050119 metadata/md5-cache/sys-apps/dbus-broker-9999
+1803052038 metadata/md5-cache/sys-apps/dbus-broker-9999
 1803021159 metadata/md5-cache/sys-apps/rng-tools-5-r2
 1803021538 metadata/md5-cache/sys-apps/dbus-1.12.6
 1802281938 metadata/md5-cache/sys-apps/help2man-1.47.6
@@ -70231,7 +70259,7 @@
 1803021159 metadata/md5-cache/sys-apps/iproute2-9999
 1801091400 metadata/md5-cache/sys-apps/s6-rc-0.1.0.0
 1803021159 metadata/md5-cache/sys-apps/toybox-9999
-1803041938 metadata/md5-cache/sys-apps/Manifest.gz
+1803060338 metadata/md5-cache/sys-apps/Manifest.gz
 1801120740 metadata/md5-cache/sys-apps/hwids-20170328
 1801011404 metadata/md5-cache/sys-apps/restorecond-9999
 1702282332 metadata/md5-cache/sys-apps/daemonize-1.7.6
@@ -70305,7 +70333,7 @@
 1802102008 metadata/md5-cache/sys-apps/man-pages-4.15
 1803021159 metadata/md5-cache/sys-apps/dnotify-0.18.0
 1801291909 metadata/md5-cache/sys-apps/iucode_tool-2.3
-1803041008 metadata/md5-cache/sys-apps/qingy-1.0.0-r3
+1803052038 metadata/md5-cache/sys-apps/qingy-1.0.0-r3
 1803021159 metadata/md5-cache/sys-apps/gsmartcontrol-1.0.2
 1803021159 metadata/md5-cache/sys-apps/darwin-miscutils-6-r1
 1801011404 metadata/md5-cache/sys-apps/hotplug2stdout-1.2.1
@@ -70328,7 +70356,6 @@
 1803020938 metadata/md5-cache/sys-apps/selinux-python-9999
 1803021159 metadata/md5-cache/sys-apps/ipmitool-1.8.14-r1
 1803022038 metadata/md5-cache/sys-apps/net-tools-1.60_p20161110235919
-1803021159 metadata/md5-cache/sys-apps/bleachbit-1.19-r1
 1801011404 metadata/md5-cache/sys-apps/grepcidr-2.0
 1803021159 metadata/md5-cache/sys-apps/hwloc-1.11.2-r1
 1803021159 metadata/md5-cache/sys-apps/hwdata-redhat-0.217
@@ -70379,7 +70406,6 @@
 1803041338 metadata/md5-cache/sys-apps/hwinfo-21.23
 1803021159 metadata/md5-cache/sys-apps/gnome-disk-utility-3.24.1
 1705220038 metadata/md5-cache/sys-apps/s6-portable-utils-2.2.1.0
-1803021159 metadata/md5-cache/sys-apps/qdiskusage-1.0.4
 1803021159 metadata/md5-cache/sys-apps/systemd-9999
 1801011404 metadata/md5-cache/sys-apps/setserial-2.17-r5
 1802262111 metadata/md5-cache/sys-apps/miller-4.2.0
@@ -70476,6 +70502,7 @@
 1801290538 metadata/md5-cache/sys-apps/paxctld-1.2.2
 1803021159 metadata/md5-cache/sys-apps/kexec-tools-2.0.4-r2
 1801091400 metadata/md5-cache/sys-apps/netloc-0.5
+1803052208 metadata/md5-cache/sys-apps/gawk-4.2.1-r1
 1803021159 metadata/md5-cache/sys-apps/sparc-utils-1.9-r4
 1702282332 metadata/md5-cache/sys-apps/s6-2.2.4.3
 1802062308 metadata/md5-cache/sys-apps/dstat-0.7.3
@@ -70680,15 +70707,15 @@
 1803021159 metadata/md5-cache/media-libs/libmtp-1.1.13
 1803021159 metadata/md5-cache/media-libs/libsidplay-1.36.59-r1
 1801091400 metadata/md5-cache/media-libs/glew-1.6.0-r100
-1802252138 metadata/md5-cache/media-libs/opus-1.2.1
-1803021159 metadata/md5-cache/media-libs/x264-0.0.20170701
+1803052038 metadata/md5-cache/media-libs/opus-1.2.1
+1803052038 metadata/md5-cache/media-libs/x264-0.0.20170701
 1803021159 metadata/md5-cache/media-libs/nas-1.9.4-r1
 1706201208 metadata/md5-cache/media-libs/celt-0.5.1.3
 1802262111 metadata/md5-cache/media-libs/liblrdf-0.5.0
 1803021159 metadata/md5-cache/media-libs/phonon-vlc-9999
 1802260108 metadata/md5-cache/media-libs/libmatroska-1.4.8
 1803021159 metadata/md5-cache/media-libs/libmetalink-0.1.3
-1801170839 metadata/md5-cache/media-libs/simage-1.7.0-r1
+1803052038 metadata/md5-cache/media-libs/simage-1.7.0-r1
 1803021159 metadata/md5-cache/media-libs/kvazaar-1.0.0
 1803021159 metadata/md5-cache/media-libs/virglrenderer-9999
 1803021159 metadata/md5-cache/media-libs/sratom-0.4.6
@@ -70757,7 +70784,7 @@
 1803021159 metadata/md5-cache/media-libs/sdl2-mixer-2.0.1
 1706180009 metadata/md5-cache/media-libs/libextractor-1.3-r1
 1803021159 metadata/md5-cache/media-libs/opencv-3.3.0-r4
-1803021159 metadata/md5-cache/media-libs/giblib-1.2.4-r1
+1803060038 metadata/md5-cache/media-libs/giblib-1.2.4-r1
 1803021159 metadata/md5-cache/media-libs/giflib-5.1.4
 1803021159 metadata/md5-cache/media-libs/ilmbase-1.0.2
 1803021159 metadata/md5-cache/media-libs/libquicktime-1.2.4-r2
@@ -70783,7 +70810,7 @@
 1803022138 metadata/md5-cache/media-libs/alsa-lib-1.1.5
 1803021159 metadata/md5-cache/media-libs/glew-1.10.0-r2
 1803021159 metadata/md5-cache/media-libs/elementary-1.17.0
-1802262111 metadata/md5-cache/media-libs/libdc1394-2.2.5-r1
+1803052038 metadata/md5-cache/media-libs/libdc1394-2.2.5-r1
 1803021159 metadata/md5-cache/media-libs/libopenglrecorder-0.1.0
 1802262111 metadata/md5-cache/media-libs/libgltf-9999
 1801091400 metadata/md5-cache/media-libs/fmod-4.38.02
@@ -70798,7 +70825,7 @@
 1803021159 metadata/md5-cache/media-libs/celt-0.11.1-r1
 1803021159 metadata/md5-cache/media-libs/libsoundtouch-1.8.0-r1
 1803021159 metadata/md5-cache/media-libs/ccaudio2-2.1.3
-1708271838 metadata/md5-cache/media-libs/libpagemaker-0.0.3-r1
+1803052038 metadata/md5-cache/media-libs/libpagemaker-0.0.3-r1
 1803021159 metadata/md5-cache/media-libs/harfbuzz-1.4.6-r2
 1803021159 metadata/md5-cache/media-libs/openctm-1.0.3
 1803021159 metadata/md5-cache/media-libs/libharu-2.3.0-r2
@@ -70814,7 +70841,7 @@
 1803021159 metadata/md5-cache/media-libs/libsidplayfp-1.1.0
 1803021159 metadata/md5-cache/media-libs/libnsgif-0.2.0
 1803021159 metadata/md5-cache/media-libs/libmpris2client-0.1.0-r1
-1803021159 metadata/md5-cache/media-libs/resid-0.16_p2-r1
+1803060038 metadata/md5-cache/media-libs/resid-0.16_p2-r1
 1803021159 metadata/md5-cache/media-libs/libpostproc-9999
 1803021159 metadata/md5-cache/media-libs/vulkan-loader-1.0.42.2
 1803021159 metadata/md5-cache/media-libs/lcms-2.8-r1
@@ -70848,12 +70875,12 @@
 1802262111 metadata/md5-cache/media-libs/libpagemaker-9999
 1803021159 metadata/md5-cache/media-libs/glyr-1.0.10
 1803022138 metadata/md5-cache/media-libs/freetype-2.8
-1802262111 metadata/md5-cache/media-libs/libdvdread-6.0.0
+1803052038 metadata/md5-cache/media-libs/libdvdread-6.0.0
 1803021159 metadata/md5-cache/media-libs/gstreamer-editing-services-1.12.3
 1801041840 metadata/md5-cache/media-libs/fdk-aac-0.1.5
 1802262111 metadata/md5-cache/media-libs/libzen-0.4.37
 1802262111 metadata/md5-cache/media-libs/flac-1.3.2-r1
-1802261108 metadata/md5-cache/media-libs/libdvbpsi-1.3.1
+1803052038 metadata/md5-cache/media-libs/libdvbpsi-1.3.1
 1803021159 metadata/md5-cache/media-libs/libclthreads-2.4.0-r1
 1803021159 metadata/md5-cache/media-libs/emfengine-0.8
 1702282326 metadata/md5-cache/media-libs/libggigcp-1.0.2
@@ -70862,7 +70889,7 @@
 1803021159 metadata/md5-cache/media-libs/liblqr-0.4.2-r1
 1803021159 metadata/md5-cache/media-libs/plib-1.8.5-r1
 1803021159 metadata/md5-cache/media-libs/libmpris2client-0.1.0
-1803041008 metadata/md5-cache/media-libs/lensfun-0.3.2-r1
+1803052038 metadata/md5-cache/media-libs/lensfun-0.3.2-r1
 1801180839 metadata/md5-cache/media-libs/glew-2.1.0
 1803021159 metadata/md5-cache/media-libs/aalib-1.4_rc5-r6
 1803021159 metadata/md5-cache/media-libs/libv4l-1.14.1
@@ -70952,7 +70979,7 @@
 1801011404 metadata/md5-cache/media-libs/libmp4v2-1.9.1-r1
 1801050119 metadata/md5-cache/media-libs/libasdcp-cth-0.1.2
 1801011404 metadata/md5-cache/media-libs/libsixel-1.7.2
-1803021538 metadata/md5-cache/media-libs/libsdl2-2.0.8
+1803052338 metadata/md5-cache/media-libs/libsdl2-2.0.8
 1803021159 metadata/md5-cache/media-libs/libyami-1.3.0
 1702282326 metadata/md5-cache/media-libs/fmod-3.75
 1803021159 metadata/md5-cache/media-libs/babl-0.1.40
@@ -70981,7 +71008,7 @@
 1803021159 metadata/md5-cache/media-libs/sg-1.5
 1803022138 metadata/md5-cache/media-libs/alsa-lib-1.1.4.1
 1803021159 metadata/md5-cache/media-libs/sdif-3.8.6
-1802262111 metadata/md5-cache/media-libs/libdvdnav-6.0.0
+1803052038 metadata/md5-cache/media-libs/libdvdnav-6.0.0
 1801011404 metadata/md5-cache/media-libs/raptor-2.0.15
 1803021159 metadata/md5-cache/media-libs/libiec61883-1.2.0-r1
 1801231609 metadata/md5-cache/media-libs/lcms-2.8-r2
@@ -71012,7 +71039,7 @@
 1803021159 metadata/md5-cache/media-libs/libvisual-0.4.0-r3
 1803021159 metadata/md5-cache/media-libs/libclxclient-3.6.1
 1803021159 metadata/md5-cache/media-libs/ilmbase-2.1.0
-1803041338 metadata/md5-cache/media-libs/libshout-2.4.1-r1
+1803052038 metadata/md5-cache/media-libs/libshout-2.4.1-r1
 1801041840 metadata/md5-cache/media-libs/portaudio-19.06.00-r1
 1803021159 metadata/md5-cache/media-libs/libsbsms-2.0.2
 1803021159 metadata/md5-cache/media-libs/libmypaint-1.3.0_beta1
@@ -71100,13 +71127,13 @@
 1702282326 metadata/md5-cache/media-libs/libmpdclient-2.9
 1803021159 metadata/md5-cache/media-libs/phonon-gstreamer-4.9.0-r2
 1803021159 metadata/md5-cache/media-libs/gavl-1.2.0
-1803041438 metadata/md5-cache/media-libs/Manifest.gz
+1803060138 metadata/md5-cache/media-libs/Manifest.gz
 1801091400 metadata/md5-cache/media-libs/elles_icc_profiles-20160501.0932
 1803021159 metadata/md5-cache/media-libs/libmtp-1.1.14
 1803021159 metadata/md5-cache/media-libs/libshout-2.3.1
 1803021538 metadata/md5-cache/media-libs/libsdl2-2.0.4
 1803021159 metadata/md5-cache/media-libs/libclxclient-1.0.1
-1803021159 metadata/md5-cache/media-libs/gexiv2-0.10.8
+1803052038 metadata/md5-cache/media-libs/gexiv2-0.10.8
 1803021159 metadata/md5-cache/media-libs/libmp3splt-0.7.3
 1801231609 metadata/md5-cache/media-libs/libpng-1.6.31
 1803021159 metadata/md5-cache/media-libs/babl-0.1.12
@@ -71156,6 +71183,7 @@
 1803021159 metadata/md5-cache/media-libs/x265-2.7
 1802262111 metadata/md5-cache/media-libs/exempi-2.4.2
 1801050119 metadata/md5-cache/media-libs/libsub-9999
+1803052038 metadata/md5-cache/media-libs/sdl2-gfx-1.0.4
 1803021159 metadata/md5-cache/media-libs/gegl-0.3.28
 1803030508 metadata/md5-cache/media-libs/libpng-1.6.29
 1803021159 metadata/md5-cache/media-libs/varconf-0.6.7-r1
@@ -71179,12 +71207,11 @@
 1803021159 metadata/md5-cache/media-libs/opensubdiv-3.3.0
 1803021159 metadata/md5-cache/media-libs/libtaginfo-0.2.1
 1803021159 metadata/md5-cache/media-libs/musicbrainz-5.1.0
-1803021159 metadata/md5-cache/media-libs/simage-1.7.0
 1803021159 metadata/md5-cache/media-libs/libcuefile-477-r1
 1803021159 metadata/md5-cache/media-libs/vamp-plugin-sdk-2.7.1
 1803021159 metadata/md5-cache/media-libs/libsoundtouch-1.9.2
 1803021159 metadata/md5-cache/media-libs/avidemux-core-2.7.0
-1802221208 metadata/md5-cache/media-libs/libogg-1.3.3
+1803052038 metadata/md5-cache/media-libs/libogg-1.3.3
 1803021159 metadata/md5-cache/media-libs/partio-1.1.0_p20170829
 1801091400 metadata/md5-cache/media-libs/glew-2.0.0
 1803021159 metadata/md5-cache/media-libs/portmidi-217-r1
@@ -71211,7 +71238,7 @@
 1803021159 metadata/md5-cache/media-libs/osl-1.8.12
 1803021159 metadata/md5-cache/media-libs/t1lib-5.1.2-r1
 1803021159 metadata/md5-cache/media-libs/aften-0.0.8-r2
-1802221208 metadata/md5-cache/media-libs/libkate-0.4.1-r3
+1803052038 metadata/md5-cache/media-libs/libkate-0.4.1-r3
 1803021159 metadata/md5-cache/media-libs/sdl-pango-0.1.2
 1803021159 metadata/md5-cache/media-libs/alure-1.2-r1
 1802262111 metadata/md5-cache/media-libs/libpgf-6.12.27
@@ -71219,7 +71246,7 @@
 1801050119 metadata/md5-cache/media-libs/pyliblo-0.10.0
 1801011404 metadata/md5-cache/media-libs/libnjb-2.2.7
 1803021159 metadata/md5-cache/media-libs/libfame-0.9.1-r1
-1803021908 metadata/md5-cache/media-libs/libebur128-1.2.3
+1803052338 metadata/md5-cache/media-libs/libebur128-1.2.3
 1803021159 metadata/md5-cache/media-libs/libmodplug-0.8.9.0
 1803021159 metadata/md5-cache/media-libs/libsbsms-2.0.0
 1803021159 metadata/md5-cache/media-libs/ladspa-cmt-1.16-r4
@@ -71245,7 +71272,7 @@
 1803021159 metadata/md5-cache/media-libs/schroedinger-1.0.11-r1
 1802262111 metadata/md5-cache/media-libs/imlib-1.9.15-r5
 1803021159 metadata/md5-cache/media-libs/libwmf-0.2.8.4-r6
-1803021538 metadata/md5-cache/media-libs/libsdl2-2.0.7
+1803052338 metadata/md5-cache/media-libs/libsdl2-2.0.7
 1702282326 metadata/md5-cache/media-libs/liblingoteach-0.2.3
 1803021159 metadata/md5-cache/media-libs/qt-gstreamer-1.2.0-r3
 1803021159 metadata/md5-cache/media-libs/vulkan-loader-1.0.61.1
@@ -71355,7 +71382,7 @@
 1803021159 metadata/md5-cache/media-libs/openh264-1.7.0-r1
 1801011404 metadata/md5-cache/media-libs/libcddb-1.3.2
 1803021159 metadata/md5-cache/media-libs/gegl-0.3.8-r1
-1803021159 metadata/md5-cache/media-libs/libfreehand-0.1.2
+1803052038 metadata/md5-cache/media-libs/libfreehand-0.1.2
 1803021159 metadata/md5-cache/media-libs/libomxil-bellagio-0.9.3
 1803021159 metadata/md5-cache/media-libs/gupnp-dlna-0.10.5
 1803021159 metadata/md5-cache/media-libs/libptp2-1.1.10
@@ -71414,7 +71441,7 @@
 1803021159 metadata/md5-cache/media-libs/libnspsl-0.1.0
 1803021159 metadata/md5-cache/media-libs/gegl-0.2.0-r5
 1803021159 metadata/md5-cache/media-libs/elementary-9999
-1803021159 metadata/md5-cache/media-libs/libcdr-0.1.4
+1803052038 metadata/md5-cache/media-libs/libcdr-0.1.4
 1802131408 metadata/md5-cache/media-libs/fontconfig-infinality-20120619
 1803021159 metadata/md5-cache/media-libs/freeglut-2.8.1-r1
 1801091400 metadata/md5-cache/media-libs/spandsp-0.0.6_pre12-r1
@@ -71433,9 +71460,9 @@
 1702282326 metadata/md5-cache/media-libs/varconf-0.6.6
 1802262111 metadata/md5-cache/media-libs/liblo-0.29
 1803021159 metadata/md5-cache/media-libs/speex-1.2_rc1-r2
-1802221208 metadata/md5-cache/media-libs/libtiger-0.3.4-r1
+1803052038 metadata/md5-cache/media-libs/libtiger-0.3.4-r1
 1803021159 metadata/md5-cache/media-libs/svgalib-1.9.25-r5
-1803030508 metadata/md5-cache/media-libs/fontconfig-2.12.6
+1803052038 metadata/md5-cache/media-libs/fontconfig-2.12.6
 1803021159 metadata/md5-cache/media-libs/librosprite-0.1.2-r1
 1802262111 metadata/md5-cache/media-libs/liblrdf-0.5.0-r1
 1803021159 metadata/md5-cache/media-libs/giflib-4.1.6-r2
@@ -71474,6 +71501,7 @@
 1803021159 metadata/md5-cache/media-libs/ftgl-2.1.3_rc5
 1803021159 metadata/md5-cache/media-libs/wxsvg-1.5.9
 1803021159 metadata/md5-cache/media-libs/libvpx-1.5.0
+1803052038 metadata/md5-cache/media-libs/sdl2-image-2.0.3
 1702282326 metadata/md5-cache/media-libs/cimg-1.5.2
 1803021159 metadata/md5-cache/media-libs/vo-amrwbenc-0.1.2-r1
 1803021159 metadata/md5-cache/media-libs/babl-0.1.22
@@ -71616,13 +71644,13 @@
 1803021159 metadata/md5-cache/kde-misc/ktexteditorpreviewplugin-0.2.1
 1803021159 metadata/md5-cache/x11-base/xorg-x11-7.4-r2
 1802202108 metadata/md5-cache/x11-base/xorg-drivers-1.19
-1803020208 metadata/md5-cache/x11-base/xorg-proto-2018.4
+1803052238 metadata/md5-cache/x11-base/xorg-proto-2018.4
 1803021159 metadata/md5-cache/x11-base/xorg-server-1.19.5-r1
 1803021159 metadata/md5-cache/x11-base/xorg-server-1.19.99.901
 1802270838 metadata/md5-cache/x11-base/xorg-proto-9999
 1802202108 metadata/md5-cache/x11-base/xorg-drivers-9999
-1803021159 metadata/md5-cache/x11-base/Manifest.gz
-1803021159 metadata/md5-cache/x11-base/xorg-server-9999
+1803060538 metadata/md5-cache/x11-base/Manifest.gz
+1803060538 metadata/md5-cache/x11-base/xorg-server-9999
 1803021159 metadata/md5-cache/dev-tex/dvi2tty-5.3.4
 1803021159 metadata/md5-cache/dev-tex/luatex-0.76.0
 1711240238 metadata/md5-cache/dev-tex/bibtexu-3.71_p20170524
@@ -71771,7 +71799,7 @@
 1803021159 metadata/md5-cache/sci-geosciences/opencpn-plugin-dr-9999
 1803021159 metadata/md5-cache/sci-geosciences/qmapshack-1.9.1
 1803021159 metadata/md5-cache/sci-geosciences/opencpn-plugin-wmm-1.0-r1
-1803021159 metadata/md5-cache/sci-geosciences/laszip-2.2.0
+1803052038 metadata/md5-cache/sci-geosciences/laszip-2.2.0
 1702282330 metadata/md5-cache/sci-geosciences/gshhs-data-2.2.0
 1803021159 metadata/md5-cache/sci-geosciences/gpsbabel-1.5.4-r1
 1803021159 metadata/md5-cache/sci-geosciences/opencpn-plugin-route-9999
@@ -71780,12 +71808,12 @@
 1803021159 metadata/md5-cache/sci-geosciences/opencpn-4.4.0
 1803021159 metadata/md5-cache/sci-geosciences/opencpn-plugin-br24radar-1.1-r1
 1702282330 metadata/md5-cache/sci-geosciences/readosm-1.0.0e-r1
-1803021159 metadata/md5-cache/sci-geosciences/qgis-9999
+1803052038 metadata/md5-cache/sci-geosciences/qgis-9999
 1803021159 metadata/md5-cache/sci-geosciences/opencpn-plugin-iacfleet-0.8
 1803021159 metadata/md5-cache/sci-geosciences/gpsd-9999
 1803021159 metadata/md5-cache/sci-geosciences/gdal-grass-2.1.0
 1803021159 metadata/md5-cache/sci-geosciences/opencpn-plugin-weatherfax-9999
-1803021159 metadata/md5-cache/sci-geosciences/qgis-2.18.12
+1803052038 metadata/md5-cache/sci-geosciences/qgis-2.18.12
 1803021159 metadata/md5-cache/sci-geosciences/opencpn-plugin-objsearch-9999
 1801011404 metadata/md5-cache/sci-geosciences/mc2bsbh-0.0.9
 1803021159 metadata/md5-cache/sci-geosciences/opencpn-plugin-otcurrent-9999
@@ -71807,7 +71835,6 @@
 1803021159 metadata/md5-cache/sci-geosciences/mapserver-7.0.3
 1803021159 metadata/md5-cache/sci-geosciences/opencpn-plugin-objsearch-0.7
 1803021159 metadata/md5-cache/sci-geosciences/merkaartor-9999
-1803021159 metadata/md5-cache/sci-geosciences/qgis-3.0.0
 1803021159 metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpndebugger-9999
 1803021159 metadata/md5-cache/sci-geosciences/opencpn-plugin-route-1.2
 1803021159 metadata/md5-cache/sci-geosciences/josm-99999
@@ -71822,8 +71849,8 @@
 1803021159 metadata/md5-cache/sci-geosciences/opencpn-plugin-statusbar-0.5-r1
 1803021159 metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpn_draw-9999
 1803021159 metadata/md5-cache/sci-geosciences/gmt-4.5.8
-1803021238 metadata/md5-cache/sci-geosciences/Manifest.gz
-1803021159 metadata/md5-cache/sci-geosciences/qgis-2.18.16
+1803060138 metadata/md5-cache/sci-geosciences/Manifest.gz
+1803052038 metadata/md5-cache/sci-geosciences/qgis-2.18.16
 1803021159 metadata/md5-cache/sci-geosciences/opencpn-4.0.0-r1
 1803021159 metadata/md5-cache/sci-geosciences/opencpn-plugin-watchdog-9999
 1803021159 metadata/md5-cache/sci-geosciences/gdal-grass-2.0.0-r1
@@ -71838,7 +71865,7 @@
 1803021159 metadata/md5-cache/sci-geosciences/opencpn-plugin-findit-9999
 1803021159 metadata/md5-cache/sci-geosciences/gnome-maps-3.24.3
 1803021159 metadata/md5-cache/sci-geosciences/libtcd-2.2.7
-1803021159 metadata/md5-cache/sci-geosciences/liblas-1.8.1
+1803052038 metadata/md5-cache/sci-geosciences/liblas-1.8.1
 1803021159 metadata/md5-cache/sci-geosciences/osm2pgsql-99999999
 1803021159 metadata/md5-cache/sci-geosciences/swmm-5.0.022
 1803021159 metadata/md5-cache/sci-geosciences/opencpn-plugin-objsearch-0.5.1-r1
@@ -71861,18 +71888,17 @@
 1803021159 metadata/md5-cache/sci-geosciences/opencpn-plugin-br24radar-1.31
 1703070308 metadata/md5-cache/sci-geosciences/mapnik-world-boundaries-20090514
 1803021159 metadata/md5-cache/sci-geosciences/libtcd-2.2.5_p2
+1803052038 metadata/md5-cache/sci-geosciences/qgis-3.0.0-r1
 1803021159 metadata/md5-cache/sci-geosciences/opencpn-plugin-gxradar-9999
 1803021159 metadata/md5-cache/sci-geosciences/opencpn-plugin-br24radar-2.1
 1702282330 metadata/md5-cache/sci-geosciences/opencpn-plugins-meta-4.0.0
-1803021159 metadata/md5-cache/sci-geosciences/grass-7.0.5-r1
 1803021159 metadata/md5-cache/sci-geosciences/bt747-2.1.7-r2
-1803021159 metadata/md5-cache/sci-geosciences/liblas-1.8.0
 1803021159 metadata/md5-cache/sci-geosciences/seawater-3.3.4
 1803021159 metadata/md5-cache/sci-geosciences/xtide-2.13.2
 1801011404 metadata/md5-cache/sci-geosciences/routino-3.1.1
 1803021159 metadata/md5-cache/sci-geosciences/opencpn-plugin-weather_routing-1.10.1
 1702282330 metadata/md5-cache/sci-geosciences/mtkbabel-0.8.3.1-r1
-1803021159 metadata/md5-cache/sci-geosciences/qgis-2.18.14
+1803052038 metadata/md5-cache/sci-geosciences/qgis-2.18.14
 1803021159 metadata/md5-cache/sci-geosciences/opencpn-plugin-logbookkonni-1.2018-r1
 1803021159 metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpndebugger-1.2
 1803021159 metadata/md5-cache/sci-geosciences/mapnik-3.0.9-r1
@@ -71929,20 +71955,17 @@
 1803021159 metadata/md5-cache/games-simulation/bcs-demo-1.3-r1
 1803021159 metadata/md5-cache/games-simulation/lincity-1.13.1-r1
 1803021159 metadata/md5-cache/app-officeext/languagetool-3.5
-1803021159 metadata/md5-cache/app-officeext/ooofbtools-2.48
 1803021159 metadata/md5-cache/app-officeext/sun-templates-1.0.0-r1
 1803021159 metadata/md5-cache/app-officeext/languagetool-3.4
 1803021159 metadata/md5-cache/app-officeext/texmaths-0.37-r1
 1803021159 metadata/md5-cache/app-officeext/dmaths-3.4.9.0-r1
 1803021159 metadata/md5-cache/app-officeext/texmaths-0.42
-1803021159 metadata/md5-cache/app-officeext/Manifest.gz
+1803052038 metadata/md5-cache/app-officeext/Manifest.gz
 1803021159 metadata/md5-cache/app-officeext/ct2n-1.4.0-r1
 1803021159 metadata/md5-cache/app-officeext/ooofbtools-2.52
-1803021159 metadata/md5-cache/app-officeext/ooofbtools-2.50
 1803021159 metadata/md5-cache/app-officeext/texmaths-0.41
 1803021159 metadata/md5-cache/app-officeext/ooo2gd-3.0.0-r1
 1803021159 metadata/md5-cache/app-officeext/barcode-1.3.5.0-r1
-1803021159 metadata/md5-cache/app-officeext/ooofbtools-2.51
 1711171508 metadata/md5-cache/sec-policy/selinux-android-2.20170805-r3
 1711051709 metadata/md5-cache/sec-policy/selinux-dpkg-2.20170805-r2
 1711051709 metadata/md5-cache/sec-policy/selinux-sendmail-2.20170204-r3
@@ -74673,7 +74696,7 @@
 1803021159 metadata/md5-cache/sys-power/apcupsd-3.14.14
 1803021159 metadata/md5-cache/sys-power/apcupsd-3.14.13
 1803021159 metadata/md5-cache/sys-power/bbswitch-0.8-r1
-1803021159 metadata/md5-cache/sys-power/Manifest.gz
+1803052338 metadata/md5-cache/sys-power/Manifest.gz
 1803021159 metadata/md5-cache/sys-power/powertop-2.9
 1803021159 metadata/md5-cache/sys-power/cpupower-4.13.0
 1803021159 metadata/md5-cache/sys-power/iasl-20160729
@@ -74697,7 +74720,7 @@
 1803021159 metadata/md5-cache/sys-power/phc-intel-0.3.2.12.24
 1803021159 metadata/md5-cache/sys-power/powernowd-1.00-r4
 1803021159 metadata/md5-cache/sys-power/acpi_call-9999
-1801280009 metadata/md5-cache/sys-power/upower-0.99.5
+1803052338 metadata/md5-cache/sys-power/upower-0.99.5
 1801011405 metadata/md5-cache/sys-power/phctool-0.5.2.2-r3
 1803021159 metadata/md5-cache/sys-power/ncpufreqd-2.4
 1712081639 metadata/md5-cache/sys-power/uhubctl-1.8-r1
@@ -74804,7 +74827,7 @@
 1801291909 metadata/md5-cache/app-eselect/eselect-php-0.9.4-r5
 1801011404 metadata/md5-cache/app-eselect/eselect-repository-9999
 1801231609 metadata/md5-cache/app-eselect/eselect-cdparanoia-0.1
-1803041538 metadata/md5-cache/app-eselect/Manifest.gz
+1803052038 metadata/md5-cache/app-eselect/Manifest.gz
 1703171438 metadata/md5-cache/app-eselect/eselect-pinentry-0.7
 1803021159 metadata/md5-cache/app-eselect/eselect-opengl-1.3.1-r4
 1801231609 metadata/md5-cache/app-eselect/eselect-python-20171204
@@ -74824,7 +74847,7 @@
 1801131209 metadata/md5-cache/app-eselect/eselect-rails-0.23
 1801231609 metadata/md5-cache/app-eselect/eselect-ruby-20161226
 1802262111 metadata/md5-cache/app-eselect/eselect-php-9999
-1802221208 metadata/md5-cache/app-eselect/eselect-postgresql-2.3
+1803052038 metadata/md5-cache/app-eselect/eselect-postgresql-2.3
 1803021159 metadata/md5-cache/app-eselect/eselect-gnat-1.4
 1702282308 metadata/md5-cache/app-eselect/eselect-lua-1
 1803021159 metadata/md5-cache/app-eselect/eselect-gnat-1.5-r1
@@ -74905,7 +74928,6 @@
 1709112238 metadata/md5-cache/app-emulation/go-secbench-0.1.0-r1
 1803021159 metadata/md5-cache/app-emulation/wine-staging-2.20
 1709290138 metadata/md5-cache/app-emulation/wine-gecko-2.47-r1
-1709150138 metadata/md5-cache/app-emulation/fuse-1.4.0
 1803021159 metadata/md5-cache/app-emulation/qemu-guest-agent-2.10.1
 1803021159 metadata/md5-cache/app-emulation/crossover-bin-15.2.0
 1803021159 metadata/md5-cache/app-emulation/wine-staging-2.19
@@ -74994,7 +75016,7 @@
 1803021159 metadata/md5-cache/app-emulation/wine-staging-2.21
 1803021159 metadata/md5-cache/app-emulation/vagrant-2.0.0
 1803021159 metadata/md5-cache/app-emulation/libvirt-4.0.0
-1803040038 metadata/md5-cache/app-emulation/Manifest.gz
+1803052038 metadata/md5-cache/app-emulation/Manifest.gz
 1803021159 metadata/md5-cache/app-emulation/libvirt-glib-1.0.0
 1711281241 metadata/md5-cache/app-emulation/docker-gc-9999
 1803021159 metadata/md5-cache/app-emulation/crossover-bin-12.5.1-r2
@@ -75061,6 +75083,7 @@
 1803021159 metadata/md5-cache/app-emulation/vice-2.4.27-r3
 1803021159 metadata/md5-cache/app-emulation/nemu-1.3.0
 1801021610 metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc4_p20170917
+1803052038 metadata/md5-cache/app-emulation/fuse-1.5.1
 1702282308 metadata/md5-cache/app-emulation/xcpc-20070122
 1803021159 metadata/md5-cache/app-emulation/wine-desktop-common-20150204
 1803021159 metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.32
@@ -75234,7 +75257,6 @@
 1803021159 metadata/md5-cache/app-cdr/cdemu-daemon-3.1.0
 1803021159 metadata/md5-cache/app-cdr/cuecue-0.2.2-r2
 1803021159 metadata/md5-cache/app-cdr/pburn-3.4.3
-1803021159 metadata/md5-cache/app-cdr/isomaster-1.3.9-r1
 1803021159 metadata/md5-cache/app-cdr/xbiso-0.6.1-r1
 1711181608 metadata/md5-cache/app-cdr/bchunk-1.2.0-r4
 1803021159 metadata/md5-cache/app-cdr/plextor-tool-0.5.0
@@ -75245,10 +75267,9 @@
 1803021159 metadata/md5-cache/app-cdr/cdrtools-3.02_alpha07-r1
 1712122339 metadata/md5-cache/app-cdr/disc-cover-1.5.6-r1
 1803021159 metadata/md5-cache/app-cdr/xfburn-0.5.4-r1
-1803041338 metadata/md5-cache/app-cdr/Manifest.gz
+1803052038 metadata/md5-cache/app-cdr/Manifest.gz
 1801070909 metadata/md5-cache/app-cdr/uif2iso-0.1.7c-r1
 1803021159 metadata/md5-cache/app-cdr/cuetools-1.4.1
-1803021159 metadata/md5-cache/app-cdr/isomaster-1.3.11
 1803021159 metadata/md5-cache/app-cdr/cuegen-1.2.0
 1803021159 metadata/md5-cache/app-cdr/brasero-3.12.2-r1
 1702282308 metadata/md5-cache/app-cdr/mkcdtoc-1.0
@@ -75259,7 +75280,6 @@
 1803021159 metadata/md5-cache/app-cdr/mp3burn-0.4.2
 1803021159 metadata/md5-cache/app-cdr/cdemu-3.1.0
 1803021159 metadata/md5-cache/app-cdr/cuetools-1.3.1
-1803021159 metadata/md5-cache/app-cdr/isomaster-1.3.5
 1803021159 metadata/md5-cache/app-cdr/kcdemu-0.7.2
 1803021159 metadata/md5-cache/app-cdr/cdw-9999
 1803021159 metadata/md5-cache/app-cdr/cdrdao-1.2.3-r4
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 63b5f21b95fd..5f12fa78ae06 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 04 Mar 2018 20:00:01 +0000
+Tue, 06 Mar 2018 05:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 2807f476a748..89aecdb7b6b8 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-3ba79511485a56e36ed780cf0516224af40e654d 1520191146 2018-03-04T19:19:06+00:00
+282499111d35a1504a4aac79a813bd79ab101b2e 1520310251 2018-03-06T04:24:11+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 735b92c0b983..6fdaceb37f50 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1520192101 Sun 04 Mar 2018 07:35:01 PM UTC
+1520310901 Tue 06 Mar 2018 04:35:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index a8825650bef3..4577adfbcdee 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 04 Mar 2018 19:38:22 +0000
+Tue, 06 Mar 2018 04:38:21 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index ded87f078634..797b9fa1ffff 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/speedtest-cli/Manifest b/net-analyzer/speedtest-cli/Manifest
index 502eb3081b0e..d8bd930ecff3 100644
--- a/net-analyzer/speedtest-cli/Manifest
+++ b/net-analyzer/speedtest-cli/Manifest
@@ -1,4 +1,3 @@
-AUX speedtest-cli-0.3.4-fix-unicode-py3.patch 1253 BLAKE2B ac3b81ddc8dacb457e57b86ec9d40238d578b584ed79160725e0c8b7f3464aadf1de15ce76275bf1546d9d6077f805634abcb54d4f7aee6e2c4490c4b9015c88 SHA512 d071aa76158334c5184766b8c6f0cee0dd789df433a633461cff834f91cc87cf717bf57449c8417ff793708e521ad2ad7f5db43808252393066b2181a378790d
 DIST speedtest-cli-1.0.7.tar.gz 21077 BLAKE2B 8bbb9b73f21f9252763461230053bac5d890d19d3f80a81f616bb4535c5e386b70b43c6ee0688ca813fab21f8387fd93df65b1b0254613efbdec93b1807d3caa SHA512 c06c0e80ec00adebc04fb2bdab5b45ec84a32d9dbf2e4fbe7b0461f4b3b1fdcf29048b8c7a906c03dcea0771417317394243bdc6f1bc8fb763e13eafae31a42b
 DIST speedtest-cli-2.0.0.tar.gz 23642 BLAKE2B 042b5c24d084400663548d3110dd28a4c4bad780d46f9f4182ab8d1a323a087970e0ebdff04dee2ecd1bed9b488dd72f4799992c762f631d3cad59aedc6452e5 SHA512 60bde263a06589c609a10e1a881a1b02f7c7426b95778d7729b1388e545713094501914c24ee08f0857c4f445354539b5508825ab1a51df284215ba681dd7888
 EBUILD speedtest-cli-1.0.7.ebuild 662 BLAKE2B c4b2a3cc3fae1300e89ca981959b1468da02ad0e34887413a9d3dc4a344ff61d4f13c8f5e01684d324bfebaf53d2a2a3a09c46c02eb9f6156dd031cdbef18101 SHA512 35d739bc858c8c843c50c03e7889a3b9999c34d171fb8f4d0c5698ae464b83a7a9d977ab0b8dc9a99517a9a6ba610d6fa87f2f572c3487f07a72e45ac3ecf5e2
diff --git a/net-analyzer/speedtest-cli/files/speedtest-cli-0.3.4-fix-unicode-py3.patch b/net-analyzer/speedtest-cli/files/speedtest-cli-0.3.4-fix-unicode-py3.patch
deleted file mode 100644
index 2bd809f9bf67..000000000000
--- a/net-analyzer/speedtest-cli/files/speedtest-cli-0.3.4-fix-unicode-py3.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/speedtest_cli.py b/speedtest_cli.py
-index d93d5c3..930e42b 100755
---- a/speedtest_cli.py
-+++ b/speedtest_cli.py
-@@ -108,6 +108,8 @@ except ImportError:
-         def write(data):
-             if not isinstance(data, basestring):
-                 data = str(data)
-+            if isinstance(data, unicode):
-+                data = data.encode('utf-8', 'ignore')
-             fp.write(data)
- 
-         want_unicode = False
-@@ -635,7 +637,7 @@ def speedtest():
-                 line = ('%(id)4s) %(sponsor)s (%(name)s, %(country)s) '
-                         '[%(d)0.2f km]' % server)
-                 serverList.append(line)
--            print_('\n'.join(serverList).encode('utf-8', 'ignore'))
-+            print_('\n'.join(serverList))
-             sys.exit(0)
-     else:
-         servers = closestServers(config['client'])
-@@ -703,8 +705,8 @@ def speedtest():
-         best = getBestServer(servers)
- 
-     if not args.simple:
--        print_(('Hosted by %(sponsor)s (%(name)s) [%(d)0.2f km]: '
--               '%(latency)s ms' % best).encode('utf-8', 'ignore'))
-+        print_('Hosted by %(sponsor)s (%(name)s) [%(d)0.2f km]: '
-+               '%(latency)s ms' % best)
-     else:
-         print_('Ping: %(latency)s ms' % best)
- 
--- 
-2.7.1
-
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 9ae0ce961815..640dc4830a4b 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/idnkit/Manifest b/net-dns/idnkit/Manifest
index f15968aa382f..a90143971d0c 100644
--- a/net-dns/idnkit/Manifest
+++ b/net-dns/idnkit/Manifest
@@ -1,8 +1,7 @@
 AUX idnkit-1.0-autotools.patch 1843 BLAKE2B 75043eeccb34f00b9faab57d7db7ec6081192090afa4438e83df7bf02dc5ae047c4597153649aa0d4b1f658a37809687d91602d2ce61bf8cc7b3e878ed21b993 SHA512 1c405d1b72d678394284936d9130450b366f7a53bdf586fb6d4331b72c2d6672a19f2322a7f284067259ed0c0dd973865d9b117ae6c15cc8a1d41c734ef0a4ce
 AUX idnkit-1.0-test-subdirs.patch 289 BLAKE2B 6c9237cd1d17785a5d0a379d610ddc6b6e7b604c14a5680e24b80f5d9188413fe4e8f5dbbc55e72fe5d4c453c94efd231110238f68ced316986abeb6134f8173 SHA512 63d76f9ad95fc83c00259d41dcfdd47442bfda6f1dfe861a824146ded113d18284c1fe6f0f5ff1eba05a9a38055e7e8fdc3579fc14a3b441d831a9bd5b75af7a
-AUX idnkit-2.3-log_h.patch 734 BLAKE2B 696ebd7daeca2c3ff3c5103c54a0bb566a62e5eaba669bc35be2891cb100fc24b532fdb6309ba90c5a2261e1b6cbd522d9e8b535c4dfa96053d151f5a938cc35 SHA512 96e61794c0dbd9b36f65d367930c326722ff362d2335e3b734a205e957031ea4d3cb8c60f0feccb9b646f9cabf045b7d340366b32bf6ea52d7a753867f71935b
 DIST idnkit-1.0-src.tar.gz 432823 BLAKE2B 4e96bed174ea704ec0eb5c6655cb65145ed808b2bf9582ec9b6dcb8606de7a006937a2f8d8fce386dbc328e074b95ca504464c1ed6d16acc7be82d9904f2c2b4 SHA512 74f2db007a1991610f62a7a060d534f724f08395a16a7d76fda0824e9017aa47ffe4e251c90d0481218b70534fcd2b32724a66223042f59c1e16c1ff39f3be19
 DIST idnkit-2.3.tar.bz2 1473267 BLAKE2B efc2a93527c217b32bfd0e2546944b30d39c3fa046e17c11f2084721f966dc838bfa821c88378c0604cbeafb8d4970cf3c19122182448d5e48c2d392a42225c6 SHA512 a0cbc111d4b7d5f444c9b79ae76378fd2edf18097adca27d5ebf811e12091f609ec45d2c62a95b1e295bd1fa644bd8a38d79841f7f4e85dcd1f6a1cd5ca622e4
 EBUILD idnkit-1.0-r2.ebuild 1058 BLAKE2B 11b1bd1d8baa95dfa3483fe482938a37871cb347bcff34943554a7c490af71fba29a457acb8dd5f97237ec8685599c6e187a3c088db4d32d218a09d2ee2972f1 SHA512 03a7a1c838acf7c90bec72ecbdd6901bc97cbc9d8ed85c6180329f2672f7e4a0cdd941d64384fbddc6697e5976f849f3f5cd428e347df47f969431bd4db00270
-EBUILD idnkit-2.3.ebuild 677 BLAKE2B d29b3a45d31ae32c7f4a7c7c1429f9ada5c773cd6a8f25a31ca8eebd7ecb3cb74039bcfb70503f8ac66a9fd99a4082cf3f954293290097b34b4694acff76ef60 SHA512 0d5c735a42161587ccd56a2917b0647d153ca72a7eee712cd070f27c31c80ae02d8fc8722ff0a49ceedf2c24b08c7f9746b5e593b10a081bd3f799a846d3df44
+EBUILD idnkit-2.3.ebuild 628 BLAKE2B b0cf5e2cd4a27b504426899ca89cfd71d2f4556912e97e361c5c48d3548b81401e23f08f6bb7da626b7dab15b34dc982c643b77b1c1d9e0348a5c6ef1c847fed SHA512 66a21b3b8bbb5997decf4ab8b0218db8165e31f59ca36d2310bc33c08485a5e8d91885ca48d1889b38d7d7e87a4d453598e28fd991cf3f3322c68e875b108ec7
 MISC metadata.xml 290 BLAKE2B 9b8f414f2eb140cd1c4c9b290bbd4f3d36e58649b68a9ed478ba55661df34bd1f8e1ea9c6d132e2edc4365bb8d4abd5f78d9b0f24e588d548354f63057da0b78 SHA512 5ae703d1a74d5fe45ac66f8f4922b754999932112931b8ba1f46d4a2e769a5d7130b4a418bf687d857a89f20e287d85e384236848c0e01747d0aa1c1ea350492
diff --git a/net-dns/idnkit/files/idnkit-2.3-log_h.patch b/net-dns/idnkit/files/idnkit-2.3-log_h.patch
deleted file mode 100644
index 975ea0b58dbf..000000000000
--- a/net-dns/idnkit/files/idnkit-2.3-log_h.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-net-dns/bind-tools uses idn/log.h
-
---- a/include/Makefile.am
-+++ b/include/Makefile.am
-@@ -1,6 +1,7 @@
- nobase_include_HEADERS = \
- 	idn/api.h \
- 	idn/export.h \
-+	idn/log.h \
- 	idn/res.h \
- 	idn/resconf.h \
- 	idn/result.h
-@@ -22,7 +23,6 @@
- 	idn/langlocalmap.h \
- 	idn/localconverter.h \
- 	idn/localencoding.h \
--	idn/log.h \
- 	idn/logmacro.h \
- 	idn/lowercasemap.h \
- 	idn/maplist.h \
---- a/include/Makefile.in
-+++ b/include/Makefile.in
-@@ -226,6 +226,7 @@
- nobase_include_HEADERS = \
-	idn/api.h \
-	idn/export.h \
-+	idn/log.h \
-	idn/res.h \
-	idn/resconf.h \
-	idn/result.h
-@@ -247,7 +248,6 @@
-	idn/langlocalmap.h \
-	idn/localconverter.h \
-	idn/localencoding.h \
--	idn/log.h \
-	idn/logmacro.h \
-	idn/lowercasemap.h \
-	idn/maplist.h \
diff --git a/net-dns/idnkit/idnkit-2.3.ebuild b/net-dns/idnkit/idnkit-2.3.ebuild
index 6935a9252545..69306f66fb59 100644
--- a/net-dns/idnkit/idnkit-2.3.ebuild
+++ b/net-dns/idnkit/idnkit-2.3.ebuild
@@ -18,9 +18,6 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 "
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3-log_h.patch
-)
 
 src_configure() {
 	econf \
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 07d1f4af609b..b8e8ac144f23 100644
Binary files a/net-firewall/Manifest.gz and b/net-firewall/Manifest.gz differ
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 3ada49a82a0e..a1191576d94d 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -15,25 +15,33 @@ AUX shorewallrc-r1 2075 BLAKE2B 7aeaa263ea5c318d3c2b29262e655929f87e36de17e347e6
 DIST shorewall-5.1.11.2.tar.bz2 551818 BLAKE2B f0bc4b7f55e0e5189b50c1fb274229c4485802ea891256cb39c1bb89ff90b8a7e6c46d095fcedc9900ff211d218627c7822db9abc5e3bb6d6764be75b2462f01 SHA512 d214d497b70a56e40af115148907fd36cfc3daa8bd8689605cdc52c0312a0843d081f8c6a33f725cfd6778b400a91eb5c5d538f5083c8ac27f72652ce026714c
 DIST shorewall-5.1.12.1.tar.bz2 554575 BLAKE2B 1f49f5fb2dec41f6f1040c82c2a95bc1b658d3add16d385a0166fc3cb9fca8bdfcb594d620b969243b71420c9de15bc84ef4d0648dde9328794fb6383d0e6468 SHA512 7b79a0f849dc24680ab99bae4345857ef70d20cda5e089c74c339b5483cacdfbbff72ae671729bdba87d5940e66b32ccd5e00f6d62a3e2d65577edbf5a305986
 DIST shorewall-5.1.12.2.tar.bz2 555472 BLAKE2B 4eaf7cf1256c4edd5d5bc134a501077d3705d6dd32717234d14566e556267d63181506e9498d50f168b0ebf9c2bebe50dc4087dcd8f2aea5834870fdfe1fb476 SHA512 7cfff999f245da3fa992cd67f18f8b13919e31d95da3dda1920cb0f883766bd5bf8e514a2db09f3fd386b7780dfdc0b811c4fbafa82f459f96dc78dd2e6fc4a4
+DIST shorewall-5.1.12.3.tar.bz2 554963 BLAKE2B dcf3334546b0c67e61b8d9a5a0710f92aad6169fd2386431abc254188837d939034d01c5f9a5cd80e1cbb10904c526d1ecc00f51b4c2e934c195b644f4715e77 SHA512 5c4c27b59fc0d0de7a5b47a84ffaf8effd664568b4f5e8e5b0f8170238873742c1507e3a20369643b5d0d83d696c2c4c476cd341f45fd71dec7a434a09e4f434
 DIST shorewall-core-5.1.11.2.tar.bz2 85166 BLAKE2B 7e6d3d858163fa6ab20a3b663bc59339c4d2a244f0f4b00a125e48a45739dadaa102a4c8637e662db5452967bcc36b0ee95752c0d92bcfd8cd9dcaaf6d03fadc SHA512 6951a4d3139bd624ecc654a1992dba367cee84d6de218f20d6c2929b34de51a6a53f94061e1e9dc286094312ece75f113e123983c80de0f450d6e786093c6030
 DIST shorewall-core-5.1.12.1.tar.bz2 85905 BLAKE2B f867d690c0c3ef8582b5418cf2a45200b5298db9f978d2d5531a4fee157298017b38e98beec0c243aa1009a138e92faa8e19fcf38f88ed030781d4a149fdd26a SHA512 d3f8e347fe2b0c9590830d297e6cea8a830c16467e461fd1d422138850ab80d0eb67213c26f0ca594d04b86d99999bf47800c57b47ae25bd064aa56d9e70fa66
 DIST shorewall-core-5.1.12.2.tar.bz2 86246 BLAKE2B c1e14fd42aadf97298ffe4ebee666ba1098142ef076a5086b45632b2f1063389756fadfbd4e35dd7958300da97d1c01e77fe234987119579d6e5588a409bbeff SHA512 457bf0db6c7b5d83895b471bcd40fa21f2f60007a819be4f9a805f79a0ba268b9ac522374519e8c95e21c99e80dbc27f8d7dc87ac078a9c8c8353cde526211fd
+DIST shorewall-core-5.1.12.3.tar.bz2 86394 BLAKE2B 05ac5047bb498c787e627dcceeb2e543f4541d86b8fa956445307ef2ef41b933b5124b039a307c441c65fca595030de9caa4344d99fb503c6b001d6436f98a98 SHA512 8f88ebc94d475ca234c8a238e793fac9c7009d61f9a8936e84a0ceda5b6b48a70ef6aef5222eaa6c7d5235aecd2821b348c9cffb74e70d9f30b89bc109df3530
 DIST shorewall-docs-html-5.1.11.2.tar.bz2 4281096 BLAKE2B 467d5fc2dd5d2dc6a8064b86439160f4f227b6903e5d84e9824a9e3a2504eec11b2957d39536dfe4edba426b439837c5dccb584ff061e61a7409f377a8599b4e SHA512 807c996c6c7a58a5f13d687025055ba4c5a3c94bff9e227e8fe8da71a909cd428bce163faac59e3d2463f9884f7f46a48c1f661daeec94f9a8c97aa0bd092cbb
 DIST shorewall-docs-html-5.1.12.1.tar.bz2 4281459 BLAKE2B 4696dcf2ebe6a3a2c9078b4081393b040481f6769ecff381512a40d97d0ba52042b3e6f3c74361917b2623a4ecaae1c76409ef4f543eb6feaab2077f96250cb5 SHA512 96f6015c9ad4a42432143f5e2411d051bc55004c6479d53b6d8b071052f309aa30df858ac2452fe1d80f2e0071d05c2fa6eee12a70065726f9e775cc2f909575
 DIST shorewall-docs-html-5.1.12.2.tar.bz2 4281009 BLAKE2B 6b16fd7556e7985b95a9c7cbf3c2dc9e9bb6988989569558f09dc7210b14f4624a9d4d75682325a3e4427c9d7fde8c5285dbe0673259122c8b7a806e08f85bb2 SHA512 1460a06fccda7e32a0ebb9f7ce0628c7a50abed37d48148222aa587b87ece249f8e3722c6628590f3d47d3b5ec25e7d2cfc246b42777e15e8a11565dbdbec070
+DIST shorewall-docs-html-5.1.12.3.tar.bz2 4281525 BLAKE2B b3e13ebfe0447d13a36e462e47cc9448f25008032da66e652bf59ce7ee9c5aaf2df88acd059fc2f8c4ecbc2b793326d0ef911689c1d3c4295b3ccc8bc6d3dd44 SHA512 0e713d56894394614fd18ddcb83486b570083ea174e9142ed5f19a8051baeeb45c72905da8a9fd8c8e4dbba5a2dfbd548c99b85d873170c3c597f629bde3fe49
 DIST shorewall-init-5.1.11.2.tar.bz2 40214 BLAKE2B e793d272b80e849ad85e0f54e88d7b0817356c35f44669a478ba30ba8d0f4f274e44d5cfb84468896d8aa743126cbdd4bce35b10f3d952c3377294344f95b562 SHA512 5ff9d85c8412cbe6ba9d0124cd3711febef14980c428ca2a4974cd82217ddf28f7dd4a8ca35900c4a59a0c47a407d45da2bedff7b0c92770c11c9761a390e417
 DIST shorewall-init-5.1.12.1.tar.bz2 41044 BLAKE2B e38a1f085e74720949ebca053c175fce405699120684b1165a00e5e357cef0b288dc9f0cfa7001795cd626226aed60f286e9939e537e5eaef0bf908f96db2c9a SHA512 e3394c5ca5edbe09941b9ef26e68a606673b13a3a3bf97e3d74a2f7c78cae50611a7f429ec322d3bf105b4b52fbef184cd286eb557af65515f0a6178e3431266
 DIST shorewall-init-5.1.12.2.tar.bz2 41371 BLAKE2B 1ab0101c7d456aa21031d8aceab978e6cb98a5a14a30cb75fa46bef97ac0222418f94079433bb09e9d908eb44e9cd13a5a2bb42983054d4c09a96fe23fd83bd5 SHA512 ef6d3283023117f7c990d75f0569b06edb72568e7c6a848f9d77ef812951c54322771360bc2004fd6d74d0d9f3e8fc91b0b4ddeda6232e91173c5ca5b13d686e
+DIST shorewall-init-5.1.12.3.tar.bz2 41487 BLAKE2B 114fa4e647d1016f315a94f94dfe2aa923d6a14bbe4104eb27720b863cf8553a4121c99899621da529861272a12aa6b35b6d2f77e1754968f6b628ac7d5342a6 SHA512 a72a58e10f37e5400ef809abc601505d9c53031d82061c37d2bc4fc65ece0b5e886e4fa5a20ba7e794f6447be4adfd0e8e918d214e82bf75f734b858dacf9a46
 DIST shorewall-lite-5.1.11.2.tar.bz2 45821 BLAKE2B a51f745a111a2aa8c824f625bcdb779c019555d8e68323dec21d20c96054241cb69b74c25664ef7e51737bae959a567c24cc5b8ab771ee5a613bd889af20e870 SHA512 75dd0e7612f5e5903bdd1a54a152ac98fb277e464a856b4ef7cbb5f5d9d67eb19de29dcc994f4b0cb3b60af68e47c0a8e19d7e33e72a8a34d71992dc043bd88f
 DIST shorewall-lite-5.1.12.1.tar.bz2 46683 BLAKE2B d8429721ce76bb6b73d8f49bd2ec75c484cd48e732b17c49923a40cb23647a6f2de84d0d8ed798ae2ea89d5ec0cc9a1c367a13175224320f7868298481261ad0 SHA512 37146a1d9bb82b6de69f46b727fb2fa66a0933e13799008716b74d882d28607329795911e9843e0bdf5e5324954c8a7fe14a0e4995184ee38d69ab9c3408deed
 DIST shorewall-lite-5.1.12.2.tar.bz2 47045 BLAKE2B 09d8881848fab61501e7bb5b993fb0dd2b58fc7323aa741bf6847e40c9ffdfaa0dca965785a8f7c18405b434fd0cea15c434b46f42988027bd99c881996e42ae SHA512 e9a2596430b89e6356ec211d6eb94d2815041c269603274f5c102249a0ec1b24d5d3787dbdc876045a0ba41af76afa514f13e6e199358e045ab4ecb4d2b5e2f5
+DIST shorewall-lite-5.1.12.3.tar.bz2 47161 BLAKE2B f9471cd473bad27ddad1f4e17b64f767edf53341bc0fbbcd1f6365a593bddde0a50e569790daa46cdd0818d9a87de59377f01a4924b24488f4fe98c594292834 SHA512 d665563613000d7d9c3d787347d730a61879e9f31da48414dbd7997e1921a5675ae4e91f7fb6a30714ee385964923007bc4828dbb7f5b59a2723ff9dffb8ec25
 DIST shorewall6-5.1.11.2.tar.bz2 195491 BLAKE2B fd9d05e9b30037fead69add2ca62e0fbbfc2481212485f3f67935c2a062f5fa97378c74e88093b81b218445e4068014f5dedead3370a7ad2424a4ccdd1ad175c SHA512 5488679f2e10bb9ff8b5d66276b068d7acc111256d06f3e1c46863948edc9b5734c3289720c5b3e444f7f9eb25fc3603f676d02df50929802f0e1d582e23f997
 DIST shorewall6-5.1.12.1.tar.bz2 196607 BLAKE2B 35d29ccd73184b6905fffa60d209b4bd91cfe05bee73f7205f24ac178f78f74a2b847342c9f27435279fc2bfd7e5e840842d6c1333245f0a04b811d1fc2a94a5 SHA512 bd982de71d53cb1f669c293c825295a2eebe70f52b98bd0a172b13b119d5daa17a14ce9c79a97a41dbf740d4864bf5ee22b40c2bb22401bffb7a84fb911d88cc
 DIST shorewall6-5.1.12.2.tar.bz2 197371 BLAKE2B 3a171bc819e8d4cd757c843222168f8b5b5749baf064d53a42d4d2f8dfcc75e9d8782b5fc31a4a2d520bdc332164197c5c893de47e5abdad6a036ba06db2d1bf SHA512 fe99cd78cd96a8ad78b46ea9c41858c915eee33dea993054ac6ddfe6ab50d2e90fa7af4c9d1e8efdd8153b5ff37f9c8fc831447a5997e819c82f8497a24a1d52
+DIST shorewall6-5.1.12.3.tar.bz2 197348 BLAKE2B f4e76d19c39f1068948a2a340e1b442ca87dfbbc76f68c4b63de0a6ecfab9ac0eb3e1eed7ddff05d9273f0dfc7ae19ed73c068949b8d6f358e08be9f67b2b1da SHA512 04877c4578b5eaca5a577fd2fa51f4aa90a29dda77316537d6ea8a07aa59667aaf5b76cd338f481291358360f66d33291ada8ff8d7ca908f24686dff19521e1f
 DIST shorewall6-lite-5.1.11.2.tar.bz2 45581 BLAKE2B 760b29fb864a942f15bba5a88cd2933ed6791533ed2492c1985567253c2cd8f02c4931552c0b8ad35599099de70bca2d0f5b2219b98298ec9541ba3f16bac035 SHA512 d5db740f4dbe86ae31d44123de0f0244bf8caa880e9f29cb19590a9a2abcc1b17ef5ba0cd0b40c5bf843415857d988cacb079a4aae7016148be1f71afd8433de
 DIST shorewall6-lite-5.1.12.1.tar.bz2 46365 BLAKE2B eb3fdaabdc11d5d2694964d69ae452e52557eff6539a1eb0de3bf607252f52515d285c858b0a75b1ff35ef02c62031ab9c510517e9e5aaeb5f6b860b50156ce3 SHA512 1992cfbc2ca4c9e4b004e10c1b0bf73157da2cdf2fe03ecc8ad9a33e941d7881565c00bd68abec6e8711c58d8df03b0dc1c413639ef7015661fb4ef79151a78e
 DIST shorewall6-lite-5.1.12.2.tar.bz2 46746 BLAKE2B e38af0dff71fb3fc00ca7d7b5ba034650016060be3202f6284ff1ca82070eeb5e0e5cb448230b4e8614bdf0ddd71d28c3d0b022d30d6ed0ea0446c85e07cb0b3 SHA512 133409bf4dc004e4eb80c28e6e035331232dddd87b6fd512077947fcb05f10390360cb3f1918d441ed268f20f09c3bfd0a7952f9252cd8e39de9c6d617f2399d
+DIST shorewall6-lite-5.1.12.3.tar.bz2 46837 BLAKE2B 37158fb740673680edba992957bcbf836b57e01b66248dcd2630542c1f54347fdb92f4d31f1e20f969c58da8ceeb6af6a1b1414e0d97d666ae30c8b269298f83 SHA512 9bfc4dea894f51f35e366d9aed1380096865ecfd0fce913f2bb5e1c2154206359d41a4e9abd5f2e287c9c7fd9aaba9c74693296429727b30cc73a33b237b3874
 EBUILD shorewall-5.1.11.2.ebuild 16131 BLAKE2B 7d84ec26d9331f14660a6fa5add471302d608c09202a6a05dbecebe3efe1de29c7783f33ec872d52bb0c1a21c147f36c3704fef3846491de9efb196ecb357ff1 SHA512 759b68fe29ea4fc9a412da40823a021067ee27d746733a24f323a45516cd13c34c6dfee70d7179ba132942df8dfd6c6339aae75146f30444ed0ced31199166ab
 EBUILD shorewall-5.1.12.1.ebuild 16138 BLAKE2B 1e94a98a4907f0187b824bac38ced587df41e912b990b0777e3e184ea68d6b7529c9b5f13fe47a70d9f920b791db47ffb0f53ee838d772deb5695f76436c44b8 SHA512 1652569e4558621ec9c3e163081829dddf304a862f7cfef5bbd96c68426b792fa57d2ff9b206340605de6cf702aeef400e0d3595415c41498ad391942b25a246
 EBUILD shorewall-5.1.12.2.ebuild 16138 BLAKE2B ae9bb119f6c9797e18652aef9ac50e0f8715fe4701e3626f1f0ca8f635b330f697cab44c11cfa3372cfe40dc5d23f138eddbc6dd58c780e576fac58ac819aa39 SHA512 5c72f544bd6cc12d0966822fd7ae9b9f133d06df8ab65eab03f021c891b343760f3804c70ed78941e8dff71482dda107b77b153e63e421d151e74f6e13ece4a0
+EBUILD shorewall-5.1.12.3.ebuild 16138 BLAKE2B ae9bb119f6c9797e18652aef9ac50e0f8715fe4701e3626f1f0ca8f635b330f697cab44c11cfa3372cfe40dc5d23f138eddbc6dd58c780e576fac58ac819aa39 SHA512 5c72f544bd6cc12d0966822fd7ae9b9f133d06df8ab65eab03f021c891b343760f3804c70ed78941e8dff71482dda107b77b153e63e421d151e74f6e13ece4a0
 MISC metadata.xml 2254 BLAKE2B e9d48407a0f055415070f5b0266ed9f534768f6d17d52b7070de30a037b89dbd08daac40b0ec313b8dfc65ba40ff38dae96c9758b78ec66d100ac8fa6b870d5f SHA512 0a201cf40dd1282b52897f751903baf28a2eb284b94316a45d8af6879f995dde1cdd4a7d474293835a0bde801ce41497bde558a51035a5e3650f0ec098688f33
diff --git a/net-firewall/shorewall/shorewall-5.1.12.3.ebuild b/net-firewall/shorewall/shorewall-5.1.12.3.ebuild
new file mode 100644
index 000000000000..d073bcb9296f
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.1.12.3.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc +init +ipv4 ipv6 lite4 lite6 selinux"
+
+MY_PV=${PV/_rc/-RC}
+MY_PV=${MY_PV/_beta/-Beta}
+MY_P=${PN}-${MY_PV}
+
+MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
+
+# shorewall
+MY_PN_IPV4=Shorewall
+MY_P_IPV4=${MY_PN_IPV4/#S/s}-${MY_PV}
+
+# shorewall6
+MY_PN_IPV6=Shorewall6
+MY_P_IPV6=${MY_PN_IPV6/#S/s}-${MY_PV}
+
+# shorewall-lite
+MY_PN_LITE4=Shorewall-lite
+MY_P_LITE4=${MY_PN_LITE4/#S/s}-${MY_PV}
+
+# shorewall6-lite
+MY_PN_LITE6=Shorewall6-lite
+MY_P_LITE6=${MY_PN_LITE6/#S/s}-${MY_PV}
+
+# shorewall-init
+MY_PN_INIT=Shorewall-init
+MY_P_INIT=${MY_PN_INIT/#S/s}-${MY_PV}
+
+# shorewall-core
+MY_PN_CORE=Shorewall-core
+MY_P_CORE=${MY_PN_CORE/#S/s}-${MY_PV}
+
+# shorewall-docs-html
+MY_PN_DOCS=Shorewall-docs-html
+MY_P_DOCS=${MY_PN_DOCS/#S/s}-${MY_PV}
+
+# Upstream URL schema:
+# Beta:    $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-Beta2/shorewall-4.6.4-Beta2.tar.bz2
+# RC:      $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-RC1/shorewall-4.6.4-RC1.tar.bz2
+# Release: $MIRROR/pub/shorewall/4.6/shorewall-4.6.3/shorewall-4.6.3.3.tar.bz2
+
+MY_URL_PREFIX=
+MY_URL_SUFFIX=
+if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
+	MY_URL_PREFIX='development/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/${MY_P_DOCS}.tar.bz2 )
+"
+
+# - Shorewall6 requires Shorewall
+# - Installing Shorewall-init or just the documentation doesn't make any sense,
+#   that's why we force the user to select at least one "real" Shorewall product
+#
+# See http://shorewall.net/download.htm#Which
+REQUIRED_USE="
+	ipv6? ( ipv4 )
+	|| ( ipv4 lite4 lite6 )
+"
+
+# No build dependencies! Just plain shell scripts...
+DEPEND=""
+
+RDEPEND="
+	>=net-firewall/iptables-1.4.20
+	>=sys-apps/iproute2-3.8.0[-minimal]
+	>=sys-devel/bc-1.06.95
+	ipv4? (
+		>=dev-lang/perl-5.16
+		virtual/perl-Digest-SHA
+	)
+	ipv6? (
+		>=dev-perl/Socket6-0.230.0
+		>=net-firewall/iptables-1.4.20[ipv6]
+		>=sys-apps/iproute2-3.8.0[ipv6]
+	)
+	lite6? (
+		>=net-firewall/iptables-1.4.20[ipv6]
+		>=sys-apps/iproute2-3.8.0[ipv6]
+	)
+	init? ( >=sys-apps/coreutils-8.20 )
+	selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 )
+	!net-firewall/shorewall-core
+	!net-firewall/shorewall6
+	!net-firewall/shorewall-lite
+	!net-firewall/shorewall6-lite
+	!net-firewall/shorewall-init
+	!<sys-apps/systemd-214
+"
+
+S=${WORKDIR}
+
+pkg_pretend() {
+	local CONFIG_CHECK="~NF_CONNTRACK"
+
+	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
+	local WARNING_CONNTRACK+=" to run any shorewall-based firewall on the local system."
+
+	if use ipv4 || use lite4; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4"
+
+		local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will"
+		local WARNING_CONNTRACK_IPV4+=" be unable to run any shorewall-based IPv4 firewall on the local system."
+	fi
+
+	if use ipv6 || use lite6; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV6"
+
+		local WARNING_CONNTRACK_IPV6="Without NF_CONNTRACK_IPV6 support, you will"
+		local WARNING_CONNTRACK_IPV6+=" be unable to run any shorewall-based IPv6 firewall on the local system."
+	fi
+
+	check_extra_config
+}
+
+pkg_setup() {
+	if [[ -n "${DIGEST}" ]]; then
+		einfo "Unsetting environment variable \"DIGEST\" to prevent conflicts with package's \"install.sh\" script ..."
+		unset DIGEST
+	fi
+}
+
+src_prepare() {
+	# We are moving each unpacked source from MY_P_* to MY_PN_*.
+	# This allows us to use patches from upstream and keeps epatch_user working
+
+	einfo "Preparing shorewallrc ..."
+	cp "${FILESDIR}"/shorewallrc-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# shorewall-core
+	mv "${S}"/${MY_P_CORE} "${S}"/${MY_PN_CORE} || die "Failed to move '${S}/${MY_P_CORE}' to '${S}/${MY_PN_CORE}'"
+	ebegin "Applying Gentoo-specific changes to ${MY_P_CORE} ..."
+	ln -s ../shorewallrc.gentoo ${MY_PN_CORE}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+	eend 0
+
+	# shorewall
+	if use ipv4; then
+		mv "${S}"/${MY_P_IPV4} "${S}"/${MY_PN_IPV4} || die "Failed to move '${S}/${MY_P_IPV4}' to '${S}/${MY_PN_IPV4}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV4}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_IPV4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall.initd-r2 "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
+		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
+		eend 0
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		mv "${S}"/${MY_P_IPV6} "${S}"/${MY_PN_IPV6} || die "Failed to move '${S}/${MY_P_IPV6}' to '${S}/${MY_PN_IPV6}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV6}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_IPV6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall.initd-r2 "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
+		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
+		eend 0
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		mv "${S}"/${MY_P_LITE4} "${S}"/${MY_PN_LITE4} || die "Failed to move '${S}/${MY_P_LITE4}' to '${S}/${MY_PN_LITE4}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE4}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_LITE4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall-lite.initd-r2 "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
+		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
+		eend 0
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		mv "${S}"/${MY_P_LITE6} "${S}"/${MY_PN_LITE6} || die "Failed to move '${S}/${MY_P_LITE6}' to '${S}/${MY_PN_LITE6}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE6}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_LITE6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall-lite.initd-r2 "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
+		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
+		eend 0
+	fi
+
+	# shorewall-init
+	if use init; then
+		mv "${S}"/${MY_P_INIT} "${S}"/${MY_PN_INIT} || die "Failed to move '${S}/${MY_P_INIT}' to '${S}/${MY_PN_INIT}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_INIT}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_INIT}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall-init.confd "${S}"/${MY_PN_INIT}/default.gentoo || die "Copying shorewall-init.confd failed"
+		cp "${FILESDIR}"/shorewall-init.initd "${S}"/${MY_PN_INIT}/init.gentoo.sh || die "Copying shorewall-init.initd failed"
+		cp "${FILESDIR}"/shorewall-init.systemd "${S}"/${MY_PN_INIT}/gentoo.service || die "Copying shorewall-init.systemd failed"
+		cp "${FILESDIR}"/shorewall-init.readme "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt || die "Copying shorewall-init.systemd failed"
+		eend 0
+
+		eprefixify "${S}"/${MY_PN_INIT}/init.gentoo.sh
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
+		cd "${S}" || die
+	fi
+
+	# shorewall-docs-html
+	if use doc; then
+		mv "${S}"/${MY_P_DOCS} "${S}"/${MY_PN_DOCS} || die "Failed to move '${S}/${MY_P_DOCS}' to '${S}/${MY_PN_DOCS}'"
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	# shorewall-core
+	einfo "Installing ${MY_P_CORE} ..."
+	DESTDIR="${D%/}" ${MY_PN_CORE}/install.sh shorewallrc.gentoo || die "${MY_PN_CORE}/install.sh failed"
+	dodoc "${S}"/${MY_PN_CORE}/changelog.txt "${S}"/${MY_PN_CORE}/releasenotes.txt
+
+	# shorewall
+	if use ipv4; then
+		einfo "Installing ${MY_P_IPV4} ..."
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+		keepdir /var/lib/shorewall
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+		keepdir /var/lib/shorewall6
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+		keepdir /var/lib/shorewall-lite
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+		keepdir /var/lib/shorewall6-lite
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${MY_PN_INIT}/install.sh shorewallrc.gentoo || die "${MY_PN_INIT}/install.sh failed"
+		dodoc "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt
+
+		if [[ -f "${D}etc/logrotate.d/shorewall-init" ]]; then
+			# On Gentoo, shorewall-init will not create shorewall-ifupdown.log,
+			# so we don't need a logrotate configuration file for shorewall-init
+			einfo "Removing unused \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed"
+		fi
+	fi
+
+	if use doc; then
+		einfo "Installing ${MY_P_DOCS} ..."
+		docinto html && dodoc -r "${S}"/${MY_PN_DOCS}/*
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		# Show first steps for shorewall/shorewall6
+		local _PRODUCTS=""
+		if use ipv4; then
+			_PRODUCTS="shorewall"
+
+			if use ipv6; then
+				_PRODUCTS="${_PRODUCTS}/shorewall6"
+			fi
+		fi
+
+		if [[ -n "${_PRODUCTS}" ]]; then
+			elog "Before you can use ${_PRODUCTS}, you need to edit its configuration in:"
+			elog ""
+			elog "  /etc/shorewall/shorewall.conf"
+
+			if use ipv6; then
+				elog "  /etc/shorewall6/shorewall6.conf"
+			fi
+
+			elog ""
+			elog "To activate your shorewall-based firewall on system start, please add ${_PRODUCTS} to your default runlevel:"
+			elog ""
+			elog "  # rc-update add shorewall default"
+
+			if use ipv6; then
+				elog "  # rc-update add shorewall6 default"
+			fi
+		fi
+
+		# Show first steps for shorewall-lite/shorewall6-lite
+		_PRODUCTS=""
+		if use lite4; then
+			_PRODUCTS="shorewall-lite"
+		fi
+
+		if use lite6; then
+			if [[ -z "${_PRODUCTS}" ]]; then
+				_PRODUCTS="shorewall6-lite"
+			else
+				_PRODUCTS="${_PRODUCTS}/shorewall6-lite"
+			fi
+		fi
+
+		if [[ -n "${_PRODUCTS}" ]]; then
+			if use ipv4; then
+				elog ""
+			fi
+
+			elog "Before you can use ${_PRODUCTS}, you need to provide a configuration, which you can"
+			elog "create using ${CATEGORY}/shorewall (with \"ipv4\" and or \"ipv6\" USE flag)."
+			elog ""
+			elog "To read more about ${_PRODUCTS}, please visit"
+			elog "  http://shorewall.net/CompiledPrograms.html"
+			elog ""
+			elog "To activate your shorewall-lite-based firewall on system start, please add ${PRODUCTS} to your default runlevel:"
+			elog ""
+
+			if use lite4; then
+				elog "  # rc-update add shorewall-lite default"
+			fi
+
+			if use lite6; then
+				elog "  # rc-update add shorewall6-lite default"
+			fi
+		fi
+
+		if use init; then
+			elog ""
+			elog "To secure your system on boot, please add shorewall-init to your boot runlevel:"
+			elog ""
+			elog "  # rc-update add shorewall-init boot"
+			elog ""
+			elog "and review \$PRODUCTS in"
+			elog ""
+			elog "  /etc/conf.d/shorewall-init"
+		fi
+
+	fi
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least ${MY_MAJOR_RELEASE_NUMBER} ${v}; then
+			# This is an upgrade
+
+			elog "You are upgrading from a previous major version. It is highly recommended that you read"
+			elog ""
+			elog "  - /usr/share/doc/shorewall*/releasenotes.tx*"
+			elog "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			if use ipv4; then
+				elog ""
+				elog "You can auto-migrate your configuration using"
+				elog ""
+				elog "  # shorewall update -A"
+
+				if use ipv6; then
+					elog "  # shorewall6 update -A"
+				fi
+
+				elog ""
+				elog "*after* you have merged the changed files using one of the configuration"
+				elog "files update tools of your choice (dispatch-conf, etc-update...)."
+
+				elog ""
+				elog "But if you are not familiar with the \"shorewall[6] update\" command,"
+				elog "please read the shorewall[6] man page first."
+			fi
+
+			# Show this elog only once
+			break
+		fi
+	done
+
+	if ! use init; then
+		elog ""
+		elog "Consider emerging ${CATEGORY}/${PN} with USE flag \"init\" to secure your system on boot"
+		elog "before your shorewall-based firewall is ready to start."
+		elog ""
+		elog "To read more about shorewall-init, please visit"
+		elog "  http://www.shorewall.net/Shorewall-init.html"
+	fi
+
+	if ! has_version "net-firewall/conntrack-tools"; then
+		elog ""
+		elog "Your Shorewall firewall can utilize \"conntrack\" from the \"net-firewall/conntrack-tools\""
+		elog "package. if you want to use this feature, you need to install \"net-firewall/conntrack-tools\"!"
+	fi
+
+	if ! has_version "dev-perl/Devel-NYTProf"; then
+		elog ""
+		elog "If you want to profile your Shorewall firewall you need to install \"dev-perl/Devel-NYTProf\"!"
+	fi
+}
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 1b04c062fe08..0e4520f85336 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 948427c7dcb1..8e176f471902 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_1.5.0_amd64.deb 65858954 BLAKE2B 60234d1cb98dd233ffc769c93bafd509ffc40eaf34cc76c3e8dfa8de1229a05e1f29291b1a57212163588a53990b1c24c1ba29486429ad63c0424049b79384c5 SHA512 36bcf67c5815bf4f001649f0bfe2a01217415fbc4b63688026ec5aba946a8a3df7e08021aa4255590fdc5820bdcd9e2d43b42798e7d8c5eb0186c351f9b10780
-EBUILD signal-desktop-bin-1.5.0.ebuild 1013 BLAKE2B 685d026c10575748a9b4e2ef72290371497942eea2f14a01eb1c9b5108c84c341cb96fc5971aa9e0b3b99d04037fcdcabebe9d786e05db48f2bc0306debf3dd8 SHA512 9c68ccf6b1d49ec97dd17613dc779069fff3465cfe01c21f0c4b6ef43e0191057486ddd0a24b7b624447aed1eea08066c4569d4e9b9b14d837ff60e37f62f472
+DIST signal-desktop_1.5.2_amd64.deb 65859590 BLAKE2B a710b8ca1c9729725a12594603e0fb3a6c800e5b03af17c9ef5158a024b8ebddd1e35ba4270a02ed805a3042a16486e163a5dca105feb1076deb80c636e043cd SHA512 10f6a0bfb1947620d2ce71f7e8dc6b9f6fe9c95556f3ae1b9b34aa5d84db0f357b78634e7ff815f9e7d2d3a6d0d628e20adb1817a027a32b2021c24ef8d4441e
+EBUILD signal-desktop-bin-1.5.2.ebuild 1207 BLAKE2B ad0c425668bd9ca11cb3abf20f6d0bda8ca2af620fe61da1650f48576a9dd74ab9a9d9355a3051d19eff75133fa5230f94dc525d89f810a5db7d176684ef2cb3 SHA512 ccba5daaed772250c074a3e17df06a3e0245137adaf651ff644d2e25d2c3902309e5827fb4d5ba3d07606a6bb17d97155281c91b5da32c59a84c561d91fc5937
 MISC metadata.xml 510 BLAKE2B 618fc8fb3b176d175bb15ceef941c60ebd89666f4b01f7b7912a4c26d8f54802982a8c089480f11573418daf88fb559dacca797c7f42493d122fd448c53eb923 SHA512 9d9ae0f5f1961fc1ad9b0e59f8d2003fc746f6f25dabb6c35b6ee8e151caf25e724b321e0c11a1b02f5431a204215caf5a4614232508b8492a0d33cd4bb46b8a
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.5.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.5.2.ebuild
similarity index 76%
rename from net-im/signal-desktop-bin/signal-desktop-bin-1.5.0.ebuild
rename to net-im/signal-desktop-bin/signal-desktop-bin-1.5.2.ebuild
index 49c5f56fefba..92008eb4f0ec 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-1.5.0.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.5.2.ebuild
@@ -5,9 +5,8 @@ EAPI=6
 
 MY_PN="${PN/-bin/}"
 
-inherit gnome2-utils unpacker xdg-utils pax-utils
-
-DESCRIPTION="Signal Desktop"
+inherit gnome2-utils pax-utils unpacker xdg-utils
+DESCRIPTION="Allows you to send and receive messages of Signal Messenger on your computer"
 HOMEPAGE="https://signal.org/ https://github.com/WhisperSystems/Signal-Desktop"
 SRC_URI="https://updates.signal.org/desktop/apt/pool/main/s/${MY_PN}/${MY_PN}_${PV}_amd64.deb"
 
@@ -33,7 +32,12 @@ QA_PREBUILT="opt/Signal/signal-desktop
 S="${WORKDIR}"
 
 src_install() {
-	doins -r .
+	insinto /
+	dodoc -r usr/share/doc/signal-desktop/.
+	doins -r opt
+	insinto /usr/share
+	doins -r usr/share/applications
+	doins -r usr/share/icons
 	fperms +x /opt/Signal/signal-desktop
 	pax-mark m opt/Signal/signal-desktop
 
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index ebf45683c8c8..2c821e268ac2 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/muh/Manifest b/net-irc/muh/Manifest
index 4d4ef8b0cf07..f5f555805398 100644
--- a/net-irc/muh/Manifest
+++ b/net-irc/muh/Manifest
@@ -1,4 +1,4 @@
 DIST muh-2.2a.tar.gz 130672 BLAKE2B dd1f925539e7656822c8d66b35ea84ccbf23278e78c5c5d692400a192bb2d93197ad4205169c76de5386dc2fd1bdd191e3979082766af5d759f79c9ceaa44536 SHA512 2e3ba080f420cf063627d4d9b1f4001c76575efb1d3e99ff9c5eee4a483d5beda6e326f0c0d60c3d848b78cac092aac51a98cabc351760ccfa38fe1549c4b4ee
-EBUILD muh-2.2a-r1.ebuild 741 BLAKE2B f66f7bee960a2bdfb1f176ceb8a4d2d26ccecd4c5c952ffa896f0487cd7d4112034b4ece075f12ea8a428fe5b614ca82085019e5d639f923859acf4b7e0f46ec SHA512 42bfa25c6b390af81a2f296b5cf0b15fe5c107c9f16d411c7e516de67df0b0ae8a133ee744f93aa4a7abf44ddb11e73423c714f2390016f11b0f480cdeb69b7b
+EBUILD muh-2.2a-r1.ebuild 740 BLAKE2B d5c6cdbe0ee2aeeac8af478ba989b2c910e19f830f53eb51d303fae8b9fe8e66b8c924c1f8204af9324ebfeafb9a99fd035a81ca75185440d0c55147a3e79b43 SHA512 972565afbf17e8e13ccf273de2a29325b0ce62417af0510162ef4c3b15c59ca3c649bcf5b6d7139dbb0e36915e9bae2640a6f588edd0827c70ea5a1b43efad7c
 EBUILD muh-2.2a.ebuild 790 BLAKE2B 7ae8896176a7551ba12bd65cf66ab7b82720894a6f6fc417d0ff0f2c8feb46078e896d1f285ef0f6e3d2adebcd326c6e292843c257b4498601fb7d80c15bd34c SHA512 0e8fbacf05c2fe058d0cf6b484eba62fe3e1d29bb53ad18e4085f36f00bc5551d706a0b2194d8ef3753a0f887e0786a4b73c479731428aba87cc66398fb01aee
 MISC metadata.xml 312 BLAKE2B 6f854a035f538341f9196db3df9589460e24ba234ae497d0376e719b86a9f3566a775ebdf8f172c4a742616a2bc2dd13624fe80498351cf7dc892e040529882d SHA512 2f77f253666a974f580a98a89580870394b7e97488a21dbc80a0607842eff9c534ac061f9a66f8d8cbf576a7e0c366e0e307f35363fbe1c8b064590d02a4ec9c
diff --git a/net-irc/muh/muh-2.2a-r1.ebuild b/net-irc/muh/muh-2.2a-r1.ebuild
index 9cb9fc287c94..cb57115efd24 100644
--- a/net-irc/muh/muh-2.2a-r1.ebuild
+++ b/net-irc/muh/muh-2.2a-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ~sparc x86"
+KEYWORDS="alpha amd64 ~hppa ~mips ~ppc ~sparc x86"
 IUSE="ipv6"
 
 RDEPEND=""
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 8c5ce351240d..11ae89262ff8 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,8 +1,8 @@
 AUX quassel.logrotate 105 BLAKE2B 16a8b32885a77817d39f14deb7d1cf2cb7788c9ecd6d179efc10d72bae688537fd063930b24f570b18f4312d600b1810f1b262c6b36f6b5990f20c1ebb699d72 SHA512 60371b4046c3c20c06d01f9cbf3f8465b40c9a989f392ed3e5a4724deff71960015eeb1707817af256618be8085b2aa5809377fec8cfae59e6b8fc958317e780
 AUX quasselcore.conf 607 BLAKE2B c0a0ecaf2089b19ba57a030bbeeb52f93617a8ed94a4077258fca9356ad5e9c11f708ea4f07e5096eec43c6ece355b6b92897115cf8d1249eae2779b9b952618 SHA512 b1fd0382d83c5983f6266c7500ac12dc00b964ff1f104cb20de9dd40b93edcbf90f98f5ab3f6f2cb87e6be63580c3ab2958f2e3ae57eb9569c24c49d8506bc38
 AUX quasselcore.conf-r1 333 BLAKE2B 67586dc8a62e94131d11d81502f09387026f98b7452a501c5048904867382ac8bbc133ab3c7fd84751f8b8b5c9a0037dba0d862209515004773241bd546cd6ff SHA512 7d3f320b5d5c9cc27db399a5460ea37f33688d523340d4509ebd2fcf20620b43d4b1a05cdb91fa07931798b18a2bdcee9f4f29c75e867bd4b5a7f170cd02ba90
-AUX quasselcore.init 1742 BLAKE2B c9449f721df267ce826cadd52e21341762324e8ee9826c64f8d31af0e0edd28fda5b26ae06c0b667038a3b88e98b4694ce13dbc3a9b43844e0cbcd437f52e8e1 SHA512 eddd620b43439becc3f714854b7d1c9f9a65b4784325b11298c94c9f15b6e1fe2547f566f8ae2ebf1134d6361228bdb047964df3ae439d540d57d8864cdecd6d
-AUX quasselcore.init-r1 490 BLAKE2B 66ac809f427009bf9841d23a12d10f87563f970919a61737c96582c89ca97cbdf93aa89baa59e77dc6cfd377b634ddde3a6d5d5862e9246e4b984c5f35abb66f SHA512 71b2381e834d86a29269516270fe2463adfe59de16d9916d9cc496959e6931719262bf980763662bfb309acb79c6508ae33c61ceacd53be912d3161105ba0c69
+AUX quasselcore.init 1744 BLAKE2B 6d79a5889f11bfb870192078675938c259d8face81c9dd1edfd4ac694bd6659ff3fc8bcab2db83a5d2907690059aa00711eed16e860ec60a8415347fdb0b2675 SHA512 44686e78ebcfd30db2a5cc3661e793c9bf110f54fb2a826e3df1a1575b2f40eea84013218575d71b4b2ab569d6d5e367e2e4b1b2e800e581e73fe5bbed9727f0
+AUX quasselcore.init-r1 492 BLAKE2B 568e41c649875fc9e334b54f341dc9f95295e37d1c350ac3356b1e92859786a242da52103acb4692bd32d647983d2b5a758b847db66041791dac5bf531cf448a SHA512 6b050c6bafa2c49ab92f8e7c77be3c6868b58040b4df8b2cc3bbc217c4bf9d69fa63a7efe9e1c9e3b055de170d79af6470fa58828c5291e0b3d6b6eb7044aff3
 AUX quasselcore.service 189 BLAKE2B a115a98b17f4e59f2bbae584ac998cb16729977b617feb7b76696fcb682c1bc2d88cc40847ed1b20dce04dd8702b86a406ce0117304501c203453d1d30667e47 SHA512 3f0e15582dca70ca11beddb50aa6c6d993d4283ff89dc83a84b1acf2c0d2edba306fdab30eb05937f363cf507e34b7f884e0852d88be68748b68ac7b4013b776
 DIST quassel-0.12.4.tar.bz2 3742639 BLAKE2B 855caaf3eb5373008dc3c6f673b68aa1bbb601541ba5eb6c9402f421ec6b1dc933c58785181ca8b3f2fd899ba91a873458ede06f0fda2a3e970980f395742be2 SHA512 66bc12a9634534e6492787172a199c774ef1642d1ddb268c24ed96608698628bca7b278021a006a4db76783b19b1e1dead9d019bb8a6cbe1e12b8857792e7b92
 EBUILD quassel-0.12.4.ebuild 4724 BLAKE2B 2b5be22d3e552e9a94925c4e67cf50be43003fb5bcccfa988e4b0ea5dafa3374d3702222ceb467dece1ae87599c7886c210556739be0067351e3acbcdafa69cc SHA512 1612344383ea25f8cdb45464d87cfb594f1685adcf26e48582772e1e2a8464ed0194ad37ff00368483df47d37377f4c01100c32533f8c6590e2f924452d00a96
diff --git a/net-irc/quassel/files/quasselcore.init b/net-irc/quassel/files/quasselcore.init
index 468c24ec2990..8e66dff8ca32 100644
--- a/net-irc/quassel/files/quasselcore.init
+++ b/net-irc/quassel/files/quasselcore.init
@@ -1,10 +1,10 @@
 #!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
 	need localmount net
-	after bootmisc postgres
+	after bootmisc postgresql
 }
 
 CORE="$(which quasselcore)"
diff --git a/net-irc/quassel/files/quasselcore.init-r1 b/net-irc/quassel/files/quasselcore.init-r1
index 5976235aafa4..cfcb5dbb9012 100644
--- a/net-irc/quassel/files/quasselcore.init-r1
+++ b/net-irc/quassel/files/quasselcore.init-r1
@@ -1,9 +1,9 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
-	after logger postgres
+	after logger postgresql
 }
 
 LISTEN=${LISTEN:-"0.0.0.0"}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index ec176c8fc28c..57535576433b 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/libident/Manifest b/net-libs/libident/Manifest
index 0cc514ccee95..dc40c0a2fc92 100644
--- a/net-libs/libident/Manifest
+++ b/net-libs/libident/Manifest
@@ -1,4 +1,4 @@
 DIST libident-0.32.tar.bz2 205831 BLAKE2B c1f7798c83764774be933d0c34ec8729c66f3fd2bee6c7f8e5e472d929068c56bda9353cfa1b2fa5e7636fbecb38c02fe133233958992ccde766d1b614dd7a0f SHA512 5e5d0e3dd2514fa5af9dba02eca52cc8015d091fca05beeb23bae1c98d33a1a1313081cafc9e1e49d2beb5c524beaf1eb3679ff54330164aa170d74dbd84b244
-EBUILD libident-0.32-r1.ebuild 533 BLAKE2B 1e8797a376e0f2c83ba1a44aa91db97f8264b3c9f3c04cc33ae89ffa6c1b8e83407a487f82b42b4bace1b4a5214a8a7431b6a356cbf0883a65411f8845150e16 SHA512 130833c34ae31bf74de41faa48ce1fdd9b97eba4498037aea337080449e6250df34f3a855cfe4a239316e0eb09b29a3651b6ef1c44c644724125296ad70d4ec4
+EBUILD libident-0.32-r1.ebuild 532 BLAKE2B a4bdb0449c03602f81e778645063e19d0cd7b188f19bed8e9c7ca0c1643d3ad50383af7b6ddeb6c11d705652a8aef826580b95be39fb53677248002d6a0b18c2 SHA512 5452bb923a33b1c13ccced5dcc05079c19eaed2fa97ab180c29afcf24be7ca1960efe95b868c55b26ff4ead7927d8bc7d509c2789d3241cf4056cca61cc7092d
 EBUILD libident-0.32.ebuild 507 BLAKE2B 3347d5ab443d80f390d9c3cad8102d8d1013859c30301a68c511f961bbad0714502f2b9e5c49ae78668925d25d9bf457584d75637ece373f1277c47f0f0a9096 SHA512 4eb6f180aa0cf6926801c0f1b5bc5a401feeb0a1ef4880fe48a426ae1711af73e044dd704f9a7f33d7b88442ae857bacddd961da95c1d47d403b8f2c6fa59fc9
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/libident/libident-0.32-r1.ebuild b/net-libs/libident/libident-0.32-r1.ebuild
index 5b8fa9f7defa..6820b8b4bce0 100644
--- a/net-libs/libident/libident-0.32-r1.ebuild
+++ b/net-libs/libident/libident-0.32-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://people.via.ecp.fr/~rem/libident/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/net-libs/libnfsidmap/Manifest b/net-libs/libnfsidmap/Manifest
index cf7bec2763db..bda1e87b8258 100644
--- a/net-libs/libnfsidmap/Manifest
+++ b/net-libs/libnfsidmap/Manifest
@@ -3,6 +3,6 @@ AUX libnfsidmap-0.21-headers.patch 438 BLAKE2B 0ef48276188f4142b2c85cb3cf326d37a
 DIST libnfsidmap-0.24.tar.gz 328720 BLAKE2B 4b33a589b9d4b47530d2044a0912481dfda770de86f7aa90e80771f2df4b555857535a7f162a485b68c9b1d48be563d246e128fa3ca1e3c79d9bf0af69b8401d SHA512 1283a4af1bcf3c6f941ab294acc0b2b4bd9ca947f2d3c2e866717478ba2e7a2190a5467b71d7e9136c5c83de564c4892f9e3304323ae17e3988af2e40c43982b
 DIST libnfsidmap-0.25.tar.gz 346587 BLAKE2B dbf31779371ba29737ed7a5901cf46f17e4a1b2ac444c2959d3ae76f41815e9a15a2ee892e417c5b7f97cf5f8396024071430fed028a8cd583aeed1a95e350df SHA512 8acf30790cdd19341c75cb8a4f7ee4dbc9f688c8514258046e55c8f4245df213709ccb7d5327a11b146b0e3b7266d3d4da018699c6be47fbedcc4cd384b54557
 EBUILD libnfsidmap-0.24.ebuild 1072 BLAKE2B cbc056d0eaa632b3692b21d6062f5538ffda57035d2683c49808b4922f14da1e8673dd0301fe9452a70341046aa6d2a513d04947827f9b9d49a2313aa13e3687 SHA512 1de6d7598472c57587b95c46c0b2093438227efdc85800d340c85f32f05b2f4fe91b30c46c04fa735c8a222c47f2a0f0342624a296fad0f0abccdaaaf3d0432e
-EBUILD libnfsidmap-0.25-r1.ebuild 1235 BLAKE2B 8bcdce55d9959821bd22634aa6bc26c668905168a8d1683e366a7e6b1cf15b8bf72db4df1380ec05b8cfae4a4dee8a52a84e581e63b6e986a1693d3f59fee852 SHA512 92cf0726f5694b326bee3aa1cb4f51fe14904f34cd8f2e559d1d1918291fc4c34fb6e48942771113a839bd99798b2930d8e847dd4e134f2c057155b49222a0fe
+EBUILD libnfsidmap-0.25-r1.ebuild 1234 BLAKE2B d26d4931b12b9ad87a0a1ad36f8ac89e725fe5d9d656eddc5b8f56e418690ff3aac29f53aaa14aa904fdea04f428d2bdf579f820c59582fbf7d5804dc4b87940 SHA512 89029a203bb21ae5093d50bcd66134b8f4ec7f13bf247ad62cce08be86f5e112932f5933eaf058e605c9657ba4fc978e3a1c0f7ad7bfa9f69270789b4a0e3289
 EBUILD libnfsidmap-0.25.ebuild 1041 BLAKE2B 7c070c248a742cc2accf30be188657705e28cebed9ae8cbc83b3871d40f642aabaeaa4a8dc0f5e4aed8d66a35ff77907eccbc426bb5fe6e507f155ddd9726233 SHA512 b4729a00a7552f9643cfeda532564ee206820c1ea59f54c938117c5b70eed67918fa96224693c277dff3c09cff7e4a2250af0f23e4d3338df77036c8549cf234
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild
index 594bed9aaf51..5c5e891191ae 100644
--- a/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild
+++ b/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="ldap static-libs"
 
 DEPEND="ldap? ( net-nds/openldap )"
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index a00d1b3a8afd..6337156dd355 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,5 +1,5 @@
 DIST libsoup-2.56.1.tar.xz 1806416 BLAKE2B eb10d76a92912dcf8f450d6e8449e2aec26936ca1b706d16351ead4174f0cc107e6a2b43b96bf75c16106f8f4b24620bfb07814162390eba195b8a9f56a338fb SHA512 5ac087eeba346c27e884a2053a4f8afdb2fc6e432527f4494024a7edc4eccdf145188a3faa64e3f4bdd98af2fcb98914e494b4ed24f92cffc2ff1485dce7d693
 DIST libsoup-2.58.2.tar.xz 1815256 BLAKE2B 23c6e40f91a2dca13fcabe4fa3af7311874cbe06962c6cdc93d8d8d0a998d29cff9e7ce61190541b6114b4996d758b7c469b0354a6012856667e9541a78177cb SHA512 85af6fac87343bdd22312518402144d33916225f60d6fa158efdd84f7ee7ed1f9895989b3558f711c9aedc93cff35a4114ad79d6d2aa19c54cb326f162a4c7de
 EBUILD libsoup-2.56.1.ebuild 2726 BLAKE2B d8451ad0baebc1441d8f9627107abbc78bdf965089b94b9286d951357641eeafef784cfb4f8b31a69510ed6b597a308a848edde02a6307e6a77cbbad7215a122 SHA512 342ca26d36901023c260c366b4dc97a003f88b397c803680aeb57de39129b48c8e12ad338673872ff315796da703ad782d4e473e658d690133247461a589b753
-EBUILD libsoup-2.58.2.ebuild 2887 BLAKE2B 73efd40daca67dc04b249613fbf74d752b2b1318eb9fab0eca3ec8a1b375da3a1f2f0809af27294f3906a66f5bdea5effbfc239ccb563c67848f2599bf616dbe SHA512 d86c8caf2aeba22ddc889244beb66146af323ec3917bf2f21f1b44401ca3576ecfd2e1a8a188402b54657278feb498968d60989dead4da848a75d180afb08442
+EBUILD libsoup-2.58.2.ebuild 2886 BLAKE2B 767b75fb4bc258f4d425f6539942b1703b84953d83e9d48cf98f3cb435ae9dc5bb69061dd216e29474abe3b1df11361664503e6a69443f7538637c6c45280382 SHA512 1492d34c2ad82d0f79f837bcacc70fe5fd2e058bda4d7ed1dbd8ff30b052e5e7d49b8c1c9a129b4b8d6b371842fad4f882ddae5426214e3c6bfda62baf9ac32b
 MISC metadata.xml 402 BLAKE2B 19f91e3d9de7ec450d9c60686a443e0180d3f36c5d9508d50ef55f64924fa4b7e6f143e7fd5c25b437bd4a1d85e9a1c8aa8592b414c73935084fa6d93aa18f55 SHA512 db900ca6c6904d8c293938f6cbd25a39aa123273cf42dd6f5c670635501c81af94e0c4076ca45267c2d8861ce61b3189900b3027c6477d9e9b6d3c093006ed9f
diff --git a/net-libs/libsoup/libsoup-2.58.2.ebuild b/net-libs/libsoup/libsoup-2.58.2.ebuild
index a3ff1aff8ea3..c9e3db367423 100644
--- a/net-libs/libsoup/libsoup-2.58.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.58.2.ebuild
@@ -17,7 +17,7 @@ SLOT="2.4"
 IUSE="debug gssapi +introspection samba ssl test vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index 7904ea4b5179..b392e7c4eff3 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -2,8 +2,8 @@ AUX libtrace-3.0.20-autoconf-1.13.patch 219 BLAKE2B 5b342005bc1004c0d85a59e4e815
 AUX libtrace-3.0.20-tinfo.patch 474 BLAKE2B bfbe8126fae0ef132671c24ae4a0a44fa5204e95e7aad330c9b3afcb033e65a95c135b09b054a7741f902b2aefe31fa5b953d62a95bb41ff227b3281956e55c6 SHA512 eb0369b9b8a273e47189b63ac90e9bcfe3a10532343efce8b5ab1d79c84a427dbd6655683c9e7b135978e703567603eec12d1314dd6bb44c91c716d166c9b824
 AUX libtrace-4.0.0-no-examples.patch 282 BLAKE2B 0a3f3a4a33490a0a7956a1884bfab647f9498c655b394c68505bb6a9677da98b3dd62b5b499e13c6be4d975cef68b95ba2874aa08edd9f121bf1f637829581d7 SHA512 f000efc2de1e46db5fa486e3640eaea95389f09e22c46b903de2e88d8f13e2421951a9f46f9cf90f5989cbd7f55cc0e16e8e038c872241d624219b8e85b86f2d
 AUX libtrace-4.0.0-with-numa.patch 655 BLAKE2B ac290763914fb35b0638050183a0bd1e8c99a6b7679715eeaffebb584616baffef7b76a4917f8bfd7b02c3da1720fd0fe77427d84d6a43cd2e67ff2b6b20c493 SHA512 f6d0dbd63b2ca7055d001612c73af3c8f0fc6eaae0c565607d241abfbc9457f3fd739aad5f7933a8b281ebf36f601534a648067a62b0582eb6741fcfdc68d5fe
-DIST libtrace-4.0.1.tar.gz 914773 BLAKE2B 763fec75fa68789a278e5b4c08f57ba413074c876d86bfb72ceb9ac31280a2e7bd2d1854710aabb2b4b7e0f46cb1cb8faf77c6564689041eacf336173559d722 SHA512 ef8c0fc5b07f2af2960d7be32bca9b8025357366e09977df8472abd957324a66f932f010acae01f1657bfe9dd917a880daef6c12ecb9a9b2cf7b74bd0d52be14
 DIST libtrace-4.0.2.tar.gz 934255 BLAKE2B 776761288aadbafc812695db9b2af7f2ace3789925e957ae5bd6bfbdb883e49af324a903ea66e303e151300e8a31467b270a45e2dab4d8af1fe2b0e981f188ea SHA512 246fb1812b9c46b7ef543c16159849bb420db633b0778a375f616286cc26988d42542dcecd47256c03d637ceaa97d60168f0ce34b9892d957a3bcae89d984514
-EBUILD libtrace-4.0.1.ebuild 1124 BLAKE2B e82d3a2736cfe68d8fd497098eb9c45f359637c5a1fd809278c637e550a12f0c53f4c2b584fa53f0059be1dd7a6c7d111016c52d248eb2c924d3b3ef738985c4 SHA512 24767e5b0b9d493fc407a98653a3f66a06c896b86e0b0bb0a5c049454743f5fd501649905f5ac2a8aedd4bb9746a9a9045bc42d31e685b858c3ff9b7ba3b1ec3
+DIST libtrace-4.0.3.tar.gz 938865 BLAKE2B b3f7cda52f18fe2905f53af61459c238fe2630c1ffca8189ed73c010a6fd057f04beca9979fc0f515de4797f1aee383b57ddc63dc9a08a88bae5946a9949f010 SHA512 08da665ed355b48daa006119261af7dc1c1a64c193efcd736e91394753f4b3c46af074044d970242d2396389577d92137264acdbb6ab70cdc69a6e3965f742ae
 EBUILD libtrace-4.0.2.ebuild 1124 BLAKE2B e82d3a2736cfe68d8fd497098eb9c45f359637c5a1fd809278c637e550a12f0c53f4c2b584fa53f0059be1dd7a6c7d111016c52d248eb2c924d3b3ef738985c4 SHA512 24767e5b0b9d493fc407a98653a3f66a06c896b86e0b0bb0a5c049454743f5fd501649905f5ac2a8aedd4bb9746a9a9045bc42d31e685b858c3ff9b7ba3b1ec3
+EBUILD libtrace-4.0.3.ebuild 1124 BLAKE2B 22aca088a8e8080ca49b4d5ce979448f51551d2ce5d5debb94454774bd724e4fd52f2e54e6b1761f669191725fbc6767d2bac156e016712aefa1f144df68e588 SHA512 4122caf1b4f48f168ce6384c61dd65f5d480c09981a9e4974306898633c2c83a0e7c49563d846437c8ea82dc2386cade4205a48071fe7ed3c76dc48ffa0d3c74
 MISC metadata.xml 349 BLAKE2B 848cf78c8b1c684331f7d0e4ffc027c3b2db879910b09b6573dfc5c19669e783a98a19e70a56d205dd2a256c7dfe3ab7e3cf411642674da0462f9f46510f4466 SHA512 4cb73fcfe0a021f618da0281bf492f407459d637e7f58ccb5a698f3612f9c8c19ca90d1449f17c9c6c47694b6a19ac8c5c80a285b1662208c6c18de51afb0ac4
diff --git a/net-libs/libtrace/libtrace-4.0.1.ebuild b/net-libs/libtrace/libtrace-4.0.3.ebuild
similarity index 96%
rename from net-libs/libtrace/libtrace-4.0.1.ebuild
rename to net-libs/libtrace/libtrace-4.0.3.ebuild
index bb592018d475..a639a3ebd159 100644
--- a/net-libs/libtrace/libtrace-4.0.1.ebuild
+++ b/net-libs/libtrace/libtrace-4.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index 5e5c5695ad48..76a271370756 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -5,5 +5,5 @@ DIST mbedtls-2.7.1.tar.gz 2040225 BLAKE2B 5743f1bdc9af8dd4425c36907d4cfa4a07ab6d
 EBUILD mbedtls-2.6.0.ebuild 2416 BLAKE2B e9f164316f072fe0648fc77391f78b14bd25fca8aac75172f086678592be85266236ae28e252d0595b52165016153f363f0b5af2ab799c544b9531070136031e SHA512 3ea0c78f51c759d556e68c51a5006d09004c98e04c7fe331b01b586dea921e39079cf00e7a6399a175c0b51bf07dec05c6a08ee54e622c35602fe5aed1f7f1cc
 EBUILD mbedtls-2.6.1.ebuild 2426 BLAKE2B fa77e8b8060ef1cba7e0dea4ba0da72b1f731fffb4194eb1d3c1b88dcd9f475e5d77a9113b825549ce1cd39bf3b2f8fa6907b862cf5ed2cb53e5f4a65214918d SHA512 38486a58add1060c65a0f190cb7b9e7327da8dfa9a3c05f93ee149b5e68ea9bf02d0acff502264d0314986e00a18ca3247f39adf4c6272fc1f6c0dd0cc0248de
 EBUILD mbedtls-2.7.0.ebuild 2426 BLAKE2B 3876ca38f5c8df3b858f4430bcf45fa5453876378fadfae9b06e0af1418c7dfdc853b9b781c0f12af47a6c2bc518c48203ba0f1bcf5fd05209dd831a33e82688 SHA512 d47bd79f91aa75bac1c15d945a01bcb1fd1df02641831b5579d52185c92419b3fb4a438be0968c4995a53ae360fd04e425b1ecc700cae42f6b92b4bb258face8
-EBUILD mbedtls-2.7.1.ebuild 2422 BLAKE2B d17ed51890bbe6c1bb7afd1f4c2854d1b0f6cfc04d0773acfa764ebd1f49cd76d16bd61152a33ff167aae84a5dcc471d63f1e0a851ad062b28efcc50c1a90669 SHA512 c55484d18e0f49988a8429fe466c8c3692d766e313101749afd2d91d26571f992db67778a0f2b3223af1bcdb6a3f35511367e136726618208a4500d433eddeed
+EBUILD mbedtls-2.7.1.ebuild 2421 BLAKE2B 4ab033812deb57bee8a03888364dff69007dbb2b8bd8a25626351cc3bb431f9a88fbd2671b9d6e708b2a1144ef562bc02dba3abd76d50b704ede8a820a7edb83 SHA512 cc3de43c61eb4d6fa138f6dde859410559138fc8873d0d5910f6a551409145153fbb5b832d9633319e5f29b3ca9b45b79a6191a4c40ff9c24dc57eca71b955bf
 MISC metadata.xml 749 BLAKE2B ae622270ab3325ba6eb31b2699f2a470f348a4c7fa45dd1d11c7e022ded38bc57acb1357082fd57cf951b0422e0b5e08157acc6ebe841db9a5ef23ba9a3d9df9 SHA512 b1d9eb197d6c904a964bc21fadb939a2cdffaab0990c2254ed57e4dcf123353762c860ce36109072a192b3b31dec25b9c1236d209f42b2e95bcedb1e9342e3e5
diff --git a/net-libs/mbedtls/mbedtls-2.7.1.ebuild b/net-libs/mbedtls/mbedtls-2.7.1.ebuild
index 460a6ad7601c..f8d1a841555b 100644
--- a/net-libs/mbedtls/mbedtls-2.7.1.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.7.1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/10" # slot for libmbedtls.so
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="cpu_flags_x86_sse2 doc havege libressl programs test threads zlib"
 
 RDEPEND="
diff --git a/net-libs/phodav/Manifest b/net-libs/phodav/Manifest
index 8aeb55b441c3..b8671071f2c0 100644
--- a/net-libs/phodav/Manifest
+++ b/net-libs/phodav/Manifest
@@ -3,5 +3,5 @@ AUX spice-webdavd.initd 344 BLAKE2B 6a7f36f4f698e5327455b3e95a71ae39df56f6d57e8d
 DIST phodav-2.1.tar.xz 293128 BLAKE2B bdb175812d742189b1efe5589f63a1fd50a18d7f1a59e0627a0eba0c8a82fd110bec1d434519c362a2d232680b3040c47768d9f960236c20dad0e036b7433529 SHA512 e43bd4c9ed97b7454e8452246c37211905b4cff430e91f3d2d36182736e1b8924d6ad477f58f110c98b85f02c085cd12c099020a0bea8abb19e65a9d52e1f4a8
 DIST phodav-2.2.tar.xz 294216 BLAKE2B e7062f933f407dff339b050a8b735e733fa41634cc34b0a37556b283b941ff620ae59a2ed3b7bce41530195f33a9fb3113f89e37190bb046352d90d72a750468 SHA512 1d16716c1bda674a6695b651e9b1bcb4b7cfefd9b60291ed3f5691f4f6f45f68a970d99fc4820bed0484cf0a43c1bf32e4d208fcc239ac0c0b7a75bf779e8913
 EBUILD phodav-2.1.ebuild 1255 BLAKE2B ce097cfc986614406a34dd30998b32b45d3b3b05b7e569b82cc0e3715f6cbf3f74d46cf8af45deab1f9ce3f48fe100285e674f952b723934bf2410f5c10373b6 SHA512 2a09d351e0b45efcb5efce2d58fe6e265c4e98d54795ff4d89c0751933534e8dc8dc0ce69031d7361f14155c822dcf90e6f9d322caffbf25c631729714a8fc1c
-EBUILD phodav-2.2.ebuild 1517 BLAKE2B 5684a44e1061b57b647c203e26581e9ba4622b1e01e099488aa1e050f30ddb9d4b38caa9dec38cc2b42a5d012e67bd8116c12949b7088096cc799d6fb0e983e8 SHA512 ab4b0dd9ee1761e0560cbf88b4323815be6540d060c584ea68bf28eba078811b48f255149dac79a10eb8a7bfa98df1147896828130e520e730ad1cf34908a6a0
+EBUILD phodav-2.2.ebuild 1516 BLAKE2B 54a74c3728ec355bda7fd24c3bd8546b2b5b14d5e13cc77a71b65ffc5ffee0049367a8fa626e3848ef4fae95f1303655bee8d23f18ceed705e18b884ca039c19 SHA512 11161ae87988747f8b057b476d77cf1d14d0a5de5d8be600a9de9fdc094cdc70b847ca0d6937089718c2fcacf41a4573c2152c3a9f7957fe73fc95f97abd4612
 MISC metadata.xml 466 BLAKE2B 81d7512b98e6c1e300131546f378edffde1f5206fde50b012cda0167df1ff4e16c7f64b5362b2dfa6797c2ebabfd8f89f88fe2bd01f5c0d3397ba1f0555b00ea SHA512 835e6f875a2540a0f6761373e568c6e24bb60ab437164638f69e238c5eba8413cd3752a19aab9ecdbbef4f1f0927d00ee11a51f8786c54feec401426ae76b6ec
diff --git a/net-libs/phodav/phodav-2.2.ebuild b/net-libs/phodav/phodav-2.2.ebuild
index 03d13d55eda9..57575f049aa6 100644
--- a/net-libs/phodav/phodav-2.2.ebuild
+++ b/net-libs/phodav/phodav-2.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/phodav"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.0"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 x86"
 IUSE="spice systemd zeroconf"
 
 # It included g_uuid_* symbols of its own from an unapplied patch to glib; now that they
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 942b4aaae94c..595157f41771 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 77999aab1b6a..5b0a190fd6c4 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -21,7 +21,7 @@ EBUILD dovecot-2.2.32.ebuild 8655 BLAKE2B 9f500ad24385b63fe899c6c66e546d6e3f68f9
 EBUILD dovecot-2.2.33.2-r1.ebuild 8714 BLAKE2B 0a7b8dda66982939f2c0ad11afbf1763fa58601343cc566e5ac747544a3ca34108c28a632e51b03c430602619c50423f3eadc287ef539d9fcc60b76308ff2fc8 SHA512 bea92573cd2c32e7d55340bf1e7208bbb1813d0d4b17db058d44dd1ca10b723abe5699f01cb0ccd8cca0b1d862b16b135d2e635efc9eaf196230bbe6d9a34715
 EBUILD dovecot-2.2.33.2-r2.ebuild 8779 BLAKE2B f88b2377e49c274e89a48c9c23fbb35e273d58a12f8c8aad042786e6bf3c91d705bc3fe12e346f07663256811167d4df1de989dea273d12f9ae0445e245882ae SHA512 b5a1cd24cd43e22c40a0ffc7a729c8434347311d3cc2d549962b19e6897b1c2133bf105e3c402d7b96ff55e9ab6d0c0b7a4783c0d1e1c03b4ca931d3184769ba
 EBUILD dovecot-2.2.33.2.ebuild 8660 BLAKE2B 8beed06e576ce5594f91ca13447c84ead235075f6d12f87a9338a2e5632e5afac51d587404430284b573ec6fdcd376538c97d2d2dea794cc9fe782042161ee27 SHA512 053b31826af33a07e35ad11c7c13ec2144544005d9321ddeb8441fe18bdf9382ce9ab3654fe3db7f94e2c76301a363a485a17b7391cb56ff2779267fd2b3d664
-EBUILD dovecot-2.2.34.ebuild 8657 BLAKE2B 17113adf18b700badb6b7c614e310449cd37a08252761e43bc96cb9d8c2464624ce04956f49fb63114b85b6b888e0391bffae4c328a85c285ea447ab1bedb02f SHA512 85666763f92a63702216d9fc43d48e7c0d6eec8b5a10e56564c95eaeabec7e7113b06f11cc78984588741e435705bec55acd2baaf3130416b619def3613bb8c5
+EBUILD dovecot-2.2.34.ebuild 8656 BLAKE2B 1f24825bf5b412c99726e356ea76feb2f68d36ea9f6337b5b0960e5895aebe18c22f326a6cf5d71f90e16895c8b9ec7b4d177ab4e071e51edb34d97d16cf5895 SHA512 988b582adcccdfe22c1c3daa62bfd338efda0f78faf17da1e0a771333f87c7432f5bec245dacd528c2d7ccdfbf7cc1bb8435c3022920347fb1e9f5122302f9e3
 EBUILD dovecot-2.3.0-r1.ebuild 8685 BLAKE2B 8296cfaa7e412b2aa564974ada73992454c051645d43c56dda17beaa82973a60cdcbc358e1f5a032c1ae4065b7a2027139c113a7d0a4c8708cd66fbe045adacb SHA512 6953fa643b55f68bd218054a583f93896e5938c28130d6d79c568fb62d1c89f7d4a4a34e3bf893834ad54d617aa107a159a5ef310f4bb04be1d0609fdc74db6e
 EBUILD dovecot-2.3.0-r2.ebuild 8748 BLAKE2B 25b7318d57283d51505243da55f5e4d3f1d93c98cebe7fc820bce2d9205369f5e00e663d2543149368db07c595f74c943882ea2de77de108229795779cc93d0f SHA512 21cc80f6f79a6fc6c593a724356c17d15efda167f8af5943f9bef3c3dd97b1493618cd100cc8fd33ebde8b357f653cfb410e6c12fb16d277257567f53e47d156
 EBUILD dovecot-2.3.0-r3.ebuild 8806 BLAKE2B 6df9cf96cd9997e8241aafa002969e161fb4069cfd1dcb17322aead6809299e10b3ed0b63432d23f2c346c4b43ac6612c1c6c3a42570b83de04539bc839e0a9d SHA512 965b36f1d7ea429fc3cf82ae7d95a50c156ca19347d5f922650b5eb028fd41dd30c0868987c211dc26d150e22588da8eedff45cc8484db2c11704b8f0ddc097f
diff --git a/net-mail/dovecot/dovecot-2.2.34.ebuild b/net-mail/dovecot/dovecot-2.2.34.ebuild
index 3deb48771683..021cb8adcb55 100644
--- a/net-mail/dovecot/dovecot-2.2.34.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.34.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
 IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 837bb438759b..3f7557f676fa 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index f24a445a3d7e..9e43a8a346bc 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -40,6 +40,6 @@ DIST dhcp-4.4.1.tar.gz 11164378 BLAKE2B fd3c65d8802c42cb936ff75ee19784e4f533c9b3
 EBUILD dhcp-4.3.4.ebuild 7914 BLAKE2B f6f94a7af0aa70428d5fa6e51ab8ac79f25fc25f094694d0ab278398c52c6021d8efe5fa1e524751ba8eb3db214e97660146175ab6e2d91bbaa234a619266087 SHA512 434a6523ec0e3f56889c71be0ab919c4282f3843badc4c8a08aba6634175eabfa4b9921602dfce7147a44f5dc215060fe335b7bec1435364cafe159a6e23bc95
 EBUILD dhcp-4.3.5.ebuild 7884 BLAKE2B 6ef306e4226389e05c904c74866918952ef16cf1caa2f4d23030aadcdbd259b8bbccb33df10daffce498fae9a189f1f8a6821a8746333d315bd2273c0cca6ed3 SHA512 d52d3ec0e9b046c29994af0af0cbd5bdc63cf040c7a4f8920d5f9f59d82223882df2cc6fa319d00a40d6b28b1938656587d9066942470fe0fdb812e732137a78
 EBUILD dhcp-4.3.6-r1.ebuild 7823 BLAKE2B a28cef0d32954b13e1f6a963e419616c656f1c8cc97451db95d922a13a86eec908cef6858f9b6a080ad94c437211ef639fb016d4d52e040f5fdd9e5bd3868bab SHA512 f9e6247ba9ec67c5f8a93f8eae87dbfde8e9754bf621eb48d7641fb42d0ca6bffa66ae7d36bd984c168bab7293e3d73b7d119b96e1d0889181cf2c64b912d522
-EBUILD dhcp-4.3.6_p1.ebuild 7819 BLAKE2B 516575129a641554b1cca35045d2c5a1e54264e499949f8f495a09a8430891ae843f9d4e417102451cc546c75724e4c56123e2aff8769dd817fc2a85edf51cb9 SHA512 ca9c51f85e08c006abb783b09877fc4810059af687631737da8f408dd63dc9621dd43768a1f1732b248378ab8d40e3f5d3ea043acbbb1c56c5ec2e0deb91103e
+EBUILD dhcp-4.3.6_p1.ebuild 7818 BLAKE2B 90252df77d6c39bcbf987539ebe48f6ee505fa84d0a0ece437a0df8906b0875e04d317f6e96483775e74d27a341c79c3967773dbcbe1f26eb627171926d79e2d SHA512 51fd796f8282193391e179a913195e1d54dc9afe7ff58d1e6806d088289d7f4034eb77e6a54d96a175a7f74ea5a8bd09416a87f842c0f164b668e148f7dee6e3
 EBUILD dhcp-4.4.1.ebuild 7926 BLAKE2B e0531baad9de9fa0ee437744ef35a7a747f29b8bfd490822b0c195423e7e57495e45bda40d59dbc16275b9723c43068d07c612e47c3e0753cf0952efcf9751fa SHA512 1952f93d33bb5e4c7f9c8bb7ebef4cbb1b279315435f8404405e824714c9c1ee1a469f7bd36732564f5b540a895539960e29b24160ef8acb729441835990f3f2
 MISC metadata.xml 669 BLAKE2B 27f8b039b9fdca5cb487c31d12bdfe550efff35a3705ba3fd20e6a783c70e48d4d6ca26fdb966230517bb0f3182da2df3d565396e2ced70f6fd94b15a1d4f601 SHA512 854b5b781642506f45df585d2072a79164620ec16e2b59abe2ef55e474f229d676f69f4820b4db1f6dce04df55bc5e3a20bcff959a34b3cc41bf61cce31f1efd
diff --git a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
index c5e7456891f2..bcadccf48ac7 100644
--- a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
 
 LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
 
 DEPEND="
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 6f169641732e..767cb63bddbe 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -6,7 +6,7 @@ DIST dhcpcd-6.11.5.tar.xz 198080 BLAKE2B 3172fcb1c09c3bb7fcf4896c6e9896744a8f4f6
 DIST dhcpcd-7.0.0.tar.xz 207924 BLAKE2B bd24f22b4852596ef4a076d1ab15ac4411dd676ba8cbfdb4b1ba29ffe1bff2d18be40369c1f8804bc01988bb30b89ee1030ea95ddb48fbfc04ca06372b317d9d SHA512 f2ab1fcb2dad0c93da757c15d0b772b40cc15c8e59161d91684f06961cf7b515473d7c3fc5973b7755ac525e6851abdf8a5f27760bb5d28fe17e90ff0feaf904
 DIST dhcpcd-7.0.1.tar.xz 207908 BLAKE2B 1a9350a0c4a9eb1eb6f5a7be78beb4a5fecd802ee90a4649ab17db69eabc75a913b9f3db97ea6260bcad3516b9613c20f74d9d68a7ac98b508458e5cd30cf15f SHA512 d2a9b053aa663dd1ed38a10a73ee3377a3a076c9638bdda9331a4c161c2ba87f5f68f366ac8e1f1015404f617b74261a03a97ac7cdfd642b4a41b87b54984c34
 EBUILD dhcpcd-6.11.3.ebuild 3277 BLAKE2B cba51124fe3369c9dce1c5aaed67f99120c5514230212c0b375156aa1af3a59a272cabd6012e071bfb33666876562f645ce575e096e4d3d810d5c3766f38d3ec SHA512 b83545d0c64adb2be1c1a34beb0018fe21f0b0bee5b2dc9bfc1ed16f9433c213b3fed1cc5db3d63ba65fcaaec40bc19217cb110af84654bd5e6e2f66db21b6cc
-EBUILD dhcpcd-6.11.5.ebuild 3285 BLAKE2B 14590d4a8a9e719919be8d47a163da84be0211bf60bd30f4abaf5291cee7e20854628dc8db66820a4bdd9397a94c3a0f110741ce46ad52c9812d1d597629e83a SHA512 d966c15bb465d092b4752488e52ec4d7a4da9024c45ffdfaef5035002ea81a3e009f4782c6f3ad89c868173231956c0470058b40ecfa665fbf837d1777c21c0a
+EBUILD dhcpcd-6.11.5.ebuild 3284 BLAKE2B 545975e52cc574935fadb61fe76cad6c80160497daca9043b936b0a8336c7be86b53f1a15d9612843dcf54939199beecc1246ad46d4d6eefc9da77933a6e538a SHA512 6ae7aec0c5896dd071a283f60ffd619db5aaec2e2e73d0e34bdbafa305277f38ee47ad53f474036914de45e6d528b99097965be62309e6f509d6f3cfb2bfd5aa
 EBUILD dhcpcd-7.0.0.ebuild 4447 BLAKE2B fe90c2b3f429f5d41f47238eeb08f705155617b6f85f1505bb62d2e07089f38ce69d860b79b82e14e0457cb05b32f3bbd6229da689138c13123adfe7d7b8f6fa SHA512 0c12c9f1d198bb3dba8b6f1788680f47e647d442177bc0bf5d635836908882e43a1d5d4515521d1ab1bad16218a117e7836cc3ed20eef6390c6502d1327caec9
 EBUILD dhcpcd-7.0.1.ebuild 4447 BLAKE2B fe90c2b3f429f5d41f47238eeb08f705155617b6f85f1505bb62d2e07089f38ce69d860b79b82e14e0457cb05b32f3bbd6229da689138c13123adfe7d7b8f6fa SHA512 0c12c9f1d198bb3dba8b6f1788680f47e647d442177bc0bf5d635836908882e43a1d5d4515521d1ab1bad16218a117e7836cc3ed20eef6390c6502d1327caec9
 EBUILD dhcpcd-9999.ebuild 4447 BLAKE2B fe90c2b3f429f5d41f47238eeb08f705155617b6f85f1505bb62d2e07089f38ce69d860b79b82e14e0457cb05b32f3bbd6229da689138c13123adfe7d7b8f6fa SHA512 0c12c9f1d198bb3dba8b6f1788680f47e647d442177bc0bf5d635836908882e43a1d5d4515521d1ab1bad16218a117e7836cc3ed20eef6390c6502d1327caec9
diff --git a/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild b/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild
index 1b5576761902..9148380d1b61 100644
--- a/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild
@@ -10,7 +10,7 @@ else
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
 	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index dd8d770a0087..b59dd19fbec0 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -3,6 +3,8 @@ AUX dropbear.conf.d 190 BLAKE2B b89e59ae84f23f00162d78cb900e4fef05fe01123a6ee753
 AUX dropbear.init.d 731 BLAKE2B d858b35872eb72dacb85baed47882a9909a2530e3a9537a10adaeaf3d77da49808fdb8490124d29379c7b61272ea7d1867477046c1700d3cf216b4fc4f8c8f25 SHA512 5087cdb36194d55bf6d5ce27852b17f1ebe06840bbed37789cf162a618fb3c56c9dffce01a8a75f8574f8d9800a12fc2e1b725ca35352a836324579c8b704fd8
 DIST dropbear-2016.74.tar.bz2 1622234 BLAKE2B c729a2c1afd13e1ca07f3c9cfe3ff0ea7888cc1687ea2793275134b3224118164ef81583f55dbec53d6322be53eaa7a7324216133919722390d0e2dfbd929f07 SHA512 c0f4ea7840077b8302b48e27b5b588a4babac6583740dfdb845c40f633aa3ec96174d1d2ade81d2c3e23ea99b75e906312c512d8c7580e6e4105b2dbd37e5e22
 DIST dropbear-2017.75.tar.bz2 1623392 BLAKE2B c024037d3ebcb3f16aed2a5f24e07c06699a510b327a0ea528db7160ad2a8e554af2a233a266f869e0e30c78f3b0b7792a817d9c07f058f605dbf2dc749a4fda SHA512 9c2f2a5e718339f83abc0ad7719bda12bfc75e5bcb87a7c0eec0afefc743e5c0a1575d290d5fde152ff2100b0f0e6fd5ef4431f7bbcb5ca9a332d93c20f5a8f4
+DIST dropbear-2018.76.tar.bz2 2688697 BLAKE2B 1c22d38487e94427b2678d070f8d370eb09bb2d69253fd6f76d8d80fd637ff86a44b00ab42e1f6d84042c72cbcbd4bb6cbb415f961502e0437c7c8c1b812f059 SHA512 82323279f7e78c366ba1ea07ff242259132b2576122429f54326518dd6092aba8ae5de4a0b8a3cef7efc3507015741abe2ac23376c03b40b247527da7a88120e
 EBUILD dropbear-2016.74.ebuild 2476 BLAKE2B 41d21f7aecf0d056a63ab5150af700d2fd36659dd25f29dc67cbb7acf852ee4e583b5ef1c7f2c74710d5409988ed91a4e3eecb2e9821911cf5a8c67cfef41795 SHA512 a1bf33919cce4fab7c1b23dac884db81883555eb9c249f30e5ff96cc856375e3849b18350a52abf7e78bcb3fc12418ad2d86508cd396562230cb155fb15f9420
 EBUILD dropbear-2017.75.ebuild 2489 BLAKE2B 2094e7d2f7b618a069cbf60cefe44da2a28c20fd89e97adad8f3c064c7b45f84a1167e434742d2867816640c4807fa2752b2412ac86227cd1d6a4432d392fd34 SHA512 10ebe3595920705fbedd1e79a10f6ca0a804e92feb9ec37e82a4666934e9b04fa6d6b7c154adebbb78339a4e82af120aecbfa7d655beda33b46384faa07da0bf
+EBUILD dropbear-2018.76.ebuild 2624 BLAKE2B be125d92c97eca0b2798caeb6357a854683af3ed62353aac7c988fb1dc6ac722d92a7a1a72ddee5d5d16b7e4b2f0707dd5498b27c9999b94b8ea25254e40ee2c SHA512 77a7488f5b18d326f504ea71219d4c38d8a48f45cdd0a846df8c882516413404983f7b60740b43f679c329622355bbcd4183f72f7032633fa4409ca74d46131c
 MISC metadata.xml 1791 BLAKE2B d5816e2173f3fe0177562b1ef7e36c6ec56c4d596c27231f02eaedd41eba091abcff7cb0e0114d5431d735b011fcaaabf01e5e70ff61478c669232243bc7e244 SHA512 1f99332f1f194f989838dc5c04fa1c7661e13da3efa7b98fa6392ab3c3e6887a4a9c7319fdb43f102b2fb3cbc0ee70e79792b595c2f49d2bbf4e50be3f362314
diff --git a/net-misc/dropbear/dropbear-2018.76.ebuild b/net-misc/dropbear/dropbear-2018.76.ebuild
new file mode 100644
index 000000000000..d2800db5b260
--- /dev/null
+++ b/net-misc/dropbear/dropbear-2018.76.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils savedconfig pam user
+
+DESCRIPTION="small SSH 2 client/server designed for small memory environments"
+HOMEPAGE="http://matt.ucc.asn.au/dropbear/dropbear.html"
+SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
+	http://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib"
+
+LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )
+	dev-libs/libtommath[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
+
+REQUIRED_USE="pam? ( !static )"
+
+set_options() {
+	progs=(
+		dropbear dbclient dropbearkey
+		$(usex minimal "" "dropbearconvert scp")
+	)
+	makeopts=(
+		MULTI=$(usex multicall 1 0)
+		STATIC=$(usex static 1 0)
+	)
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.46-dbscp.patch
+	sed -i \
+		-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
+		options.h || die
+	sed -i \
+		-e '/pam_start/s:sshd:dropbear:' \
+		svr-authpam.c || die
+	restore_config options.h
+}
+
+src_configure() {
+	# XXX: Need to add libtomcrypt to the tree and re-enable this.
+	#	--disable-bundled-libtom
+	# We disable the hardening flags as our compiler already enables them
+	# by default as is appropriate for the target.
+	econf \
+		--disable-harden \
+		$(use_enable zlib) \
+		$(use_enable pam) \
+		$(use_enable !bsdpty openpty) \
+		$(use_enable shadow) \
+		$(use_enable syslog)
+}
+
+src_compile() {
+	set_options
+	emake "${makeopts[@]}" PROGRAMS="${progs[*]}"
+}
+
+src_install() {
+	set_options
+	emake "${makeopts[@]}" PROGRAMS="${progs[*]}" DESTDIR="${D}" install
+	doman *.8
+	newinitd "${FILESDIR}"/dropbear.init.d dropbear
+	newconfd "${FILESDIR}"/dropbear.conf.d dropbear
+	dodoc CHANGES README SMALL MULTI
+
+	# The multi install target does not install the links right.
+	if use multicall ; then
+		cd "${ED}"/usr/bin
+		local x
+		for x in "${progs[@]}" ; do
+			ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed"
+		done
+		rm -f dropbear
+		dodir /usr/sbin
+		dosym ../bin/dropbearmulti /usr/sbin/dropbear
+		cd "${S}"
+	fi
+	save_config options.h
+
+	if ! use minimal ; then
+		mv "${ED}"/usr/bin/{,db}scp || die
+	fi
+
+	pamd_mimic system-remote-login dropbear auth account password session
+}
+
+pkg_preinst() {
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
+}
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index fe0a6dd6f2d1..25e46dc078ac 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,10 +1,7 @@
 AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad3294a927d8cbd708427e4aba8b6f62157a5b6e7cec8d7631a6d79ccd55616a9bca63003ef72f5 SHA512 100a9480dc086e18972c25bbf554e47737dae43989fc7fe1d01173c2570e64792e64fa7d52a93ca53f3e1248b3b335fd838b5c7713dae937e919f0e6a99bb132
 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
 AUX dropbox_at.service-r1 220 BLAKE2B 3e7111d8b49bc52626343960d2609f084032c8015c06d700883d47c8ce7569ef5bcb881b682c68a2a911d5f24bcbf554a0e098722f4bf0f1477b80243c6978b0 SHA512 ea685e6eb901b841e54aeb9b530d5a0d2a367d8b598019f7f0d2ae69b013be7cf3986c68fabbbaa30c51c9fb5406dc45b07ff15914c7cf18a7aceacf466328e5
-DIST dropbox-lnx.x86-41.3.76.tar.gz 70413240 BLAKE2B 1404c7975b9f58d288c8519c09734d3e0e52a714824158867d19a7965f0275e3e13d77d725ea030cce50d785f10ca6304e35d55ee89216a1a810f91aa732f4d7 SHA512 98fec83f92d5465ae61d56b0a02209d6145da1017c29d71ef4eb7e8684f28e6bcfadc77a055cddf7f5512eaf02d8235f1dc273b1f22deccbbcb70d7047ee8df8
-DIST dropbox-lnx.x86-43.3.47.tar.gz 108318530 BLAKE2B 0627385c672b4ee024c9062b9da837fad97e728d43afe6476bbbd5108eda4c729ac6230d2be8851381e3c3be98d3a86cb492719e645d9f07a10e579482eb6230 SHA512 23df4e4e2c3cd99d16890091a7c2d3f61341806241462b6ef095b86d5db4b663090e12848038c731014079dd77adaef47fb721b1eac8bc84e945daaae3ee438a
-DIST dropbox-lnx.x86_64-41.3.76.tar.gz 74449460 BLAKE2B 7983f0e48839fc6c3386b06c4380649e83977a2619bcc888b68a67b0e61996e72133935143a144798d5555595cd6d00063af3aef8c4b293e61eda18dff4ea96a SHA512 ea8cce634d7ed9e77d1d5f30dc7f89396d32783e3c3644d6fca52619d7cff958b407ecf21a1a6478091d148f1d0a42d68b6283e7dbe2652a48adb8f36554fd03
-DIST dropbox-lnx.x86_64-43.3.47.tar.gz 114389696 BLAKE2B 63ec9fe71516715340e3bf579ff40690a56fb3d2200dbf291f6f1f58f56885e115aebf87ea3b306d3682b634d418b6b30e45abe3a16d566cc53dcfcfc004bcba SHA512 e11b01cdf67e16593822d722a8e3d822e9a02a99036a938521bb9e31a2451118168e434e1924006d9629d7b2a847bfacd2d7b0b213d6e1c90fb92fa3378629bf
-EBUILD dropbox-41.3.76.ebuild 3067 BLAKE2B cc6b02df756cd8103995f4112862aac49323af5d8b1386e150cf569b22d099060bec8cb853af00282a1aad1be5738dc7b72f394cf80f868bf0734143d034e9e3 SHA512 3e483a2dabc571c9c761d86048ba2c11406cb9421d1616d021e916d234f1b77943cd7be6caceaaad9c781890ed2760e1b1e35afce67575d21e2d59298af6f325
-EBUILD dropbox-43.3.47.ebuild 3033 BLAKE2B c5815f972322253fbd9f63179af64c9f6a06a241ed652b45ffd44f28d86f93362c565b53f9670856f66255227d5a6d9b5cb9f86abd52eb82849e685f5cb7a1f7 SHA512 94f46da3e3e50fe095b0a11df0ba935e6f03bfffa981efd4b5262d9cbe30b03b423a556da8332ca765a0f9aafb165acd25178675be16990dd4be574bd43ea80b
+DIST dropbox-lnx.x86-45.3.88.tar.gz 108891513 BLAKE2B f72ea5663a2ea46b0c34294eb18e647f857c8769a3a341fe73b1d4d252a3c08f3add1613b0413e6909e3a5b770f32e473b3383a956c08fec78067736b5b66cbe SHA512 499249377c22452a8266402e6b4ab48f9a1cf1249c4354919a5861ccb7080e8df47d4ef7d757a1667b3511b82c9faf512de1aa1e2e35a939908f74976a728724
+DIST dropbox-lnx.x86_64-45.3.88.tar.gz 114967662 BLAKE2B 3276b3b20bc96eff3a756064c64b5a0e8ad28b27d29579dd6dc34043427bb209bc5d86be62651f6642f61af17388113ec9a1a4a211e3149ecb8679a4b8e505ca SHA512 d3a787487084237fff928afd6ec2192f27e196c589bba3c6bd8a501055d1a3d4c8dcb88b15336ea03bed38e2a02d0731bb9725cbb324bb6e00ec95e98ed671ea
+EBUILD dropbox-45.3.88.ebuild 3079 BLAKE2B 4cea1be2d51e713e471fe54411a54c6652c302085798fa67d696c72dab246615b7fc767eb278c08b6ff3feab02eac7945a9b4259bf90b1c2bef85e82993dd386 SHA512 e3e1b8989ccf71656e3fd2d77b747db3e66207dc80cae00ac9ac441768e1eebe87f44060874cdc349dcb07357d05ae3b5ea1998d5671a047d0fdef543e8f5fcf
 MISC metadata.xml 392 BLAKE2B 19f1d26ecc891282c1930e65db36adbfc73c6cc110dbfa1a90a6ed85f87dd1936860dd1710c3c3e2593df22fea34e5aa803a4b46a812e764563dcad19320c466 SHA512 35be87e089ea5aa62a5f90ac1241953df5c5115dc59258c7f5bdbacdb7a11938c79361c07e87d366f1db2af8a172d571cf2c9061885c60b7fa39a802bd31a141
diff --git a/net-misc/dropbox/dropbox-41.3.76.ebuild b/net-misc/dropbox/dropbox-41.3.76.ebuild
deleted file mode 100644
index 5b8bb0394c9f..000000000000
--- a/net-misc/dropbox/dropbox-41.3.76.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils gnome2-utils pax-utils systemd python-single-r1
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="http://dropbox.com/"
-SRC_URI="
-	x86? ( https://dl.dropboxusercontent.com/u/17/dropbox-lnx.x86-${PV}.tar.gz )
-	amd64? ( https://dl.dropboxusercontent.com/u/17/dropbox-lnx.x86_64-${PV}.tar.gz )"
-
-LICENSE="CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-linux"
-IUSE="+librsync-bundled selinux X"
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="librsync-bundled? ( dev-util/patchelf )"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-# USE=X require wxGTK's dependencies. system-library cannot be used due to
-# missing symbol (CtlColorEvent). #443686
-RDEPEND="${PYTHON_DEPS}
-	X? (
-		dev-libs/glib:2
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtdeclarative:5
-		dev-qt/qtgui:5[-gles2,xcb]
-		dev-qt/qtopengl:5[-gles2]
-		dev-qt/qtnetwork:5
-		dev-qt/qtprintsupport:5[-gles2]
-		dev-qt/qtwebkit:5
-		dev-qt/qtwidgets:5[-gles2]
-		media-libs/fontconfig
-		media-libs/freetype
-		virtual/jpeg
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXinerama
-		x11-libs/libXxf86vm
-		x11-libs/pango[X]
-		x11-misc/wmctrl
-		x11-themes/hicolor-icon-theme
-	)
-	!librsync-bundled? ( <net-libs/librsync-2 )
-	selinux? ( sec-policy/selinux-dropbox )
-	app-arch/bzip2
-	dev-libs/popt
-	net-misc/wget
-	>=sys-devel/gcc-4.2.0
-	sys-libs/zlib
-	|| (
-		sys-libs/ncurses:5/5
-		sys-libs/ncurses:0/5
-	)"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
-	rmdir .dropbox-dist || die
-}
-
-src_prepare() {
-	eapply_user
-
-	rm -vf libbz2* libpopt.so.0 libpng12.so.0 || die
-	rm -vf libdrm.so.2 libffi.so.6 libGL.so.1 libX11* || die
-	rm -vf libQt5* libicu* qt.conf || die
-	rm -vrf wmctrl plugins/ || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf PyQt5* *pyqt5* images || die
-	fi
-	if use librsync-bundled ; then
-		patchelf --set-rpath '$ORIGIN' librsyncffi.compiled._librsyncffi.so* || die
-	else
-		rm -vf librsync.so.1 || die
-	fi
-	rm -rf *.egg library.zip || die
-	ln -s dropbox library.zip || die
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	use X && doicon -s 16 -c status "${T}"/status
-
-	make_desktop_entry "${PN}" "Dropbox"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r1 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/dropbox/dropbox-43.3.47.ebuild b/net-misc/dropbox/dropbox-45.3.88.ebuild
similarity index 90%
rename from net-misc/dropbox/dropbox-43.3.47.ebuild
rename to net-misc/dropbox/dropbox-45.3.88.ebuild
index a4f6a2f6b6c3..1bb000a90cb6 100644
--- a/net-misc/dropbox/dropbox-43.3.47.ebuild
+++ b/net-misc/dropbox/dropbox-45.3.88.ebuild
@@ -3,18 +3,18 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
 inherit eutils gnome2-utils pax-utils systemd python-single-r1
 
 DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
 HOMEPAGE="http://dropbox.com/"
 SRC_URI="
-	x86? ( https://dl.dropboxusercontent.com/u/17/dropbox-lnx.x86-${PV}.tar.gz )
-	amd64? ( https://dl.dropboxusercontent.com/u/17/dropbox-lnx.x86_64-${PV}.tar.gz )"
+	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
+	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )"
 
 LICENSE="CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-linux"
 IUSE="+librsync-bundled selinux X"
 RESTRICT="mirror strip"
 
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index 5436e0e9e9e9..e9eebc99b8ae 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -3,5 +3,5 @@ DIST gns3-gui-2.0.3.tar.gz 5528039 BLAKE2B 05831031780a163f650a3eef8b4fd67629f05
 DIST gns3-gui-2.1.3.tar.gz 4792762 BLAKE2B 577381bdee06f967e4fddec3b0885920e8a25380d834ab1c983e010d40a14f63c69912f745bb72b4605e49cdf7192fe52ac57380d5f65f03d067a2f1dd03f7d6 SHA512 da90eea0920f9fc10bb5ea7e0039ca11bfaf36870e182a6b97ffdbab9f12da0d13b58c4a13ca747add675426324f3c1cde5eedbd858a68ee4bbefdcdff193904
 EBUILD gns3-gui-1.5.3.1.ebuild 1297 BLAKE2B b5189930d8cf8557c303aed8ef4eb4574a4061cc17ff2186ccfa306d8afc2c49da70c8ea8bdc64f41a0ba043e605886678d08b52e58edb45a28971714766ff14 SHA512 22caaff4f7e1c66379b5e6d0f8ea6be5a149e4c471503a34131308f4891f8f098c80ce2b3cc56fed877f0ffa35c398d100caf9500bf2116540220427cf7f29a3
 EBUILD gns3-gui-2.0.3-r1.ebuild 1121 BLAKE2B 136cd7afd962a8c646371e142541a8e7dc9f6f715ed2dcd2049f93cf7eed15cb7241524fcad3fcefe6a869ae4c72f54711376c7cb558d2de8456d2044301a036 SHA512 ffc3b9117a2fb85cc45f1f64f2e0234ff4d05e50f6ba8c9622eef4175e25b03ecba9f878826381ad045784bcc3741a81ff33827b6c702d7648ad3ed1d9488765
-EBUILD gns3-gui-2.1.3.ebuild 1120 BLAKE2B 0ea9305d7c3dd2ed12f44e79d50903fdc9ea65883fc4e522e88f292089b5a0e5971e925712fda8407e8a244084d9ac674246ff7d5b5d69e6874ed877c3ad10c8 SHA512 b757423bf34f95dab7935eba78fe7e807c6cf96bde57c474cca99b32d799ace6a4f046e548e3c281af2065ec9c69411e9dc19ea23cd8c4e1e8ec98378995f417
+EBUILD gns3-gui-2.1.3-r1.ebuild 1130 BLAKE2B f83d5c25cefd54c08125a0b22a0a8b13fb0b072832771cf903220f061b0e796427de874088a5eb027210833d1b928186539edb5ff613ad3dfb2ad387abdf98ec SHA512 08a42d922282d4755cfd68253ffaac04216f9ed79a54ed5dc90c8b6c423dea6668be9fc3749ef60dc54b55ae08c86148c2daa6c51c2fadd74921c0785d84f23a
 MISC metadata.xml 318 BLAKE2B 48afdefbfe17caa240dcf16634f6c6b0344cee5b3cdb98002a20440227655840d5d284e7f012860c9a5bc47e0873f9ca4628e160fd95459fc59cce965c39d62e SHA512 dc536a1fe5c3823df1695330539be342f516f572adbee086dffc8d3d8b55141c0b081043b6aa673bd8d150e4a6211f82dd27119a5835bd0a87a33b6457c4a3cc
diff --git a/net-misc/gns3-gui/gns3-gui-2.1.3.ebuild b/net-misc/gns3-gui/gns3-gui-2.1.3-r1.ebuild
similarity index 89%
rename from net-misc/gns3-gui/gns3-gui-2.1.3.ebuild
rename to net-misc/gns3-gui/gns3-gui-2.1.3-r1.ebuild
index 4b0c4fe8bdf2..e8b9a99df0c5 100644
--- a/net-misc/gns3-gui/gns3-gui-2.1.3.ebuild
+++ b/net-misc/gns3-gui/gns3-gui-2.1.3-r1.ebuild
@@ -24,8 +24,8 @@ RDEPEND="
 	>=dev-python/ws4py-0.3.4[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.6.0[${PYTHON_USEDEP}]
 	>=dev-python/paramiko-1.15.1[${PYTHON_USEDEP}]
-	=net-misc/gns3-server-$PVR[${PYTHON_USEDEP}]
-	dev-python/PyQt5[gui,network,svg,widgets,${PYTHON_USEDEP}]
+	~net-misc/gns3-server-$PV[${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}]
 "
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index 016b9c72ba27..23a222f680c4 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -3,5 +3,5 @@ DIST gns3-server-2.0.3.tar.gz 1468528 BLAKE2B fac026020563386553841e98c8f056cc27
 DIST gns3-server-2.1.3.tar.gz 1658657 BLAKE2B 4ce83aceff8f70f93032b2baafb0dd5c94062b8c431a73b9a83401266ae77f18a4e318651ecd05b789b71c512fc3549d0d1fb95b26fe1fdd23b2953b3367f04c SHA512 df6a98943f893f3d10c16b2a4242869a1407adad56e6c127e6525fe49acefbac9329bf76bc2b16904997985843fdb2b94d03c58f658034ec44763e6d69f7ddaf
 EBUILD gns3-server-1.5.3.1.ebuild 1589 BLAKE2B 4b654788be2921cafd9bfdaf7c0752d7a8744e9eb4f7e766425d2d51fbfcb6970ef663a95d99a170c362c0454ed0f6e2405f3df6f32377597642ee0578f63172 SHA512 55cc83a0f392f71f72b65e97654dd54d986c91fcf92c713ba4e1795c5a9d19969942d80346a015ad2b342a9e9fcbbe386a5905311c3a3c4282b321aed0303c3c
 EBUILD gns3-server-2.0.3-r1.ebuild 1650 BLAKE2B ff8a0a841c2a76c9846d2016e74cd3ecc27e92c8609fbcd081b60bf43719aec46f2b3d218598b0f950b294532303d9889a6e3b762776e5fdf290985e9722db56 SHA512 db2473bef2d12c9bb9ee5db48dcf73f14a8919d3eeab23b4d2071034df3426c2a73ea155452aa8faa9ad98d446820cb689b09a0180c6e7f53172f25ca701dd19
-EBUILD gns3-server-2.1.3.ebuild 1705 BLAKE2B aa2745f19f96405d43fddb2445ff22c21a696c1d8bbeafd91486f2289ffa27910ea8eb394743ac867bcd627518ea5b9e797586be7890dca210de5eeda3abc241 SHA512 19779eaa0b8f285915400d1ee17d420d78b4c7c315f4b6de74cc2f9b76c694bae8ae6bec64d8dc2ec457e79269b54972eea9e9ee48721293a84db3eec690c96d
+EBUILD gns3-server-2.1.3-r1.ebuild 1800 BLAKE2B 6a05b1e711198504d3e8f577b996a031a52dc6cd9840032124a5434bdb98f5c7d2e54ba30ad98d4a4c900678aed3c874836bb79201dd50ca22172874f5a51133 SHA512 a6d6f942438c498a53b83f79df1c847d6f93ae85f9b853c743a1ae248b157ba0cf88dec079ebc0306436e89ecd308624f5cbb9be9d8a2ebdc3528e71acbdf823
 MISC metadata.xml 318 BLAKE2B 48afdefbfe17caa240dcf16634f6c6b0344cee5b3cdb98002a20440227655840d5d284e7f012860c9a5bc47e0873f9ca4628e160fd95459fc59cce965c39d62e SHA512 dc536a1fe5c3823df1695330539be342f516f572adbee086dffc8d3d8b55141c0b081043b6aa673bd8d150e4a6211f82dd27119a5835bd0a87a33b6457c4a3cc
diff --git a/net-misc/gns3-server/gns3-server-2.1.3.ebuild b/net-misc/gns3-server/gns3-server-2.1.3-r1.ebuild
similarity index 94%
rename from net-misc/gns3-server/gns3-server-2.1.3.ebuild
rename to net-misc/gns3-server/gns3-server-2.1.3-r1.ebuild
index 11fbd6e25e49..c5055f961770 100644
--- a/net-misc/gns3-server/gns3-server-2.1.3.ebuild
+++ b/net-misc/gns3-server/gns3-server-2.1.3-r1.ebuild
@@ -18,6 +18,7 @@ RESTRICT="test"
 
 RDEPEND=">=app-emulation/dynamips-0.2.12
 		>=dev-python/aiohttp-2.2.0[${PYTHON_USEDEP}]
+		<dev-python/aiohttp-cors-0.6[${PYTHON_USEDEP}]
 		>=dev-python/aiohttp-cors-0.5.3[${PYTHON_USEDEP}]
 		>=dev-python/docker-py-1.4.0[${PYTHON_USEDEP}]
 		>=dev-python/netifaces-0.8-r2[${PYTHON_USEDEP}]
@@ -25,6 +26,7 @@ RDEPEND=">=app-emulation/dynamips-0.2.12
 		>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
 		>=dev-python/libcloud-0.14.1[${PYTHON_USEDEP}]
 		>=dev-python/raven-5.23.0[${PYTHON_USEDEP}]
+		dev-python/prompt_toolkit[${PYTHON_USEDEP}]
 		>=dev-python/psutil-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
 		>=dev-python/python-zipstream-1.1.4[${PYTHON_USEDEP}]
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index 60973cb77685..dcc9651828bf 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -5,11 +5,11 @@ AUX iperf3.initd 287 BLAKE2B 4e99a38963676e411481f18ebbe492b5d0cea179be7fe590712
 DIST iperf-2.0.10.tar.gz 290282 BLAKE2B f36ea3572c53dc94646e09372dc0ad3bda6a3d13dbab2eb059e8ecfbb51ad663c2fb456f3365a1645d84e9865ecd397bf695e2f21def54e83ebdc00b0880e2aa SHA512 74bf49133cd123243c179e174cbaa7d2f74ca9fb47c80ca2c88b2e68ce8bca0a73709e51b3aac6bd85b8c70483b70f33e8a2424e7e0e5922397967330f7e2ecc
 DIST iperf-2.0.9.tar.gz 277702 BLAKE2B 6de23e43be0c14bce2379e699b1e25a8ac5ed80cdef1493167c80253cbefac3357dadb00c15d572c5e4213528d0e48b9242cd93b71dc367e22753243e56b2496 SHA512 ff75e51af9d368eedb1e1dc4621f7575219525f0e438f1c8fa896aa7e990a6812a9a351db9004952057d81127f52b67350820e85c9ae1d8db2e6a60c1f2534d2
 DIST iperf-3.1.3.tar.gz 549466 BLAKE2B 645e9614ef8f4e4f7949d9aaa99631eba604754a7744d1a729408c5549beb4baf692cee99498dddd8150e1cf06adaa13213cf70510e8ab54418274cdcf145ecd SHA512 67795d9d5b4fc719b3fbbc2683cbe2777412bb7212282a50a378f5bb3793c3c17e278d22816fd9d289b2606ce97624d496ba236e3686ce1a31b9f1d6e6f474e9
-DIST iperf-3.3.tar.gz 592986 BLAKE2B 808e66a7e16d492c5602653b8a784e30ca65805e700d53555091fda0856cb64a6528a96025b5457f48df73561da7b64dd2fe7c21eafda04ce1b598e4582595f7 SHA512 f01f317f308301cc10abc6f592ba6e5172aa41d191d41927e2aa764210b8572126061d42c517ebda4b593a828ec545b1e04175f2f564999e124ad9a462acc342
 DIST iperf-3.4.tar.gz 595206 BLAKE2B 948b629178afadce3498f4665ee205dcb6033a1b410d00906da104de72d059e934ed74b69da11c149c88602a280a6d0b4097863ca5867cb197f90621fb619e19 SHA512 dacc1c02515d42276f810609eeeeb95c393222695e541917928f5373e4bc7033da93038a6ffa3898d00e39a47c6e4bdf02d08e39f429e9032f25912d723c71de
+DIST iperf-3.5.tar.gz 596476 BLAKE2B 756216618b45b637581318afaa5b48366061501c3ee65bbd6788ed1b6ab61073fa5e231a5212cde0a0703970c97af2511aaa59e250f2326cc1e393771828850c SHA512 f1823b5cd23b344b772a37f485e458d6b3703c11892ea4fa2abca61f474eed6229b3cb75db78adedf87092431d11c3174bfbd92833fc56dedab64953f50ac6a4
 EBUILD iperf-2.0.10.ebuild 701 BLAKE2B 6ae19ec54c963ebe5609c22370a80662e13db46e7750785da8b4087b7ba7fc8949df61ea8665b93cbf7bdfb6938f6aae57a8197af439a771b342bb303d65826e SHA512 7c2136a8ad639bbfc43929813ed43148daf6a3320ed729a2b41c464eb42f5f3eca6a5260654f21c132ac1190bfd0271fd8b5d3931f3d931ca2dbfb20750d785a
 EBUILD iperf-2.0.9.ebuild 695 BLAKE2B 25720f5cd6b51839994ad64b099e13cb22b2347154e9cae057506ef40d0e1dcd54ef2c2e4c42f8e1efef2a093b26eed41695be04e80a69f2c2701d139e9e0c9a SHA512 21438d1baed959f6203d23a62a0040ae2ceb289ffaa5b56a1e5d3a542d31d743041d5d6bd7c057c4bbb63086545a62bc7546996d90cde951bd2e4e116c948b7e
 EBUILD iperf-3.1.3.ebuild 888 BLAKE2B 5e9d333b068de8320118a8253d85482efdbb232704f5ee193212fb7854b77820cbdbe1ff4cb77cc8941a07f5079143128743653e357ba1477c84ad607200eef3 SHA512 2dd6dfd2affb6d429c2a91f674e52390e1039c98df381e1ceb93f837b85631a27b615a7713d39c3797a8f873465c568214d717f92010f473792c17ff91683999
-EBUILD iperf-3.3.ebuild 913 BLAKE2B 63a3d14ffd7aa1f55550cf1f170ac8c10bf5de6d91c748def6db9bcfaea273eca5ab45ded01b3ac4a2c23815e6070b96bd358cf335a69672fd2a8ce5be0768a0 SHA512 423c1d6feb7a0c864f165393ee8325c39ed4f6a570e2651d1db52d1f211994dddfaaac82be87e4f3fd6df6141c83ed5a7dd689ddc437c8b4c973dbd8fe1b8e1a
 EBUILD iperf-3.4.ebuild 913 BLAKE2B 5d5b1ef155bf1c151151c29c9ba50cd22ed4b93e06cbbe80363dedbee5c2a285af6e3c1285f57d605db95c3d6efa0f15d504e1218d0a9a8269eabb175b03cfcf SHA512 94835496e5f04604516a2671cbc0e2cc986074db45ded727109afc75c4489abde68d7a7a63566c0cc2d98bc2c94f9b4b6dd058f1a9ca39197c98c25488b94e51
+EBUILD iperf-3.5.ebuild 913 BLAKE2B 5d5b1ef155bf1c151151c29c9ba50cd22ed4b93e06cbbe80363dedbee5c2a285af6e3c1285f57d605db95c3d6efa0f15d504e1218d0a9a8269eabb175b03cfcf SHA512 94835496e5f04604516a2671cbc0e2cc986074db45ded727109afc75c4489abde68d7a7a63566c0cc2d98bc2c94f9b4b6dd058f1a9ca39197c98c25488b94e51
 MISC metadata.xml 406 BLAKE2B a76547cb9d2885900ccabe6c2549039abba6b7a4a0febd58038a088957817634e7340393f0f5c0b4cb655bf54f4ecb33232040aacd0bca3070d6ea48146f70ec SHA512 98d8685483b308d70c56e436291e0229f53982bb78a953b13455eeddaba53ec4ad1d860fc1be4b9340cb89a06471d1caee938bc6213355179147923e0d7eaa17
diff --git a/net-misc/iperf/iperf-3.3.ebuild b/net-misc/iperf/iperf-3.5.ebuild
similarity index 95%
rename from net-misc/iperf/iperf-3.3.ebuild
rename to net-misc/iperf/iperf-3.5.ebuild
index 37399ff4a4d9..5943f9805db6 100644
--- a/net-misc/iperf/iperf-3.3.ebuild
+++ b/net-misc/iperf/iperf-3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index cea9697d4e96..706365b4b6c7 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -1,6 +1,6 @@
 AUX ntp.conf 727 BLAKE2B 1b37cee807c41593ffc44994e390c98406c49154477bc2a603ba4037308ac1e3c83fc49700c1c0d6ee2e3f274dcb76bc13bfaeefdc9cd533a56cef9454ee27eb SHA512 5b55618b870e436b2160e46ede5e1b8031dab368d72bf376a6a9664f1cb528ae37e10eedeb7d438fee8155e3c50139ac240af95a14215aebbfef3133f3b68694
 AUX ntpd.confd 90 BLAKE2B 980ea88c97b1deff65f53c13410fe46bc1e19a80140776002ae2fdc0a3ad18c9855b74a70f1a89eb31854bbdad6729753c3a199cddb25b58178a79a0ea0a7050 SHA512 a2fdf88f6f55bcf0a6545db77817e3a740dba50bf56b4fdd80d335e8c909d0880fbd962041754d7f5fb3946ed131d9a739ec72008bacab9f1f47ff82dc74c542
-AUX ntpd.rc-r2 491 BLAKE2B b6f035bbdf9a9cc67d9fbee1752fa98e81bdc0d46f58fc20650513e41e7372319f7c8592ba73cafdaacb72fd3ebefcf1e524cf0e44348174104c9d88751816fd SHA512 215c8b37814de267834d6656146bf871f0e0da66cbd472d43d9b304ce73326bdfc4ba6624545988a8d7ca09e8a52e183c89081bdb690137a7e6d174aff97a42a
+AUX ntpd.rc-r2 484 BLAKE2B 826a3ee09486d912525fe6d44b967e25d8b31485d89a80987afcf459ea335058ff8a7835f3931017505aad6c5ba60e546b608ce26a51ad38f5972675d0a47559 SHA512 dc89a58edf6f83878d42522a015f2c3e12db9505ea3d6bc4b04e6e82947a7be6e8d143e8808bb58644641dd754744fd4be20c8b944a4261b460c30b95436fc31
 AUX ntpd.service 299 BLAKE2B 307dbf3a8569cdd1d54095bdb9b409986a9de3c7ec98405b4544f1df565828da2b685ce408061bc03f9a7991fbd61a9b42577c4e6db06bd2a4a012949cafe2dc SHA512 b625e993bbeba5da9c0f14ec8ff9d256575d9590a6c506436e834a9dc17877bfd57920b008bd01409d47de71acfb221a0d92c0203e2aacca33083e196466faf9
 AUX ntpsec-1.0.0-fix-seccomp.patch 587 BLAKE2B c937a12ed548a4d825964c66e37faebb35b3b8ca2bb6dda6a75a84cfcce04777a0e9ff48a6f3bbd82dfc9fd47977aba749dd93200e81280cea5475bc04c933f3 SHA512 12eaa510d6dac6b6e2fe764d6ec8cc8582031be25e5e6785a4813d4c150ecb36574b64f1fa8c2a7d6cf6a49423642fe875774b8d6e894f31f8605e5716313107
 DIST ntpsec-1.0.0.tar.gz 2405862 BLAKE2B b1631491500cafa5d41761fe6cb2db523450ed7801d06678048d6b8878d93dbd1e9d7cb2081a8400421213cf78a6724220236149a7f719896d1e8e48f5337d85 SHA512 9fb06310508b30d2ae2d66212d7d87b00e8eea294cebc27eb70435d764bd639fcec234b66e78deafb700476c88e47afe2d1b463563008c32efbb0644dd611f43
diff --git a/net-misc/ntpsec/files/ntpd.rc-r2 b/net-misc/ntpsec/files/ntpd.rc-r2
index 13fcbdd092d2..82a950ef5dac 100644
--- a/net-misc/ntpsec/files/ntpd.rc-r2
+++ b/net-misc/ntpsec/files/ntpd.rc-r2
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 description="ntpd - the network time protocol daemon"
 pidfile="/run/ntpd.pid"
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index 5f1980ee37bc..dfeb00bce9b3 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -18,5 +18,5 @@ DIST quagga-1.2.2.tar.gz 2986142 BLAKE2B 2c2326e015ed4ce7364a960b56108bbd04c184b
 DIST quagga-1.2.4.tar.gz 2925847 BLAKE2B e0e8d8b8e2243bc5cecc2e66d26040780f839414a16fb8a719d25a6fe1c29dc8545a92700a3758100715e1efb3d874584903885af51ef9f5d88c4a02d02dbc74 SHA512 3e72440bcccfd3c1a449a62b7ff8623441256399a2bee0a39fa0a19694a5a78ac909c5c2128a24735bc034ea8b0811827293b480a2584a3a4c8ae36be9cf1fcd
 EBUILD quagga-1.2.2-r1.ebuild 3753 BLAKE2B 460befe5cbd2ad7cda462bfcf47ce10064d4b930c458b0076e00ad7b2ca2f03dcd8c9245ba65b4d75437498d841c1ccd3987cf61db61205fcfa2f20aab21a50b SHA512 2b64bc0363275d7ab6da6dd1e9fdddc819a2fe6bce5a2878157ef82a38c78ff388e11cf6c683de336dc121ee04ed5ffbc81c59f251c8ac78faca3fbe5de3b75c
 EBUILD quagga-1.2.2.ebuild 3675 BLAKE2B 29d8900e617dd1a682dc592aa167a6d917484b21a264cd2d5a1e463a4b67fbaf7d00b843602e851b02a471a395176819a9c98efd95fd6cbec80b62d305fe9982 SHA512 ad383a681c9e0f1e196d26d34c6d1825d264d7b80f901688c3b081f40b993eafbc618eb94a43f118bfecf8361dfab018136a831162d8aebe8350d397b24ab6d1
-EBUILD quagga-1.2.4.ebuild 3677 BLAKE2B 93dc3cd4565b29f1a7857ff1469acf46f624d0305a1128240f1f757056bf7d0f8a865f7ac873e21cefd45d096a81f144830cef518565ca0292864787a38a8d63 SHA512 090f5553aea4d0475ce2fc862c6738488423c38506ac45e323c015292635b899d8b1aa320aca1f575ca07184225d23822d679ec46f19cd5731df682a95bb790b
+EBUILD quagga-1.2.4.ebuild 3676 BLAKE2B e7be45ad60bb2a1181ba09953d03fec0f55ae365ae7d360f50cad11b4eb8e2e844af6fe7c18b8b3f48deeb5c2e1d54d5c3e2705430ca3b5ce33a8c170fff473c SHA512 11d4b19047dbc0fc0278b7ef98260e1ec5359a4e206e563d125d476141260445e9fd90de64bffcfb706acd8d3109fa1f411c1a042fe5c02da50941f5f5844811
 MISC metadata.xml 2375 BLAKE2B c3bb85308f39337c4bfe74dc7f373dbf3999fa38ee800d63b543f00771d580f52db69005227f778105209b703e1fa7e1ce88e4a6549f5fc673e8defcce4cd97b SHA512 77ae3e9edac846d80a8b9bf2cc6c7582bffbf9b43cffc0649dfdd1f3dcf528ebf0c99ebd70c4fe27c524f98ba453798de7f320d50f7b76287623b8ac8265a6db
diff --git a/net-misc/quagga/quagga-1.2.4.ebuild b/net-misc/quagga/quagga-1.2.4.ebuild
index 550025ce130e..ce2b7eda17f0 100644
--- a/net-misc/quagga/quagga-1.2.4.ebuild
+++ b/net-misc/quagga/quagga-1.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~s390 sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ~ppc ~s390 sparc x86"
 
 IUSE="bgpclassless caps fpm doc elibc_glibc ipv6 multipath nhrpd ospfapi pam protobuf +readline snmp tcp-zebra test"
 
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index b39fa7560604..cb827bb0cd53 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -12,5 +12,5 @@ AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aab
 DIST rsync-3.1.2.tar.gz 892724 BLAKE2B e366514ae9835ba7c201a9e09fb9342c5e52fa36d45d46300d080403de25a64ba3ed7a703e56b4f47a743a597694a2d0a50bb4bab6cfa0aa7b59a4f7b93b9f21 SHA512 4c55fd69f436ead0cb5a0b7c6fdfef9bb28ddb9c63534eb619e756b118d5b08cfc5e696498650932c86e865b37e06633da947e6720ca0c27ed5c034313ae208b
 DIST rsync-3.1.3.tar.gz 905908 BLAKE2B 616a1f3239327a28b881310f5f249c90b8bcdb05091279cd62f9cb4e35a8428c7cdd9b89e711ba124601a738f0deb9bfbebafba7fd88b72866476138a9f8c75a SHA512 8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99
 EBUILD rsync-3.1.2-r2.ebuild 3067 BLAKE2B 6d7a98dd131f732aabf23725b90a0c4d9ca63bdfb94894c0764d249444331bd2c2aed6e07190ce8d844b6ebb60e32b38a4cd728f63539af80d05458f065ae77a SHA512 c1b0b9035e003d9c5648f5f265231fec047bda7f709d1e82172b6537eec10e8c2f0c0d73471d4d81f7a51339988ed4a3ebf4c7afc42106b5db17545f05162ce7
-EBUILD rsync-3.1.3.ebuild 2827 BLAKE2B f1b1a71d49b43e8c0acf70f99ed32580edd32ed0cdd37b0198eb543b7cb57f00f7d2ac40bfe8e50822642aa4ceb458bbbb0daf4042206a8676ab8b52c61a0d2b SHA512 734b6ce5428085ebe113aa8896ee13544f657ba2b77d467b460f9d507d8dacf85c7f369ada4ef9e519b77b39d47623f346c56a065b4b95e0d5f0393189dd8ed0
+EBUILD rsync-3.1.3.ebuild 2826 BLAKE2B 898d0bc505c29dfbe7d303706edb37d074c4fcac9fa42de53279e07e0842175dde8cd9e30d3c13adc989662b03d7b6e6ee53cbd7024d94bf4be45fc7f7c18648 SHA512 0885f46cb5b1fa5ff402d926c66934077ec6d30b031f9f6d1332c9638547d9896f058d02b05c88c0a3bc534355f3b88b5c0304ac8b59ad85e471d535700022d9
 MISC metadata.xml 449 BLAKE2B 961dae7e8c69c0d452c9eedf67223d14ff8ff481821206d6fe2daed3a23a0da704155d61339b0d32182e5ba9195ff25b3383bd90945ea474b21da7f66f09c77f SHA512 1c0f031c078a7c22b8375b093dcd241e139ca86a61e2d463d9d01946b57b24dff29ab489ac063b70d210d1306106896fe77bd9678331d5954ef3182222d4f920
diff --git a/net-misc/rsync/rsync-3.1.3.ebuild b/net-misc/rsync/rsync-3.1.3.ebuild
index a547e3fdfb2d..ffc429ee2543 100644
--- a/net-misc/rsync/rsync-3.1.3.ebuild
+++ b/net-misc/rsync/rsync-3.1.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 [[ ${PV} = *_pre* ]] || \
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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 ~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="acl examples iconv ipv6 static stunnel xattr"
 
 LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 7bceb652faef..3aefde14e6b0 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -5,7 +5,7 @@ DIST socat-1.7.3.1.tar.bz2 488467 BLAKE2B 57e03488bb8513dd7961cf4ec42d9176ea1ce9
 DIST socat-1.7.3.2.tar.bz2 493324 BLAKE2B 8f30a47be52fcbaf9715435c7848e0d86bb8166fd7aa2de5ba2c7a297696ad1ebc6315acfb87fb8777f87645575fbc015c9e4b1a664fa6602bdf6cf2bc4481e5 SHA512 9ed4911deb09c36955b62a2efbcdfdff0e9d963fa30110e32396e49133d395afd7e61a19ca6a1a23e6e98ded4f603bcbb68c8eb3da4ce870f1450b8b6f7dd293
 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31 SHA512 f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834
 EBUILD socat-1.7.3.1.ebuild 1183 BLAKE2B c9a6ffac8e7155f3347c9ff4bbb24727525750556a94f96d6dc10ea6d020b28582ce54734a24aee5bf07d474290fce3c3e9698727c5fc69ff114ead8c0ab5e53 SHA512 e74c8df05fbda264927cfa59c1e35c596c64088dae51a193823967c23a121929cbc7d2d719d7ecc998279f8ce81dcd8e61be5abe5701280b0ad26f2eaf77c4c2
-EBUILD socat-1.7.3.2.ebuild 1527 BLAKE2B fca07a0c665eee86b7d41216e2f177c602cb54d74fd5d8926cb67d743df9a4e1f2308eb759f87206764b5faa531acdd7aeb7b666f2023e82c8363093914674c7 SHA512 ee3b4a6c254e27bbdeed66b86c48d10c778b7a4df4ec85f02b45a0cf8904f3ce68d03fae39bf59c098b8aa07647983ebdfce7174cdbfc542d09044db0b46c342
+EBUILD socat-1.7.3.2.ebuild 1526 BLAKE2B 065ff18af4b538d5f064d1a0d40bdb15a773ce0d0bce5f39d89ecd3ac27af7d05c2701c8e23b0f2df7fe79552d13f9c0769af87f55980c85d88271f5c9f99272 SHA512 bf991114ba2adc3d0a1a006456bdfb3af4504d03ba96bcd2aca698f2960affdaab2dfd829c097cee4da55c01d0a2336192cfdc487e8c3054d4794204ca451385
 EBUILD socat-2.0.0_beta9.ebuild 1512 BLAKE2B 7f8c902a4637d6fb404c8dfc5e06b31c1e7235ed7e0d174f61d961a50b68b1cdb1b5d74bf93834a1595a794776f989a277b66a4b9da3598145b6fa9c311025df SHA512 859b4a4732bf418f5e517e6345b484c6fcb2ff2e4b42f59824dbfe51943c5432ba7fdce610501bc673c7b51399115b3b60af78441c5932739c5597219fed8705
 EBUILD socat-9999.ebuild 1430 BLAKE2B 469a907b8192fdd96917be4aa71c0cf0aadc6853dc5db6b2f78cc98c979ec41bda06dd5575fd9426029ecd12fc151c3fad736c50807ae44931a009676dc886c0 SHA512 b4d6de5f62b6131efcfede03b81357abcc8201c609fad8b28b3527e0a5a956cb4e495493918005816bb83ab6cf1c07ac45fcddd770f0b4579624cd41d2fe5802
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-misc/socat/socat-1.7.3.2.ebuild b/net-misc/socat/socat-1.7.3.2.ebuild
index c4cf894a49ba..4d82cb66a518 100644
--- a/net-misc/socat/socat-1.7.3.2.ebuild
+++ b/net-misc/socat/socat-1.7.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="bindist libressl ssl readline ipv6 tcpd"
 
 DEPEND="
diff --git a/net-misc/srf-ip-conn-srv/Manifest b/net-misc/srf-ip-conn-srv/Manifest
index 922f2aafd6fa..d85ef1ca5d85 100644
--- a/net-misc/srf-ip-conn-srv/Manifest
+++ b/net-misc/srf-ip-conn-srv/Manifest
@@ -1,5 +1,4 @@
 AUX srf-ip-conn-srv 162 BLAKE2B 88d3a39843f4d0fea05c5d37a6e23c17e001b833e47f7a3aa5b51616d65f812e92e39b2f67ac73c09308835f36ef1f96ebf23cc27f21adaf6ca338600268cb64 SHA512 7a5d2fe94f89c06ae54e01a532bc57735d39a0a620d11a536a5f27ae0912a017661b4e5928ceb3f4a63e49d155592cb763043a6a53f270810b15bc0f22074e41
-DATA srf-ip-conn-srv.pid 6 BLAKE2B a20e8a4239a8a660a152c1b58e7989f7d3e84e7ab16eda41283624c59ab68662b063ddbfe7f65ccec70c9c9858e4d1e20fe311b6a52ab92fb5ae7f7a6eb97438 SHA512 b34f721fe50aec75d17d74f002a9a09ef643dfdbc06d9a889cfc93ddf0ca95b7e23ecc90f2947a7ec7ba31bd0709473c3f706f8aac4dfc04ca76ce6ab27fcf31
 DIST jsmn-35086597a72d.tar.gz 11056 BLAKE2B 12db2b739b910602ecef6b2417443275b10eae7baf746d77e017a5c568417e8a013531af1666d5ec7a26bb25a45d78505afea1681508964b82c8c08c5101d4da SHA512 0cec27867f3ffd39ae1040e5236b7710a0e1b31fd184da6b56aed3995379da64907dc00aa01692f244ed5ea59ec995d62bacfd3a130bd1dd59724405f24560bd
 DIST srf-ip-conn-140c9b8a8619.tar.gz 112882 BLAKE2B fd368385d5a2e54ee7d7f7aed1149120ad9249702fc0b9db9eb415adcb5da65191b23776e23d337764baad1bbdb500993f8c5590da77f33900a549cf291c3219 SHA512 6f6e6fbc1b3d17fb36ef48c530756d2c4b2bee0a0e9016355ca57ac7124ca2b18c845110d40818673b200a3700b92f6b40664d157a158979705146aad579186b
 EBUILD srf-ip-conn-srv-9999.ebuild 1703 BLAKE2B 721ad8f7d682fc7a44b58a31eeeef59c8b553aebad2d4fb428d0bbe8ca6d52895b232a51b7f0d8ae05c9099f632f9b2a29652c5b6e73da91a561b21afdd6a3af SHA512 557704ae6a2831103de64197fc63d1e45cb532501b84e95261129855f09cf3fe6bad57b85fa7a4b33ce3f1456c6737a9123c2697929632a1600dc4850519ca87
diff --git a/net-misc/srf-ip-conn-srv/srf-ip-conn-srv.pid b/net-misc/srf-ip-conn-srv/srf-ip-conn-srv.pid
deleted file mode 100644
index e9fe9b5ac5a0..000000000000
--- a/net-misc/srf-ip-conn-srv/srf-ip-conn-srv.pid
+++ /dev/null
@@ -1 +0,0 @@
-22258
diff --git a/net-misc/ubridge/Manifest b/net-misc/ubridge/Manifest
index 50c93a51791e..4d570192001b 100644
--- a/net-misc/ubridge/Manifest
+++ b/net-misc/ubridge/Manifest
@@ -1,3 +1,3 @@
 DIST ubridge-0.9.14.tar.gz 63492 BLAKE2B 4c19bb79c264c9bec2ca39fea8b386817f6eb41d23b35f9fbd0a1407b45398ad5362bd76cbb81597438367a2af8d80308f13d3e8faa4e75c6173bbeb23da177d SHA512 7e92ca6ee8dd5815991c5d157278487cfad69710f0a63fc217d5d0e61678d272bf5a0d31b6afe25b1060df1ad13e229f1d573c03fecb1453167a9ff364283a5f
-EBUILD ubridge-0.9.14.ebuild 936 BLAKE2B aa241130e2b708f92a15cd25e1cece31cf3298c77e99bb18f33e1830d910bfd1c00215e99582add5c1758d26ed517f7810643b43dcf029d96fd98bcde7446c46 SHA512 f1bcfbe44339cd5db4ac312a33e410215cff779be475bc0216ce119356ec44fdca8adf1dec98904caaf96723b6520df2f9c7ce57c1e4ecdc23083b922f535360
+EBUILD ubridge-0.9.14.ebuild 935 BLAKE2B dcef1058bd7f96c1736d666fd59e4e95e6d96649dc62131cd89604f55936a31df4b76227179a4831daee191a049ee11b57582a8d0d3453f1fa2da08bb9e2b073 SHA512 e7ed35fcc9a5fab41664c79886f4a5e70b86937edc39681be526c2813c251346dda6e91b506af3d48845d7b1a1ed911898b03829b1d0c5d5e71a393a346e0ef4
 MISC metadata.xml 304 BLAKE2B 6c6bdd7ed65d6d4ff07fefad752e781d8f9ae7464126e38009ec24c020f5e2bd2d2c1ec9bcfc74666060ecb5b887f5ab97842b33e4a7cb88c27132f1d6c3b87d SHA512 c12018bf171da9b243405c0f3ccdf50752bcc77a5744acf94d7643ca5f52dc2d5f04f3cff22d7e16b530cd0255d3e183f2a39a6f099915d49d2bb2bbce673633
diff --git a/net-misc/ubridge/ubridge-0.9.14.ebuild b/net-misc/ubridge/ubridge-0.9.14.ebuild
index 2b8f85f6a50d..f0697a74df8d 100644
--- a/net-misc/ubridge/ubridge-0.9.14.ebuild
+++ b/net-misc/ubridge/ubridge-0.9.14.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 inherit fcaps user
 
-DESCRIPTION="Bridge for UDP tunnels, Ethernet, TAP and VMnet interfaces."
+DESCRIPTION="Bridge for UDP tunnels, Ethernet, TAP and VMnet interfaces"
 HOMEPAGE="https://github.com/GNS3/ubridge"
 SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/net-misc/valve/Manifest b/net-misc/valve/Manifest
index 8de44a158787..850da2d3b5f8 100644
--- a/net-misc/valve/Manifest
+++ b/net-misc/valve/Manifest
@@ -1,4 +1,3 @@
 DIST valve-1.0.tar.gz 272182 BLAKE2B bc2373569d2f55b5a4d69297b9fb58131bb15fc0d3be538572412267ca642db53e7a337ac44991f4659cb5459ea9f64ca55afee5aaf3e2d64efa871f522b9386 SHA512 116d3c6c400ad523c1c40cf592f56a43e0920ea0b0b2436d8f6185f4664adbc79c30e0cec63ccf922e5998357138a5b50a7e7bb2d9d0b77cbd054d8d1a5ffc12
-EBUILD valve-1.0-r1.ebuild 594 BLAKE2B 9851f58ae57fa814c6d80547e590d9c6acb46881f19d9c02632d447914bae633f55cde8500e498efa21803a9fec43a8d1f6c81bd29d4df51d8923dc3dce703be SHA512 7d618e4511a4d2e2f145b415baeb21951a619be1abe10dd0d8b3ebb2a569ab1d65cc577a662d525e3b02489aa226d0857854ee83b4fb6b6de8ef50e66d772a1e
-EBUILD valve-1.0.ebuild 647 BLAKE2B c36c11403b379058b526891bc394bebe22ca50c0527e59780cf3dbd9c993197e4818f5f753f1a542a12d33ec6c9c09f2195f42a8ea00c4e60b9d69a1b8b6de4e SHA512 0fbc3d6e28a85b13264fcfb81604aebf8953a447bcf9b142083227ee2cfe32b763512f936ce5d67383de09bebb2316eb224112b4e0fa5d73baa1d3a1111ea5f9
+EBUILD valve-1.0-r1.ebuild 597 BLAKE2B 11be8729041ca5368342ccaa9f5bddf1687684d3ff5627dc0ec3ea86c157869f48c91e03f67fcff507251fc59f474574c468174f5e2841dee174a0ec5e9ef586 SHA512 83134e37fddf49760f5c085ba928acd35af6348afbefba9803eab3b69613a7fbbd8f6a69277badd8556d915dd7360dad74d9733aa362a7d27d5e5b71e0fea998
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/net-misc/valve/valve-1.0-r1.ebuild b/net-misc/valve/valve-1.0-r1.ebuild
index ae6d5a2b21db..52f73b5320ce 100644
--- a/net-misc/valve/valve-1.0-r1.ebuild
+++ b/net-misc/valve/valve-1.0-r1.ebuild
@@ -4,8 +4,8 @@
 EAPI=6
 
 DESCRIPTION="Copy data while enforcing a specified maximum transfer rate"
-HOMEPAGE="http://www.fourmilab.ch/webtools/valve"
-SRC_URI="http://www.fourmilab.ch/webtools/valve/${P}.tar.gz"
+HOMEPAGE="https://www.fourmilab.ch/webtools/valve/"
+SRC_URI="https://www.fourmilab.ch/webtools/valve/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
diff --git a/net-misc/valve/valve-1.0.ebuild b/net-misc/valve/valve-1.0.ebuild
deleted file mode 100644
index dff76c7f8ad2..000000000000
--- a/net-misc/valve/valve-1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Copies data while enforcing a specified maximum transfer rate"
-HOMEPAGE="http://www.fourmilab.ch/webtools/valve/"
-SRC_URI="http://www.fourmilab.ch/webtools/valve/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="doc"
-
-DEPEND=""
-
-src_compile() {
-	econf || die
-	emake CTANGLE='' CWEAVE='' || die
-}
-
-src_install() {
-	dobin valve || die
-	doman valve.1 || die
-	dodoc README valve.pdf || die
-	dohtml index.html logo.png || die
-}
-
-src_test() {
-	emake CTANGLE='' CWEAVE='' check || die "check failed"
-}
diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 5c740ef2a869..b244c48ec6a5 100644
Binary files a/net-nntp/Manifest.gz and b/net-nntp/Manifest.gz differ
diff --git a/net-nntp/tin/Manifest b/net-nntp/tin/Manifest
index b0408ec91afd..52e2f13805bc 100644
--- a/net-nntp/tin/Manifest
+++ b/net-nntp/tin/Manifest
@@ -5,5 +5,5 @@ DIST tin-2.4.2.tar.xz 1491388 BLAKE2B 16fab433443d5859cc9661790ff837e8f45767e7f4
 EBUILD tin-2.0.1-r1.ebuild 2189 BLAKE2B 309648ac4822f255b3f8fc7f8f8b697f02dbfa97ddaf2cbf6c824893e26f6f733f9f683b5990d87a3ced0f1f727ab9654b77d54e68d0012d178485f95d2e0dc6 SHA512 07efd7d5111367bd72093d9b77925b33861f62bb1a99786c7577c94270d420d97fb0a27103e30771ef8e462b786f9788dd32e17efd793a208309f57f628477ea
 EBUILD tin-2.2.1.ebuild 2108 BLAKE2B 98593eb9525eedaa9db21033dbe3b22a82ed91aea8f6edb5aa0c63c0fe72aea4c82cbb428aba96c5a022c83d59f569c5118802e826d0ff012e663a5feaf9eff2 SHA512 a5c1801e538bda92d121767a16d27f86c91165d2507b3027a11d37f0fe53e73c106f0182019308e9747b3ab2b1cf317a7811491db7af9c0389a5d39e3c1a4d60
 EBUILD tin-2.3.1.ebuild 2112 BLAKE2B 1b56fd9c3848ba974f257363c122e7436961674b146e8d07f0f9b386f91e25374b5e86ef0073256501141674ea4ba238c99ed5d4ca7eabee824b51da404a19a8 SHA512 470bf9c33c6c610fefd4ffc8bc413f9b8b9653125d532b64fec28a10877268bcc2e7cc0164f87f75dba0a8e3baa30b1dae3bd41b21b7111a63e775f5bbcbc2df
-EBUILD tin-2.4.2.ebuild 1727 BLAKE2B 663ae019bb389682e37e90b7518cc9a738fd7421c4e151a185708c450f7bf0bf2760ef64a6368a7e2c154a2dbe3291685f8cd5924bec1330e5b9be8ce2572e54 SHA512 66df77ecac23d4616046cc735b9d70485d267f132d15197f12fd953d335dc4af8404f2dbc068ccb34338bc9330a1c1b71f2b6f439c1f5b5a347ff799b91c925c
+EBUILD tin-2.4.2.ebuild 1726 BLAKE2B 536d0964e8b1ea01a295f93f398829d0c51fea08ed21cb8ab9895c006437279590f275c2540b48968a58770d35173aa3c9a69ebaf6fdbffad78f92e9c863345b SHA512 55b3b6525a04e7425d90d68657abc5f343dfcd38a80a506180fdcc9cc889e0c21039e549bf49724eb3bed17dd45919ceb193d5678e48e3d35ce6586421de8177
 MISC metadata.xml 545 BLAKE2B 677b122bf3d9d837fb2159f63e44726719f51308612399ff463717a5df307b9796d841941e0156f569a9719ca2d6946d4aaa543ca9fad34cb68120da299768b7 SHA512 21578f131458fa9445675790df540870888edf0a46a0690e84ce35d42ad0c3b636fc0f003826b6711e797c3f4af56ac0febbc48276e6a5675d4d193be4656eda
diff --git a/net-nntp/tin/tin-2.4.2.ebuild b/net-nntp/tin/tin-2.4.2.ebuild
index 85882e9809e3..a6966e6ca514 100644
--- a/net-nntp/tin/tin-2.4.2.ebuild
+++ b/net-nntp/tin/tin-2.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.tin.org/pub/news/clients/tin/stable/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="cancel-locks debug doc +etiquette gpg idn ipv6 mime nls sasl socks5 spell unicode"
 
 RDEPEND="
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index c8960151dc69..c6a9a62d0ad7 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 208374f8c6d1..8093ac3e0e0c 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Brian Evans <grknight@gentoo.org> (5 Mar 2018)
+# Mask embedded USE on virtual/mysql to transition it to be obsolete
+>=virtual/mysql-5.6-r11 embedded
+
 # Brian Evans <grknight@gentoo.org> (28 Feb 2018)
 # Mask client-libs USE to force users to install alternative standard pacakges
 >=dev-db/mariadb-10.3 client-libs
diff --git a/profiles/license_groups b/profiles/license_groups
index 76f10de34b4f..ee18a412c5fc 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -71,7 +71,7 @@ BINARY-REDISTRIBUTABLE @FREE bh-luxi Broadcom Dina intel-ucode ipw2100-fw ipw220
 
 # License agreements that try to take away your rights. These are more
 # restrictive than "all-rights-reserved" or require explicit approval.
-EULA Adaptec-EULA AdobeFlash-11.x ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER-2 CYANA DOOM3 dotnet-eula ETQW FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs spin-commercial spin-educational StarUML-EULA TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi worklog-assistant Xerox yangcli-pro zi-labone
+EULA Adaptec-EULA AdobeFlash-11.x ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER-2 CYANA DOOM3 ETQW FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs spin-commercial spin-educational StarUML-EULA TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi worklog-assistant Xerox yangcli-pro zi-labone
 
 # Local Variables:
 # mode: conf-space
diff --git a/profiles/package.mask b/profiles/package.mask
index a5703541ebb3..4bdf67673abc 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,32 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (06 Mar 2018)
+# Maintainer not responding, depends on deprecated Qt4.
+# Masked for removal in 30 days. Bug 598651, 635192, 644396
+media-gfx/photivo
+
+# Patrice Clement <monsieurp@gentoo.org> (05 Mar 2018)
+# Package name change from msgpack-python to msgpack breaks dependencies.
+>=dev-python/msgpack-0.5.6
+>=dev-python/neovim-python-client-0.2.1
+
+# Andreas Sturmlechner <asturm@gentoo.org> (05 Mar 2018)
+# Dead upstream, depends on deprecated Qt4.
+# Masked for removal in 30 days. Bug 644404
+net-fs/smbtatools
+
+# Mike Gilbert <floppym@gentoo.org> (04 Mar 2018)
+# Dev channel releases are only for people who are developers or want more
+# experimental features and accept a more unstable release.
+>=www-client/chromium-66
+
+# Andreas Sturmlechner <asturm@gentoo.org> (04 Mar 2018)
+# Dead upstream, depends on deprecated Qt4. media-sound/cantata
+# is an actively developed alternative based on Qt5.
+# Masked for removal in 30 days. Bug 644412
+media-sound/qmpdclient
+
 # Andreas Sturmlechner <asturm@gentoo.org> (04 Mar 2018)
 # Dead upstream, depends on deprecated Qt4.
 # Masked for removal in 30 days. Bug 645436
@@ -475,11 +501,6 @@ app-vim/pam-syntax
 virtual/jdk:9
 virtual/jre:9
 
-# Mike Gilbert <floppym@gentoo.org> (16 Dec 2017)
-# Dev channel releases are only for people who are developers or want more
-# experimental features and accept a more unstable release.
->=www-client/chromium-65
-
 # Patrice Clement <monsieurp@gentoo.org> (12 Dec 2017)
 # Masked due to a hard dependency on an ancient versions of dev-libs/msgpack
 # (<0.6) that have been punted from the tree.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 7c9e89a4d2be..9745adb4f95d 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2289,7 +2289,7 @@ dev-lisp/abcl:clisp - Build Armed Bear Common Lisp using GNU CLISP
 dev-lisp/abcl:cmucl - Build Armed Bear Common Lisp using CMU Common Lisp
 dev-lisp/abcl:jad - Enable support for disassembling compiled code using JAD
 dev-lisp/clisp:hyperspec - Use local hyperspec instead of online version
-dev-lisp/clisp:new-clx - Build CLISP with support for the NEW-CLX module which is a C binding to the Xorg libraries
+dev-lisp/clisp:new-clx - Build CLISP with support for the NEW-CLX module which is a -C binding to the Xorg libraries
 dev-lisp/clisp:pari - Build CLISP with support for the PARI Computer Algebra System
 dev-lisp/clisp:svm - Build CLISP with support for the Support Vector Machine module
 dev-lisp/clx:doc - Builds documentation
@@ -2540,6 +2540,7 @@ dev-python/matplotlib:gtk2 - Enable x11-libs/gtk+:2 support
 dev-python/matplotlib:gtk3 - Enable x11-libs/gtk+:3 support
 dev-python/matplotlib:pyside - Qt support via dev-python/pyside
 dev-python/mpmath:matplotlib - Add support for dev-python/matplotlib
+dev-python/msgpack:native-extensions - Compiles native "C" extensions (speedups, instead of using python fallback code).
 dev-python/nbdime:webtools - Install web-based diff and merge tools.
 dev-python/netaddr:cli - Enable netaddr shell with dev-python/ipython
 dev-python/networkx:scipy - Enables scipy backend
@@ -2913,7 +2914,6 @@ dev-util/geany-plugins:enchant - Enable spell checking using enchant
 dev-util/geany-plugins:gpg - Enable geanypg plugin which integrates GPG using app-crypt/gpgme
 dev-util/geany-plugins:gtk3 - Use GTK+3 instead of GTK+2
 dev-util/geany-plugins:gtkspell - Use gtkspell for dictionary support in GeanyVC
-dev-util/geany-plugins:keyrecord - Enable the keyrecord plugin
 dev-util/geany-plugins:multiterm - Enable the multiterm plugin
 dev-util/geany-plugins:overview - Enable overview plugin
 dev-util/geany-plugins:pretty-printer - Enable pretty-printer plugin
@@ -4545,6 +4545,8 @@ media-sound/csound:websocket - Build the websocket opcode
 media-sound/darkice:aacplus - AAC+ encoding via media-libs/libaacplus
 media-sound/darkice:opus - Enable Opus audio codec support
 media-sound/darkice:twolame - Build with twolame support
+media-sound/deinvert:liquid - improve sound quality using net-libs/liquid-dsp
+media-sound/deinvert:wav - wav file support using media-libs/libsndfile
 media-sound/denemo:fluidsynth - Enable Fluidsynth MIDI software synthesis
 media-sound/denemo:portmidi - Enable support for the portmidi backend
 media-sound/dir2ogg:mac - Add support for decoding Monkey's Audio files
@@ -7209,7 +7211,6 @@ sci-geosciences/grass:liblas - Include support for LAS and LAZ encoded LiDAR fil
 sci-geosciences/grass:opencl - Enable OpenCL support
 sci-geosciences/gshhs:data - Add earth data with sci-geosciences/gshhs-data
 sci-geosciences/liblas:gdal - Add support for the sci-libs/gdal geospatial raster library
-sci-geosciences/liblas:geotiff - Add support for geo-tagged TIFF files with sci-libs/libgeotiff
 sci-geosciences/mapnik:gdal - Enable sci-libs/gdal library support
 sci-geosciences/mapserver:gdal - Enable sci-libs/gdal library support
 sci-geosciences/mapserver:geos - Enable sci-libs/geos library support
@@ -7218,7 +7219,7 @@ sci-geosciences/mapserver:proj - Enable sci-libs/proj library support (geographi
 sci-geosciences/mapserver:xslt - Enable xslt and exslt support xml-mapfile support
 sci-geosciences/merkaartor:libproxy - Use net-libs/libproxy for getting the HTTP/HTTPS/SOCKS proxy configuration
 sci-geosciences/merkaartor:webengine - Enable dev-qt/qtwebengine in some plugins
-sci-geosciences/qgis:designer - Build custom widgets for dev-qt/designer
+sci-geosciences/qgis:3d - Build QGIS 3D library using dev-qt/qt3d
 sci-geosciences/qgis:georeferencer - Determines whether georeferencer plugin should be built
 sci-geosciences/qgis:grass - Add support for sci-geosciences/grass
 sci-geosciences/qgis:mapserver - Determines whether mapserver should be built
@@ -7656,6 +7657,7 @@ sys-apps/fwupd:gpg - Enable GPG support.
 sys-apps/fwupd:man - Build and install man pages
 sys-apps/fwupd:uefi - Enable UEFI support
 sys-apps/fwupd:uefi_labels - Enable UEFI labels support
+sys-apps/gawk:forced-sandbox - Always enable --sandbox mode for simpler/secure runtime (disables e/r/w commands)
 sys-apps/gawk:mpfr - use mpfr for high precision arithmetic (-M / --bignum)
 sys-apps/gnome-disk-utility:fat - Include FAT16/FAT32 support (sys-fs/dosfstools)
 sys-apps/hwdata-gentoo:binary-drivers - Adds support for ATI/NVIDIA binary drivers
@@ -7738,6 +7740,7 @@ sys-apps/s390-tools:ncurses - build hyptop monitoring program
 sys-apps/s390-tools:pfm - build the cpacfstats tool
 sys-apps/s390-tools:zfcpdump - build the kernel disk dumping utility
 sys-apps/s390-tools:zlib - build the zgetdump utility
+sys-apps/sed:forced-sandbox - Always enable --sandbox mode for simpler/secure runtime (disables e/r/w commands)
 sys-apps/selinux-python:audit - Enable support for sys-process/audit and use the audit_* functions (like audit_getuid instead of getuid())
 sys-apps/smartmontools:caps - Build against sys-libs/libcap-ng to allow smartd to drop its privileges.
 sys-apps/smartmontools:daemon - Install the monitoring daemon (smartd) and associated scripts.
@@ -8959,12 +8962,9 @@ x11-wm/pekwm:themes - Install additional themes
 x11-wm/ratpoison:history - Use sys-libs/readline for history handling
 x11-wm/ratpoison:sloppy - Install sloppy, a focus-follows-mouse implementation for ratpoison
 x11-wm/ratpoison:xrandr - Enable support for XRandR
-x11-wm/stumpwm:clisp - Use CLISP for the runtime
 x11-wm/stumpwm:contrib - Install contrib modules
 x11-wm/stumpwm:doc - Include documentation
-x11-wm/stumpwm:ecl - Use SCL for the runtime
 x11-wm/stumpwm:emacs - Add support for GNU Emacs
-x11-wm/stumpwm:sbcl - Use SBCL for the runtime
 x11-wm/subtle:xrandr - Enable support for the X RandR extension
 x11-wm/subtle:xtest - Enable support for the XTest extension
 x11-wm/vtwm:rplay - Enable rplay support, needed for sound.
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 8a98e1b4fff8..b8256a804f46 100644
Binary files a/sci-geosciences/Manifest.gz and b/sci-geosciences/Manifest.gz differ
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 4c5e711c6c81..5852f2224323 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,6 +1,4 @@
 AUX grass-7.0.1-declare-inespg.patch 647 BLAKE2B ec303cc88965ff24d9521a3d2fdec3cd62f14bb9830a37942aa3373acc5351b07022f782c8f22f560bbf1f794fd46fa524b7ddab07a360c3e6f34cf3c1258972 SHA512 9206619090c0f138c734f7fe48467cd343cd01120ac4d7eaec3d822b7cac1cbc6e4630bfedd68e7bdd6966716116a1d6714faf373a1eceb08726acd16ca34bb4
-DIST grass-7.0.5.tar.gz 40862798 BLAKE2B 4d581929f0aae706eb1129201acd62211296ba73b2f077a4141799afaa6522a481c8ff218edaf713b152f8728f7e23fe780c8f3e5d07e9a66105f1d86c0a55ef SHA512 42ff0577ca4fb1fe5f370090b94bec82eec1be65883152d64eacae6b3628e91e67ced045ca2a299f32e9d773995b35cc98b4cceaee6518c788f9366f3c7371bd
 DIST grass-7.2.0.tar.gz 48315008 BLAKE2B 927da2119e199cee7cbf55a172141abfe9ce86499e307b355fec2cdf79ec3424acddc4410e3049e7cade5dd3da39e618af7e1003093f87de5735a981984b46c6 SHA512 b1aa17ec554c2f0473df3726993b0891df4589c60ca9362405932a4c479b5883245b0a0ba9e787ce2e9de210b6307f34883e4e63ddfbf04eb5d75e8583bc2c5b
-EBUILD grass-7.0.5-r1.ebuild 6900 BLAKE2B 588f0bdf15fb2758759db6a87c1f70ebf941e242610b3a1b35e3966dcd99dc20a7aaba8b511e9e1d3f8fd9ef0ddc6123515340a6cacb61c72ef4d01ee081f118 SHA512 3a3938e7da834fd21b0eef252f79994aa68285e619a9d9797b8fccab0d92f1ad5d05d6a70e795d1e83c432638ac049bcbe04d75d285b5b251720171544b0ce00
 EBUILD grass-7.2.0.ebuild 6905 BLAKE2B a713c98783a6861d5c9c5d109bcc8db34f451030874d071e549880031b9a20cc6ba9b36cac748f2c3242068a72d802a0925530e8d3a6399e39fed78b2d0c2604 SHA512 096db304514328f6d5798f85ff1f381ab0192e74407519c7dc32b156b44568b21fec51b2d3a969a84d52be8b1e065c853da777ff36b679dd906992466a7808c5
 MISC metadata.xml 916 BLAKE2B 1b87536bd014b5572a4cf678336d0de43daa0a2d56f2bdb4db5c777c09c8efa644d974fe649f0fe758f088a1ea10a4d4308dad670172e5f7366aeaf9653146d1 SHA512 fdaae85dd85171b0e5b316a7edd7d09e78eb5fe267e760dfe9722dd469f6594b909fba85b082722463abf5a564a34aaeec9eefd5a53859814089cd02af742e2a
diff --git a/sci-geosciences/grass/grass-7.0.5-r1.ebuild b/sci-geosciences/grass/grass-7.0.5-r1.ebuild
deleted file mode 100644
index 9be8c956e38a..000000000000
--- a/sci-geosciences/grass/grass-7.0.5-r1.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"  # bug 572440
-WANT_AUTOCONF="2.1"
-WX_GTK_VER=3.0
-
-inherit eutils gnome2 fdo-mime multilib python-single-r1 versionator wxwidgets autotools
-
-MY_PM=${PN}$(get_version_component_range 1-2 ${PV})
-MY_PM=${MY_PM/.}
-MY_P=${P/_rc/RC}
-
-DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
-HOMEPAGE="http://grass.osgeo.org/"
-SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/7.0.5"
-KEYWORDS="~amd64 ~x86"
-IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-admin/eselect-1.2
-	dev-python/numpy[${PYTHON_USEDEP}]
-	media-libs/libprojectm
-	sci-libs/proj
-	sci-libs/xdrfile
-	sci-libs/gdal
-	sys-libs/gdbm
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	fftw? ( sci-libs/fftw:3.0 )
-	geos? ( sci-libs/geos )
-	blas? ( virtual/blas
-		sci-libs/cblas-reference )
-	lapack? ( virtual/lapack )
-	liblas? ( sci-geosciences/liblas )
-	mysql? ( virtual/mysql )
-	netcdf? ( sci-libs/netcdf )
-	odbc? ( dev-db/unixODBC )
-	opencl? ( virtual/opencl )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng:0= )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	readline? ( sys-libs/readline:0= )
-	sqlite? ( dev-db/sqlite:3 )
-	tiff? ( media-libs/tiff:0= )
-	truetype? ( media-libs/freetype:2 )
-	X? (
-		dev-python/wxpython:3.0[cairo,opengl?]
-		x11-libs/cairo[X,opengl?]
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXaw
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXp
-		x11-libs/libXpm
-		x11-libs/libXt
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/flex
-	sys-devel/gettext
-	sys-devel/bison
-	X? (
-		dev-lang/swig
-		x11-proto/xextproto
-		x11-proto/xproto
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	opengl? ( X )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-7.0.1-declare-inespg.patch
-)
-
-pkg_setup() {
-	if use lapack; then
-		local mylapack
-		mylapack=$(eselect lapack show) || die
-		if [[ -z "${mylapack/.*reference.*/}" ]] && \
-			[[ -z "${mylapack/.*atlas.*/}" ]]; then
-			ewarn "You need to set lapack to atlas or reference. Do:"
-			ewarn "   eselect lapack set <impl>"
-			ewarn "where <impl> is atlas, threaded-atlas or reference"
-			die "setup failed"
-		fi
-	fi
-
-	if use blas; then
-		local myblas
-		myblas=$(eselect blas show) || die
-		if [[ -z "${myblas/.*reference.*/}" ]] && \
-			[[ -z "${myblas/.*atlas.*/}" ]]; then
-			ewarn "You need to set blas to atlas or reference. Do:"
-			ewarn "   eselect blas set <impl>"
-			ewarn "where <impl> is atlas, threaded-atlas or reference"
-			die "setup failed"
-		fi
-	fi
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Fix unversioned python calls
-	local pyver=${EPYTHON/python/}
-	sed -e "s:GRASS_PYTHON=.*:&${pyver}:" -i "${S}/lib/init/grass.sh" || die
-	sed -e "s:= python:&${pyver}:" -i "${S}/include/Make/Platform.make.in" || die
-
-	# fix header being unconditionally included
-	# see upstream https://trac.osgeo.org/grass/ticket/2779
-	sed -e 's:\(#include <ogr_api.h>\):#ifdef HAVE_OGR\n\1\n#endif:' \
-		-i "${S}/vector/v.external/main.c" || die "failed to sed main.c"
-
-	epatch "${PATCHES[@]}"
-
-	eapply_user
-	eautoconf
-
-	ebegin "Fixing python shebangs"
-	python_fix_shebang -q "${S}"
-	eend $?
-}
-
-src_configure() {
-	if use X; then
-		WX_BUILD=yes
-		setup-wxwidgets
-	fi
-
-	addwrite "${ROOT}dev/dri/renderD128"
-
-	econf \
-		--enable-shared \
-		--disable-w11 \
-		$(use_with cxx) \
-		$(use_with tiff) \
-		$(use_with png) \
-		$(use_with postgres) \
-		$(use_with mysql) \
-		$(use_with mysql mysql-includes "${ROOT}usr/include/mysql") \
-		$(use_with mysql mysql-libs "${ROOT}usr/$(get_libdir)/mysql") \
-		$(use_with sqlite) \
-		$(use_with opengl) \
-		$(use_with odbc) \
-		$(use_with fftw) \
-		$(use_with blas) \
-		$(use_with lapack) \
-		$(use_with X cairo) \
-		$(use_with truetype freetype) \
-		$(use_with truetype freetype-includes "${ROOT}usr/include/freetype2") \
-		$(use_with nls) \
-		$(use_with readline) \
-		--without-opendwg \
-		--with-regex \
-		$(use_with threads pthread) \
-		$(use_with openmp) \
-		$(use_with opencl) \
-		--with-gdal="${ROOT}usr/bin/gdal-config" \
-		$(use_with liblas liblas "${ROOT}usr/bin/liblas-config") \
-		$(use_with X wxwidgets "${WX_CONFIG}") \
-		$(use_with netcdf netcdf "${ROOT}usr/bin/nc-config") \
-		$(use_with geos geos "${ROOT}usr/bin/geos-config") \
-		--with-proj-includes="${ROOT}usr/include/libprojectM" \
-		--with-proj-libs="${ROOT}usr/$(get_libdir)" \
-		--with-proj-share="${ROOT}usr/share/proj/" \
-		$(use_with X x)
-}
-
-src_compile() {
-	# we don't want to link against embedded mysql lib
-	emake CC="$(tc-getCC)" MYSQLDLIB=""
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		INST_DIR="${D}usr/${MY_PM}" \
-		prefix="${D}usr" BINDIR="${D}usr/bin" \
-		PREFIX="${D}usr/" \
-		install
-
-	pushd "${D}usr/${MY_PM}" &> /dev/null || die
-
-	# fix docs
-	dodoc AUTHORS CHANGES
-	docinto html
-	dodoc -r docs/html/*
-	rm -rf docs/ || die
-	rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die
-
-	# manuals
-	dodir /usr/share/man/man1
-	rm -rf man/ || die
-
-	# translations
-	if use nls; then
-		dodir /usr/share/locale/
-		mv locale/* "${D}usr/share/locale/" || die
-		rm -rf locale/ || die
-		# pt_BR is broken
-		mv "${D}usr/share/locale/pt_br" "${D}usr/share/locale/pt_BR" || die
-	fi
-
-	popd &> /dev/null || die
-
-	# place libraries where they belong
-	mv "${D}usr/${MY_PM}/lib/" "${D}usr/$(get_libdir)/" || die
-
-	# place header files where they belong
-	mv "${D}usr/${MY_PM}/include/" "${D}usr/include/" || die
-	# make rules are not required on installed system
-	rm -rf "${D}usr/include/Make" || die
-
-	# mv remaining gisbase stuff to libdir
-	mv "${D}usr/${MY_PM}" "${D}usr/$(get_libdir)" || die
-
-	# get proper folder for grass path in script
-	local gisbase
-	gisbase="${ROOT}usr/$(get_libdir)/${MY_PM}"
-	sed -e "s:gisbase = \".*:gisbase = \"${gisbase}\":" \
-		-i "${D}usr/bin/${MY_PM}" || die
-
-	# get proper fonts path for fontcap
-	sed -i \
-		-e "s|${D}usr/${MY_PM}|${EPREFIX}usr/$(get_libdir)/${MY_PM}|" \
-		"${D}usr/$(get_libdir)/${MY_PM}/etc/fontcap" || die
-
-	# set proper python interpreter
-	sed -e "s:= \"python\":= \"${EPYTHON}\":" -i "${D}usr/bin/${MY_PM}" || die
-
-	if use X; then
-		local GUI="-gui"
-		[[ ${WX_BUILD} == yes ]] && GUI="-wxpython"
-		make_desktop_entry "/usr/bin/${MY_PM} ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
-		doicon -s 48 gui/icons/${PN}-48x48.png
-	fi
-
-	# install .pc file so other apps know where to look for grass
-	insinto /usr/$(get_libdir)/pkgconfig/
-	doins grass.pc
-
-	# fix weird +x on tcl scripts
-	find "${D}" -name "*.tcl" -exec chmod +r-x '{}' \;
-}
-
-pkg_postinst() {
-	if use X; then
-		fdo-mime_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-}
-
-pkg_postrm() {
-	if use X; then
-		fdo-mime_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/sci-geosciences/laszip/Manifest b/sci-geosciences/laszip/Manifest
index 14fcb6e51de6..ad87ba8fd49a 100644
--- a/sci-geosciences/laszip/Manifest
+++ b/sci-geosciences/laszip/Manifest
@@ -1,4 +1,4 @@
 AUX laszip-2.2.0_fix-build-system.patch 1516 BLAKE2B e79bff26c87b51667394c361379bee1d6f048d928b051dd9c357834b50a9980da8ecd248aa63acb25ca76ae19130d99a7b2db183056869670731b818f56da84a SHA512 3b2a8523491ffeded85e7aad50b1792f1f26354838afb7ab2e36bb29e2178cd1fb75601c238d59eff7779bb87a7fd5d93696a2da01951df188e66833ce6ff301
 DIST laszip-src-2.2.0.tar.gz 407457 BLAKE2B d183ab6acf67708b3fc293ade228f516cc364d4cd494f5758cbba93969605f66e450aaa01a07660fd8976031b7747b40e0400573558d0f14b0e19874bf7d9fe3 SHA512 44dacb0d0ab79ac02c784549f42c4522451646b322835afc78fbf8bb82be40e023d374635c2a18989c73a5553e05b55d7c32f35d510f816704020b0e02365824
-EBUILD laszip-2.2.0.ebuild 626 BLAKE2B e24603b6c2be6f09d708df542fcb864560dbcd147b92eb8bac3ff7660f5b3d03c231c38322720bd4ea87aeed04cc1ef40b8e6324ba1653f2d5874c11fb8e8e03 SHA512 67a95792f5caf53492af5a67ac41bd389521e9dc14eba9383b011900ca9059d535df9426215c1461f5c250e208d5517d544ec182bc80fd2051202ebebdcbb2d6
+EBUILD laszip-2.2.0.ebuild 625 BLAKE2B caac280245582941cefc963bb83ac9f4fd238a0dc090f1cf69ffb12639e68f46d6de3e35964c1f2d458bff0c04fc5d71a22e5d8a6b3e396b2b8606a78d27278e SHA512 c94dc23f159a80585b03477fbfd71c571690de2712ee027f02e1836737cc987c29d5b77690ccf6ff6ddfe692e4150ec59972f34a68619d8803722f8860e964f4
 MISC metadata.xml 589 BLAKE2B ebabf344079655662d4b4a401c8632c07d07f0f3e0d716c29cde0ba883d279a7a5ea91986c9010415485911400b599af33174b3cc9fab690c73d1ae2d42f68fc SHA512 ce1cd4bd4d400deb43cc2b1f83450a91ab6e202e51b4d32a4dc3eaec3cf20a6ab3bb399f9edd5c38ce0872809b4dae1b08420c3456730a23c0b2f26791c66b57
diff --git a/sci-geosciences/laszip/laszip-2.2.0.ebuild b/sci-geosciences/laszip/laszip-2.2.0.ebuild
index bdabd9793af1..1524c071b9d2 100644
--- a/sci-geosciences/laszip/laszip-2.2.0.ebuild
+++ b/sci-geosciences/laszip/laszip-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/LASzip/LASzip/releases/download/v${PV}/${PN}-src-${P
 
 SLOT="0"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ia64 ppc ~ppc64 x86"
 
 S="${WORKDIR}/${PN}-src-${PV}"
 
diff --git a/sci-geosciences/liblas/Manifest b/sci-geosciences/liblas/Manifest
index 3b34877b1abc..b1fbdeaab6bc 100644
--- a/sci-geosciences/liblas/Manifest
+++ b/sci-geosciences/liblas/Manifest
@@ -1,6 +1,4 @@
 AUX liblas-1.8.0_remove-std-c++98.patch 1141 BLAKE2B 880a1d478c16e680b45e1a064cef2c50d6c662ef1ca15c6beb6548d9dda056e19d2bc30fa87f067e566abf22d1c1b72496539f073d749878933c00bf7d099d8d SHA512 90defe2149a8cf8766022af6cf1248985c350e56bb9fcae99daf9551acf9272b93ea9b9c25ecef86803e75deb0ab50c2a0f919c35705d54ca38c7cafe5940f03
-DIST libLAS-1.8.0.tar.bz2 3907684 BLAKE2B e7516aedb9f0f1df49cb9d4e669749ded5a04999990bb6856fee1181ce65b7d2e36ba779c3fce2f34080bb2293d68f7d2e447ff2fca29f9d3b8ee9b8210b31f6 SHA512 1804149c7bcf04896a683a1098d372a65c000b7562795911fae697f81f370315aa373f34c12fa740d4607c07cd73e48354e34c9e26b032ffe679ecbfd4496a50
 DIST libLAS-1.8.1.tar.bz2 3920203 BLAKE2B 2ef8e822c5d1c07d929e788c59e6e5b942aba637fb764d37e1505d136c75cd4a28efc4702b022bcfee8063b684956b4466c9ec00e737d7024ca2719d7b11f341 SHA512 1cb39c557af0006c54f1100d0d409977fcc1886abd155c1b144d806c47f8675a9f2125d3a9aca16bae65d2aabba84d5e5e322b42085e7db312f3d53f92342acf
-EBUILD liblas-1.8.0.ebuild 860 BLAKE2B 21c698a0b8150fce20677df26ce7e4fefb97314977edb4bd0e26000f926b7f46ebd1c0a650d01c3b8cf7383ab7e3ec1bca928ee1f396102ef8b07fb45341b23c SHA512 b11a84d4efd57208a542c02530c2342f2e1218606bebe1b47c8c345b59d838019fe6190c8419ffc74877260f139f53e935a3a7f46244f4ff019fe6a9d0bd2639
-EBUILD liblas-1.8.1.ebuild 988 BLAKE2B 49dd9dd1aacb2297e6388272fa6df837be67496656b0788b472d39f18d13603b33478e532575e0be6e3778c460e09459ac39a841731a092b84d02e2c1bd219ba SHA512 34ee3b5aec0b23922e10cdc62bb125633172db136b4a77c9c8cadfcc008eba23a57ef16c1eb0b0ae42bf3155df5a5e224d8af8c96631bba4edbc51d6b3191a01
-MISC metadata.xml 700 BLAKE2B 04a72f3e453495412b2cd34d6c6743351842ddb6fe5dfaf856f6a63ea0a7546df8611cb50ae23e39b6669502ab9c7befe43f4d1fc198d410ef7822fdc23fabf4 SHA512 56edecc4e8eee02fe781ce5a61368e5253ba249a78413f4e200a56164878ec768256b36abde5c97022849ba2ca7ed5209ff5d19700b56e43652e3f0a642371d9
+EBUILD liblas-1.8.1.ebuild 987 BLAKE2B 830e1e9e1fa0c87e4aaeee132606f1f7573b6ac9af20daa3a3f0f1315458cb040ccdbc84bbce850489e30f0b5533a01b66fb6f559262a99aa97d28cfa70c1103 SHA512 92450d2cc3fd4da04f32bf21f2d3a873f2d170e85c80085997cb2662ab9ba2b4247acbdbb7e4f29cbffbe832e49138d4f8d0d58a8d7dda37b9be354d82f20154
+MISC metadata.xml 596 BLAKE2B 0bbf059831a7bfe972752880a392fac1c7eb4143e7227cef7417f21392e746cc444c2c835c0d013ca0d3b068de353abb07b62693470b59dc29cfad14c85f09c5 SHA512 a89101c2ad1510b458d138b0be0606290d32b8d0267e27d5aa1ddbe865dee2da67ea960751390d394d4525e6fb4c6679a72092c76acb0f85b5840d8ce0d0b114
diff --git a/sci-geosciences/liblas/liblas-1.8.0.ebuild b/sci-geosciences/liblas/liblas-1.8.0.ebuild
deleted file mode 100644
index 7db7d88088be..000000000000
--- a/sci-geosciences/liblas/liblas-1.8.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-multilib multilib
-
-DESCRIPTION="C/C++ library for manipulating the LAS LiDAR format common in GIS"
-HOMEPAGE="http://www.liblas.org"
-SRC_URI="http://download.osgeo.org/${PN}/libLAS-${PV}.tar.bz2"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="gdal geotiff"
-REQUIRED_USE="gdal? ( geotiff )"
-
-RDEPEND="
-	dev-libs/boost:=
-	sci-geosciences/laszip
-	gdal? ( sci-libs/gdal )
-	geotiff? ( sci-libs/libgeotiff )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/libLAS-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}_remove-std-c++98.patch
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package gdal GDAL)
-		$(cmake-utils_use_find_package geotiff GeoTIFF)
-		-DLIBLAS_LIB_SUBDIR=$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
diff --git a/sci-geosciences/liblas/liblas-1.8.1.ebuild b/sci-geosciences/liblas/liblas-1.8.1.ebuild
index 5996bcb6aae3..083d66bcf08f 100644
--- a/sci-geosciences/liblas/liblas-1.8.1.ebuild
+++ b/sci-geosciences/liblas/liblas-1.8.1.ebuild
@@ -14,7 +14,7 @@ RESTRICT="test"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ia64 ppc ~ppc64 x86"
 IUSE="gdal"
 
 RDEPEND="
diff --git a/sci-geosciences/liblas/metadata.xml b/sci-geosciences/liblas/metadata.xml
index 5491d30c6e63..ed125b665799 100644
--- a/sci-geosciences/liblas/metadata.xml
+++ b/sci-geosciences/liblas/metadata.xml
@@ -12,8 +12,6 @@
 <use>
 	<flag name="gdal">Add support for the <pkg>sci-libs/gdal</pkg> geospatial
 	raster library</flag>
-	<flag name="geotiff">Add support for geo-tagged TIFF files with
-	<pkg>sci-libs/libgeotiff</pkg></flag>
 </use>
 <longdescription lang="en">
 A C/C++ library for reading and writing the very common LAS LiDAR format.
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 4ff976547fb0..61e839acb87d 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,15 +1,16 @@
 AUX qgis-2.18.12-cmake-lib-suffix.patch 454 BLAKE2B b5b7b1d64fd8c8eef1b0579124261d41b8a1e01b6670d211cdebcff4f4dd905b4e15fcf94386a5e297cadc3360bf48000106805f3425cdf383c043b3cda0560f SHA512 f6b04bddf4d60d4eec257fb71cf87e15e7a72c34c1016e8eadeb660ebc7079cb8b9104041e4df5e7cbe0e00954ad65ced53b7e19f3f9f7cfbee1b791874ddcd7
 AUX qgis-2.18.12-sip.patch 4471 BLAKE2B c4bbdbfe43f6b9c2a4f8aec25109a40967fd93ca815d0fcb2007ee8072e620c0b3aca08890cff4e085a8a2f35962d3f8e3eec54f4256274f7edb5a977b74dc63 SHA512 df08773c915ee640b6ef81ffdb1553e144f5530934bed3a37230824662fa99de91bcc52475f7232e44df3ebd147abf54f537b6a23b02563a5155c14a7d2cb9a6
 AUX qgis-2.18.6-featuresummary.patch 1009 BLAKE2B bca5de34bc4eccc10aee3b4320be0259c342d45ea538fd92d6229243fc6b0c6ab90dcc8f24fd9bc10119cac6ab87c1a64f47528269f07865e3e8bf1ca16e4f1f SHA512 4f271d7fb5b39b49bd06cb6308e82b44088978e2fcc17e453dcdc71655000b91be06e08ce05a373ed45d25472422a7b317c12b19a3a41620df07ea723766b44e
+AUX qgis-3.0.0-featuresummary.patch 986 BLAKE2B 088e7aa420ae6da6b7bcbd7ffff53ec4364861fc554ae490ed5b9606eea700369158a83e5bf90f183fdc7f59bbfc9a43d4a59efd261813f022b20de3a0ac3a49 SHA512 d8ad2e2c8a1f83172f37434657762d7796adf75db06201a1cc52f412327e22aeb3d5df7b24232bfb8da66593db85e772aac3fe33672fc01f81c2fabf9b8d1835
 DIST qgis-2.18.12.tar.bz2 84936155 BLAKE2B 0d47094ae8dac3101888140b5773a8e7b52d2562517bb30983592043267adc28d878ad644162ad04d84440497c567d075225db3db5a215440dee7258a8faade3 SHA512 e34dd98d0d0aa5fdf1f980dbc1376c25a9a7ffaa59b1a2eba8423e7f44bc039b547f3f65368178a8c485fa34526dd9fece2e09d9372fed3b9a758f7286b690ea
 DIST qgis-2.18.14.tar.bz2 84935301 BLAKE2B 37468062894235608f6efd0b58311e019f57ec0b3e6db63d8fef92ae93ac95ed13fe51290ebd063d31f1ea2318a23d7bdabb0774b451a2305064162addb4da29 SHA512 da738ae25f1207441a52091af9a3e70fd17f95704a23e27f72ee4c7ba213fd9ccf2d6685d91c34f94c555ca2dce420d6a07840b1fa682d6b960abdf3ba177036
 DIST qgis-2.18.16.tar.bz2 84976777 BLAKE2B ad68ce63698266bc081db7be0529ef50f66ee9c048b2e2a743cfc24d1ddb161c86c71283c09740a22c45476f863516f8855c69a5ccf074e9676d1ed5a09563a1 SHA512 1fe060c1d392f304eea10a211815e14081299a865e34114625f3a5f2a1b365f571bb30878a21cbf25bc32285ffc689d37cb7dbcab129ce5f03ccd6fa0781876d
 DIST qgis-3.0.0.tar.bz2 94186303 BLAKE2B 2b2623c218a86af22ee13e1271e66244fc6191732db6bc694860015824525188308609c8758062910ba7065ca6790d4091beb15ff324d1a8410e65525cf785b0 SHA512 91201c5d48f9450734a6268f70cba830e363db15a979266af1a7f2ef73857ca11e89145d027f394d052d0536e54b4f62523b1ad49bbe698743fec882ceecfabe
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
 DIST qgis_sample_data.tar.gz 13601736 BLAKE2B 92acadbd009b181e74516120b3a700c96c7c1a732240434439bbe51afa441dee6521dac7bf6629fb5d7489b63fd0e0a45b1871df099820e8cd594920fa1499b7 SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78
-EBUILD qgis-2.18.12.ebuild 5238 BLAKE2B 71ce0aa312a0dabb8ef91b0f256dd65253617e3e5b37da7c8b2ece291a977c824247860c315ec2e113a1b77468120728b16aef0b876abdd3bdd6f4c60477f920 SHA512 6ed6eea3577c8b33773cf2d998458ee4c6a9ed5fa47c4912e8b8f15657a4c8cfa8ff8b054614c65cf664924d4a0070b2025e5b897c51fd66b1fcbbcddd6db2e3
-EBUILD qgis-2.18.14.ebuild 5230 BLAKE2B 0ab87ecfaa25d53ad9253d51e776d1b12e2e0bdfdb14d20d86ea8177e77fbc9b5d607523a6cd66345c66383965f06459df3569b8cb00e774919492e43de85024 SHA512 4bcbf4eeb9c73d99646d0ddc2ca78ebb15fcb8d5e29895990c316b2495d6aaad413cfaf390641128562fbe46fafe07c4070f304f7d3a24ace3551e19b0f1971e
-EBUILD qgis-2.18.16.ebuild 5227 BLAKE2B cdc3794d934707153185ff5bb25c99d55bcd277995862bdd32714e0d51c488fa205aca16317421b495242ebde4e4a7017a6009b5b27d06e66d59d402dc1026b4 SHA512 c32036b5fce7c205bf4ae40b9e2cb7e55d7a98b5287e13316a68cc3cab8bf0e770c4a4f3085749b1a8cf44f865605c2e808c7d4b5bc29ed9e1eab197776ca105
-EBUILD qgis-3.0.0.ebuild 5993 BLAKE2B c0c346c0c99540b2372c539e16e80be8459c92c1633ae45daffa5fe3104693d02d9a37e325d85603b03e7784426d0244e63ea78d32c9b316cbdeef13f0e53ade SHA512 4d6aaa0d039c94d0bb6484f9179e2a5f7e5e3e1a8fd04226dc8f585b2a1a0071f0310496c1e783e213ec3bc54c200461d7da95dcb1c0ec4342f813ea195db81d
-EBUILD qgis-9999.ebuild 5993 BLAKE2B c0c346c0c99540b2372c539e16e80be8459c92c1633ae45daffa5fe3104693d02d9a37e325d85603b03e7784426d0244e63ea78d32c9b316cbdeef13f0e53ade SHA512 4d6aaa0d039c94d0bb6484f9179e2a5f7e5e3e1a8fd04226dc8f585b2a1a0071f0310496c1e783e213ec3bc54c200461d7da95dcb1c0ec4342f813ea195db81d
-MISC metadata.xml 1121 BLAKE2B c81c6538e2b0a0094f7566fc72e2c4249d5ff21d999355502b0eaf89cb77b0be305d0df0aa366144bf4ced98e5b07969b33a4f6ee2efb3438cdf098788850571 SHA512 bdd356ee78300f01de7169ab2c8915c369e8e2d5a7cce85df21ba4c4835b65164cc28d7258e7ac0efba4b826cce2d90d179c9247b3f53c06ba73d6b2ac175d06
+EBUILD qgis-2.18.12.ebuild 5238 BLAKE2B db6c6fa1262605f1595cf0f7ee63c8126e80b0f5fbee6676a52729a1f09ca6b40e00502ee67490807302549ecff490b1c0ed6b5c8d7381695875cb2fa5dfdb5b SHA512 2c4bb08747a740f7fb9e3405245163e2b628c40fd1d95123afd2f364dd35e77dbf7bcec52fa77069d89d4a37f0d62fd36000d3e1d77c635171ae8d8c5336b901
+EBUILD qgis-2.18.14.ebuild 5230 BLAKE2B 4d54d00b4ac1f8af236c8136069e61d396f4a84ec27f9e41a487eec4f02de75ce8bf27f0d5fdd6cba3aa967880f0233dbd1fc7786a1b43fc32ca4cae10e75ec7 SHA512 f8b5ad44a9ee52a16368d8144aa8c24601876a0cf06ae647a1d538ea9867930c1dc6a7784d60d4488da4e62ac613faca5b714b1522873b95c642d64272a5edf6
+EBUILD qgis-2.18.16.ebuild 5230 BLAKE2B 4d54d00b4ac1f8af236c8136069e61d396f4a84ec27f9e41a487eec4f02de75ce8bf27f0d5fdd6cba3aa967880f0233dbd1fc7786a1b43fc32ca4cae10e75ec7 SHA512 f8b5ad44a9ee52a16368d8144aa8c24601876a0cf06ae647a1d538ea9867930c1dc6a7784d60d4488da4e62ac613faca5b714b1522873b95c642d64272a5edf6
+EBUILD qgis-3.0.0-r1.ebuild 6141 BLAKE2B 3b6fe020bf25cc345e9d345e819d76961ad5db2b0bd164c05938ffba9d10a05afdd9a58a1abc2191a0a7b2a0aa7c15703277617b0b1d57406e7197e57d4d60bd SHA512 1a1ba0ac0d1d502aff097e5ef1db9b96e5f6b3078977a1a56162e6d94886638a579e1f042b8ad2d0649baec3656862bd721d78498fe3ed2730b4cecede615a07
+EBUILD qgis-9999.ebuild 6148 BLAKE2B faa4704920b164b825c81356d905a88dd5b092931e6eaa8ab98bd703393df763b5b496d1da033661d1bb1fd2cb8804971501cf589c55b102a1abf0c1ab771c2f SHA512 fc934044fc00c46878be2cfb62fdcc24fbe412e5a8b12da6b211a2e24766fc2e0569929990cfe639b26803df23ff3e1963783724a5b78859eb633993ef3e984f
+MISC metadata.xml 1114 BLAKE2B eb9f40495ad88a2e5b6d07b4eb2bfd6eb4be9f992bb631cc0bb0826959a54db372253dbdc4ed79f16755b43041f81fa66a584af798dbb5b974fdcaf08046fcea SHA512 89554d9c97f843c63f5cf96f9cbb67aa8f14f26ff3956e25d7c6951a8dbbb859383df2ceee555d5e542624042377d2fee0c9f77683f184e98911df8bc0bd6700
diff --git a/sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch b/sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch
new file mode 100644
index 000000000000..8787dc09196d
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch
@@ -0,0 +1,31 @@
+From 70505aa1569c541dd252115848f46f91811955c0 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 9 Apr 2017 20:21:28 +0200
+Subject: [PATCH 1/2] Use FeatureSummary
+
+---
+ CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ed0a84013a..26f4659f61 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,6 +28,8 @@ SET(CMAKE_COLOR_MAKEFILE ON)
+ # set path to additional CMake modules
+ SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+ 
++include(FeatureSummary)
++
+ # in generated makefiles use relative paths so the project dir is moveable
+ # Note commented out since it cause problems but it would be nice to resolve these and enable
+ #
+@@ -908,3 +910,5 @@ ENDIF(WIN32 AND NOT UNIX)
+   SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md")
+   INCLUDE(CPack)
+ ENDIF (WITH_CORE)
++
++FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+-- 
+2.12.2
+
diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
index 511bb239d69d..f25562d2fc93 100644
--- a/sci-geosciences/qgis/metadata.xml
+++ b/sci-geosciences/qgis/metadata.xml
@@ -14,7 +14,7 @@
 	tracks from your GPS.
 	</longdescription>
 	<use>
-		<flag name="designer">Build custom widgets for <pkg>dev-qt/designer</pkg></flag>
+		<flag name="3d">Build QGIS 3D library using <pkg>dev-qt/qt3d</pkg></flag>
 		<flag name="georeferencer">Determines whether georeferencer plugin should be built</flag>
 		<flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag>
 		<flag name="mapserver">Determines whether mapserver should be built</flag>
diff --git a/sci-geosciences/qgis/qgis-2.18.12.ebuild b/sci-geosciences/qgis/qgis-2.18.12.ebuild
index 3dcd7a697d1f..94f4a69b124c 100644
--- a/sci-geosciences/qgis/qgis-2.18.12.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.12.ebuild
@@ -60,7 +60,7 @@ COMMON_DEPEND="
 		dev-python/python-dateutil[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
+		dev-python/qscintilla-python[qt4(-),${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/sip:=[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
diff --git a/sci-geosciences/qgis/qgis-2.18.14.ebuild b/sci-geosciences/qgis/qgis-2.18.14.ebuild
index 6a6e8c383ad8..2f935622f68c 100644
--- a/sci-geosciences/qgis/qgis-2.18.14.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.14.ebuild
@@ -60,7 +60,7 @@ COMMON_DEPEND="
 		dev-python/python-dateutil[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
+		dev-python/qscintilla-python[qt4(-),${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/sip:=[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
diff --git a/sci-geosciences/qgis/qgis-2.18.16.ebuild b/sci-geosciences/qgis/qgis-2.18.16.ebuild
index 1471c7e45cf7..2f935622f68c 100644
--- a/sci-geosciences/qgis/qgis-2.18.16.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.16.ebuild
@@ -60,7 +60,7 @@ COMMON_DEPEND="
 		dev-python/python-dateutil[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/qscintilla-python[qt4,${PYTHON_USEDEP}]
+		dev-python/qscintilla-python[qt4(-),${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/sip:=[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
diff --git a/sci-geosciences/qgis/qgis-3.0.0.ebuild b/sci-geosciences/qgis/qgis-3.0.0-r1.ebuild
similarity index 93%
rename from sci-geosciences/qgis/qgis-3.0.0.ebuild
rename to sci-geosciences/qgis/qgis-3.0.0-r1.ebuild
index d773dd571876..84a8a75f10bc 100644
--- a/sci-geosciences/qgis/qgis-3.0.0.ebuild
+++ b/sci-geosciences/qgis/qgis-3.0.0-r1.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://www.qgis.org/"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="designer examples georeferencer grass mapserver oracle polar postgres python webkit"
+IUSE="3d examples georeferencer grass mapserver oracle polar postgres python webkit"
 
 REQUIRED_USE="
 	mapserver? ( python )
@@ -36,6 +36,7 @@ COMMON_DEPEND="
 	dev-libs/expat
 	dev-libs/libzip:=
 	dev-libs/qtkeychain[qt5(+)]
+	>=dev-qt/designer-${QT_MIN_VER}:5
 	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
 	>=dev-qt/qtcore-${QT_MIN_VER}:5
 	>=dev-qt/qtgui-${QT_MIN_VER}:5
@@ -52,7 +53,7 @@ COMMON_DEPEND="
 	sci-libs/proj
 	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
 	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-	designer? ( >=dev-qt/designer-${QT_MIN_VER}:5 )
+	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
 	georeferencer? ( sci-libs/gsl:= )
 	grass? ( >=sci-geosciences/grass-7.0.0:= )
 	mapserver? ( dev-libs/fcgi )
@@ -69,7 +70,7 @@ COMMON_DEPEND="
 		dev-python/markupsafe[${PYTHON_USEDEP}]
 		dev-python/owslib[${PYTHON_USEDEP}]
 		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[sql,svg,webkit?,${PYTHON_USEDEP}]
+		dev-python/PyQt5[designer,sql,svg,webkit?,${PYTHON_USEDEP}]
 		dev-python/python-dateutil[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
@@ -98,6 +99,8 @@ RESTRICT="test"
 PATCHES=(
 	# git master
 	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
+	# TODO upstream
+	"${FILESDIR}/${P}-featuresummary.patch"
 )
 
 pkg_setup() {
@@ -130,7 +133,7 @@ src_configure() {
 		-DWITH_APIDOC=OFF
 		-DWITH_QSPATIALITE=ON
 		-DENABLE_TESTS=OFF
-		-DWITH_CUSTOM_WIDGETS=$(usex designer)
+		-DWITH_3D=$(usex 3d)
 		-DWITH_GEOREFERENCER=$(usex georeferencer)
 		-DWITH_GRASS=$(usex grass)
 		-DWITH_SERVER=$(usex mapserver)
@@ -138,6 +141,7 @@ src_configure() {
 		-DWITH_QWTPOLAR=$(usex polar)
 		-DWITH_POSTGRESQL=$(usex postgres)
 		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
 		-DWITH_QTWEBKIT=$(usex webkit)
 	)
 
@@ -150,8 +154,9 @@ src_configure() {
 
 	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
 
-	# bug 612956
+	# bugs 612956, 648726
 	addpredict /dev/dri/renderD128
+	addpredict /dev/dri/renderD129
 
 	cmake-utils_src_configure
 }
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index d773dd571876..e1f95949f665 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://www.qgis.org/"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="designer examples georeferencer grass mapserver oracle polar postgres python webkit"
+IUSE="3d examples georeferencer grass mapserver oracle polar postgres python webkit"
 
 REQUIRED_USE="
 	mapserver? ( python )
@@ -36,6 +36,7 @@ COMMON_DEPEND="
 	dev-libs/expat
 	dev-libs/libzip:=
 	dev-libs/qtkeychain[qt5(+)]
+	>=dev-qt/designer-${QT_MIN_VER}:5
 	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
 	>=dev-qt/qtcore-${QT_MIN_VER}:5
 	>=dev-qt/qtgui-${QT_MIN_VER}:5
@@ -52,7 +53,7 @@ COMMON_DEPEND="
 	sci-libs/proj
 	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
 	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-	designer? ( >=dev-qt/designer-${QT_MIN_VER}:5 )
+	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
 	georeferencer? ( sci-libs/gsl:= )
 	grass? ( >=sci-geosciences/grass-7.0.0:= )
 	mapserver? ( dev-libs/fcgi )
@@ -69,7 +70,7 @@ COMMON_DEPEND="
 		dev-python/markupsafe[${PYTHON_USEDEP}]
 		dev-python/owslib[${PYTHON_USEDEP}]
 		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[sql,svg,webkit?,${PYTHON_USEDEP}]
+		dev-python/PyQt5[designer,sql,svg,webkit?,${PYTHON_USEDEP}]
 		dev-python/python-dateutil[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
@@ -98,6 +99,8 @@ RESTRICT="test"
 PATCHES=(
 	# git master
 	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
+	# TODO upstream
+	"${FILESDIR}/${PN}-3.0.0-featuresummary.patch"
 )
 
 pkg_setup() {
@@ -130,7 +133,7 @@ src_configure() {
 		-DWITH_APIDOC=OFF
 		-DWITH_QSPATIALITE=ON
 		-DENABLE_TESTS=OFF
-		-DWITH_CUSTOM_WIDGETS=$(usex designer)
+		-DWITH_3D=$(usex 3d)
 		-DWITH_GEOREFERENCER=$(usex georeferencer)
 		-DWITH_GRASS=$(usex grass)
 		-DWITH_SERVER=$(usex mapserver)
@@ -138,6 +141,7 @@ src_configure() {
 		-DWITH_QWTPOLAR=$(usex polar)
 		-DWITH_POSTGRESQL=$(usex postgres)
 		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
 		-DWITH_QTWEBKIT=$(usex webkit)
 	)
 
@@ -150,8 +154,9 @@ src_configure() {
 
 	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
 
-	# bug 612956
+	# bugs 612956, 648726
 	addpredict /dev/dri/renderD128
+	addpredict /dev/dri/renderD129
 
 	cmake-utils_src_configure
 }
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index ebc4d9ae069e..a3440a0fb1c3 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 34b003a0a37f..8254cf4a9455 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -2,5 +2,5 @@ AUX gdal-2.2.3-bashcomp-path.patch 621 BLAKE2B 0f825aa27d68e35afdcbd7c5d3239b6b6
 AUX gdal-2.2.3-json-c-0.13.patch 3733 BLAKE2B 34921f8e2717a446bead6d8b07c6a8e2455752bd4534d066c4bb6150f1cd03856269a8510535517cbf60e609053e470107e9ce62d58358afcb48aa819a546563 SHA512 f4beaa11431b1eb2c6986c3da24a696cdade04f025a9bdeb9726c392aecdf597126c7735b1b2c1175bd0de71a2441b2c1e5d01e597acd7869e9c75644660994d
 AUX gdal-2.2.3-soname.patch 2062 BLAKE2B 159b3d8eec126a141ff21c908d45193411bdbcc50e03386131c313cbd71861859a1b8a5a5648307868fee484b8a1dd816b580bb2304cb7e1e72e42df40cea042 SHA512 0f06d8de537ddc19c6c4ee800c0c4b084ceb04a47fd24f28c3095909219e27634e66086158f80f011ccfb7865fc559a966770bfa95d3a8fd144f3f8a3d34571d
 DIST gdal-2.2.3.tar.gz 13754766 BLAKE2B d9482e7ee40bb5558fbbb43b750dfb95344abe45142c19e1f767535d3fc127fa9d6ed4496d730a25cb4132980efbffb4685e8663798fa05515b8548edb689e42 SHA512 841e5ba3c1a442b678dcaabac719ea7707b817f3dc717a34430dc7ba1f2c27fa88e27b7a8645075fae6e16373b36e6c50f674bdd6b70d10059e6bc4be7a72046
-EBUILD gdal-2.2.3-r1.ebuild 7519 BLAKE2B a9c89375ce4204b9a5b4149cf33078f78687c1cd442acfce7c3a1dedc985eb39f4dd94b059df9b4eb5fbd3536a1487557bae6e5ff56d53ae0ddc88978b997f14 SHA512 543d4aee1eb21294a005d88d242c81b37f96d25059355fdd36c3a1366d60199060d1d7a2abd372062652fafe99bdce7cdde447845c10ca45193c1aef990c9e15
+EBUILD gdal-2.2.3-r1.ebuild 7518 BLAKE2B e45e61a635ea63a7de849d4b01f27d2f0a2f0602803735753f392f3864b33b7b03e2d45af6e68da12147cfd67d4e08a816f2510e03d2f869218db430b7d11caf SHA512 120f5290dff2b0ccbc99a13247062717f7d6cdb5a52f02e60861f32e834d5c534f916caad6c5acadc70238e9f7a2beeabc256bfe6b8b860eecbaf9e4b8cbc917
 MISC metadata.xml 1522 BLAKE2B b67678f81739e2fb2866cc6ca49545368fce4a85b145ba3f8228b8a39ecb2d7f75b55500f13768838c9ed11a47f586ab7b05eb31e2dbf6fcd4d29c5d8896107f SHA512 091112e555a5a77c5643cbd4465046bfd9fe287e209b42f5410787a2f1a2e4d7ec640efad93c277f0f6581db2264fa104d5aba2e8cbc4126c2c14fe4d86afcee
diff --git a/sci-libs/gdal/gdal-2.2.3-r1.ebuild b/sci-libs/gdal/gdal-2.2.3-r1.ebuild
index 9370d1a2cd68..aa2b79c9e5b7 100644
--- a/sci-libs/gdal/gdal-2.2.3-r1.ebuild
+++ b/sci-libs/gdal/gdal-2.2.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
 SLOT="0/2.2"
 LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls"
 
 COMMON_DEPEND="
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 8dbd4f918abf..a070e3fb7e02 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/cgal/Manifest b/sci-mathematics/cgal/Manifest
index 08aaa34dd4f7..a03fbc0a127c 100644
--- a/sci-mathematics/cgal/Manifest
+++ b/sci-mathematics/cgal/Manifest
@@ -1,8 +1,12 @@
+AUX cgal-4.11.1-fix-buildsystem.patch 840 BLAKE2B e1179b2721e52b2edf305e2cb434a914f0b46b6aa694fd1766a8622b65ed8e8209a06bc134bfab97f07b789af45f74605fc7ed2b6c45ed5f5574a0a801c479dd SHA512 5e6315dfa64c58ea88d473b3513ec0817e6d212c325dd70b523d2dca2817fed2cdb0791686b7353c410e42ff8b1ee228a045bd6f002b591672066b33ce6f09ad
 AUX cgal-4.7-fix-buildsystem.patch 761 BLAKE2B 13897f474dee1a4129a0555179082a50cb12831cbc2226617aaa128b87fdcfabc2cc0e97fa65b39013e147dcbfa7e851c2453ee8d415389f4622a2dc2f55f728 SHA512 97d380e915561a8407f6daf681457d5cce1f5ae2f8e1af25b1bea21876d661941144d53c6d96f90c65b9377aece98d2c0b14450917f4b768644de51020fe2338
 DIST CGAL-4.10-doc_html.tar.xz 27147028 BLAKE2B ccdb77a497c2aef3004c3adfd81bf8f79a3322ed6cc071569d23666cf8ad00a94ce01f1bab21171eb461066e45a42c9c7003705d3d3d701879e7eb1e13af0eef SHA512 1c1c90c3ce07c5e4bf5a125cd5dccd0595f5c5d8fcf0f16df8a5506c6fe611c30440e034621c3477ae55670f96abbe389bfc2f3e0c88e099133b03cce6f2923d
 DIST CGAL-4.10.tar.xz 14249804 BLAKE2B 4715449bebc45fe9270b4a336af964eda4c1a603a9a63b3f3b6922253e18f205e27d5d14dea7ae90ece4184c8b3bafb0ff2963311da7a95ab6d21d8961679ac1 SHA512 2029ad647e73692bb38b2ed9606aae61ec1d74df886bb6fd0f4e3388fb08a51de87a1e290df0dcc621a8abc2654915e2d331ec9f6d27ddd9a21f187a165fa09d
+DIST CGAL-4.11.1-doc_html.tar.xz 30575368 BLAKE2B 088cedcde628520625a4494b261e3ae963b8f3688ce4c1117e70f925ff86d11606482d3ce04415d6f03d07a52dfbf041ee315a0e627eb2d7944d08223b51077c SHA512 b16ad29a2981fc72902cc2c850a02c0412eb2f09f5ec864d85c92230ffe1f996c45ae2558b472b0b239d6c7718ccc6da6d65e52b5a7b33d1b406eda4aad0bca5
+DIST CGAL-4.11.1.tar.xz 14650588 BLAKE2B 08a7a61d92fc5293eef194d4bb1a42c69cacd8bbc3ee3c1e803435d0d7e2c3cf6533ce5a8f40fb4bf4e6b2ba34ec2c74abd2c2cbdbddbb874caa75b7d80624ba SHA512 0687ddd52e7a7d5e437a57c06d6c1ad7b325a7d0055fc48ba11be6fbc3e4003e2b28a35a9caac0c69af4c73d7d85553502e777714fa56c64580131b04dbe563e
 DIST cgal-4.9-doc_html-1.tar.xz 26612436 BLAKE2B 17ea9c6e7bd9c981c0b8282b4e4dd3606e1939902c131947e05eccd1760d743740bc9bc385052954c3e60a49a7d5f1d961b4f954892d172095e3a2cf86e8887e SHA512 df9855ff2b152a32dfb584c68b861e2cd480c073cd8cfddc494295455aff8d96e00ba6424b7a7f460e2f9e8db0fcefe858a656f4834821dd5466f61eb3d555b2
 DIST cgal-4.9.tar.xz 13749292 BLAKE2B fc6f44dec7c4cfd6ec13911cd668f0c6df7e73cd85540678f43c95b6fd9130449ca2597222e6b668b05072194302b95d63ff775ca82380aedc4fb8c439967c5b SHA512 6f55e061917869dea1083e6fccac132a5232c2de4c01d0ed052bbb31789a23cc66334f12a884ed1e8a1b84af0e2a7186000964dd12e4b41914ee7fd5e36baca8
 EBUILD cgal-4.10.ebuild 1996 BLAKE2B d94c7a8c9fc7e6b2ad4bc0f76d73a53e42dbac4a4a79b5d56ce921333793a505706bfa87da685819944b5d9ac1ff28a2cf0a12b8b7943fbdc7b1216c80e9a565 SHA512 af69e87c18b6d000f224402e609c729051b1d05d864d759c0e7e5a2550c9ff2f5cd15e899bbd475879a86fb10bef41a33f149dd50615337a9ff9fcd73937bed5
+EBUILD cgal-4.11.1.ebuild 1854 BLAKE2B ec5b8ef250df2b34c97cd4fa3c6dfa5a46a866ecd4bfadae6c29b3a76f251c20d66bdb20784310059a88791d00112926799c1bdd6cac823e63f5eef3806ad8fd SHA512 39aaabec4f5bb9ff66bba690ff870bbbcdb96b42a2032bbbc8b4ec6f8c316ee3ab5fae4d322c0cee1b72a1332ca0e926fdebede07156e46e139fbc4bd747fe03
 EBUILD cgal-4.9.ebuild 1920 BLAKE2B dadff73dac32bc6b2aab830495446de6d05d0ccaff9e554a70075a283e38cb468c7f2539173f5b5921951e76bb112c28b3a5f448907c223044d7e6887933b80c SHA512 19e6e2a617a8c9c4fbd5ab4f832c14f5c5ca6ce600f34e3aa6dc8f73aa98c0b3e0b64667a5f29d552c974f164e71c500ee1c3f14c781e659a5fdfae6615c6f03
 MISC metadata.xml 1320 BLAKE2B 783149a7fc48a50a58319ff81790908eb6294bf1fae99fcf8cffd6249ef1c60c1a87f3d818352f70b36790d2fd9ffb0daa9b16d918625a27f82b843579228fd1 SHA512 ee385a11e84af08f5c8146da067d27beceea4f15b2ede403ed799dc7766a4f749904356f22175eceb121555d6a40f3994381f6a1f8d2a90178962b65cf2a40d0
diff --git a/sci-mathematics/cgal/cgal-4.11.1.ebuild b/sci-mathematics/cgal/cgal-4.11.1.ebuild
new file mode 100644
index 000000000000..97da0b221e6d
--- /dev/null
+++ b/sci-mathematics/cgal/cgal-4.11.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic
+
+MY_P=CGAL-${PV}
+
+DESCRIPTION="C++ library for geometric algorithms and data structures"
+HOMEPAGE="https://www.cgal.org/"
+SRC_URI="
+	https://github.com/CGAL/cgal/releases/download/releases%2F${MY_P}/${MY_P}.tar.xz
+	doc? ( https://github.com/CGAL/cgal/releases/download/releases%2F${MY_P}/${MY_P}-doc_html.tar.xz )"
+
+LICENSE="LGPL-3 GPL-3 Boost-1.0"
+SLOT="0/13"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples +gmp mpfi ntl qt5"
+
+RDEPEND="
+	>=dev-cpp/eigen-3.1
+	dev-libs/boost:=[threads]
+	dev-libs/mpfr:0=
+	sys-libs/zlib:=
+	x11-libs/libX11:=
+	virtual/glu:=
+	virtual/opengl:=
+	gmp? ( dev-libs/gmp:=[cxx] )
+	mpfi? ( sci-libs/mpfi )
+	ntl? ( dev-libs/ntl )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+	)"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.11.1-fix-buildsystem.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+	# modules provided by dev-util/cmake and dev-cpp/eigen
+	rm cmake/modules/Find{Eigen3,GLEW,OpenGL}.cmake || die
+	sed -e '/install(FILES AUTHORS/d' \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCGAL_INSTALL_LIB_DIR="$(get_libdir)"
+		-DCGAL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake"
+		-DWITH_LEDA=OFF
+		-DWITH_Eigen3=ON
+		-DWITH_ZLIB=ON
+		-DWITH_GMP="$(usex gmp)"
+		-DWITH_GMPXX="$(usex gmp)"
+		-DWITH_MPFI="$(usex mpfi)"
+		-DWITH_NTL="$(usex ntl)"
+		-DWITH_CGAL_Qt5="$(usex qt5)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${WORKDIR}"/doc_html/. )
+	cmake-utils_src_install
+	if use examples; then
+		dodoc -r examples demo
+		docompress -x /usr/share/doc/${PF}/{examples,demo}
+	fi
+}
diff --git a/sci-mathematics/cgal/files/cgal-4.11.1-fix-buildsystem.patch b/sci-mathematics/cgal/files/cgal-4.11.1-fix-buildsystem.patch
new file mode 100644
index 000000000000..e6c9cd984d67
--- /dev/null
+++ b/sci-mathematics/cgal/files/cgal-4.11.1-fix-buildsystem.patch
@@ -0,0 +1,15 @@
+diff -urEbwB CGAL-4.11.1/cmake/modules/CGAL_SetupFlags.cmake CGAL-4.11.1.new/cmake/modules/CGAL_SetupFlags.cmake
+--- CGAL-4.11.1/cmake/modules/CGAL_SetupFlags.cmake	2018-02-24 21:00:36.000000000 +0100
++++ CGAL-4.11.1.new/cmake/modules/CGAL_SetupFlags.cmake	2018-03-05 12:13:47.233411449 +0100
+@@ -61,11 +61,6 @@
+   add_definitions(-DCGAL_TEST_SUITE)
+ endif()
+ 
+-if ( NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Debug"
+-     AND NOT "${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo" AND NOT "${CMAKE_BUILD_TYPE}" STREQUAL "MinSizeRel" )
+-  message( FATAL_ERROR "${CMAKE_BUILD_TYPE} is not a valid build type: only Release, Debug, RelWithDebInfo or MinSizeRel is allowed" )
+-endif()
+-
+ message( STATUS "Build type: ${CMAKE_BUILD_TYPE}" )
+ 
+ string( TOUPPER "${CMAKE_BUILD_TYPE}" CGAL_BUILD_TYPE_UPPER )
diff --git a/sci-mathematics/octave-epstk/Manifest b/sci-mathematics/octave-epstk/Manifest
index e61216619122..7b3ad97b1fa7 100644
--- a/sci-mathematics/octave-epstk/Manifest
+++ b/sci-mathematics/octave-epstk/Manifest
@@ -1,7 +1,4 @@
-DIST octave-epstk_2.3-2.debian.tar.gz 10079 BLAKE2B dac7f138373a14bb51190dadeb4481c73b204756a1760242141459c011e59e14d705e2cc1b3f4de9a5a49ee034dffa898e1d217a90ea564556ecc71346d84d4f SHA512 076c374581df44d5b6ac9e0a7fd0a412adfda325fd28fbbf036a739d444332a75dea30a3e313f4df8ec54ceab60fea8206cf70837ae83407b17c5ff42e35563f
-DIST octave-epstk_2.3.orig.tar.bz2 1401307 BLAKE2B d2537046e2436e595ad7d86c783b095af51d3598faa9b97d22724e75fc8e009afe096bcf736145e90757088c9148c1d2dad1689bc06343d7789d0f1137bb5a48 SHA512 3b672e78636a1d339355d5f8340a0f35c3af443061e76de875a0f22fae5fa394b3373fb12770705a301dbccdd1ad577aec2934daa04e8f3d16f8133b77e9bbd7
 DIST octave-epstk_2.4-1.debian.tar.gz 10905 BLAKE2B 79290d650a3a9e485c2b45fabcf5aa6c68585656f5f1c81ac3412ea123986bb51ed18b7f093bcec954964e260907594d5fda0f28915ef951fe59c6d238092278 SHA512 93ce2bdb04b2be36bc73d2c13a1bdd909b30597a76bc80db0abb1b4f53467742086559ed1f5ce265cea70f84c9b33d07a514b4fc1c8afc46640d0031907e6dea
 DIST octave-epstk_2.4.orig.tar.bz2 1072111 BLAKE2B 25694cb80fe66efb15508f6654218a2fcfd66997258e590626caf4daeafdc68b92dba5c9b0066c25777af609606d9b6e15ebea45c8fabcca17c962a1d664172c SHA512 64de7c23e2a79f03a6aeaa9e8a73c6d95e59cf616fc601bd8c6ad18d3870b1c60752f95cdc174cc31b3095e8b6e3858111c7d72b3b6df8effee4393791282112
-EBUILD octave-epstk-2.3.ebuild 885 BLAKE2B 6e566560842828cfd9116a855c1136d3cd036750c73fb2f732789369757ca1d739df51316d46443fd7dd774fd056b74bf461ab782cfc67eddad585015d05b00d SHA512 7d55c2cc0eaed1747a571ca926e844a27f537bc469c0ba3e6968bf7c564a328891d95a4bb859abcdd7fc585d6a29937d80dfa38c05870f5ec09e94fb2fc8c9a8
 EBUILD octave-epstk-2.4.ebuild 871 BLAKE2B dbffdcfac3e8df62a095fbf54f764f73c7fdd357e5452481d44017157978f8a539af6a0939d97848c6856906ead60e23be5e1179e7e75d33f58c483461b97c08 SHA512 a84e188cc192d109733cc27ab92aa54dae4f0a5a184147f8397ff15d2b0391e7676018e29b7f82e896db7fb09e6bc27bc6fac26569a1dd5c20a64220915c3cef
 MISC metadata.xml 614 BLAKE2B 7e4e57a0aa9b57d55fe747609630d9ec2b037595f88ba1d3352a3702c85de6695c43035d75780189bc7293b581766b5305ff37c005de2843a6e9033000540d0c SHA512 d3ff3c6669d6fb6dac67df09c9eb7245e5cbf91d9bdd0d0ae47f66fcf3e11a2f769bdc9f934a35189792364a902518ae6d906963859eabfdc65579f6253e1061
diff --git a/sci-mathematics/octave-epstk/octave-epstk-2.3.ebuild b/sci-mathematics/octave-epstk/octave-epstk-2.3.ebuild
deleted file mode 100644
index f4c6f9a75dc9..000000000000
--- a/sci-mathematics/octave-epstk/octave-epstk-2.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils
-
-DEB_PR=2
-DESCRIPTION="Graphical output functions for Matlab and Octave"
-HOMEPAGE="http://www.epstk.de/"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.bz2
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${DEB_PR}.debian.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND="sci-mathematics/octave
-	app-text/ghostscript-gpl"
-DEPEND=""
-
-S="${WORKDIR}"
-
-src_prepare() {
-	local p
-	cd eps*
-	for p in $(cat "${WORKDIR}"/debian/patches/series); do
-		epatch "${WORKDIR}"/debian/patches/${p}
-	done
-}
-
-src_install () {
-	insinto /usr/share/octave/site/m/${PN}
-	doins eps*/m/* || die
-	use doc && dohtml -r eps*/doc/*
-	insinto /etc
-	doins debian/epstk.conf || die
-	dodoc debian/README.Debian debian/changelog
-}
diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index 2b85b5823574..5d025ff5f3e0 100644
Binary files a/sci-misc/Manifest.gz and b/sci-misc/Manifest.gz differ
diff --git a/sci-misc/netlogo-bin/Manifest b/sci-misc/netlogo-bin/Manifest
index 2256a7962019..349dfb623e8f 100644
--- a/sci-misc/netlogo-bin/Manifest
+++ b/sci-misc/netlogo-bin/Manifest
@@ -1,7 +1,14 @@
+AUX behaviorsearch-6.0.2.sh 1588 BLAKE2B 7dd66ab3e2210e6932101301942287c76f7526ca68dd9901657330f6baeae93ac834022d001fdc885b0bf2b77c278fc30f0d024bee8f866bd37e0a971c2e6036 SHA512 9f5538dcd6b6d9f7c94b147876a3ca826017814b3bd2db8689782ef1df239d052e3784107f533e265b896f541812f42310fd6597e1c047173841faf248fa592c
 AUX hubnet.sh 159 BLAKE2B 58c5ad561c056db21caa67067267bd7c564b77f16b90ba97ee5397ea58df0cbfdd571cf1d5b2a2e9be5306c879e22f97ae9c8905cbb8b207ef4b4bd6c755ecd1 SHA512 dd9587ceca13079ca7a10e632e885af1ea0b5b0e15c56c989c59a0eda786982aca6465c356daebcd034ea466a956ddcd2fe923d8e749b7c94da28a9c462f6757
+AUX hubnetclient-6.0.2.sh 2007 BLAKE2B 11d3da62d0c51941e7655250c0864a42cdc11509b8bb04162f2e3b649aa181c964d667c3c9955221d16acc1f7fb0d9f56f9015c0e2df7065903165094aa584a4 SHA512 2d365440ed1b5236515a9d7ac09a4f8c3af623855bc23f52918a7295023ccac2d90ca58611519ba7a85ad10eefcd18773a8649fbe2c84b97cc15f9b7d1b297e9
 AUX netlogo-3d.sh 170 BLAKE2B 841ec01083567b2a194b6ee31d30f821402848a7fd56e130df4eee3a42bc6d00ce9729ce23e018484f842c1aab09c5ef2442819ef238c23790c1d75bb16e405a SHA512 f962a3bc75a5bccbb0230bb8058da95b570139adb39fd75641f2c01e6e93e66bbe96b532294fc9bd2ac983c4c67e940638951f358e703b031b33f2f91b370860
 AUX netlogo-5.0.3.sh 148 BLAKE2B 819476a2afd15b6a5a1ce4cddb7181747492faea35c77968220b5aa51bee9b83cfd654a1f9c148e1b191dceb42a4cca35a7b78bb7546d335b3a5c07e31e64391 SHA512 a0470a9725536a0d73b6ff66067545f38320898dd7c8539459857af780d12125169460ba15a87d96b0909aebbbeeb1a37d6df15f905e8585a0eab041eec78844
-DIST netlogo-5.0.3.tar.gz 66725456 BLAKE2B 85df19cd0ef501c903e9b2f2ee2a6ca39430a5f64e1086365b9a29baa3962a7e1d018001652db7da54f1d6623b477d644f7b745b30e2c3be3462f5cb4e5cb891 SHA512 39d660d5dbd7e74f072621a74bfc18648ed208b833b3d442f2a9dbefc673065c4a7bf0e4a8ebb670b4d4220ee7bec452cc97f32731a28ca2eb56656bea795b81
+AUX netlogo-6.0.2.sh 1975 BLAKE2B 63424bfc1a547593382d45747b5c20d6260488e161347fc5a5e6b85cdc27166f9bc49e223b223fb5f62247a9e9100df01f87c90b725c732291386d026a8c9a5c SHA512 94b9341d9d6999eca24f634566d707f90756aa19efab5767ab7e68bd6bb49bfea0e1769dc95895a0b4157443a5ed500470f8d7a28992b742d4f454512a53b117
+AUX netlogo3d-6.0.2.sh 2072 BLAKE2B b1e50dde00ab399ac3cd8ec4b29257c071ceb83f3e28684510e3bd12ee49bd478f96bacaab04de51799162e9ff368810c65df4c8c83459115cd49554e0988278 SHA512 2199d968bfbbec8c3346961faf3069564fe7017df3bc2426ccc60248ef9340376b378007083ee1bba6bc162dcfbc9ffe40c30331f771ae5faf9e7e9282c20c2e
+DIST NetLogo-6.0.2-32.tgz 192943415 BLAKE2B c7d20154ade89ae54f98fa08ae4832d9c81a97d1a7a93aaf0de75bd2914bae340ddd71dc3862957bf7e22863d5df9c5464a2bcd517ff0e9b087105237a8d5ac9 SHA512 ac8652a2487b01d02af0c8510ce4c80b2bf84cf2afc3d1bfbda198c1b7aeb0c5cbd85664e9841bc7704aec048482bc78306035673d2d59be67fb2ae50b63106b
+DIST NetLogo-6.0.2-64.tgz 190213078 BLAKE2B 6b0a077538f3e3f3e7769c605a67f6bb6b791319877910eac74e065091d3f6b8cd328d8b354415234b2dd9d4b96b3ca7d18074f54263f460f38b77b8dbe4b9bb SHA512 091200b66305e3ff84e9d1b9a293eaa5f6000a103de86d942c5d0f749aee52cf5519954d05807609f7c0cbeceeab15930ef48612b4f6c1445e529e876aaa9d8e
+DIST netlogo-5.0.3.tar.gz 29500644 BLAKE2B 8c71ba6b138cdf6bc999d3244ccf283720150a949526426249984ae87e50bd8bf2dab7141f9d4402c99e34463db772487347ee05c0125b996ce5424e165c19f9 SHA512 fc8d2d5a2a19ddeddec4643a06639e696cd403f605337b1b8072eb842b0f81fab1b264d386c4c0a09f7c2a44f9667b16a89f024d2fcf020ebd679b525ae9772e
 DIST netlogo.gif.tar 10240 BLAKE2B 5199290ca492dc4be03dac04a672b4a187daa6caa12a5a487137259071dad156e553ca7eea02f6cd7d66187e4956324fc2d3f2818f10f1557f276f003986be69 SHA512 9a9bc81660599d2b35875f301d5b9824bfa2dafa21dc96b1e6e281d4682ab7b4052844a961b46f5300131c91a4562c58e4b1a4d753cb2b24a18e64b42d333e32
 EBUILD netlogo-bin-5.0.3-r1.ebuild 1681 BLAKE2B 4907b55b86a29235e581397536fc00dd6b1ea7f0a06523cd0930b6bd9b8b176ccce8696f60f49a1b78e30d56ca68aee7c1fdfccbc48410cf53203715a136e5e1 SHA512 e3c0bf2c4b81a69fb7f9155f744a20ca34fbd8099a7a8aafad8f9b64ed6a7adab1475dbda74724fa8eadcf6eaa393ca6ed6cdae30ef53df04f738e3578e7ec3d
+EBUILD netlogo-bin-6.0.2.ebuild 2573 BLAKE2B 5e0f7e6a660dac2656fae96294cc01fb0622049a329b11551ccaaf89599f11a6fff59c490022e180d04837270ecf83e5204835a796963160120fef31c48d4983 SHA512 4b5efd20cef885027f6c0ad07c4df68a7542d72549bca1c32c941b476248685b11c022e5de767df0854d94d4d3ac64b1b474e35c32703cb31c5c972bdca8a139
 MISC metadata.xml 725 BLAKE2B f74c86871b9805278ce5f84d86193437ff9c3130e91deaff4ed9871b09336d37906c732b13620faa19b89d41916a7da1a8f61edd758942d690caac2878d3c7e4 SHA512 7bd804bf2c348af64992139edfa0d6b66a69c8f451ec92be6d1d909dd49833c216b444fce22c7c7d86354a32cc73be4334ccd6a60de1a9f6d5da9053f802dc08
diff --git a/sci-misc/netlogo-bin/files/behaviorsearch-6.0.2.sh b/sci-misc/netlogo-bin/files/behaviorsearch-6.0.2.sh
new file mode 100755
index 000000000000..225f4a332cff
--- /dev/null
+++ b/sci-misc/netlogo-bin/files/behaviorsearch-6.0.2.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+WD="`pwd`"  #store the current working directory, where this script was called from.
+
+#BehaviorSearch needs to start in the NetLogo base folder,
+# and "behaviorsearch" must be installed in a subfolder of the NetLogo folder.
+NETLOGO_DIR="$( dirname $( readlink -f "$0" ))" # the copious quoting is for handling paths with spaces
+cd "$NETLOGO_DIR"
+NETLOGO_DIR="`pwd`"  #in case it's a relative path, like "."
+LIBRARY_DIR="${NETLOGO_DIR}/app"
+BSEARCH_DIR="${LIBRARY_DIR}/behaviorsearch"
+
+JARS=""
+for f in `ls -1 "$LIBRARY_DIR" | grep "jar"`; do
+  JARS="$LIBRARY_DIR/$f:$JARS"
+done
+
+# If you want to use a different version of java, or if "java" is not in your PATH, 
+# you can run this script with the BSEARCH_JAVA environment variable pointing 
+# to the java executable you want to use. e.g. "/opt/java6/bin/java"
+if [ -z "$BSEARCH_JAVA" ]; then 
+	BSEARCH_JAVA="java"
+fi
+
+JAVA_VERSION=`"$BSEARCH_JAVA" -version 2>&1 | head -n1 | awk '{ print substr($3,2,3) }' | sed -e 's;\.;0;g'`
+if [ $JAVA_VERSION -lt 108 ]; then  #108 = java 1.8
+	echo "Sorry, this program requires Java Runtime Environment 1.8 or higher"
+	exit 1
+fi
+
+# If you have enough RAM, up the '1536m' below to '2048m' or more.
+# Or you can set the BSEARCH_MAXMEM environment variable when running the script
+# More RAM is especially helpful for multiple threads/parallel execution.
+if [ -z "$BSEARCH_MAXMEM" ]; then
+    BSEARCH_MAXMEM=1536m
+fi
+
+"$BSEARCH_JAVA" -Dbsearch.startupfolder="$WD" -Dbsearch.appfolder="$BSEARCH_DIR" -server -Xms256m "-Xmx$BSEARCH_MAXMEM" -classpath "$JARS" bsearch.app.BehaviorSearch "$@"
diff --git a/sci-misc/netlogo-bin/files/hubnetclient-6.0.2.sh b/sci-misc/netlogo-bin/files/hubnetclient-6.0.2.sh
new file mode 100755
index 000000000000..3fb98d0909f1
--- /dev/null
+++ b/sci-misc/netlogo-bin/files/hubnetclient-6.0.2.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+BASE_DIR="$( cd "$( dirname $( readlink -f "${BASH_SOURCE[0]}" ) )" && pwd -P )"
+
+if [[ ${JAVA_HOME+1} ]]; then
+  JAVA="${JAVA_HOME}/bin/java"
+else
+  echo "JAVA_HOME undefined, using java from path. For control over exact java version, set JAVA_HOME"
+  JAVA="java"
+fi;
+
+# -Xmx1024m             use up to 1GB RAM (edit to increase)
+# -Dfile.encoding=UTF-8 ensure Unicode characters in model files are compatible cross-platform
+JVM_OPTS=(-Xmx1024m -Dfile.encoding=UTF-8)
+OPTS_INDEX=2
+
+ARGS=()
+INDEX=0
+
+for arg in "$@"; do
+  if [[ "$arg" == -D* ]]; then
+    JVM_OPTS[OPTS_INDEX++]="$arg"
+  else
+    ARGS[INDEX++]="$arg"
+  fi
+done
+
+RAW_CLASSPATH="args4j-2.0.12.jar:asm-all-5.0.4.jar:asm-all-5.0.4.jar:autolink-0.6.0.jar:behaviorsearch.jar:commons-codec-1.10.jar:commons-logging-1.1.1.jar:config-1.3.1.jar:flexmark-0.20.0.jar:flexmark-ext-autolink-0.20.0.jar:flexmark-ext-escaped-character-0.20.0.jar:flexmark-ext-typographic-0.20.0.jar:flexmark-formatter-0.20.0.jar:flexmark-util-0.20.0.jar:gluegen-rt-2.3.2.jar:httpclient-4.2.jar:httpcore-4.2.jar:httpmime-4.2.jar:jcommon-1.0.16.jar:jfreechart-1.0.13.jar:jhotdraw-6.0b1.jar:jmf-2.1.1e.jar:jogl-all-2.3.2.jar:json-simple-1.1.1.jar:log4j-1.2.16.jar:macro-compat_2.12-1.1.1.jar:macro-compat_2.12-1.1.1.jar:netlogo-6.0.2.jar:parboiled_2.12-2.1.3.jar:parboiled_2.12-2.1.3.jar:picocontainer-2.13.6.jar:picocontainer-2.13.6.jar:rsyntaxtextarea-2.6.0.jar:scala-library-2.12.2.jar:scala-parser-combinators_2.12-1.0.5.jar:shapeless_2.12-2.3.2.jar:shapeless_2.12-2.3.2.jar"
+CLASSPATH=''
+
+for jar in `echo $RAW_CLASSPATH | sed 's/:/ /g'`; do
+  CLASSPATH="$CLASSPATH:$BASE_DIR/app/$jar"
+done
+
+CLASSPATH=`echo $CLASSPATH | sed 's/://'`
+
+# -classpath ....         specify jars
+# org.nlogo.headless.Main specify we want headless, not GUI
+# "${ARGS[0]}"            pass along any additional arguments
+java "${JVM_OPTS[@]}" -Dnetlogo.extensions.dir="${BASE_DIR}/app/extensions" -classpath "$CLASSPATH" -Dorg.nlogo.is3d=true org.nlogo.hubnet.client.App "${ARGS[@]}"
diff --git a/sci-misc/netlogo-bin/files/netlogo-6.0.2.sh b/sci-misc/netlogo-bin/files/netlogo-6.0.2.sh
new file mode 100755
index 000000000000..5ad35832ba28
--- /dev/null
+++ b/sci-misc/netlogo-bin/files/netlogo-6.0.2.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+BASE_DIR="$( cd "$( dirname $( readlink -f "${BASH_SOURCE[0]}" ) )" && pwd -P )"
+
+if [[ ${JAVA_HOME+1} ]]; then
+  JAVA="${JAVA_HOME}/bin/java"
+else
+  echo "JAVA_HOME undefined, using java from path. For control over exact java version, set JAVA_HOME"
+  JAVA="java"
+fi;
+
+# -Xmx1024m             use up to 1GB RAM (edit to increase)
+# -Dfile.encoding=UTF-8 ensure Unicode characters in model files are compatible cross-platform
+JVM_OPTS=(-Xmx1024m -Dfile.encoding=UTF-8)
+OPTS_INDEX=2
+
+ARGS=()
+INDEX=0
+
+for arg in "$@"; do
+  if [[ "$arg" == -D* ]]; then
+    JVM_OPTS[OPTS_INDEX++]="$arg"
+  else
+    ARGS[INDEX++]="$arg"
+  fi
+done
+
+RAW_CLASSPATH="args4j-2.0.12.jar:asm-all-5.0.4.jar:asm-all-5.0.4.jar:autolink-0.6.0.jar:behaviorsearch.jar:commons-codec-1.10.jar:commons-logging-1.1.1.jar:config-1.3.1.jar:flexmark-0.20.0.jar:flexmark-ext-autolink-0.20.0.jar:flexmark-ext-escaped-character-0.20.0.jar:flexmark-ext-typographic-0.20.0.jar:flexmark-formatter-0.20.0.jar:flexmark-util-0.20.0.jar:gluegen-rt-2.3.2.jar:httpclient-4.2.jar:httpcore-4.2.jar:httpmime-4.2.jar:jcommon-1.0.16.jar:jfreechart-1.0.13.jar:jhotdraw-6.0b1.jar:jmf-2.1.1e.jar:jogl-all-2.3.2.jar:json-simple-1.1.1.jar:log4j-1.2.16.jar:macro-compat_2.12-1.1.1.jar:macro-compat_2.12-1.1.1.jar:netlogo-6.0.2.jar:parboiled_2.12-2.1.3.jar:parboiled_2.12-2.1.3.jar:picocontainer-2.13.6.jar:picocontainer-2.13.6.jar:rsyntaxtextarea-2.6.0.jar:scala-library-2.12.2.jar:scala-parser-combinators_2.12-1.0.5.jar:shapeless_2.12-2.3.2.jar:shapeless_2.12-2.3.2.jar"
+CLASSPATH=''
+
+for jar in `echo $RAW_CLASSPATH | sed 's/:/ /g'`; do
+  CLASSPATH="$CLASSPATH:$BASE_DIR/app/$jar"
+done
+
+CLASSPATH=`echo $CLASSPATH | sed 's/://'`
+
+# -classpath ....         specify jars
+# org.nlogo.headless.Main specify we want headless, not GUI
+# "${ARGS[0]}"            pass along any additional arguments
+java "${JVM_OPTS[@]}" -Dnetlogo.extensions.dir="${BASE_DIR}/app/extensions" -classpath "$CLASSPATH" org.nlogo.app.App "${ARGS[@]}"
diff --git a/sci-misc/netlogo-bin/files/netlogo3d-6.0.2.sh b/sci-misc/netlogo-bin/files/netlogo3d-6.0.2.sh
new file mode 100755
index 000000000000..5db1d3a2847b
--- /dev/null
+++ b/sci-misc/netlogo-bin/files/netlogo3d-6.0.2.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+BASE_DIR="$( cd "$( dirname $( readlink -f "${BASH_SOURCE[0]}" ) )" && pwd -P )"
+
+if [[ ${JAVA_HOME+1} ]]; then
+  JAVA="${JAVA_HOME}/bin/java"
+else
+  echo "JAVA_HOME undefined, using java from path. For control over exact java version, set JAVA_HOME"
+  JAVA="java"
+fi;
+
+# -Xmx1024m             use up to 1GB RAM (edit to increase)
+# -Dfile.encoding=UTF-8 ensure Unicode characters in model files are compatible cross-platform
+JVM_OPTS=(-Xmx1024m -Dfile.encoding=UTF-8)
+OPTS_INDEX=2
+
+ARGS=()
+INDEX=0
+
+for arg in "$@"; do
+  if [[ "$arg" == -D* ]]; then
+    JVM_OPTS[OPTS_INDEX++]="$arg"
+  else
+    ARGS[INDEX++]="$arg"
+  fi
+done
+
+RAW_CLASSPATH="args4j-2.0.12.jar:asm-all-5.0.4.jar:asm-all-5.0.4.jar:autolink-0.6.0.jar:behaviorsearch.jar:commons-codec-1.10.jar:commons-logging-1.1.1.jar:config-1.3.1.jar:flexmark-0.20.0.jar:flexmark-ext-autolink-0.20.0.jar:flexmark-ext-escaped-character-0.20.0.jar:flexmark-ext-typographic-0.20.0.jar:flexmark-formatter-0.20.0.jar:flexmark-util-0.20.0.jar:gluegen-rt-2.3.2.jar:httpclient-4.2.jar:httpcore-4.2.jar:httpmime-4.2.jar:jcommon-1.0.16.jar:jfreechart-1.0.13.jar:jhotdraw-6.0b1.jar:jmf-2.1.1e.jar:jogl-all-2.3.2.jar:json-simple-1.1.1.jar:log4j-1.2.16.jar:macro-compat_2.12-1.1.1.jar:macro-compat_2.12-1.1.1.jar:netlogo-6.0.2.jar:parboiled_2.12-2.1.3.jar:parboiled_2.12-2.1.3.jar:picocontainer-2.13.6.jar:picocontainer-2.13.6.jar:rsyntaxtextarea-2.6.0.jar:scala-library-2.12.2.jar:scala-parser-combinators_2.12-1.0.5.jar:shapeless_2.12-2.3.2.jar:shapeless_2.12-2.3.2.jar"
+CLASSPATH=''
+
+for jar in `echo $RAW_CLASSPATH | sed 's/:/ /g'`; do
+  CLASSPATH="$CLASSPATH:$BASE_DIR/app/$jar"
+done
+
+CLASSPATH=`echo $CLASSPATH | sed 's/://'`
+
+# -classpath ....         specify jars
+# org.nlogo.headless.Main specify we want headless, not GUI
+# "${ARGS[0]}"            pass along any additional arguments
+java "${JVM_OPTS[@]}" -Dnetlogo.extensions.dir="${BASE_DIR}/app/extensions" -classpath "$CLASSPATH" -Dorg.nlogo.is3d=true -Djava.library.path="${BASE_DIR}/app/natives/linux-amd64/:${env_var:PATH}" org.nlogo.app.App "${ARGS[@]}"
diff --git a/sci-misc/netlogo-bin/netlogo-bin-6.0.2.ebuild b/sci-misc/netlogo-bin/netlogo-bin-6.0.2.ebuild
new file mode 100644
index 000000000000..ae454d5e6ce7
--- /dev/null
+++ b/sci-misc/netlogo-bin/netlogo-bin-6.0.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop
+
+MY_PN="NetLogo"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Cross-platform multi-agent programmable modeling environment"
+HOMEPAGE="http://ccl.northwestern.edu/netlogo/"
+SRC_URI="
+	https://dev.gentoo.org/~jlec/distfiles/${PN/-bin}.gif.tar
+	amd64? ( http://ccl.northwestern.edu/netlogo/${PV}/${MY_P}-64.tgz )
+	x86? ( http://ccl.northwestern.edu/netlogo/${PV}/${MY_P}-32.tgz )
+"
+LICENSE="netlogo GPL-2 LGPL-2.1 LGPL-3 BSD Apache-2.0"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_PN} ${PV}"
+
+DOCS=( "NetLogo User Manual.pdf" app/docs/shapes.nlogo readme.md )
+HTML_DOCS=( app/docs app/behaviorsearch/documentation )
+
+QA_PREBUILT="opt/netlogo/app/natives/linux-*/*.so"
+
+src_prepare() {
+	default
+	cp "${FILESDIR}"/netlogo-${PV}.sh netlogo.sh
+	cp "${FILESDIR}"/netlogo3d-${PV}.sh netlogo3d.sh
+	cp "${FILESDIR}"/behaviorsearch-${PV}.sh behaviorsearch.sh
+	cp "${FILESDIR}"/hubnetclient-${PV}.sh hubnetclient.sh
+	if use x86; then
+		sed -i -e 's/linux-amd64/linux-i586/g' netlogo3d.sh
+	fi
+}
+
+src_install() {
+	einstalldocs
+
+	# Override the config files so they don't use the bundled java path
+	sed -i -e 's/app.runtime=.*/app.runtime=$JAVA_HOME/g' app/*.cfg
+
+	# Once docs are installed, remove them from the source so they don't get
+	# installed below
+	rm -rf app/docs app/behaviorsearch/documentation
+	insinto /opt/netlogo
+	doins -r app/
+	doins -r "Mathematica Link"
+
+	doicon "${WORKDIR}"/netlogo.gif
+
+	exeinto /opt/netlogo/
+	# We don't copy the NetLogo binaries since they are hardcoded to use embedded java
+	doexe netlogo.sh
+	doexe netlogo3d.sh
+	doexe behaviorsearch.sh
+	doexe hubnetclient.sh
+	doexe netlogo-headless.sh
+	doexe app/behaviorsearch/behaviorsearch_headless.sh
+
+	insinto /opt/bin
+	dosym ../netlogo/netlogo.sh /opt/bin/netlogo.sh
+	dosym ../netlogo/netlogo3d.sh /opt/bin/netlogo3d.sh
+	dosym ../netlogo/behaviorsearch.sh /opt/bin/behaviorsearch.sh
+	dosym ../netlogo/hubnetclient.sh /opt/bin/hubnetclient.sh
+	dosym ../netlogo/netlogo-headless.sh /opt/bin/netlogo-headless.sh
+	dosym ../netlogo/behaviorsearch_headless.sh /opt/bin/behaviorsearch_headless.sh
+
+	make_desktop_entry behaviorsearch.sh "NetLogo Behavior Search" /usr/share/pixmaps/netlogo.gif
+	make_desktop_entry netlogo.sh "NetLogo" /usr/share/pixmaps/netlogo.gif
+	make_desktop_entry netlogo3d.sh "NetLogo 3D" /usr/share/pixmaps/netlogo.gif
+	make_desktop_entry hubnetclient.sh "NetLogo Hubnet Client" /usr/share/pixmaps/netlogo.gif
+}
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 20ca37080ae1..d770f4c599a5 100644
Binary files a/sci-physics/Manifest.gz and b/sci-physics/Manifest.gz differ
diff --git a/sci-physics/lammps/Manifest b/sci-physics/lammps/Manifest
index 4adf466fd47a..16abfa6dbe8b 100644
--- a/sci-physics/lammps/Manifest
+++ b/sci-physics/lammps/Manifest
@@ -26,6 +26,7 @@ DIST lammps-9Dec15.tar.gz 82374079 BLAKE2B 8b5054b59162b98bf98980a8ece344af733de
 DIST lammps-9Jan17.tar.gz 109694893 BLAKE2B dc3af18d4a7db43d22bc4d2ed79366f7f1b73cd5f8951d289ce6ad0a572b14fd8f1bc946382afe9fc60bc46354beb374caf09d195419235e077bf9386259f194 SHA512 ea7c61bc9607ff0e4c0af5c1a668d400841dfc11c6d6aacc6131a48a5a0d11cb6857303626b583d5119e5257b5b338853c5afafcc3870bb30d5743ff5648348c
 DIST lammps-patch_17Jan2018.tar.gz 91721592 BLAKE2B d606a5fd699f3e7aaa777065532f778e96a5b21b88de3fcce69e79c4931fea233ed1ad68f56120865061623c6e33282b9f23f927a7a9820f8f824a241e5cd823 SHA512 533ada073882e9bfc6431db62c4899005983d9efbbb043bcb50b2b0a7af2b11c411bbcc6523b2ffbd5d46531b24573f4b98a07dc757bacbc2f27bb056d7956ff
 DIST lammps-patch_1Sep2017.tar.gz 88751184 BLAKE2B 013ba612c67767c0e11b64f0b726a81c534ceb763ac9eba9a94ef9e02166278c28cb5937162b83f783b80fef6471b0e265e45245cc5594eaa2b27ec2d5f972cf SHA512 01b56484d6e9d03c0cdc2f8100f571d6e0a354b08bda7f22176744f2724e566443514e7d8abb0571d4207709155441644d4c6dbcf17ee2a8dc4f10cb6c3e8ac1
+DIST lammps-patch_22Feb2018.tar.gz 91869050 BLAKE2B 09d364b489d4402145b879ca40b290a4e33f39b6e5e4183bcccb09001002cb742917c8792f942a8b64bd992cde5c0f8dcd8b76506048f1392d33d1192aa4551d SHA512 8d4ac0f9cdcf4caa10bfb48129eec21cf31f7ce881b4cbd803c20fb638f7e55a1e645d314e172fe70eab473a4976c7f482e8c059e0c4e82527eb9438437ae146
 EBUILD lammps-20150210.ebuild 4832 BLAKE2B f857d2e0e82c2e5b05fe89c62fda44b917d8be0a184171235eadee85c97699de5d4f22a1ea20c12a5523702ab376df9c80d486a7751cd3fbc9527a6954e59026 SHA512 fbbfd6768d9ee99f49aea6abb030486a7f80c4aad95412407031499681a2a36997c31cb4873e0ab867425678b952a44284129accde9abe60c1bfb891c38d2dfa
 EBUILD lammps-20150515-r1.ebuild 6708 BLAKE2B 88d66db586b1900c8dfb039c305fe14ee9a0b1dfb231a8613e77689a22e429144621f45cb9e91adaa34e2dabd9ea8c11e4f49f60854c328f0c02fb9209ac5f4f SHA512 72c53dcd1cade6756010065353742f75eae95a4178e133509dae09233007491c52c3c5bfa3f98243a8d32066c0320c1726d99e1bf06c6e2e1ff16fbe2592d75b
 EBUILD lammps-20150515.ebuild 6703 BLAKE2B 6bdc6a410d9ded09f0273621e8d8bb167f3e183ca3e7f921b983647efca8cdec0cea266991177c3a109d952871b516b26a47c4176dca9a16f1ba879c718c4a7c SHA512 cfc3f0c55d93194db134dabf9153739904c5afb036ad9917930086c3d5cbcef9ccbf8afc6f682ecd22b2b73daee7dc2cd6fcc4f5da0f931b2e1b7561084a2464
@@ -50,4 +51,5 @@ EBUILD lammps-20170706.ebuild 6029 BLAKE2B 5a054b176d72e106972da77d412830ae24378
 EBUILD lammps-20170901-r1.ebuild 3040 BLAKE2B e42773dc4fb72164b616788e6d39885708acae9b89e5933bcb26f6a91350ab6528abfd0870059bc3576b7745b48de1166b63180f5a01c23509966ff602dde0a0 SHA512 33e4171aade9ae9da8f9e050aa675faed0ed77989e5862995e0a18df52fff1b416343cc2209a09b48f3d0d37ec935fd5ae1e5a966667010383b7f1a04697a8df
 EBUILD lammps-20170901.ebuild 3008 BLAKE2B db21f6df81e82bca23b32df40a08d214a55d60805a94bebf911d0123cc70be83760564b444028a7fdb30dd2ca0b54010dfd54eb644cac970b067f0f9d1445d24 SHA512 766c140ce1e0889ec3b88c65047cec54668058ca53f0e3dc61312cedb716beeb402328632dcab4c32aaaeca8af7f733d03cec60fe9a0f342d1f0ae0eb50d6ad4
 EBUILD lammps-20180117.ebuild 3040 BLAKE2B 74b48a09ab862dc1fb0d7b1fc927b16250926d7b528d1d36a8cbe1fb3ce1fd58522355bb7559f7a4ae999b5748d0b66e2982c218a8acd40435243825d6a07cc2 SHA512 6965f3a6102e86b375482a35061ffbd6d1b3ee2bd7e8023f66c639af9630e29face9be627196cb0658e28b9b09a19f55b5bd62688370a8f01cc78152b5952b80
+EBUILD lammps-20180222.ebuild 3040 BLAKE2B 74b48a09ab862dc1fb0d7b1fc927b16250926d7b528d1d36a8cbe1fb3ce1fd58522355bb7559f7a4ae999b5748d0b66e2982c218a8acd40435243825d6a07cc2 SHA512 6965f3a6102e86b375482a35061ffbd6d1b3ee2bd7e8023f66c639af9630e29face9be627196cb0658e28b9b09a19f55b5bd62688370a8f01cc78152b5952b80
 MISC metadata.xml 1338 BLAKE2B 553629a0b3221db88a37cd6b0bfa806da9265caf2df038736211351a87ac34af5a98f0e7f3e34246d814a378cd64b1ed82d69f4c26e18c3a7700441f8be6fa2d SHA512 b3556e8444b4cb42d1fa80cc8735e11e07cd2928af67104d4518b874e167d5755840c3585e3ffefa88057f84d711cafe0a60405323b4ad6a9546c19d4a5d94bd
diff --git a/sci-physics/lammps/lammps-20180222.ebuild b/sci-physics/lammps/lammps-20180222.ebuild
new file mode 100644
index 000000000000..1f8951205bb4
--- /dev/null
+++ b/sci-physics/lammps/lammps-20180222.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit cmake-utils fortran-2 python-r1
+
+convert_month() {
+	local months=( "" Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec )
+	echo ${months[${1#0}]}
+}
+
+MY_PV="patch_$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:0:4}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
+HOMEPAGE="http://lammps.sandia.gov/"
+SRC_URI="https://github.com/lammps/lammps/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cuda examples gzip lammps-memalign mpi netcdf python test"
+
+DEPEND="
+	app-arch/gzip
+	media-libs/libpng:0
+	sys-libs/zlib
+	mpi? (
+		virtual/mpi
+		sci-libs/hdf5[mpi]
+	)
+	python? ( ${PYTHON_DEPS} )
+	sci-libs/voro++
+	virtual/blas
+	virtual/lapack
+	sci-libs/fftw:3.0
+	netcdf? ( sci-libs/netcdf )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
+	dev-cpp/eigen:3
+	"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}/cmake"
+
+src_configure() {
+	local mycmakeargs=(
+	    -DBUILD_SHARED_LIBS=ON
+		-DENABLE_MPI=$(usex mpi)
+		-DENABLE_GPU=$(usex cuda)
+		-DENABLE_TESTING=$(usex test)
+		-DENABLE_ASPHERE=ON
+		-DENABLE_BODY=ON
+		-DENABLE_CLASS2=ON
+		-DENABLE_COLLOID=ON
+		-DENABLE_COMPRESS=ON
+		-DENABLE_CORESHELL=ON
+		-DENABLE_DIPOLE=ON
+		-DENABLE_GRANULAR=ON
+		-DENABLE_KSPACE=ON
+		-DFFT=FFTW3
+		-DENABLE_MANYBODY=ON
+		-DENABLE_MC=ON
+		-DENABLE_MEAM=ON
+		-DENABLE_MISC=ON
+		-DLAMMPS_XDR=ON #630444
+		-DENABLE_MOLECULE=ON
+		-DENABLE_PERI=ON
+		-DENABLE_QEQ=ON
+		-DENABLE_REAX=ON
+		-DENABLE_REPLICA=ON
+		-DENABLE_RIGID=ON
+		-DENABLE_SHOCK=ON
+		-DENABLE_SNAP=ON
+		-DENABLE_SRD=ON
+		-DENABLE_PYTHON=ON
+		-DENABLE_MPIIO=$(usex mpi)
+		-DENABLE_VORONOI=ON
+		-DENABLE_USER-ATC=ON
+		-DENABLE_USER-AWPMD=ON
+		-DENABLE_USER-CGDNA=ON
+		-DENABLE_USER-CGSDK=ON
+		-DENABLE_USER-COLVARS=ON
+		-DENABLE_USER-DIFFRACTION=ON
+		-DENABLE_USER-DPD=ON
+		-DENABLE_USER-DRUDE=ON
+		-DENABLE_USER-EFF=ON
+		-DENABLE_USER-FEP=ON
+		-DENABLE_USER-H5MD=$(usex mpi)
+		-DENABLE_USER-LB=$(usex mpi)
+		-DENABLE_USER-MANIFOLD=ON
+		-DENABLE_USER-MEAMC=ON
+		-DENABLE_USER-MGPT=ON
+		-DENABLE_USER-MISC=ON
+		-DENABLE_USER-MOLFILE=ON
+		-DENABLE_USER-NETCDF=$(usex netcdf)
+		-DENABLE_USER-PHONON=ON
+		-DENABLE_USER-QTB=ON
+		-DENABLE_USER-REAXC=ON
+		-DENABLE_USER-SMD=ON
+		-DENABLE_USER-SMTBQ=ON
+		-DENABLE_USER-SPH=ON
+		-DENABLE_USER-TALLY=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	local LAMMPS_POTENTIALS="usr/share/${PN}/potentials"
+	insinto "/${LAMMPS_POTENTIALS}"
+	doins "${S}"/../potentials/*
+	echo "LAMMPS_POTENTIALS=${EROOT}${LAMMPS_POTENTIALS}" > 99lammps
+	doenvd 99lammps
+
+	# Install python script.
+	use python && python_foreach_impl python_domodule "${S}"/../python/lammps.py
+
+	if use examples; then
+		for d in examples bench; do
+			local LAMMPS_EXAMPLES="/usr/share/${PN}/${d}"
+			insinto "${LAMMPS_EXAMPLES}"
+			doins -r "${S}"/../${d}/*
+		done
+	fi
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 08f042c5b699..ec72b9473ed2 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/bleachbit/Manifest b/sys-apps/bleachbit/Manifest
index c26f328bc146..bfc7e8c0c547 100644
--- a/sys-apps/bleachbit/Manifest
+++ b/sys-apps/bleachbit/Manifest
@@ -1,5 +1,5 @@
 DIST bleachbit-1.12.tar.bz2 396838 BLAKE2B 1784b5bc6602e5599b29ffbd0ad0f27f05ffe3aaab25756e3e07fff56c72517493b551063975c943a0e16efc2ecb30fdf69878577b8a5b27eccfdfb3bdd59c40 SHA512 b9c13a75b86eebbedaf928394714ac4d7847b8d53d345a4884acee68cd9c46ff1d5f4108479d7695109bad03c0fcdbb6f89e77d8794a60697fd5c6acdb34530c
-DIST bleachbit-1.19.tar.gz 881530 BLAKE2B b3a9ebe066828ead728f4393ba9d52b92967004638f7d74a5dd0576693d2e7ee37eb9e4e4352b973602b7bd6179c7b3a5816109f3f57a56e95c5cbfde32472c3 SHA512 2543a121786ae41c535c7faaf9741808bca57bde75da9b7df75c2653e2864441713fe3b3388ff71db2e88dc9626b457c656fa713774899b7a4912d05329b7eb2
+DIST bleachbit-2.0.tar.gz 886357 BLAKE2B f63ded34d245df892b2c14683ceaae8b57e786a8ab3111e7f76d484c6d3db404996119ab4114c3ae025848936a784878b3f100cf2ca8737401a6daaaf74a077e SHA512 adf5c2f2382b2eaab0eb2b4a173b392c160af7974f223c74ae51a30423514a15b98f04194b9ccde209b5c067d8481f0f1ee28651896d3002fcfa3927d8db056b
 EBUILD bleachbit-1.12.ebuild 1497 BLAKE2B 2f9511605fc483f3f853c1d7b19e1b7884fb075002843b9dba66b1f21b5849c7ba21e1219d5513b92e0a1477eca63c06d6d9383329af9fb10f172ad1119cdeed SHA512 4083aa52a3ae8091bb2532496ad1aa8c7aa48c68c371e8d681fb85c6e6d3745d76ccdb5181f15c61d8a4b07d3ea6220dde37f66848fe2753597da921841ef4fd
-EBUILD bleachbit-1.19-r1.ebuild 1667 BLAKE2B 3fe1bddb497aad685f9fe830da27275be5d4e9b0d61408080f2d1ee72e9bfc4adc59800d0207afc18b7fe004888ac9718b3a02e37af5401a4ce61aedac400162 SHA512 0348dfb64de0c4d6748c2f99ecd7db02b87e64caf0b60bae7d886b577bbe67eb69ac918413d6c32de646b23f265bebceec7024c856151f781939a16651e551c8
+EBUILD bleachbit-2.0.ebuild 1209 BLAKE2B 78d6ae6756b2bcf40686b6d70473a8efca937a53c6018fa2959a756560e8c29994f81b74d58e0b9503ac2122830ea582d7a43c1ce0fbd3f3a22f5c877b9fef5b SHA512 1c579246ba2cc9ef81f7bb9e530a3305f6881a835131cbb1e58641b1d5d2e799b022b68d09b0059ec2824ed11d8fd4922ea225122e4200763a780938161a9fe3
 MISC metadata.xml 571 BLAKE2B dfb5414d647ae661fa1aaab2e5a301ce80a5306f1c658ce2448368fa2dc4b0f3f49d0084de0b5f0bf9e0f00f1abe4c6a441f68d5abe0a610ac13a4392a0343f5 SHA512 59eaf4a789189b5f02fbf945a26cddc46c3ca22ce0aeb5b0311768bf8af21bb80081bc31f859add067a32a6a7840343af43d0680913c0422161efb0784b09a8f
diff --git a/sys-apps/bleachbit/bleachbit-1.19-r1.ebuild b/sys-apps/bleachbit/bleachbit-2.0.ebuild
similarity index 58%
rename from sys-apps/bleachbit/bleachbit-1.19-r1.ebuild
rename to sys-apps/bleachbit/bleachbit-2.0.ebuild
index 6e9674128119..3cf1d36382e9 100644
--- a/sys-apps/bleachbit/bleachbit-1.19-r1.ebuild
+++ b/sys-apps/bleachbit/bleachbit-2.0.ebuild
@@ -3,14 +3,10 @@
 
 EAPI=6
 
-PLOCALES="
-	ar ast be bg bn bs ca cs da de el en_AU en_CA en_GB eo es et eu fa fi fo fr
-	gl he hi hr hu hy ia id it ja ko ku ky lt lv ms my nb nds nl nn pl pt pt_BR
-	ro ru se si sk sl sq sr sv ta te th tr ug uk uz vi zh_CN zh_TW"
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite(+)"
 
-inherit distutils-r1 eutils l10n
+inherit desktop distutils-r1
 
 DESCRIPTION="Clean junk to free disk space and to maintain privacy"
 HOMEPAGE="https://www.bleachbit.org"
@@ -19,25 +15,14 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+gtk nls"
+IUSE="+gtk"
 
 RDEPEND="gtk? ( dev-python/pygtk:2[$PYTHON_USEDEP] )"
 
 DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
+	sys-devel/gettext"
 
 python_prepare_all() {
-	rem_locale() {
-		rm "po/${1}.po" &>/dev/null
-		if [[ $? -ne 0 ]]; then
-			eerror "Removing of ${1}.po failed"
-			die
-		fi
-	}
-
-	l10n_find_plocales_changes po "" ".po"
-	l10n_for_each_disabled_locale_do rem_locale
-
 	# choose correct Python implementation, bug #465254
 	sed -i 's/python/$(PYTHON)/g' po/Makefile || die
 
@@ -45,20 +30,22 @@ python_prepare_all() {
 }
 
 python_compile_all() {
-	use nls && emake -C po
+	emake -C po local
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_newscript ${PN}.py ${PN}
 }
 
 python_install_all() {
 	distutils-r1_python_install_all
-	use nls && emake -C po DESTDIR="${D}" install
+	emake -C po DESTDIR="${D}" install
 
 	# https://bugs.gentoo.org/388999
-	insinto /usr/share/${PN}/cleaners
+	insinto /usr/share/bleachbit/cleaners
 	doins cleaners/*.xml
 
-	newbin ${PN}.py ${PN}
-	python_replicate_script "${D}/usr/bin/${PN}"
-
 	doicon ${PN}.png
 	domenu ${PN}.desktop
 }
diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest
index 4d7ff3444b8d..ec9598c2cd84 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -1,8 +1,14 @@
 DIST c-dvar-7706828ecda2d8c508d6fc233dc9d198bab482ad.tar.gz 28454 BLAKE2B e109755fc3392f1c91820606af81852464a45b32ef43a9bce6fe32095f463336df8c5fe2410573830a1ac368d99d7e3da4cedb7e5ec89761459a5c6b9f54af11 SHA512 b6d69b11b3e47e8538c8eab04780966480db3881bf642f732b883f0b995ba374382fff54abe81eabe377d029445cc4af5bf52c8740282b0c03b959d8d5ae944d
+DIST c-dvar-f0a525477142f64c45b0be9393cc3b5dc3a6d6f9.tar.gz 26255 BLAKE2B 10941922212219f3b4c09306b8daf26cd921b078472c15db85205adcd65d503de5f58bc05eef3a2e60ca1485ebe44d282c2966ddd732d42ee092fe7880db5bbf SHA512 bf1593ca794ca973e8336954b527733f61c0bd389a729da32c84bc35ba6decea6434ea9728789e92f1663d2ec10cf3e4d4f50c8db907ed1566790214c40eaf5c
+DIST c-list-05bada3508c21027dbbbf1319f27ed65c7c03bc0.tar.gz 20726 BLAKE2B b9a4dd6d490136571600eeb790320986e8cd1e330772da28a6c5d7708f3f4026b5938369dc38827d8c19033feb254c58e155cb5c4359898be431cffb297fd393 SHA512 c9e5cdd30de45ead06565530eae996dd95712cb15880e33ae95bcc2a0ee65223177d1c46627f564eaf3edf13786410c870dec996a5103ea7ec02e280f0dbd650
 DIST c-list-72c59181d677a3f50b201d51f190b1bff02d4279.tar.gz 20474 BLAKE2B e1459b064cf0bfd7656338b03f2f591b56308bab8541f72be0822a7849630d05d11c5f9df31753ae9cb6ca25389eef1e24a2e50791c81faea1d6e487bd06a46e SHA512 9f271160d1f3e40128ba158409730216c829060fa9f9844e7243826fd0219c3f678980eed5b8e15e13d65c6408b959bd47e07197791e06d03f6864fe9a9cf359
 DIST c-rbtree-825f626a16257c5f0b0c523c11ce1bca16851180.tar.gz 27988 BLAKE2B 9a6b47cee256e96c3cd7db1e3de684b7628427e90f3000cb69f7d177085322e37d8636b3d14d659c3619316e248ec9e970466b066491483c2e8787d1d8942d04 SHA512 649aff910fb38b49462f794fd908d6d6071c9b064ed8445255d674df2184277bd54ff04c2c1789b61585f377aa1fd611c4e241b5104641d60ae5ec803d675894
+DIST c-rbtree-ba0527e9157316cdb60522f23fb884ea196b1346.tar.gz 28400 BLAKE2B 35a0529bd262cbd8aa11228714ac331d7cd8202bd79165db4bebe5d5a1895adb58440d52edd7fcbfffb8d9a2f86c44d7642b0328ffae0bbcbdcd5c48999fdd12 SHA512 425c4525b7aead4f68ed401eefdff81b3fe1f444c76e934a67e0f18a3ba17b52bf3a1398879fa929d97186da7d4cb485618aec74b671145560ba251f5d24af8b
 DIST c-sundry-50c8ccf01b39b3f11e59c69d1cafea5bef5a9769.tar.gz 26702 BLAKE2B c67af60b180b80c358c94d43961423cd18b147ec98dd71fa9e858ae6b67ad29d1d1484816be9eff1ce5c7193aa22b7b754f4cc535888c2a62b88ea43155f71c6 SHA512 44fccf4509ad752f7ef8aef7e1afd62eb51660f2daba42f0ad8b1711a62ec53aa2bde78b895fbdd939ba9a1ba1fc06621c2506eb068948da4d6e7192cb8df29e
+DIST c-utf8-cc67174f455c9196ebffc37b4d4f249da3dbc66f.tar.gz 21436 BLAKE2B d94c87a8ce99f3585da45678f36e59bbeded5d66f4cf7908da9fee3a4691fc704a0deefe66ddc3c7d8f653ec4bd7b2e8ed5892548a34930a10d1e5132f0954db SHA512 915258ea1d0f4e575c5f37746d34f98aebd6c9dd0c42e137f117dea1a8bbc895b775d9f9a6b2d91a6b008b095eb322332b3ec4d3de1a2333c8cbfcd7b89364b5
+DIST dbus-broker-11.tar.gz 160473 BLAKE2B b043709f5fcf18f27d0d76792c2f11f227764233d9362b65485fd76601f4cbabf4426065d6b2e659434a38b020901f2a8b3bdce86e8f5fef7acd8161df877c3e SHA512 c46f1739e289d82ef86d0d640c66f13ac97e10a483f513a4e6158e489ca1f05c45967131dd326a75f98d6b84e7891efcf605dde91ed73da4bfe2f076fcada56e
 DIST dbus-broker-9.tar.gz 155810 BLAKE2B ebb64f35303de988ea081b6dc9186a53317c5e610ca826afc4243191148f6d8d7038d6aa6f94bdd7b5225ebd2f2d93394d467605e5f878617becfd487ad0dfb6 SHA512 4eed5dede2ba6d45b883b1a484d59b774655063334611413e165558cb1e2efb21a5e17a182e836ae43cbfbfd366737c709d53ed0b9ec29ba3a9cd3718b29ec40
+EBUILD dbus-broker-11.ebuild 1959 BLAKE2B 1036ae55a30b7052a269494f1b7a30983e34ca312031f2e7f59f69e92cdf63dcf753f98edf46d7a93a6ae98e45d9cde260df70e21305dcb0757eb9c1ddab0072 SHA512 b11c2accaf059da089d98fd29b9b88ce39ce9a558bd31f721ccdf0a0d47a60ac73953dde929ee5bcd0ea6f9bffc7cc35de77387de0dc9436a4eef8a8a2701d03
 EBUILD dbus-broker-9.ebuild 1823 BLAKE2B a9060cc64329fc18816ac961d0ea4a11894f031ffc2c98ca301cc4f19472523c3d124850fe5ef33b897fdbf11006d3d4f9f71d8032abef7c5c12adfb0b17dc9a SHA512 04978b559c3f7178e2f909c33450b7160bf249de10483f952ebb1b6b6893dabea3c98854daec1b3318af817cc16516d4dc7cbf51f6cdc146b32fc076e86c9425
-EBUILD dbus-broker-9999.ebuild 1823 BLAKE2B a6c2e5b441d56f0caa72e2ccdb68aafe26f58abfbae3c15458025a5f7c9366008e6aae0d0df4783680b11cf81a86d109c3cd223eaa1013d672e2595ee8ca27bb SHA512 45c48046545ef2d598fbb70834528792d2ce2675747323806d2637a4cf6af722e27add476fe47eb6acc2a7bbe84c08fd507414c941fb7036e109fc3a8db3ae91
+EBUILD dbus-broker-9999.ebuild 1959 BLAKE2B 1036ae55a30b7052a269494f1b7a30983e34ca312031f2e7f59f69e92cdf63dcf753f98edf46d7a93a6ae98e45d9cde260df70e21305dcb0757eb9c1ddab0072 SHA512 b11c2accaf059da089d98fd29b9b88ce39ce9a558bd31f721ccdf0a0d47a60ac73953dde929ee5bcd0ea6f9bffc7cc35de77387de0dc9436a4eef8a8a2701d03
 MISC metadata.xml 327 BLAKE2B baaa6c7be634d16ffbe1196a29bcc2254c77d857dd1b807d50dac7adbd3d20370bf55ac0ea8f60b0fb160bf9ae69d42a5002b4150c4b22c101b37ecab96028a2 SHA512 b350af1c8be6e227fb301fca4dc1d6c90a8ceaf1e4cbf3d83ea54a302a15baa9df560d9b728a66be843b3eb679fa9536ca2f531776ee5d09753233148a0cabe1
diff --git a/sys-apps/dbus-broker/dbus-broker-11.ebuild b/sys-apps/dbus-broker/dbus-broker-11.ebuild
new file mode 100644
index 000000000000..a21aaabdae9f
--- /dev/null
+++ b/sys-apps/dbus-broker/dbus-broker-11.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
+else
+	dvar=f0a525477142f64c45b0be9393cc3b5dc3a6d6f9
+	list=05bada3508c21027dbbbf1319f27ed65c7c03bc0
+	rbtree=ba0527e9157316cdb60522f23fb884ea196b1346
+	sundry=50c8ccf01b39b3f11e59c69d1cafea5bef5a9769
+	utf8=cc67174f455c9196ebffc37b4d4f249da3dbc66f
+	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz
+		https://github.com/c-util/c-dvar/archive/${dvar}/c-dvar-${dvar}.tar.gz
+		https://github.com/c-util/c-list/archive/${list}/c-list-${list}.tar.gz
+		https://github.com/c-util/c-rbtree/archive/${rbtree}/c-rbtree-${rbtree}.tar.gz
+		https://github.com/c-util/c-sundry/archive/${sundry}/c-sundry-${sundry}.tar.gz
+		https://github.com/c-util/c-utf8/archive/${utf8}/c-utf8-${utf8}.tar.gz
+	"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Linux D-Bus Message Broker"
+HOMEPAGE="https://github.com/bus1/dbus-broker/wiki"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="audit +launcher selinux"
+
+RDEPEND="
+	audit? ( sys-process/audit )
+	launcher? (
+		>=dev-libs/expat-2.2
+		>=dev-libs/glib-2.50:2
+		>=sys-apps/systemd-230
+	)
+	selinux? ( sys-libs/libselinux )
+"
+DEPEND="${RDEPEND}
+	dev-python/docutils
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	if [[ ${PV} != 9999 ]]; then
+		rmdir subprojects/{c-dvar,c-list,c-rbtree,c-sundry,c-utf8} || die
+		mv "${WORKDIR}/c-dvar-${dvar}" subprojects/c-dvar || die
+		mv "${WORKDIR}/c-list-${list}" subprojects/c-list || die
+		mv "${WORKDIR}/c-rbtree-${rbtree}" subprojects/c-rbtree || die
+		mv "${WORKDIR}/c-sundry-${sundry}" subprojects/c-sundry || die
+		mv "${WORKDIR}/c-utf8-${utf8}" subprojects/c-utf8 || die
+	fi
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-D audit=$(usex audit true false)
+		-D launcher=$(usex launcher true false)
+		-D selinux=$(usex selinux true false)
+	)
+	meson_src_configure
+}
diff --git a/sys-apps/dbus-broker/dbus-broker-9999.ebuild b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
index 9c888fb6cf05..a21aaabdae9f 100644
--- a/sys-apps/dbus-broker/dbus-broker-9999.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,15 +9,17 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
 else
-	dvar=7706828ecda2d8c508d6fc233dc9d198bab482ad
-	list=72c59181d677a3f50b201d51f190b1bff02d4279
+	dvar=f0a525477142f64c45b0be9393cc3b5dc3a6d6f9
+	list=05bada3508c21027dbbbf1319f27ed65c7c03bc0
 	rbtree=ba0527e9157316cdb60522f23fb884ea196b1346
 	sundry=50c8ccf01b39b3f11e59c69d1cafea5bef5a9769
-	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/c-util/c-dvar/archive/${dvar}.tar.gz -> c-dvar-${dvar}.tar.gz
-		https://github.com/c-util/c-list/archive/${list}.tar.gz -> c-list-${list}.tar.gz
-		https://github.com/c-util/c-rbtree/archive/${rbtree}.tar.gz -> c-rbtree-${rbtree}.tar.gz
-		https://github.com/c-util/c-sundry/archive/${sundry}.tar.gz -> c-sundry-${sundry}.tar.gz
+	utf8=cc67174f455c9196ebffc37b4d4f249da3dbc66f
+	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz
+		https://github.com/c-util/c-dvar/archive/${dvar}/c-dvar-${dvar}.tar.gz
+		https://github.com/c-util/c-list/archive/${list}/c-list-${list}.tar.gz
+		https://github.com/c-util/c-rbtree/archive/${rbtree}/c-rbtree-${rbtree}.tar.gz
+		https://github.com/c-util/c-sundry/archive/${sundry}/c-sundry-${sundry}.tar.gz
+		https://github.com/c-util/c-utf8/archive/${utf8}/c-utf8-${utf8}.tar.gz
 	"
 	KEYWORDS="~amd64"
 fi
@@ -45,11 +47,12 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	if [[ ${PV} != 9999 ]]; then
-		rmdir subprojects/{c-dvar,c-list,c-rbtree,c-sundry} || die
+		rmdir subprojects/{c-dvar,c-list,c-rbtree,c-sundry,c-utf8} || die
 		mv "${WORKDIR}/c-dvar-${dvar}" subprojects/c-dvar || die
 		mv "${WORKDIR}/c-list-${list}" subprojects/c-list || die
 		mv "${WORKDIR}/c-rbtree-${rbtree}" subprojects/c-rbtree || die
 		mv "${WORKDIR}/c-sundry-${sundry}" subprojects/c-sundry || die
+		mv "${WORKDIR}/c-utf8-${utf8}" subprojects/c-utf8 || die
 	fi
 	default
 }
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index b59bb9df174a..aadc80972116 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -12,5 +12,6 @@ EBUILD gawk-4.0.2.ebuild 2076 BLAKE2B 73d9ce392a42ee14556b70be84ed284108212c471d
 EBUILD gawk-4.1.3.ebuild 2003 BLAKE2B 55c637567276e73fbb4032c3d297480a769ee0769a354ec491a857da2afb9708ad650d5f70db1224d315dd82675316cff38ef0ac3af83cbcf280dbfbbc24078c SHA512 87b224aa2cd9b231eb088b588242860ef323913ec64cb403f7622504f82e8d4431fc7f0b53d5bfe33df5c2852b5b6390b235870d4a9e3058fd4803dab2eeadd4
 EBUILD gawk-4.1.4.ebuild 2094 BLAKE2B 85bd6bf6647da168a75f34349bb77769f818f9467b300bfc4c0d78e2dafb91c61872503a0d6a9536e1a5e3c6484e611843c814bd8c73460d6625277ecf4bbbce SHA512 bd67dd62aa4dd7ccd96252d47bab41b4d5215cb1258d000e770e54f94a831dc04cf97a49d02536581e1b4cd5c1a27069f1cf6d86b970034b8e433a0dcd1feed4
 EBUILD gawk-4.2.0.ebuild 2217 BLAKE2B 7167b9d789eb38036c4ae2d46ee00c8ab29dcf959920e92a3529380fd132126c27ef5125cfa52165551fb6134217230512f98a31259316f4977ff5013df56038 SHA512 8711fd432cb13b920561bf5ced80694c3cfdca84932301bf5ffa505a3fdc0d1d07f108534ba18cb386cc05061afa00466d301d46b69abc5502f315d094a982aa
+EBUILD gawk-4.2.1-r1.ebuild 2574 BLAKE2B 887cc51f129b56ace31986b3718c3ffadb8f19a197aa59427ccc706032e4373d0bb80ac6484405da2f2fd8417e8d7759a07d7b895ad59d415d6d9889ccdb6920 SHA512 4abd41cb11ba0cbbf8ccb2ef9459678af6ac6507a400a8cbd7d96f41045847101ab22721ffc2637e2717bf88f591f04adb817ae91360e8573ded16ea16c4c31b
 EBUILD gawk-4.2.1.ebuild 2204 BLAKE2B 82c60e85badb8d968c796c6aa83ed366b0b399fb32342bfecabc6aeba7dbfce73361b5a7968d9a61269d0c25cfda7c5add6159f62aee7dd6fc35f4f1bf93445b SHA512 b814c89f185cf3086c7a06f2bfe2a1bae616a9b5bfd062ab9c230c043f9072ead65ab438295b5c7abb430bcbc9a5c601ce41eb8ce1a0b8e429fbbb9a3881bb6d
-MISC metadata.xml 347 BLAKE2B 3b0515d5ca37d12fbced19fc573e31fee27137e618aea3db03395a6bdecd8ad89d0d231fd3bb566ee993704a57b090a32697016885456e386b2c33ec37761b64 SHA512 1150e37d64393f26ef81056ff25e9720a4bc82dd28c9cffd164d144bb6d2f660f802a31d5ebf4fd121a01b36a4a5073893ebec6b735d3eb570da36705d5f446e
+MISC metadata.xml 465 BLAKE2B 4ae9d07b535014b76695db5d04b7a8b984c045dd78e90c8e7b0b3215a3021e5b190bfd89ca3f0dd5d9d8f1b55340ac57e40e02509e0d65288032458a0a247096 SHA512 517baceec7b9ea9311d1a946df59da35e6a5619344426ecdca6ff56e0da876ae1e6f793417e5d563da0f4528c535026deedf451eb6da8c7140db69709342a3cc
diff --git a/sys-apps/gawk/gawk-4.2.1-r1.ebuild b/sys-apps/gawk/gawk-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..3bf1a7e90d2b
--- /dev/null
+++ b/sys-apps/gawk/gawk-4.2.1-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs multilib
+
+DESCRIPTION="GNU awk pattern-matching language"
+HOMEPAGE="https://www.gnu.org/software/gawk/gawk.html"
+SRC_URI="mirror://gnu/gawk/${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 ~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="forced-sandbox mpfr nls readline"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	mpfr? ( dev-libs/mpfr:0= )
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	default
+
+	# use symlinks rather than hardlinks, and disable version links
+	sed -i \
+		-e '/^LN =/s:=.*:= $(LN_S):' \
+		-e '/install-exec-hook:/s|$|\nfoo:|' \
+		Makefile.in doc/Makefile.in || die
+	sed -i '/^pty1:$/s|$|\n_pty1:|' test/Makefile.in #413327
+	# fix standards conflict on Solaris
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i \
+			-e '/\<_XOPEN_SOURCE\>/s/1$/600/' \
+			-e '/\<_XOPEN_SOURCE_EXTENDED\>/s/1//' \
+			extension/inplace.c || die
+	fi
+
+	if use forced-sandbox ; then
+		# Upstream doesn't want to add a configure flag for this.
+		# https://lists.gnu.org/archive/html/bug-sed/2018-03/msg00001.html
+		sed -i \
+			-e '/^int do_flags = false;/s:false:DO_SANDBOX:' \
+			main.c || die
+		# Make sure the sed took.
+		grep -q '^int do_flags = DO_SANDBOX;' main.c || die "forcing sandbox failed"
+	fi
+}
+
+src_configure() {
+	export ac_cv_libsigsegv=no
+	local myeconfargs=(
+		--libexec='$(libdir)/misc'
+		$(use_with mpfr)
+		$(use_enable nls)
+		$(use_with readline)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	rm -rf README_d # automatic dodocs barfs
+	default
+
+	# Install headers
+	insinto /usr/include/awk
+	doins *.h
+	rm "${ED%/}"/usr/include/awk/config.h || die
+}
+
+pkg_postinst() {
+	# symlink creation here as the links do not belong to gawk, but to any awk
+	if has_version app-admin/eselect \
+			&& has_version app-eselect/eselect-awk ; then
+		eselect awk update ifunset
+	else
+		local l
+		for l in "${EROOT}"/usr/share/man/man1/gawk.1* "${EROOT}"/usr/bin/gawk; do
+			[[ -e ${l} && ! -e ${l/gawk/awk} ]] && ln -s "${l##*/}" "${l/gawk/awk}"
+		done
+		[[ ! -e ${EROOT}/bin/awk ]] && ln -s "../usr/bin/gawk" "${EROOT}/bin/awk"
+	fi
+}
+
+pkg_postrm() {
+	if has_version app-admin/eselect \
+			&& has_version app-eselect/eselect-awk ; then
+		eselect awk update ifunset
+	fi
+}
diff --git a/sys-apps/gawk/metadata.xml b/sys-apps/gawk/metadata.xml
index 3fa1f9889991..58cec04bdcb0 100644
--- a/sys-apps/gawk/metadata.xml
+++ b/sys-apps/gawk/metadata.xml
@@ -6,6 +6,7 @@
 	<name>Gentoo Base System</name>
 </maintainer>
 <use>
+	<flag name="forced-sandbox">Always enable --sandbox mode for simpler/secure runtime (disables e/r/w commands)</flag>
 	<flag name="mpfr">use mpfr for high precision arithmetic (-M / --bignum)</flag>
 </use>
 </pkgmetadata>
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index f746e7925ad4..857e2e3b2950 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -3,6 +3,6 @@ DIST hwids-20170715.tar.gz 2091853 BLAKE2B 66e930346176d3501ba0e5f802b7e44fe327a
 DIST hwids-20171003.tar.gz 3035908 BLAKE2B 8ecce99f6a6233b3dd79e1663053b6718fd8b4975a02e5735c1b8483214193bcd45a606145a7709f0b9021dd69e0757361bd568f4ba2d66a52641f691aa7f50a SHA512 6a05963f1883cfeb774671931a32eb9322ead145d4d8aa2fa791e90fc3c823a0b3baeaaa4ce84de0e6a10dcd7f1b5943f6d2cab8790d21e8f34ca1d403598a8a
 EBUILD hwids-20170328.ebuild 1442 BLAKE2B de4a2b9d8395ce3c5c0a09f3f735519b0fea7166faf60439d67da84952027fb47fc2aebcb9c0ba5960d0b6c42874bc4833371596ceb99fe394a49c4af8df54af SHA512 3dbde4bd8f65b1822da919b5cea69e20d9173e2e14f26054dfaf08ee0a24839d867a699a3950de2249a88cb17848747983c3bd38e86f2deed14615c844ea6c29
 EBUILD hwids-20170715.ebuild 1455 BLAKE2B 48b2ba621d627158d3cee3c1e96cdae5327620431e894314677ea3c0341282d41d87cabf045c1dca24a1c1c7055dd3365d700b5fea973eaab5f18ee0dc7c13c0 SHA512 3460a0646dcb649b10d7c02b98f50719d298a00f224df3aa06dd79235ea1107c914b20f07a53d675ee9bed3f76fdf30befcb5b33fc61c1d10b952122a2e9430c
-EBUILD hwids-20171003.ebuild 1715 BLAKE2B 3c3eee89c5187c16e3c0988be9f978560be54160163d36b523d9d60d21cf75974dcf222c426fb2e7ce0d49be00202aa63d47d26ece9aa5fdffa8f47c757c43a4 SHA512 69fed4c80017d23740fa142de19a8893d49022cfc15921128342b1349e105a3ccbf95163670ff10dc7fe96624065d13e0e60f1c7081733b13836ff22bcb0a949
+EBUILD hwids-20171003.ebuild 1714 BLAKE2B d8c2621a5ec45c78524cae29c468e359b5650103f8863f6c86cdbbb7b9da34879a48b1af58eed4e75026164a514b37750b517a3b70bc5dc480467268a74ead67 SHA512 1ac2e10d3376b2068a26e5e64874b459169b985c843e18ee66fb71eae2a80d132b5d91ace3c6f6daf369333f71c1200c7b9bb8232dc649134145325e53aba06b
 EBUILD hwids-99999999.ebuild 1750 BLAKE2B 37d13e56d50016ec2ec0d02c6c9aa5975036ab904f3e5e8b74cc13d888d73164e92b85b1e68dd82140b1fb662c1c0b5a68429c90cf4a2be2e6b48204772d3a16 SHA512 84fcacd98a96fd5c1f6ef2f13dec9ce46a6e3a0bb942eeb3c041d6bbb8ce0d4c63bf392f747f0e6473fe15420143170aee147b52941fac40b903c375b43bdda8
 MISC metadata.xml 647 BLAKE2B 88b205060dbd1c22edb25b740b5b84d0b36e8746a8bfd5793ab385afa2afd34e54626c2b09e59dc2cf91d838ae44dea878be26cd9cab83a98054a3d0b4bfbd52 SHA512 b05dbd41c2a839d2ac8baaf8ee2352ee999d48deb123c54e048da44cccb06f64729620983848a6b16ada8af50e6fb68adf15323ff362f230b7213f485b1ec27c
diff --git a/sys-apps/hwids/hwids-20171003.ebuild b/sys-apps/hwids/hwids-20171003.ebuild
index 80c0211ae370..03b4277f6447 100644
--- a/sys-apps/hwids/hwids-20171003.ebuild
+++ b/sys-apps/hwids/hwids-20171003.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "99999999" ]]; then
 	EGIT_REPO_URI="${HOMEPAGE}.git"
 else
 	SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 fi
 
 LICENSE="|| ( GPL-2 BSD ) public-domain"
diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest
index e0aaaf12c52f..11ba985503e0 100644
--- a/sys-apps/man/Manifest
+++ b/sys-apps/man/Manifest
@@ -13,6 +13,6 @@ AUX man-1.6g-echo-escape.patch 630 BLAKE2B add028d6c6bd11590b3f69f989aac874e6695
 AUX man-1.6g-fbsd.patch 366 BLAKE2B 882b3b3048e3dcb4f64f38e94d7603ae577038dce6636d6b2cbcb76a96b1c54427ddff737429e9e464fc50d0956cf9a9da86c0689bb6ebd8ae84d5d8f15727a6 SHA512 4019267584b1350b2c9da9aa1851a2e4e96f271265d189ecd677206be20dac67cd212b2887f844f43c10d96076a76613a12e53f3b29a185ec62ed4bff4c5a502
 AUX man-1.6g-xz.patch 1848 BLAKE2B 6a0855eda72386a0f48e715e9ba620b3473b3aa854c42fabd93bc02b7c9cd44fbd07f2608257fe953bdfa9b02e8fa35876d651ba5aab99937fe42325fcfb7b69 SHA512 6a883fa800a6d3b11c76a70e1a31c0736d380271c9f21315863ddaca9529e3d613b587724287fb94bab2b0d97215f6ccb3f1438a5c5e339e5a2edf872c92515c
 DIST man-1.6g.tar.gz 256906 BLAKE2B f13e21400aecd41a5f001b37bf3c6f9fd8463ff627f761cfd0a6846c7b8dac48a6dc87ff2cf4786b55800a558141cffcc0d66420943e46f708292f5653b42d51 SHA512 c786fa2201aed92293e5590dc3ad5d550cf14e5059fa274ef7719af86ee4c892e747576495b6dc0a09286e73e2f0f0caf860216e0c8032d9ef13e5d26853048b
-EBUILD man-1.6g-r1.ebuild 3691 BLAKE2B b1b70ac40645756896dbc07bf0e8b03d3ff890b832dd7c4247f67bc040449eac08e115a6c254d949cb17d19b66bddd7df6828e57f6510a3769d32e356aed9cb8 SHA512 345a60fb954eda80191fc035f8925bba5456adda0e8bed8ab210378bb3ad9011b93386c315a4633b080af21d053ec3c644c55d168797a85c38638b0ec96bd30a
+EBUILD man-1.6g-r1.ebuild 3690 BLAKE2B fcd91fe17c43ce832935f2b14e0528fc315fe45ec0b8f39f866b934d4a6ce50bbd6957aaa5445ad79803917be5bdb52924767ed6ce2231f36899e56a1fa33e0e SHA512 478e94d96433da55cf39a21828620b53639534f9f4a6cf6e50f8116c035ff86287bb5a84f740b974216093099555283aedd4a44bb53efd978c2851fa4ba95188
 EBUILD man-1.6g.ebuild 3615 BLAKE2B a5b54b2f72e9051b61143984dbfd2f876b0529b6d7885ce9f1e546e0342a2378e165421d701a7b15644badcff56cb38dd9ad6267f772879b55c2360e062f5fb4 SHA512 bab63322d55c19177916326f8958a60ba1bc0c1310302cab38b4d92fad54b6e8c0d49d66594a572151c2b3c33402998388ffdeab4aaa48912557cd7d675965f3
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man/man-1.6g-r1.ebuild b/sys-apps/man/man-1.6g-r1.ebuild
index f1ed1ad03406..2e4652ddccc7 100644
--- a/sys-apps/man/man-1.6g-r1.ebuild
+++ b/sys-apps/man/man-1.6g-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://primates.ximian.com/~flucifredi/man/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+lzma nls selinux"
 
 DEPEND="nls? ( sys-devel/gettext )"
diff --git a/sys-apps/prctl/Manifest b/sys-apps/prctl/Manifest
index b9560abc0f4c..eee651cbd737 100644
--- a/sys-apps/prctl/Manifest
+++ b/sys-apps/prctl/Manifest
@@ -2,5 +2,5 @@ AUX prctl-1.6-no-implicits.patch 473 BLAKE2B dabd09b5d334dc2731af41229248e1f5dcf
 DIST prctl-1.5.tar.gz 17507 BLAKE2B 43bfdbe3ced9e2cdb05c672bf02726f82ed25c3c4b852a7ac799c168caa73de89424eb40e684dc013518c25d6dbac02e7449cababc0a593bf7e2d6d90c2ef459 SHA512 60463a80fcadec9f2c6fbb0e179391affb594a15f116bc0c6dba350251b6fab1eb7bfca5753e0765cb27b723b76a86cbe19bdaa3ef50d4fee6696ed861e0bb96
 DIST prctl-1.6.tar.gz 18876 BLAKE2B 9f26fec1d178141d7e5aa7390dc0403ab1774d711a12588074ee6dbf62c980ab3713179b2f476f20cac0d7e4b027899b144fa67164021dd13b10be3dc087fb2f SHA512 c5b70abbb76f76f4a4c53cebcbd34fa4e87d7db2278a2ea17128da30dea958cc4e4d75b641cb3b9fbd8fa56fee482e97dbae5e61c697e80ef4d13f4b6d28cfda
 EBUILD prctl-1.5.ebuild 535 BLAKE2B 06d96bb44cfbfac5175753f003173b339f0aa0cc441cf77595a0543c40a73122cb7929b6322075de97a084d815f0d365bb19995cf2ae4aa19978dd5d62e28bb3 SHA512 8233568d1a1f7ad873e04b8cd87097778a5eb468af4894fe7ce40c0068a06667d8eca33eb68353cd86d7ae3655bcbcd407cae4d11acac6ae8081aceeaec61fb5
-EBUILD prctl-1.6.ebuild 597 BLAKE2B d7e672fea2785fbd7640ea5f72b70343617e48e6f0579559141385d1d37a73935f0ef595cab4e70d6c4316f85e07ecbfa8b54086ae8d677d61c5f0f1e41763e0 SHA512 af984e9080fc984cf04384edf6aa5edd38e42ebcebe23a722fa597d9155c9b44fcd536a3f53f52f3c48e5dce40504635d764d12ab058603e966cf4a340336e3b
+EBUILD prctl-1.6.ebuild 596 BLAKE2B 4c7ee0d20b40ae1142e9fa4ab6b45fc325289b5df321f90b2deb303eff1d83e806689e82d611329039589829593f22e035bc96eeecb78720938a7d4c26118fe4 SHA512 dc9cbb8c0c3d0f75d90cdfd42c1caf3d9586e34e53a31444b84aedf84af5417b63cc5e3c6f611d8af546b54fa8f9c51496b0844471aa5cfe259f6cf1e200bb11
 MISC metadata.xml 449 BLAKE2B da01afb0a080790cad07f77c097cc92bad6fca77c6d8da75b21e35eb9f1253153bb90bdff9aa719bb77a0c1e760dbb2c60d8152c9d2de15e37fd41fd2edcda80 SHA512 a254e2fa6263298f6f35967195a6f27ea434767c5690082df42e09f3bbb2439835643cfa4d030a09fd5a1829086ebadd6c5485cd53c49ed0ebf291e897f9290f
diff --git a/sys-apps/prctl/prctl-1.6.ebuild b/sys-apps/prctl/prctl-1.6.ebuild
index 903043fdd691..c656b7bba801 100644
--- a/sys-apps/prctl/prctl-1.6.ebuild
+++ b/sys-apps/prctl/prctl-1.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ia64 ~x86"
+KEYWORDS="alpha ~amd64 ia64 ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/sys-apps/qdiskusage/Manifest b/sys-apps/qdiskusage/Manifest
deleted file mode 100644
index 61a06306f41c..000000000000
--- a/sys-apps/qdiskusage/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST 107012-QDiskUsage-1.0.4.zip 79148 BLAKE2B b03cc26752760a7be7d8bfbdf4ba6ad88e8e7f4050dea341bb37af70683816890852a0e917f15dc79e32bd1777d0834adaf44e6d0b88262ebabbac9e7a4130d5 SHA512 ca3350823aa0f9e620f3ea782f4dcfaf6dcd91dcfe87a3e017f1a6d34165c134d095be135a6f365210c4c0a7b1b9d0b04ffbcd4d9ac1051731e19fa305b88520
-EBUILD qdiskusage-1.0.4.ebuild 720 BLAKE2B 52001d43dbe482409613f07029c56da923fc1ba381db301eb499944fee97ff1073e5bc3bd0762dbe2da1d010e4da3ecd5880614af022840d69a59bfc235e565c SHA512 5f795099d0fd2e92f2cf6710ccd5d39118935801ccb1a8c05073482447b3e2a1d7765d65db95a5ec94f5a895b70c4463b440e0bcce9f3241a65b0931b1c826b9
-MISC metadata.xml 243 BLAKE2B 62402a9efa915237fe628c64d7f86b5f50b86761152a67e78115054ff61475d1ae71ee62e9922abca7db47c89488a99b8c8162cd79683e0a69540e946f8fec0a SHA512 fc40891d1d0c8526f7ac87f25fbdb63e927494f972894e0006fe85eab8eef60ae79761cbc42febd202172da040283a2daa432908bf02ef83d27454660f20e72b
diff --git a/sys-apps/qdiskusage/metadata.xml b/sys-apps/qdiskusage/metadata.xml
deleted file mode 100644
index 32fe1293e9a9..000000000000
--- a/sys-apps/qdiskusage/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>qt@gentoo.org</email>
-	<name>Gentoo Qt Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-apps/qdiskusage/qdiskusage-1.0.4.ebuild b/sys-apps/qdiskusage/qdiskusage-1.0.4.ebuild
deleted file mode 100644
index c32f8bb028b6..000000000000
--- a/sys-apps/qdiskusage/qdiskusage-1.0.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-inherit eutils qt4-r2
-
-MY_PN="QDiskUsage"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Qt4 Graphical Disk Usage Analyzer"
-HOMEPAGE="http://www.qt-apps.org/content/show.php/QDiskUsage?content=107012"
-SRC_URI="http://qt-apps.org/CONTENT/content-files/107012-${MY_P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND="dev-qt/qtgui:4"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install(){
-	newicon icon.png ${PN}.png || die "newicon failed"
-	newbin ${MY_PN} ${PN} || die "newbin failed"
-	dodoc README || die "dodoc failed"
-	make_desktop_entry ${PN} "QDiskUsage" ${PN}
-}
diff --git a/sys-apps/qingy/Manifest b/sys-apps/qingy/Manifest
index a1d023797f8a..fd6b50fc7c14 100644
--- a/sys-apps/qingy/Manifest
+++ b/sys-apps/qingy/Manifest
@@ -7,5 +7,5 @@ DIST qingy-1.0.0-screensavers.patch.gz 17372 BLAKE2B 4bfd2c2b0ce1a2721046607b0f9
 DIST qingy-1.0.0.tar.bz2 611393 BLAKE2B 139d01ca03b31919e89172ca4404cc694ce0b81f2ebf5a77add16c5959822169c76a1103af7694c2c9a28916265d83a763bdd7730ab8b3ac4621d4b2fd6906d8 SHA512 79af86de9d1530f429f21a32ef6542987f62f6b5461fe5ba6553deb4fcf36d5746cdb3c6ae8d7c08ace298dd4304cb90a11203239ac7f5c2093c3c5b80f34b54
 DIST qingy-gentoo-theme-2.1.tar.bz2 150702 BLAKE2B 0144a66fd95f5b8afc58db862ae90259e653c58b5698e1bbc619f6b5fcdcab6be6885ecce57febdbbcf3a6253d190c28cf9a81004ee22eb14be7f1f268653359 SHA512 4e5e35f3f14c831e3a383e846018cd39b07761c7f1977f94923ae8889383a3cc5f63cd061b85174c076488e697018ff58bdac3ddaeefab352a3058700a130abd
 EBUILD qingy-1.0.0-r2.ebuild 4075 BLAKE2B 271d6f850551bebee5a83ea6c2471756de0d27a08be77ecf2860dc1d62b16e13d835e3f801e0a92c350ffdd77ea0ed4dc73f0443c71aa5c5aef70f85ca0eed12 SHA512 cc848a116d0dbbb728f385a0c6e3119c618a7584e10d41580cc35fcea2cfeb22a2fe1633cc8adc712a4b08a8fdfa2f5a26e118e7ffd342db02f22cb242776d39
-EBUILD qingy-1.0.0-r3.ebuild 4063 BLAKE2B edfe56fb48bfac61ea0d02c280154bc09775ac1b1f9351d5fb5bd64d3e18e781dfbd212617a86b37b5df714737902fa6eb7a4bd345dea6f98b771aa9bf63adc8 SHA512 0f2a5882526c4613bd42747e275b981c3ab545acae347273345ada93ad9bd56e936e54a9decf93f603388884470a224c6c32f21dc2b8c195daa01f2248341336
+EBUILD qingy-1.0.0-r3.ebuild 4062 BLAKE2B 9d1a356e1b7c993578b727b827c9c5f52c92cf2a3a65b03285c58e4226cdb0dcd341f75e011a302a439cb19237d749d30059a12f6826bab3627e2018f5dda73a SHA512 3bd33145482919a262009d055e93fbc5341a16a94fcdf5e61283f1a72b81c31894eb894ab4e8a92269376dd8cafdcf771fe014b7361fe669bbd40ac8a8528369
 MISC metadata.xml 520 BLAKE2B 283f63386d116aae632026bf5bd61178022ac58d2a76a54087a42934bb9db1d714b0e14ebfaf74c48dfdc2ffd8505068a45fe2c2fca9446b33a2f48445f98458 SHA512 675beb88cd98c9e5e9c94b3292bf82aa91b1c17178b0718b0fc282202127b8fc0d58062f31ed4cd927aac4614dd3f975594a60fb293f3359e788cc8a2d1b8485
diff --git a/sys-apps/qingy/qingy-1.0.0-r3.ebuild b/sys-apps/qingy/qingy-1.0.0-r3.ebuild
index 656331e6c7e8..d478b600b051 100644
--- a/sys-apps/qingy/qingy-1.0.0-r3.ebuild
+++ b/sys-apps/qingy/qingy-1.0.0-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="consolekit crypt emacs gpm opensslcrypt pam static X"
 
 RDEPEND="
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index 751130fefb8a..ee083e215e16 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -7,5 +7,6 @@ DIST sed-4.3.tar.xz 1167168 BLAKE2B 5751943cb64d03afef727deba3bee7027a1611b4729c
 DIST sed-4.4.tar.xz 1181664 BLAKE2B 03804c209c2108cca4aa991cd68065fd03a15c726b6daf5212603835b5c046c63e9c2e4c28f76dfe165128f060db5b992c981f314d2fe230f30521545d00a468 SHA512 4e1b0a7403913f1e25047eb2292a0a9b3488b15b4463ce2803e05eaecbc2da19f477a18e6a70c992461c38ced90774415091aa2d8ce85cb74e391610d9eedb70
 EBUILD sed-4.2.2.ebuild 1703 BLAKE2B 85de6422cc772bb64b6e4ccb3a8e385e21314f266497a30753dd37f193c95ec57f0522488efb6e956f582e34182ae38d13492b01cb3fe90d504b6af4f9ca25ef SHA512 83ad39ac0a61046ddfb1ceab35284b776bf1bac6656f7a60d3e4eee8070febec7bdbfe23138934d0b6fb688142759825deab25eb6988c90b54d269b553cc274b
 EBUILD sed-4.3-r1.ebuild 1471 BLAKE2B ccfc211be1e8ee18580188db738958243c13af4ed0a42934386628a086199bb48ce1edac9609098545f599b352824fd3bbf1e984fbc02dc928676150f010c16f SHA512 a87cb60ca1b125d0db8b90f5cd4211b5f90316cee63d5543ab92e089a1c6782599d66b9fcea2431523126a1e7b1b1230d14c396fdf2c6de1d2704aacee08ea87
+EBUILD sed-4.4-r1.ebuild 1731 BLAKE2B 0023f4b656ec18b2b4ee250e387ee978fe377840e130b9a9d1b72255ead62ee3b799b5c1dd55c56cf29a277460f0abe7b7ac1c2646377e62692e501ede065345 SHA512 0c75b2e7d8c33c4fcd87199b7e76c44baf1e7c84f616c60f6d8a1d3667c41a443397fbf270033e585d739c78d40fc67ea3c8ae3e543feda3bb63c45d173ed37d
 EBUILD sed-4.4.ebuild 1431 BLAKE2B 81ed2cb028f7f748629b8c9b73a2786ed48bab298e92ad10c1b6b5436ac03d515766ad1223d1cff4c8157714abaca950e9791b498fbb1558dbbe8f2609039dda SHA512 d1cc340b33bb8d5ac0565136d9dabf84d261f5496fb0ebfe27f69a2d37dc8031bedb43e610e744d7bd60de0b672afde5e6fbdb4862d556ed960de832f2f7b94a
-MISC metadata.xml 323 BLAKE2B 746a8514f64aa6bc67931a9a1c61ff47dd0ff984dee09d04afd44557986ef1fe87ebdbd844fb68bdbe8158ec16b6d776b6f9956f2b5611495af5aa3d56c8bff5 SHA512 ec3a11f7aafded3d4b5e12680358f39dbeb166f96af51eae8dafb21b186024ddb9b5b9ba36bde626be01b1938fd6f4bbcb58f0f8bad2208a84d44eaadc95652e
+MISC metadata.xml 454 BLAKE2B 3bb53d0a0a1d85cb0415e9c81db669e048c980923b6aad172ab2e666a995ff7e88dbcc4290f479613a60b83aeb62d1b7d9bf9b5d4ea9ee8a190bea6a87dff7e4 SHA512 4c30d1ec7669e56902672117382e8617718858e9aaad078a6ed298428f55396a81d336963560d3f4679499a0f1e291f99462601ab0c76768359086fa9bcb9b55
diff --git a/sys-apps/sed/metadata.xml b/sys-apps/sed/metadata.xml
index b738f8c54a01..ea2a7bdbf75c 100644
--- a/sys-apps/sed/metadata.xml
+++ b/sys-apps/sed/metadata.xml
@@ -8,4 +8,7 @@
 <upstream>
 	<remote-id type="sourceforge">sed</remote-id>
 </upstream>
+<use>
+	<flag name="forced-sandbox">Always enable --sandbox mode for simpler/secure runtime (disables e/r/w commands)</flag>
+</use>
 </pkgmetadata>
diff --git a/sys-apps/sed/sed-4.4-r1.ebuild b/sys-apps/sed/sed-4.4-r1.ebuild
new file mode 100644
index 000000000000..26c3858da53b
--- /dev/null
+++ b/sys-apps/sed/sed-4.4-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Super-useful stream editor"
+HOMEPAGE="http://sed.sourceforge.net/"
+SRC_URI="mirror://gnu/sed/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="acl forced-sandbox nls selinux static"
+
+RDEPEND="acl? ( virtual/acl )
+	nls? ( virtual/libintl )
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_bootstrap_sed() {
+	# make sure system-sed works #40786
+	export NO_SYS_SED=""
+	if ! type -p sed > /dev/null ; then
+		NO_SYS_SED="!!!"
+		./bootstrap.sh || die "couldnt bootstrap"
+		cp sed/sed "${T}"/ || die "couldnt copy"
+		export PATH="${PATH}:${T}"
+		emake clean
+	fi
+}
+
+src_prepare() {
+	# Don't use sed before bootstrap if we have to recover a broken host sed.
+	src_bootstrap_sed
+
+	if use forced-sandbox ; then
+		# Upstream doesn't want to add a configure flag for this.
+		# https://lists.gnu.org/archive/html/bug-sed/2018-03/msg00001.html
+		sed -i \
+			-e '/^bool sandbox = false;/s:false:true:' \
+			sed/sed.c || die
+		# Make sure the sed took.
+		grep -q '^bool sandbox = true;' sed/sed.c || die "forcing sandbox failed"
+	fi
+}
+
+src_configure() {
+	local myconf=()
+	if use userland_GNU; then
+		myconf+=( --exec-prefix="${EPREFIX}" )
+	else
+		myconf+=( --program-prefix=g )
+	fi
+
+	export ac_cv_search_setfilecon=$(usex selinux -lselinux)
+	export ac_cv_header_selinux_{context,selinux}_h=$(usex selinux)
+	use static && append-ldflags -static
+	myconf+=(
+		$(use_enable acl)
+		$(use_enable nls)
+	)
+	econf "${myconf[@]}"
+}
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 2837d7d44ba3..81fd44b74c7d 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -11,5 +11,5 @@ DIST shadow-4.4.tar.gz 3706812 BLAKE2B b4dc056643ea507af975df68a1775193c942227ae
 DIST shadow-4.5.tar.gz 3804933 BLAKE2B c4714b7fe9a1af5a5751d4274e70e7fb31994cc40058b44c401bbbdf83c238fcf48e6e6e663d8a61f614b6291ea524862d9d2425d7d839340a10f8fb7c8eaa85 SHA512 02d6482a1159689e404dd49a68b4e2db85e9ffdcdfbacc8efcbd9043f14a1ec3fc4d749700df915d375df67d589219b6b0f57a6cfd9fb5b197012888a608913b
 EBUILD shadow-4.4-r2.ebuild 5484 BLAKE2B 988704357c01c35a2808b48c921c6de6ac6eb06429e6a35945263fba094caf8bddb0d4fed6ef236845f7983671dbee109d95a01f84703e7b4fc59a7fe26ce569 SHA512 8584c5805f4729a4ab42ccac22a558b0899258f9408cae4a9c5570f6b4ea7f9a969da92393ce456f1d5e2a5199bacbb5317f3433a7d41afb5b52e280493b0f56
 EBUILD shadow-4.5-r1.ebuild 5405 BLAKE2B 7518b3700adf543a619413066415f64959a50efbbe669b28622e8d2d4cd749705b256c62e3ba73a88e6f3c0d6c195c87c377e7541e165ccbf4328ec5f4b1b0df SHA512 a50352c9b189d5265e921e977acff5c96dedef2634b046f66b376e6d6e2fdab40b629e453695a3153dd1edb13740e94d6d205daed544b3bba885fd35dbb7251e
-EBUILD shadow-4.5.ebuild 5325 BLAKE2B c2849ceaf174e3ea0a660c7da8912f60d4c1446119759c1d98131ee493074340c1bc149e3c542552f56a802cb5b56d2d0db60b36860afe858c84a00122bbfeb1 SHA512 1f1a6dc525673045fee660b661bf772aea028718b172f386560999b884807f1b3e0dd6a9a6ef6a9c89ebe79d9a0ff14526c62dd77d7c9ca96ebc55f1243a870a
+EBUILD shadow-4.5.ebuild 5324 BLAKE2B 7e31b15f14edc3434fa1acca45a5c4955f78e5794d342d09834a0f9dbccb16c1d71e83952fa971a71f03844f6868fa81b16da7b473383156f10cebb2432b0ea8 SHA512 baa289b709d84f9b056d2415ed147d0bf80bed3e3645ab7738617693d7b8ada235410cf95c1d944044125bbab79f9feb101bcb1cd2d74eb33fc709346711107d
 MISC metadata.xml 565 BLAKE2B bdd91116c16f590eabb6f18f05a4f72b55651383431c78fb07c27b23e7152b25816895e2ae3e2afd1ecd6e2b9fa9dd0005d198f2ab7ee2061583b586e4c44b01 SHA512 be29faf2eb981bdb0d643ca691d48b10ee702c3a32ca7fca1d00365aa1c4beb5b1b4bec8104be4352fed32f3fabc3108061b8eb8f0054e612c268b5c6f4b1469
diff --git a/sys-apps/shadow/shadow-4.5.ebuild b/sys-apps/shadow/shadow-4.5.ebuild
index 0863851a2f6c..bac5e9be3bd9 100644
--- a/sys-apps/shadow/shadow-4.5.ebuild
+++ b/sys-apps/shadow/shadow-4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="acl audit +cracklib nls pam selinux skey xattr"
 # Taken from the man/Makefile.am file.
 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 6e39f6e556f2..5f4cb06a15ad 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -11,9 +11,11 @@ DIST systemd-233-patches.tar.gz 12553 BLAKE2B 5d19f2dc82cc6cbd9b2e9393f932dfa3c8
 DIST systemd-233.tar.gz 4660737 BLAKE2B 38cdd74543447b3c02391b328428fed169fe2cf2df6e9341dcaf2f7d3d977612ec102301e144c1cada90d61e9e9bda3b2faaef708c8ff4bd0b52b143760a83b2 SHA512 5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e
 DIST systemd-236-patches-2.tar.gz 54737 BLAKE2B bce5f9e234c975a2b6e474ca2a0c2c82e704f02cf19885134dddc5edbd0b7bfb3773d737f88f78ba2ab81093dfceeb44d76ecda99cf2b916072dcdfa84720c19 SHA512 b74ab6944135c938b2d0d2a1dd40ac4cc4ff26d072603d6bfbe4529d808b2e481eb910155895bce14607842ad6d30751aded51654a53f76278becbb5e317b875
 DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d
+DIST systemd-237-patches-0.tar.gz 74617 BLAKE2B 52750bb08731e9e694a00fedc1e42beb7c6ad7736d3b6567f2ab094d4356506d10ec11e1c4c62623078d647c3314c71c9f141eb7c8628b610fd8a5e818b90ec6 SHA512 a6db99b330585e57c722bb0e692b0d988d5fbfef60c6cc87efbb7b903e55642c2f03bf6cdc80f15da22d0c41b5051387dac23a2f04238331f235154b17f32d1b
 DIST systemd-237.tar.gz 6871350 BLAKE2B 4734a110a297fbbd6679bced6302fcdca55ab5d4207905e8dee9f5545f1de841d5adeaa4fd89961b9e63709d04b5c862b8bc81481311cf8e72ee327e459c9d91 SHA512 15ef4b92815a6dd9a6c51672dbc00fd7cd0f08068ef0cbeaca574f68d330b28bc67ba1946f24f75ef3d9e7b63843a73eea700db54688061dbf5c9f8470394c3b
 EBUILD systemd-233-r6.ebuild 13593 BLAKE2B 82e15d7171054d46049bc9a50a8482bc1ebbe7bb53af2ad1b6ee594582f30cb561c6d2e18226f4401c605cf9bcd53290128c7be441cfa6cd60470e313144009d SHA512 53b2e092bc48bc8d2899d9869e77049e9ce0cc6178ac63bb830544ec0a69a3ba5ba29a82a5ba76ab19dd4ce8997b9ae5ffeb3698780fe086ed5a632ff386c1d3
 EBUILD systemd-236-r5.ebuild 13009 BLAKE2B f1f56c383f2adb71505e9da2366ec60d5e7a328f01cbba7250650f4d869212103af37c1bd458178d8ade8ea982b0bc9f816c507878935bc8fd6b1e68cb67f568 SHA512 d29a255338ebb943d6e7619a15cb310236244d3c9019177534feef6f11dbdf6e8317dd86fc327c51dc7b3ebb34ceaae939de509b7bb06d4312c27c9c4e40b444
 EBUILD systemd-237-r2.ebuild 13075 BLAKE2B ff45dd6aa7ff3c27ad18495eb44a8ff04c67d8dddc80546fafa52e3845f1f3ded10f47f9b4e6c46b46786651d3c387f0e86e87ebf09f52045d62054fd9c5f403 SHA512 8bd6fb56e66284ef26f5ad525a38ce67e74d2b48d57dd15a1c67dfd60805da57745b837342d45c96406bef4c7a26aabf0de0db6f60fafb026268a6a154f457b1
+EBUILD systemd-237-r3.ebuild 13136 BLAKE2B 78e7a0488497d3fd8be87f640a5f9fb7c7547e4c1c95ae21ff36a42998ef5ca75e16e7421335b5a979ef05c273c9b69e1915afc77637d5f5836ca26579627591 SHA512 61522415b4d25c8d83ab2c598a06df60dbf8d545091f304dc86b42378e62da2c5a7eee3113e11e6b5225aa98f7287ba77917c1a2c3468635d0fc2bdf503d3462
 EBUILD systemd-9999.ebuild 13020 BLAKE2B dcba36f9056f996c5aba1be98786e050be0ea128a03b4deb73d9e3d8f5ec6bfe9f2e0b1d9b6be105269dc7a93f34d967e55d5b9ec30c8abb22a6443c06f8f3ec SHA512 0bb205a1421d6bc733794c6db488d58d5855ba972c7f9715253a4d584f02c103ce445171d4fedd5651fc81aa492d696a49c05aea6130840ea0b6f7f931b78259
 MISC metadata.xml 2032 BLAKE2B a554cb3dc21d5c5a5a4227f05f4a91054080999d23022051252f3461fb9c4398112fa1c96982205b4e1709de00ae395706ac46b86ae44610ecf85ededc3ceca7 SHA512 1c97f2c573c63a63d2ed78820d891d9593c5d8636574270c4306dc3c8ce739e52f6829e7e219cc2744acd7f3e2362e340b7c2406923f1aaf9adebc785cdb6544
diff --git a/sys-apps/systemd/systemd-237-r3.ebuild b/sys-apps/systemd/systemd-237-r3.ebuild
new file mode 100644
index 000000000000..466126ca683a
--- /dev/null
+++ b/sys-apps/systemd/systemd-237-r3.ebuild
@@ -0,0 +1,441 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}/${P}.tar.gz
+		https://dev.gentoo.org/~floppym/dist/${P}-patches-0.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+fi
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +seccomp selinux ssl +sysv-utils test usrmerge vanilla xkb"
+
+REQUIRED_USE="importd? ( curl gcrypt lzma )"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	!<sys-libs/glibc-2.16
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
+	curl? ( net-misc/curl:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	http? (
+		>=net-libs/libmicrohttpd-0.9.33:0=
+		ssl? ( >=net-libs/gnutls-3.1.4:0= )
+	)
+	idn? (
+		libidn2? ( net-dns/libidn2 )
+		!libidn2? ( net-dns/libidn )
+	)
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	nat? ( net-firewall/iptables:0= )
+	pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
+	pcre? ( dev-libs/libpcre2 )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/baselayout-2.2
+	selinux? ( sec-policy/selinux-base-policy[systemd] )
+	sysv-utils? ( !sys-apps/sysvinit )
+	!sysv-utils? ( sys-apps/sysvinit )
+	!build? ( || (
+		sys-apps/util-linux[kill(-)]
+		sys-process/procps[kill(+)]
+		sys-apps/coreutils[kill(-)]
+	) )
+	!sys-auth/nss-myhostname
+	!<sys-kernel/dracut-044
+	!sys-fs/eudev
+	!sys-fs/udev"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-apps/hwids-20150417[udev]
+	>=sys-fs/udev-init-scripts-25
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	>=sys-kernel/linux-headers-${MINKV}
+	virtual/pkgconfig
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+	test? ( sys-apps/dbus )
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/237-0001-networkctl-display-type.patch"
+	)
+
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
+			"${FILESDIR}/gentoo-systemd-user-pam.patch"
+			"${FILESDIR}/gentoo-uucp-group-r1.patch"
+			"${FILESDIR}/gentoo-generator-path.patch"
+		)
+	fi
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+meson_use() {
+	usex "$1" true false
+}
+
+meson_multilib() {
+	if multilib_is_native_abi; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+meson_multilib_native_use() {
+	if multilib_is_native_abi && use "$1"; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in PATH
+		-Dsplit-usr=$(usex usrmerge false true)
+		-Drootprefix="$(usex usrmerge "${EPREFIX}/usr" "${EPREFIX:-/}")"
+		-Dsysvinit-path=
+		-Dsysvrcnd-path=
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Defi=$(meson_multilib)
+		-Dima=true
+		# Optional components/dependencies
+		-Dacl=$(meson_multilib_native_use acl)
+		-Dapparmor=$(meson_multilib_native_use apparmor)
+		-Daudit=$(meson_multilib_native_use audit)
+		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
+		-Dlibcurl=$(meson_multilib_native_use curl)
+		-Delfutils=$(meson_multilib_native_use elfutils)
+		-Dgcrypt=$(meson_use gcrypt)
+		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
+		-Defi-libdir="${EPREFIX}/usr/$(get_libdir)"
+		-Dmicrohttpd=$(meson_multilib_native_use http)
+		$(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false)
+		-Dimportd=$(meson_multilib_native_use importd)
+		-Dbzip2=$(meson_multilib_native_use importd)
+		-Dzlib=$(meson_multilib_native_use importd)
+		-Dkmod=$(meson_multilib_native_use kmod)
+		-Dlz4=$(meson_use lz4)
+		-Dxz=$(meson_use lzma)
+		-Dlibiptc=$(meson_multilib_native_use nat)
+		-Dpam=$(meson_use pam)
+		-Dpcre2=$(meson_multilib_native_use pcre)
+		-Dpolkit=$(meson_multilib_native_use policykit)
+		-Dqrencode=$(meson_multilib_native_use qrcode)
+		-Dseccomp=$(meson_multilib_native_use seccomp)
+		-Dselinux=$(meson_multilib_native_use selinux)
+		#-Dtests=$(meson_multilib_native_use test)
+		-Ddbus=$(meson_multilib_native_use test)
+		-Dxkbcommon=$(meson_multilib_native_use xkb)
+		# hardcode a few paths to spare some deps
+		-Dkill-path=/bin/kill
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+
+		# multilib options
+		-Dbacklight=$(meson_multilib)
+		-Dbinfmt=$(meson_multilib)
+		-Dcoredump=$(meson_multilib)
+		-Denvironment-d=$(meson_multilib)
+		-Dfirstboot=$(meson_multilib)
+		-Dhibernate=$(meson_multilib)
+		-Dhostnamed=$(meson_multilib)
+		-Dhwdb=$(meson_multilib)
+		-Dldconfig=$(meson_multilib)
+		-Dlocaled=$(meson_multilib)
+		-Dman=$(meson_multilib)
+		-Dnetworkd=$(meson_multilib)
+		-Dquotacheck=$(meson_multilib)
+		-Drandomseed=$(meson_multilib)
+		-Drfkill=$(meson_multilib)
+		-Dsysusers=$(meson_multilib)
+		-Dtimedated=$(meson_multilib)
+		-Dtimesyncd=$(meson_multilib)
+		-Dtmpfiles=$(meson_multilib)
+		-Dvconsole=$(meson_multilib)
+	)
+
+	if multilib_is_native_abi && use idn; then
+		myconf+=(
+			-Dlibidn2=$(usex libidn2 true false)
+			-Dlibidn=$(usex libidn2 false true)
+		)
+	else
+		myconf+=(
+			-Dlibidn2=false
+			-Dlibidn=false
+		)
+	fi
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_test() {
+	eninja test
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
+
+multilib_src_install_all() {
+	# meson doesn't know about docdir
+	mv "${ED%/}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if use sysv-utils; then
+		local app
+		for app in halt poweroff reboot runlevel shutdown telinit; do
+			dosym ../bin/systemctl /sbin/${app}
+		done
+		dosym ../lib/systemd/systemd /sbin/init
+	else
+		# we just keep sysvinit tools, so no need for the mans
+		rm "${ED%/}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
+			|| die
+		rm "${ED%/}"/usr/share/man/man1/init.1 || die
+	fi
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd
+	keepdir /etc/udev/{hwdb.d,rules.d}
+	keepdir /var/log/journal/remote
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+
+	# If we install these symlinks, there is no way for the sysadmin to remove them
+	# permanently.
+	rm -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
+	rm -f "${ED%/}"/etc/systemd/system/dbus-org.freedesktop.network1.service || die
+	rm -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
+	rm -f "${ED%/}"/etc/systemd/system/dbus-org.freedesktop.resolve1.service || die
+	rm -fr "${ED%/}"/etc/systemd/system/network-online.target.wants || die
+	rm -fr "${ED%/}"/etc/systemd/system/sockets.target.wants || die
+	rm -fr "${ED%/}"/etc/systemd/system/sysinit.target.wants || die
+
+	local udevdir=/lib/udev
+	use usrmerge && udevdir=/usr/lib/udev
+
+	rm -r "${ED%/}${udevdir}/hwdb.d" || die
+
+	if ! use usrmerge; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT%/}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT%/}"/etc/env.d/??locale )
+	local locale_conf="${EROOT%/}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+pkg_postinst() {
+	newusergroup() {
+		enewgroup "$1"
+		enewuser "$1" -1 -1 -1 "$1"
+	}
+
+	enewgroup input
+	enewgroup kvm 78
+	enewgroup render
+	enewgroup systemd-journal
+	newusergroup systemd-bus-proxy
+	newusergroup systemd-coredump
+	newusergroup systemd-journal-gateway
+	newusergroup systemd-journal-remote
+	newusergroup systemd-journal-upload
+	newusergroup systemd-network
+	newusergroup systemd-resolve
+	newusergroup systemd-timesync
+
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required. Despite that this file is owned by sys-apps/hwids.
+	if has_version "sys-apps/hwids[udev]"; then
+		udevadm hwdb --update --root="${EROOT%/}"
+	fi
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respect, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	systemd_reenable systemd-networkd.service systemd-resolved.service
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index e1e5518fba7e..ce82f73e71aa 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index a077d6b1464d..c9928fbde43f 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -1,10 +1,8 @@
-AUX elogind-235.1-docs.patch 714 BLAKE2B 93271996cbff4cc8f1cb222c83672f491d3473839fffea4818e7a7341fdb0060de23cca70576d81d0c6783fc796d998b0b70a38237ec7ab14dd8e2521659d49e SHA512 2e530aa318d3ba0de3a1fceb4d8316f8215e1a8d769b077cf4b223ae2f8103c62c2852dd3fd45540646ad6272b0edbb4b23d70a379a2601765c61b4d78b4d81e
 AUX elogind-235.2-docs.patch 652 BLAKE2B c1d5336d18942efb082e39b2278b8af88da5da37c54a9cca0a9fd45f11fc8751da720d80dfad2c2688ebe81cac3101b491a098b516403bd4c46d9c277d39b2e8 SHA512 59179098c638b8b7228ed6013ff133305138b4aff32e8210fddcc8b056e21d2baeb8619debc9c2231f629cd5c99b79040da677f1eddc958119e488a91222f011
 AUX elogind-235.2-drop-logintest.patch 451 BLAKE2B 61c25c176fd85786d899b34831c320e364b91e8f250c323caf1a5badb531cd58281ef5ac43347a4b94f44e7a40232d5cfded4c3ee7a113cbfd440bc24b13fbd9 SHA512 9017ceb04a779dbc5a2dbc5f1fa4c412d8538626696815f9a6ace3acb4c7d3dc1ca7685292b02483a2f80bc6685769efc853dcedd0e71e13bdbd324bb16ceafe
 AUX elogind-235.2-legacy-cgroupmode.patch 2527 BLAKE2B de50970f6c930b2ff35f6ecc4119e06abb23cbc02fcdb649930258b717ab05cb5b4b1ad8de1e89da705c8a1b66093eedba984c0a831fd60cef3d9704e09c6161 SHA512 1c98981db6efc6afb779aef93fd4cd7ba31a1995d74d1edea9b486c4724fe7bc215df95745a3553324750794530466679cbde491bf01ed5bab99a20eda135bb2
 AUX elogind.conf.in 218 BLAKE2B 7ee0a72c4a628a233fdbb2d3104487859aaa7e5c4f2624e5a4eafb37ed90fb8f64349b1a8acc92e69ec618496bb7f6263b7a5d0fe15a1afe1c03f5955743f079 SHA512 2c62ab28d7db9cd52489069f80363159000385a25dd7f2afe5a03598a0b7a1f61af7c18df71f6286e72f5966e55b62a4029e30cb786dd813bb201b9e20adccd7
 AUX elogind.init 490 BLAKE2B 71c102f89a71a2963da50b153d8696a9480d81caa48e8422e7f39614e9bfb0b09037bc4dea202c3735e170140752429dd54747b99941d861453b4714dcb98819 SHA512 60fe1cb55ec0f605f06fb3744a0300accebfc14c4ecd24b7db2e8b0cb1537e816a4a4ccbc4b2eeac45e2f3ca8942dd10d24bdcd814cccbc2ceed198b2657238a
 DIST elogind-235.2.tar.gz 975652 BLAKE2B c568b5eec89da14f55211cf4405d96b4bb1ea274d1237739a92c4f3585a6181a3e17dc7ed2af5161c649cae2149b3bd25f4212cf5a304383b254e39d7aa0b378 SHA512 6fa9194e8c21fa3d3caf6f9499f772dbfe38b9d40d8a0fe43ee32ad4b2acd672a78798d00694d1e0d6107625f4f3f06b71e0a5466ed4be446d670f9bcd961313
-EBUILD elogind-235.2-r1.ebuild 3480 BLAKE2B dda1cbaaa5dc3f355eb9d407df64c4d10e740071f575acdd9c47123c68eaae31c696dd6c150ee8d07dc2e2a57328de330450cef0feff6cc926a633916dd7ba18 SHA512 85d5d135c93599cdb77157aeefedf0b2670f38c5859433a1a611095feefc670b1114c743bdd34725aa0db275089e8aeeaef421798adf613e8de15e13a3ec5a86
-EBUILD elogind-235.2-r2.ebuild 3570 BLAKE2B 53e24310768c27760662fb72967786f2d86258cb2eb137554147b60f7c641c5f5c4b38cbe58ed50ec4f2d5ab7d82c2226c91a6f808134092bd114518e3dee782 SHA512 4f01a646c8a1b941cb346c56a211bda5ccc04f13e6803ac3591c9aa46c6d3391e60fb00b9dc1c6d56137c5961f24fe6ef1a0ab8aaa55cd9ae2c727662333f071
+EBUILD elogind-235.2-r2.ebuild 3274 BLAKE2B 01b8ed8c003382dc7eaf676a2b95493c442c673306405a832f174dabf025c0787daee1b98bfc584480f78b608fe4281a81b3ed554e14156d3c045ddee6c95da8 SHA512 f866e80c5631e3fae2269f5f12350e76a15ccea6186325319bc7c05ddade5cf0055761b6e01e068391fcda7dcff107437dbba31745a91ed04fefdd81f90c3402
 MISC metadata.xml 379 BLAKE2B fc63654412fa4cb02122205ad53d29ed35153457c5dd5c5ab8fa3c3dbfcc7c00b2704220d4cb9040f8d6f794bbb9bd0f8cb9be80d410efb6cf85eeee8ce46503 SHA512 30be0eb7903ffb83d9e24fbcacc8db09c0f8cd7187df5f75b2c12fb5cfae1110d52f29aba502ea92af53df02451cc40e0f3789382f87a16bd281f06e9cad6c68
diff --git a/sys-auth/elogind/elogind-235.2-r1.ebuild b/sys-auth/elogind/elogind-235.2-r1.ebuild
deleted file mode 100644
index 0a887ba050c1..000000000000
--- a/sys-auth/elogind/elogind-235.2-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info meson pam udev xdg-utils
-
-DESCRIPTION="The systemd project's logind, extracted to a standalone package"
-HOMEPAGE="https://github.com/elogind/elogind"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC0-1.0 LGPL-2.1+ public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+acl debug doc +pam +policykit selinux"
-
-COMMON_DEPEND="
-	sys-apps/util-linux
-	sys-libs/libcap
-	virtual/libudev:=
-	acl? ( sys-apps/acl )
-	pam? ( virtual/pam )
-	selinux? ( sys-libs/libselinux )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-util/gperf
-	dev-util/intltool
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	!sys-apps/systemd
-"
-PDEPEND="
-	sys-apps/dbus
-	policykit? ( sys-auth/polkit )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-235.1-docs.patch"
-	"${FILESDIR}/${P}-legacy-cgroupmode.patch"
-	"${FILESDIR}/${P}-drop-logintest.patch" # bug 645156
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD"
-
-	if use kernel_linux; then
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	xdg_environment_reset
-}
-
-src_configure() {
-	local rccgroupmode="$(grep rc_cgroup_mode /etc/rc.conf | cut -d '"' -f 2)"
-	local cgroupmode="legacy"
-
-	if [[ "xhybrid" = "x${rccgroupmode}" ]] ; then
-		cgroupmode="hybrid"
-	elif [[ "xunified" = "x${rccgroupmode}" ]] ; then
-		cgroupmode="unified"
-	fi
-
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${P}"
-		-Dhtmldir="${EPREFIX}/usr/share/doc/${P}/html"
-		-Dpamlibdir=$(getpam_mod_dir)
-		-Dudevrulesdir="$(get_udevdir)"/rules.d
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		-Drootlibdir="${EPREFIX}"/$(get_libdir)
-		-Drootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind
-		-Drootprefix="${EPREFIX}/"
-		-Dsmack=true
-		-Dman=auto
-		-Dhtml=$(usex doc auto false)
-		-Dcgroup-controller=openrc
-		-Ddefault-hierarchy=${cgroupmode}
-		-Ddebug=$(usex debug elogind false)
-		--buildtype $(usex debug debug release)
-		-Dacl=$(usex acl true false)
-		-Dpam=$(usex pam true false)
-		-Dselinux=$(usex selinux true false)
-		-Dbashcompletiondir="${EPREFIX}/usr/share/bash-completion/completions"
-		-Dzsh-completion="${EPREFIX}/usr/share/zsh/site-functions"
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
-
-	sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die
-	newconfd ${PN}.conf ${PN}
-}
-
-pkg_postinst() {
-	if [[ "$(rc-config list boot | grep elogind)" != "" ]]; then
-		ewarn "elogind is currently started from boot runlevel."
-	elif [[ "$(rc-config list default | grep elogind)" != "" ]]; then
-		ewarn "elogind is currently started from default runlevel."
-		ewarn "Please remove elogind from the default runlevel and"
-		ewarn "add it to the boot runlevel by:"
-		ewarn "# rc-update del elogind default"
-		ewarn "# rc-update add elogind boot"
-	else
-		ewarn "elogind is currently not started from any runlevel."
-		ewarn "You may add it to the boot runlevel by:"
-		ewarn "# rc-update add elogind boot"
-	fi
-	ewarn "Alternatively you can leave elogind out of any"
-	ewarn "runlevel. It will then be started automatically"
-	if use pam; then
-		ewarn "when the first service calls it via dbus, or the"
-		ewarn "first user logs into the system."
-	else
-		ewarn "when the first service calls it via dbus."
-	fi
-}
diff --git a/sys-auth/elogind/elogind-235.2-r2.ebuild b/sys-auth/elogind/elogind-235.2-r2.ebuild
index 9aebf298ae6b..bae01cc02e4f 100644
--- a/sys-auth/elogind/elogind-235.2-r2.ebuild
+++ b/sys-auth/elogind/elogind-235.2-r2.ebuild
@@ -108,7 +108,7 @@ src_install() {
 
 pkg_postinst() {
 	if [[ "$(rc-config list boot | grep elogind)" != "" ]]; then
-		ewarn "elogind is currently started from boot runlevel."
+		elog "elogind is currently started from boot runlevel."
 	elif [[ "$(rc-config list default | grep elogind)" != "" ]]; then
 		ewarn "elogind is currently started from default runlevel."
 		ewarn "Please remove elogind from the default runlevel and"
@@ -120,12 +120,4 @@ pkg_postinst() {
 		ewarn "You may add it to the boot runlevel by:"
 		ewarn "# rc-update add elogind boot"
 	fi
-	ewarn "Alternatively you can leave elogind out of any"
-	ewarn "runlevel. It will then be started automatically"
-	if use pam; then
-		ewarn "when the first service calls it via dbus, or the"
-		ewarn "first user logs into the system."
-	else
-		ewarn "when the first service calls it via dbus."
-	fi
 }
diff --git a/sys-auth/elogind/files/elogind-235.1-docs.patch b/sys-auth/elogind/files/elogind-235.1-docs.patch
deleted file mode 100644
index bb28bf412d4a..000000000000
--- a/sys-auth/elogind/files/elogind-235.1-docs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/meson.build	2018-01-14 18:59:36.141461154 +0100
-+++ b/meson.build	2018-01-14 19:00:46.208461781 +0100
-@@ -2634,16 +2634,7 @@
- # install_data('modprobe.d/systemd.conf',
- #              install_dir : modprobedir)
- #endif // 0
--install_data('README',
--             'NEWS',
--             'CODING_STYLE',
--#if 0 /// UNNEEDED by elogind
--#              'DISTRO_PORTING',
--#              'ENVIRONMENT.md',
--#endif // 0
--             'LICENSE.GPL2',
--             'LICENSE.LGPL2.1',
--             'src/libelogind/sd-bus/GVARIANT-SERIALIZATION',
-+install_data('src/libelogind/sd-bus/GVARIANT-SERIALIZATION',
-              install_dir : docdir)
- 
- meson.add_install_script('sh', '-c', mkdir_p.format(systemdstatedir))
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 731eebcd5484..10aa2687364d 100644
Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ
diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest
index 68543cc35ef2..e1bec7849c2e 100644
--- a/sys-boot/plymouth/Manifest
+++ b/sys-boot/plymouth/Manifest
@@ -4,7 +4,7 @@ DIST gentoo-logo.png 14501 BLAKE2B e7236c16b96a2d35a6f062b89bc0a6c6fc696a803b7da
 DIST plymouth-0.9.2.tar.bz2 1231336 BLAKE2B 2e565b0bb23dbab19bc164756165ca85793df3fe0e2df0c9aa2aa7e827f19f7b531951f2b7a302368e8b86829555754cc8cb67606291a80242b0a23a023643c7 SHA512 89356eb8326504fbf3155de262ce15de0847f0a0e6d157d873cf1dea9af464a6cb9e11d7143ee9a595b217a2487060b5835eba5ac142c3cd6d66689deb272e60
 DIST plymouth-0.9.3.tar.xz 1102724 BLAKE2B 7ee17cc785e6197cc9488afe6ceae27541992872813a9f937211930f653207d77c1a331cb093156af5ec9502a04cf1f9e4123c42e07931eaf270fefedcc03700 SHA512 d7b9ba97485cdac7ad6bcaf5a7f1a9c84ece54b8d46d5efce4170294c0aa6571656d7d9957b53aed9c1e51d4d525714f54b7dbb08d8ec0b196a1a4419fd186ed
 EBUILD plymouth-0.9.2-r1.ebuild 2494 BLAKE2B e0f1711a6fdfc2096eab5f90f4c85c16031d0505ed3fa114388645b8f0a2781dc15f77f9c7bac2be66e3c0a193a4a0e1797a60bfe7b31b702c50a11194135933 SHA512 4413aec2441e4466eaf308f352264abd9147c3eba073affe7b9e7ba84f97169f6be605f64e73c28b83b664699c981349c345576b855274cee9942f490d644435
-EBUILD plymouth-0.9.3-r1.ebuild 2586 BLAKE2B 8200d7a82c063c02c9dc4dcd443ed4c0be21ba28b796b438aee15b96cfa3b995d60c8e93603d57380c5d1e8efed2f960bf94ceb69469d70bcd9ff52da0aec0ab SHA512 4fcdf64f197af5b94c8b551294059c13a72b483ec82d9d4b198ff493e50cb73daaf8802073c7f8e71be4ccc62640e071ffa2efe363964700887c58c699b03003
+EBUILD plymouth-0.9.3-r1.ebuild 2585 BLAKE2B d67507b56f0c864ce51d649d3a2a577aeb6b7a7688814045aea01e329cefd1899cc37ba019ee5ebce4db3011855df7146c61767fd37a8e5c2bed661609d55855 SHA512 291db5b95322b27a4798347b6e86c674f87a88380b72052f93c3f1a0fd1f35e3bfacf36fce2d3f67be0d5b8731307e6a387f05275622d26fb4ff4f07ccfa6a7b
 EBUILD plymouth-0.9.3.ebuild 2473 BLAKE2B b490f8947be293aee67da6bb517d38393896d9a8afc391574f91fd1d3cd2b7c48a6479f5ea8081e795bc63728ae4b84004ddd59c04d56700e6b6d2649f8118d5 SHA512 5a92e14027c37c1f98061d92da74896f3955b41b6e2c76853ba3b1ddd7e8579267faadf06272156491e70ade5380c08382f2a5407e050b137586557386758997
 EBUILD plymouth-9999.ebuild 2522 BLAKE2B fdc1b56d96b6ba460d7c98f4b6ea3bbdd2e622836b47418a1af3d1afe34e08e23faaca36bab9b4c1ca02e4b7ef478cd4a6a942029cce6630dec617be8113bc82 SHA512 c7fc665ee59af6353c1baac23b1de212f65e438e5ef59b40873d2a0c1fae3433a1d18b79723bd45cabf82dcee5e0ef47bda2acb218ad725cbf0b6f83c735d86a
 MISC metadata.xml 1154 BLAKE2B c2110cccc02da18e101a516922a8e6e7fafb5087d482490f2b06213bb08a473916d3c9c5cc9b676914f1ab598237f0aa971f8a996d89be3f5088a3f4b45ede4b SHA512 aa809296ffaf68e481a09ae75c1500bf01e7474dca0990cdb66182881d5bff269aa19c60a022e37157330a52c5319410061f0209cc08128828981a46f7dc1b4a
diff --git a/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild b/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild
index 07707fbd471b..d765af6fe2fb 100644
--- a/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild
+++ b/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://cgit.freedesktop.org/plymouth/"
 LICENSE="GPL-2"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
 IUSE="debug gdm +gtk +libkms +pango static-libs"
 
 CDEPEND="
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 1da60da51646..f2f5f75c5027 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 133e4c0f7d62..442e773cf473 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -52,18 +52,18 @@ DIST automake-1.7.9.tar.bz2 577705 BLAKE2B 0fdd9eec855f79dba2067374d2fb902d92fa4
 DIST automake-1.8.5.tar.bz2 663182 BLAKE2B a1488fe8653517d16e69e64655829119283ae9f49d5a29c4886100197fb08d6893abf2701000125fcbaa9923c76a2466de25e056ffcf856eb2878c34284c00b6 SHA512 862f9fe8dd4f0fd51b97d80b767304b982d9c9307bf66933298187bf121f5c827f0b4880eab92f07d16e0c1d41ff5179923c7ae8d8aabd635db8574d4a3021b0
 DIST automake-1.9.6.tar.bz2 765505 BLAKE2B 078d4dff44be18d93a8b1b30367a6010fff0be890a61a23926910ac2d92ac87672e7fec8f3548815eaa72310b3c4e042ce0f5df0250423446b39924eee4d044b SHA512 6aa8824876003bcac804e88d58f014a2449c7e1d824e46b5e971d3e2d070bc6ac0a3881e8eaae12e2f7f310c6b81dfb83ad4647d58785fc7e6759aa37478784e
 EBUILD automake-1.10.3-r2.ebuild 2193 BLAKE2B ad0b6db8051ba050182e0635d2907dc24bfdd9b03748ebd18a213f241d80972439151121ab0774a33746d0cbf48c9b313a198d409a131bfa941f44baa4594e7a SHA512 6b92b5d94e7d46c3ae233ae7102faf0e2b27f51d11878acce9e991a196e45dcd5ce09c4ca92331b8b5887d9cc1dc10ae6a5a8262cb3d5498f9a28cf3b73373b3
-EBUILD automake-1.10.3-r3.ebuild 2424 BLAKE2B 6b54e2d06cb101e377260a4e8afbca90bb921a3fb1ef0fc9655fce917bc82e3b8f153dd66906f5c7de01bb25275475a598dcd397f3c0fea3ffddbc78ed5ea51b SHA512 0751ce146e971eef8acc3e53a75487226facc71aecbad121271ea0bf81da59b619d04d496c11f51a96b21aa6d1daadc96ee14637b9c9a0605be981e47a66caca
+EBUILD automake-1.10.3-r3.ebuild 2423 BLAKE2B 2cf3a1fdb8ee0b84d286db0e3ac7094f388096fb0bed7a206d2f641c3a9f56fefcf82086a2977fdd8db82d411979e54f4ef1f4b71c3af1250fe551f7fe199bf8 SHA512 8a33938367adc51a59170791b7e1ac55d972cf54fbc057b9cce97b638c4c70865361c7cea8ca608847beb8734b14b8f59ad42210da1c880736c9cdedaee5bda1
 EBUILD automake-1.11.6-r2.ebuild 2364 BLAKE2B 33a33b8b8b3852fb77bbe7b31d45fd172ab09a787c330ce5221c6e5dba141a2e3b1940b4f0b8064f661cf011d5adb1cc65eea18ad81cf388da083f54bc6a58a3 SHA512 fad55a76b4307f12623b956306dc8b5671a90e393ab357600a0327a9af9b272497567bd7ff24ffeaac3eb68ec884a62af66f40c2dcd80297a5be926de701a4ff
-EBUILD automake-1.11.6-r3.ebuild 2648 BLAKE2B 87d1d77a86855d23fb864ec798bd37ba52f3a49dd844798dfa4ca3daa545f703f40b68e4ee4b0771f08ce277dc6802678e941a13da33857a8dcaa5f1714f405d SHA512 8ac05c1dd115a1b98d923c35eb31454245005eb8e1eb4dce0a0ffaa8d35d1f26c178bb4474de7a3a0264ea77a40a30fc694499fc0cb57930c3c93241882a93ab
+EBUILD automake-1.11.6-r3.ebuild 2647 BLAKE2B e6d2a5d2caeeaa5b27283880508b4b0a60e0d631bf66206b382c383ad89b6ef4f0325f6d9e4c14804ad3334ebc99207e3487577f86b0b0a55eecd5d50b1bff88 SHA512 d0458079c53bf4cbfcecd9b7cb7882b5da952012477a734eecc9f64ad83e3401426dd2968d4b6311e436792af67a8fcdc058c1e3f3d43124ebd1cf680b900911
 EBUILD automake-1.12.6-r1.ebuild 2194 BLAKE2B 28f5632ee81fd266afe21d9862c043c5e852c073550a1f8e005ebecd59f4fc42066284792fc30ac5b80b6a5022cdc616ac6f00816d9806463932dc28cff4e746 SHA512 197da1ebc2d08199bdee702360c54a5d52a175f23761da25a1ce8e72cc70a2c7aec044544c8a310ed1333c67869e220ec499fae84b2df3f3c68c1606c29f3b2f
-EBUILD automake-1.12.6-r2.ebuild 2437 BLAKE2B 120734071fa55088f3f6e10d48517f66f15e47761f9a1bbf06c94da738f3fa310f31a9f3a63fc48d11ef73627d81f0668f33c59a86ac898f9d7229077707b2d5 SHA512 943748c02a6bc170eb25102a0f4ff6e389bf084f14bbc3b3155725207d6e582f07261352faebb4d4d6201a9d7da250a61cb2e50a3c64d8d8181f360aab60ce9a
+EBUILD automake-1.12.6-r2.ebuild 2435 BLAKE2B 23215588f54f3cc42d90d5f0dda49cacd31790a775b7912d79addbe50482b82a7453d8e9b1f101d12bd15247a31fdde21b3e19b92d333308a66014c6a43369bd SHA512 93f900aac53f30283127027f9b7c5f98bc69dab94f2fbfe0f28b1eefcd445bdde89ba81be166b038d886c4d7ce1947b22cfa21e9782483986acc741a5cf5cdfe
 EBUILD automake-1.12.6.ebuild 2124 BLAKE2B 138882c17f0191b598f1d0979b36e6bfeb219a8fea92d7d3840aea594f62fc36a949da6d927cf16a4e3c73e00c7300a5795eebd0510b6061e3e0eb2fa264d3b1 SHA512 0e7dbf281831b7e94655a1ad505472845cfd9eab52d02a78b67b3b90f2dc0514e5006e55cf501606486e1fe720be2ba8378358a9c73980312c91840ebed42846
 EBUILD automake-1.13.4-r1.ebuild 2421 BLAKE2B 9c858d89626d8c75f089baf6261e69d127db735337e2b572916589dc85a52ce907a800d560bad2813f464c1941f2602bff2df0fc3788cb53c98ad11efc1c1ff8 SHA512 98cdd9b84eb42477f7fb3411d7ce77a21e25a122f9b5141c8c7c8b874d8771709aa5513856a6fa24c6d8175a9dbaea2a0370f223587bd6f33a050b9bd8ad4afb
-EBUILD automake-1.13.4-r2.ebuild 2683 BLAKE2B 34ac99e723c16d4bb4624552e7cde9f7d5ed7994a815ecae94c421b41acc0eb957378a746d6c50d31239463e95f7242706c69868d73c38bf4c07dfcfab8d86fa SHA512 cb2ca0c20aceee132d890b2016636989001f205f1b65fc5373823cc13c8c50e2e645f897f17e1e87b25af63bd608e8986a67696c7e8c3d3d24723c926f8526e9
+EBUILD automake-1.13.4-r2.ebuild 2682 BLAKE2B d29995073ddaaa549d354a5b960adf3ad57ba802c075175f30ce0461e381d063eb3e2a94775502da63bee347faee02ac20f19c95cdf560db550cf921f9a67a78 SHA512 8724d9448223ce6c7b14f5eab91510b83ad1859e0fb51f97c187d119880d33f3b5c078af4ebeff4c19dabae37662050782df3702ac8bef90f4d34185b39eae2d
 EBUILD automake-1.14.1-r1.ebuild 2733 BLAKE2B 149f5f1a99b9b569f457304bc07ce359b6622ad21e05bf3d3cd058f199abedee71a55531a624190516e9c6dfb00ec01e5d390501fed241fcd23986eb5a12bae3 SHA512 df61f8c6c0cc1e4dd93cfd2432b1a4ab1dc4f695947455627fd96c0d203c484b7ee1ff3d45db861f5553d122267d0ba6c889c9d513d047a3ce8820f65d18c0bf
-EBUILD automake-1.14.1-r2.ebuild 3109 BLAKE2B 350affad3684cfa569d8761a6d8eb1934e2db0080ba0b5a7b00d5fb80283dd5b0a3c2608fb3a3f42fe9a2bbc3271d684df43f2221307606971e1e6d254b4af0f SHA512 307c48bf1714aa05711065b23acbbbb05be458dfe5e9c72ce15e172cad3d1f5cf71b1e919f2776975032006cd56eac03f485b7a7fe89acb5a7aa9aba8beb1718
+EBUILD automake-1.14.1-r2.ebuild 3108 BLAKE2B 3f605d15d873e2ae8623f2bd1b14d891dc0f5d9722427d5ffc27a54e1f99a949f5d4a93debab1d30c8e00e27dcaffe40fe20a06c95425559c33a1c4384365b37 SHA512 0a833afcae3cf79837c401a7f14d68a79d0de42f87155f1e4f45beeb914358c1e36a0c801c62af6a88a4d0f1ab70af743acc0dbf54493e89231fe693da9ca1e6
 EBUILD automake-1.15.1-r1.ebuild 2910 BLAKE2B 4f2efb028801ae608a8e2cdd5e23fa81f19b3a20dcc6fb61c450db6ccbfcbdf1d3663c63a2e49cddc780d093115be713b715388e03f7890c797125d929ad61a8 SHA512 0ea6f2b3149c347d6c60b58ccc1c7f503c4849c6fb8e1f6012a57029d309831a251ffa74bb8bffa97fc46d09081ea366bc28255a8545ebbe65bb6d420a8837af
-EBUILD automake-1.15.1-r2.ebuild 3214 BLAKE2B 737a3021c87c85111c62f6da6eeca9e6d55d671fff1c8c3968c44cfeebf0be784e7ede0cc09f68cf5371fee4ed685a742f21fcab2fba800e8a0d486afe8ffe4d SHA512 58f2cd3358d04791607e666ad7d67e70d66aaba1209bae0ee9ebdc59adeaf591b51c8c6c00b7e3584cbbfb50217cbe5aae6579a3c37f538ceb9cc9e2f9f6b346
+EBUILD automake-1.15.1-r2.ebuild 3212 BLAKE2B 16fde3eaaf25415568da1be5b01c32e3bd3b0f932453f97ca5dd9ff88509e3450464da1969e0add7dcd4cbe2bb1bfd559d3c8334a26c183c7afed335a609b536 SHA512 5bfaedb270609dfccea969d3387cfcaea52e63e6b5957a7ee15e3bca2a7808438e752ba29c25a34caa5a116409152860c856a834f122d236726e89c777ac5d61
 EBUILD automake-1.16-r1.ebuild 3271 BLAKE2B 8a12206ef54365c57de82c9cbe79ccb388075d54680d9e83c6b27ebaed181eece9ff8d6bf33d3718954a375d544f5f7c1b50784e8126a7e9d7549aca14f683c9 SHA512 bc291cc88086bf4dc7aefdc216ce2f1159c347d4ddae574efc0e2fcb394df726767d014a6065c07cb8c629517debef8a9a159c3f343d9ff3df50f415a189222f
 EBUILD automake-1.4_p6-r2.ebuild 2481 BLAKE2B 6247d6b13d0b5902ffc48b15936e69a45300bda12b236a80a99ba31562e7e1706201a1ff56c8cf0a6539c50a2e2b44972018f5e882e42b4801b6b1e7ce1b1e53 SHA512 db4daa874be88149d6eef10a8babe82bdaba6125c7cb5413a1c6b01a28cc7d0933adca8c1b6eb2aa31cb1e708cb6ec0404138f1c2661b4c008ce0c2a80d5c0fc
 EBUILD automake-1.5-r2.ebuild 2299 BLAKE2B 4d2c160631fb5dd5f3803a37168c90941f1d60890e0ec707a1e27a6dafd4dc960f54aa71c1beb0d646948dbc6a317aec7e2fa7805d587cef417d0e5227ea7984 SHA512 13f0e0ffb4b322743bb7e7922f380f77faf5fb9106055a540a66cce0663bca3bfb670d6d22d5dfa0e3c9678b4b20e7cbd17bd6719497d99e334adf592cf1d9fa
@@ -71,6 +71,6 @@ EBUILD automake-1.6.3-r2.ebuild 2047 BLAKE2B 92a42f972d1d976370774166e25a13c399b
 EBUILD automake-1.7.9-r3.ebuild 2202 BLAKE2B 53799091072558b9f99744cedf87aafb8a7970cf45bfb3a73875ebac250ed89b4304d1a0591ab8fd721936e4a9ee449722ad0d2f20a6abe5bceb800f6709ab48 SHA512 61897ab690599c4b653b847aa668a1ef22f477237fe57bc69acb8024c326157b85d49527a1555aa6799d682475052a8cc88a6de0682bcba59f8618b473489e86
 EBUILD automake-1.8.5-r5.ebuild 2229 BLAKE2B 057da2c27f531aa821021a9decf048452a7f5733d36e417cd707bc9a23ed2c91201f0bcd6fd9d9eec179f21531019e71cf682daad40efa06df6e510a37c3f892 SHA512 16264cc047c6e0df06ec3d921c778852fe27a63902a26acb1edfe2ff9bd74bfb316237edd618f38fd77a40d3a3af140d24ecacc6fa78ed5e026a37e4c75a96af
 EBUILD automake-1.9.6-r4.ebuild 2444 BLAKE2B 315aeb35b63d282beb7c715aa093426451817c41d2a4899d90db0adb0d8fadfa86a8a710990f901619eecf4a86c3e4985efd6d6a207dd469703a7499327f2076 SHA512 458b186f09016902160bbf8c2df786a2315fa7676551aca0d35f765f9126beeda938577defb859e58ed18af3049dd3e98960ba9ca7399083471b661c8b51a549
-EBUILD automake-1.9.6-r5.ebuild 2573 BLAKE2B b4b7a1143e853c56e6726e3dfbf21aea80ab4eac0f001d5e0f1c94a4c00d761bc99335d365858843991d7ff2606eaf62cd05c5119e828586dfd06c1795c4d8cf SHA512 75a0b4e89ec57f5a9a2afd9814b3b8497736966f7bea2f591dbec6fdec8b88da56aef791d8a15d425bdee1761a97efd4ac32d335b7f125bb28e7e48151111ce0
+EBUILD automake-1.9.6-r5.ebuild 2571 BLAKE2B c717944cc206b3b6f947b2a6881b241327e5417650485708bcfbb9e1378115ad23262f4c2b643a25db935ad80ae41b51471123eae62e73f5cab45542001af3a8 SHA512 cdcdd71a2037d7b59b82cbcb767aabf46bd5fceaa10046f737c52059aa4c447e4ef9a0358fd86529572b742f3c9116c13914bebec21edd7cebebf6bfe3a1325c
 EBUILD automake-9999.ebuild 3219 BLAKE2B 5899f7e2f76ed43bb23c09678572fe36101e2bc381f678415ad17782400ba03880cf65701edb9aebf35cabbcfbfbeb78f9bd5c491c974fe7687af40e6022f185 SHA512 5d5e6cfc2026d09df95a751202638518a1a59b91d0a2257b1d6d178e82a2b2434ad56a5b84204db940963172bffefbadace158524daccd006e449b7be652d676
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/automake/automake-1.10.3-r3.ebuild b/sys-devel/automake/automake-1.10.3-r3.ebuild
index 6a6e53a947c9..7b7d2d9b7070 100644
--- a/sys-devel/automake/automake-1.10.3-r3.ebuild
+++ b/sys-devel/automake/automake-1.10.3-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="test"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.11.6-r3.ebuild b/sys-devel/automake/automake-1.11.6-r3.ebuild
index 02e52cf3bc33..aa5a0bc231ec 100644
--- a/sys-devel/automake/automake-1.11.6-r3.ebuild
+++ b/sys-devel/automake/automake-1.11.6-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="test"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.12.6-r2.ebuild b/sys-devel/automake/automake-1.12.6-r2.ebuild
index 973453754e21..5be617044d4a 100644
--- a/sys-devel/automake/automake-1.12.6-r2.ebuild
+++ b/sys-devel/automake/automake-1.12.6-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="test"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.13.4-r2.ebuild b/sys-devel/automake/automake-1.13.4-r2.ebuild
index 863794f1cf99..7ff39a37b0f9 100644
--- a/sys-devel/automake/automake-1.13.4-r2.ebuild
+++ b/sys-devel/automake/automake-1.13.4-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.14.1-r2.ebuild b/sys-devel/automake/automake-1.14.1-r2.ebuild
index f15a789263eb..851d9ca6f5f2 100644
--- a/sys-devel/automake/automake-1.14.1-r2.ebuild
+++ b/sys-devel/automake/automake-1.14.1-r2.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://www.gnu.org/software/automake/"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.15.1-r2.ebuild b/sys-devel/automake/automake-1.15.1-r2.ebuild
index 9eff37c40ada..93ac48c12626 100644
--- a/sys-devel/automake/automake-1.15.1-r2.ebuild
+++ b/sys-devel/automake/automake-1.15.1-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	if [[ ${PV/_beta} == ${PV} ]]; then
 		MY_P=${P}
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
diff --git a/sys-devel/automake/automake-1.9.6-r5.ebuild b/sys-devel/automake/automake-1.9.6-r5.ebuild
index d3b0c6b9ea25..6c1611f16892 100644
--- a/sys-devel/automake/automake-1.9.6-r5.ebuild
+++ b/sys-devel/automake/automake-1.9.6-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="test"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/patch/Manifest b/sys-devel/patch/Manifest
index 841ef28939a2..184a1592f95c 100644
--- a/sys-devel/patch/Manifest
+++ b/sys-devel/patch/Manifest
@@ -2,5 +2,5 @@ AUX patch-2.7.6-fix-test-suite.patch 2610 BLAKE2B e750283b85f0cb9d52324f28b8a030
 DIST patch-2.7.5.tar.xz 727704 BLAKE2B a7aefd05da73329ae301f0f6429306661d72fedd59c6d35acef4828c7e5951c0ce3e8cedfc8ed9ac45d45f6eff564c2e41c0ccb95fbe1c668f63844b7069520c SHA512 6620ac8101f60c0b456ce339fa5e371f40be0b391e2e9728f34f3625f9907e516de61dac2f91bc76e6fd28a9bd1224efc3ba827cfaa606d857730c1af4195a0f
 DIST patch-2.7.6.tar.xz 783756 BLAKE2B e3dd2d155a94c39cb60eafc26677e84de14c3a6d5814dff69de091ded52f21862490970254297795f2c42a0c3203f7e88a8f65bb66968f8dfd6e066bf53f2dfb SHA512 fcca87bdb67a88685a8a25597f9e015f5e60197b9a269fa350ae35a7991ed8da553939b4bbc7f7d3cfd863c67142af403b04165633acbce4339056a905e87fbd
 EBUILD patch-2.7.5.ebuild 911 BLAKE2B 3eda3342754fb82470d8abbd3a9b9e3ee24b6e8ed62f8d0629fa3b6c3e248a4b522aa1a0074011108d8a74ddf4a94d00aa8d8423efd1b7755b4895438fbe3180 SHA512 f15e1b045b40506b1390a98bcf71834e153bc99d03fac764fea092ada307ac9f36444919052ff4c3a13ba3d5cb9b2afb089f0694f95a19f2636cef43cf149698
-EBUILD patch-2.7.6-r1.ebuild 1005 BLAKE2B 736262b329a5cc34856a005ab62fb2155d8beb76f9ec51802301386cc6812c5f9e3ba9abe4054a4549f5521fd56921bf3d13120c7357190e596d3b3b236f0596 SHA512 2424eeed16176ee7b48388caf2dc2d066936d68812c017a2a78e010b7ed40ba36b971839888cfa6003daaf68ba3faaeeefa733fe6cfecca3e95fdfd354ea7689
+EBUILD patch-2.7.6-r1.ebuild 1004 BLAKE2B 16e886147b476259950b008a29297cc77d31ca5d5bd68870ac58fb119a7e1d13f74a5648e2edb64df90fc81f130111f39062d329fa6c2876f613aa495586ed0b SHA512 b0a2cc4aadf4587d17a89199697e3f45b84669f027d02c961997bed41adbd4438344ec701092b68f3a6006dc6887f2ce40fa060ae40f9f39f750c840e5ec3b8b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/patch/patch-2.7.6-r1.ebuild b/sys-devel/patch/patch-2.7.6-r1.ebuild
index b4b3fdb87250..2177f236f450 100644
--- a/sys-devel/patch/patch-2.7.6-r1.ebuild
+++ b/sys-devel/patch/patch-2.7.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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 ~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="static test xattr"
 
 RDEPEND="xattr? ( sys-apps/attr )"
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 1a08db2f406d..e7296b1f2ac3 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index fe6c29569160..cb5534b86bb6 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -6,6 +6,6 @@ DIST mtools-4.0.17.tar.bz2 412310 BLAKE2B 08edc8f18e5b6f8f35008f4b1de51726eeb4b9
 DIST mtools-4.0.18.tar.bz2 420190 BLAKE2B 92fdf8b054287e3cb4eddb40c98f5ac4229a38473b633c25ab74a07a8a72d38c2767ae648a35cf0dac9dedfa2f7789afc4904a50e1328e2baa0a289d93b094fb SHA512 3981a4727aa4e2ec5c931201b236f52fcd1c9d55f888cb2fbdc5c4172402e2b229ede9a5005b972ffdad59bcb861e2fcc01404845e521116419079ae78239090
 EBUILD mtools-4.0.15.ebuild 832 BLAKE2B ecf428ecd0841e31755b8990e130ad026d6502d6aec680ba921f8d4b3e6da578305ec3f3f7769e2ad3911d89e34219e5e49a3a37141dfc006efe329dbae32178 SHA512 9a108e56611864710598fb7d624305aa2f3efd4cf85dad7ee9a7a71f57645caf9604fc42295ae4c1f66fbe30bfb2494ba199b84b0336ac2e976e2b9be33c1ecf
 EBUILD mtools-4.0.17.ebuild 901 BLAKE2B 06c1ec452ac4fee02f17c9167c2f2d8814f3cb18452246cf9fbf6d6a8a1f1d9c985c1bc9f8b7fe80f4be841472da932107f23da4755fef4e0ed897ab772a34b1 SHA512 047da0fb150a4e9196bafc7731f4d6ea5456284923b64f9735c56f554c5692b677e4a16c7af91d2feec76fd2dd04b3d97617a03289bb5c38533782991c354246
-EBUILD mtools-4.0.18-r2.ebuild 1315 BLAKE2B ae70320b877699ab26c48f80eb1ca557a8f661778375f2bb747f014a20bad90fe16ee78517c87a3d81886f42251a9461b8c8a8ab648e9cff095302c2c6015dc1 SHA512 d194c1458418d5f4acc5e3d421c1896f0346ffee846b157e8971b0f7109e83ec737e84f9b7c2927ce28e3341c1721d3e83acd273ba16b6da156c3d93055dae9c
+EBUILD mtools-4.0.18-r2.ebuild 1314 BLAKE2B 91798b430101c67a34fb30358accd39de9e882c5d64e90f6553e7d66525a996a5045295783b3c1f9fe2635b0d19a66240540f6f7dab0ae5afa8e93face0f1baa SHA512 643fe3d602ef4bee7100a636b63b16d8517740705f0cad952c831930a89b15341c0399f1feead1837a73d3efe5a27bba0d2d9d9fd005c280b442b6184da42171
 EBUILD mtools-4.0.18.ebuild 1080 BLAKE2B 5617ceabdfe6f8536cd94bb86aec543ed6f8ae81396291c661ec72a235aba12b27452b57fb87e8912d7d5394379ffa097e0223949f8c208d5a7bb10c7e8c2a52 SHA512 f777db7ae901411b303fe9259ad151b16145f1576fbf71429cf6242b1e10b9347943fdd38de3c995f95c34d1150d33e6377f276fde6b3a6c364a82eacf1e96d4
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/mtools/mtools-4.0.18-r2.ebuild b/sys-fs/mtools/mtools-4.0.18-r2.ebuild
index b24e3026f32b..4f6e87a3b1eb 100644
--- a/sys-fs/mtools/mtools-4.0.18-r2.ebuild
+++ b/sys-fs/mtools/mtools-4.0.18-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="X elibc_glibc"
 
 DEPEND="
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index fe07c4490f6e..b2f00d7bfd13 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index ea10216cf280..0dbe49d729fd 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -46,6 +46,9 @@ DIST genpatches-4.14-27.extras.tar.xz 17492 BLAKE2B 4a1d976f56d48c8da2c43cd30650
 DIST genpatches-4.14-28.base.tar.xz 763484 BLAKE2B f1ecc9bdd37f7e65287d5f3e2027bbcacf08f946a42cbdfb7f115c5641b450b22c29f8d43e0a8827d02195a8aa867640855dc8752e9cd3209db95428198e5736 SHA512 5ce9a2d51267dc06dd0da96e8dc7ce010a7ba1b19d6be8e4c352f674f86bdc3f32c18664bbf816293ab5f2030088f4fe4a8367f51f1b57adc945332799f07074
 DIST genpatches-4.14-28.experimental.tar.xz 5180 BLAKE2B d99fa03d0f4003a0c55361dae11a519311ecd367d06f0034166726334399757d4846a7edf885f67a37c72561f614d2190421f56a73818be23abb713f401d7342 SHA512 6f45a8e1cf2ebfd4d0295dec64b7c4b5345281e2b7abbe3a5f522fc7cb939d7f05f09713177cf9023fe29936fcc4013bd2cbb388f7b342ea7778e764349c8f48
 DIST genpatches-4.14-28.extras.tar.xz 17488 BLAKE2B 29d1c5a21219938645204649ebc62daa54f4a879412e4d0adc456b182f54d882be0882d025e641e7c49230a0c7ff2e11af549d20a8d0977842cbcbe7b05813d9 SHA512 c31199fbb9431e4f4b853a19332b21e7f357df79b4ef84db765b9a13d7f9f009a81db9473b0d60d76cf513439ed9eda9769efcc244d4ede7827cf2ab4045461a
+DIST genpatches-4.14-29.base.tar.xz 791916 BLAKE2B cbe93337cb76ff0d9a39be29362d8d1d94b086828a3cde84369bdd2ef68d8eb0633bbf0ca6f8add26bb83a705b7fa87047f533721551c213da2962f33df95958 SHA512 4cf5e2933d438c5b718497d0fdfde15beda14cdfd72debaeb594113476777fa28d2ccd55a0aef9d52af6f4bc989e2f066670d6c7cb7f00331f497790a8a05df5
+DIST genpatches-4.14-29.experimental.tar.xz 5180 BLAKE2B 1b2c5562700863d74bf5ab8423e523e6dcb9431979cb45aaa6a6d3b8135caedfb6c9c06be68fbce4f20bb980318075fe5cdcf5a079fd74b0e469f946e457c763 SHA512 b337951377b24d6fe7d475e196e5232933de402154ddd52154ae7909bf004ba00a730eb4959f9c171fe9e82ab09d19ee7ab0f21fa9a00c6b09608ad24e37e33c
+DIST genpatches-4.14-29.extras.tar.xz 17480 BLAKE2B 4e7ec2ac266170e066a1cdded46341f553d042d8ecae8d1f6825a8a9e9b17460961cba706003f827a1f236bf0e448788313d6866f0addc960a9dfe745c3e8196 SHA512 2e768f58c1d7348c0e832a1dc1cb768022f5802d9982d486f95b01f316d823d48f956e09ee3f292d05fa41d532c324f35ad624f5c115b6c77680cbd5c74f0731
 DIST genpatches-4.15-1.base.tar.xz 5908 BLAKE2B 6627ff7c5bd6b799dae5e61b1638ccc538715cc253521fd07faa0c5ea7dc9aed5204c040742d37a9d172509577ae5442526d11cbe8714540ee8e1f1637d0fbbc SHA512 c7b8cb613f4a2e6570808d179be6972511ea45c849c4415509e38e1d4688014cab15486628bb282178f306ff786e83718fb2171d1391057bb817ed67a0508caf
 DIST genpatches-4.15-1.experimental.tar.xz 5184 BLAKE2B 814356256c11ea5bb67706f47ed76d6fe6f8b4232b989ca042509ed2a7f3088f55bd113d3cac25342a66e4803f90864cca803c91661af106141b78ac9cf5fe18 SHA512 e840928a463a764d59013424045f64c1fdc8e5d18cf1d20c9ea15388d5f4c4b9ec6aa86e88c33add716366d6b18be175943c22b6bb1c88d3cdbaebb606a38b10
 DIST genpatches-4.15-1.extras.tar.xz 17492 BLAKE2B 1242891d2ebe519d6c9d43eb6a0b2e9dd1c51ae76dc8aaf71f14dfbf3b9c52097cfc4ad59c5e2add1da4ded0a34a06e2d302a0366a8afb665f1536f899fa3f9d SHA512 21830b23a1b16291beba81ac122a36e8bcf9268b548aa6e9258f18283e80f610ed249ccf320f27b0a45acd35e3bd8ba5ceb0420e360ae94635121f89d74903b6
@@ -121,6 +124,9 @@ DIST genpatches-4.4-122.extras.tar.xz 16452 BLAKE2B 1d3b14cee46406a1dbe50002f281
 DIST genpatches-4.4-123.base.tar.xz 1865224 BLAKE2B 0bd2ec4723c62c6261ab2068518b9b3ad540575793fc996d72856d3f21d153c11854b7d0bb443445159c2f3910a856bfb46dd08dc1bc95e137fc87bc558be412 SHA512 12d82b9f91cae17f9dec018bf58b0f99bac1ab82692441b05d84c6d9df8a060d838a0e430269f36851ed777373ef9e5619ead2e5a078d5ceb324dad80282ed4e
 DIST genpatches-4.4-123.experimental.tar.xz 87776 BLAKE2B 965353a62c59ae643d16b9a60481e47df694b183de5eed7a07f402d0d39d2868147d69eacaf677e1191ef143ed7ecc0b7ffc811ff10f7f87f22bd8b92739c10c SHA512 e5b39958d3c17776f3663313bf125263298dacc46f54630ba26b6d37923b77ecf09d895a9699ef0add402328793950ad2e607ad96770ec6447d3ab60a9f28e75
 DIST genpatches-4.4-123.extras.tar.xz 16456 BLAKE2B 0d632f2f45a8b5a9b14182e160a825fe930ecf0302d31abe0525dbad347727f347b4537517d1f594ccdfef35562d54b29b513e3c93f2aa34c2491c5bb1bbf8ab SHA512 7a41da008eb8119e25ba1bbd41c077c17bdd888e7be9175cc7f7af22d0d45598abd87dfcf985130c2677a9544fab7456095e0b15ebd384b3d186692cd0cba5ae
+DIST genpatches-4.4-124.base.tar.xz 1872564 BLAKE2B d756fd483da71da0f0a032e8aacd06b789d7ba6fd9f20e87e3c1106f71b02d3ebea2dbd7d2bdf657806a2b3a9b1e638dd61f19854bc2a0a5fe7e5d9a7dbb0fe7 SHA512 fb6ecadb7ed520cb5f35af035311142a370a9d30c9df6a4b25cd51b48ea33c0727f58567c19927a0b3df09083fe816702fd394d531100c56f5e75a9d1e535e35
+DIST genpatches-4.4-124.experimental.tar.xz 87764 BLAKE2B 1949627cb676c0f92f91536c7325a8d38b8f3659cfefb55f8902de9d0d1e15f0b3c0628b9be1bbbe335d4ef373c62fa945f426674fcee76b3648e9898aa13f3b SHA512 16b58c86b5fe8fdfb3ffba969c19ec5fda52c54369d7c5a700b5f14ce5eca6f866772f9f2346bbebe98039baf1dde11ac42ef665bfe53b42cbcd984ebafa6e25
+DIST genpatches-4.4-124.extras.tar.xz 16460 BLAKE2B 2455cb186ced99e1b262940c040d80235f87247641a61be4f6e7707089ee22b85e18cdbbecb637d73275081658d83cd057be5e7b4dd68b2b481e4d2be79535fb SHA512 1978d8f290b537fab536033394cfcca264135367523bc0abc6d7307fa43322a37b260dd8d2bbb091795d071d62b1dbd59af5dd1c7880e06b74e1d96a9f0c6119
 DIST genpatches-4.4-91.base.tar.xz 1428436 BLAKE2B 4b706e9682e883dd1954632efe5ec161347432a6260c353e160b8591f8377e6d1e1768acd2e3e72237e3ea6b7104137e3504e3f290fb12b0dabf662b0fb034c1 SHA512 cdddd25be04b33558f7ebcee66df992aae38f29181474ebed82958d4d50639097b4a82eaf256d7b3576bfcd0cd3fe7682956e1d2cdbdb912d47fe86205d9b554
 DIST genpatches-4.4-91.experimental.tar.xz 87760 BLAKE2B d8a165fb3708192a12e826a713e896ca83785da084c9a9aeaae909473c598669867fa303636d762facd2d7bc1a857da3ba0d994ee62d008dc17955dd84181942 SHA512 0bbc83e076d45da1d0258bfd7f6acf6170e99891a9a857b2552f3a0fcefff4f318a8c5c8779591b0bb654760f905530de18723f2ba960618eae59a1b7219c28f
 DIST genpatches-4.4-91.extras.tar.xz 16468 BLAKE2B b99298cd9e57a2b8a0619495df0450373c9f5c14ff2398d76534c7167f3a563c05e67f9aff80ff97a474ae7a8cb298a4ffbc5eab25d79075aac5cc01964c3e9d SHA512 229922945fcb882a0cb7dcba8bac9de51683690462a8df59e181a03d702fcb1c9b54078c5434624b4a197c481f0bb9b73dca58456ef5a5884a30bfd3644dfd6d
@@ -187,6 +193,9 @@ DIST genpatches-4.9-87.extras.tar.xz 17352 BLAKE2B 671b4dd2905585f9a05120520db4a
 DIST genpatches-4.9-88.base.tar.xz 1635784 BLAKE2B 984b572eda6e5e529b572e184b4f0a37b6d9f919c4711f5f73a89a8214ab2671bd4ab495e16dfd77e802692e769901865075779cf404f359be14921b0f5e65af SHA512 9041d8fffb4e4242aba90472c2469ced6c71b2ab51c135ae2dfc8bb48e5f56cf7dae9405445282db40dd0ddeb4d8c5ac615d00972ce16550084443964c33260a
 DIST genpatches-4.9-88.experimental.tar.xz 106372 BLAKE2B bece20f11e36c6aa3d40e82a411515aaa71ad00910dc73bbc303b3875d18de664e1b9daca434359f1ad0efdb4500b362d208f5161df4e5846955c671f2dc2d7b SHA512 85210e31c24cb1380ca9c55c63838857808ed57f35982231d0d584e1dc8827008087a51b8ce23c3f947f94085d85a00e822a6cd42e3fee70ad4630e264d7b4b5
 DIST genpatches-4.9-88.extras.tar.xz 17360 BLAKE2B 00e0aeb808a94997964f266f4518b97163f5f25948940ac15a0f77c3a53e8b8ea60361071b332ae095c96957736c1640034ae51a07fdecddbd73d6678ad61897 SHA512 758ca092dc266278b68dedeafe98831961a0eb0beb89f8ffd9dd398b38808cd0d26d0f7c527dcaa4d6fd3bdd33838d37d057fc2a88a3a77723158bcfcbda57cb
+DIST genpatches-4.9-89.base.tar.xz 1646644 BLAKE2B fe6f25fa225bdf40147cad94805cbaa816f3e6d18cac674716c5b47f42e8125b00c421ada6876ede3cabe598903d70b70d7cd966ea08fecddf3f05812d52edd6 SHA512 ea6d1d81cdf91a94660cad88606970429dbcd1635a6f77b17fe2033edba4827c22212461f9e681b3a88e0f32020bfdd94c72d43aa04b31d81fc70e2d91c5ead9
+DIST genpatches-4.9-89.experimental.tar.xz 106376 BLAKE2B 46bc3138012006fa09724def4a4d64ac74c782a9eb101a741f9b8c429f35ada95b3c9bd704cc48f7a839e22d40dc8b0293ed497421754f5cd900951741745403 SHA512 44b107ea8f8f58444bfff322adabcff2526c8e4455193b00357e43ee3d4b4a88e7df9c40bede32b3742672617919f98098b2603d3a60f69fb484558283fb02b6
+DIST genpatches-4.9-89.extras.tar.xz 17352 BLAKE2B 492b2c9d3b5865b15e6be00e419d7c656be507ca65cf7943da3fc0f6076d4f70d062a9e2a31403d5e6486c9fa73326dc8de522887d581ba017b6284e5dbc1981 SHA512 cec57e60b99d80066a1c9a120f680b6edd33736417491bf3181b824725df50c1a1252ae1a339d32a38f18d38bcd04264ff9f70bea9093c814e3f5809e7c8eafd
 DIST linux-4.1.tar.xz 83017828 BLAKE2B d1dc4e458db191f16306b3d2d7eb60ef5e04307406c769cccdd88beb407f8de228ab1f095a44d6e992b06d01cd896fda31dec1cdf16667f4ca0b628da594aee3 SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.15.tar.xz 102181404 BLAKE2B 5fd831356c2174d2779ab31033caec6929b2f47857f0bb82ef43ad1140c639d0dc5553e64d062f67486eeff780d5df8d971051fd5a626b51bed170067fea11e0 SHA512 c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea
@@ -208,6 +217,7 @@ EBUILD gentoo-sources-4.14.20.ebuild 742 BLAKE2B 5a8da52fd82e1849f964e9ffcc6633c
 EBUILD gentoo-sources-4.14.21.ebuild 742 BLAKE2B e4307cbbe77deed1fc1f3035e8fe810b3b20472ceaea3850182fc182b42c125deb30da4e47a60760b68275f3bccee74b4772713b7788b17dd09cd242b3e9061d SHA512 cbc9d590de0bb768982b07d3c13aacd8db8a99dde24d9f4a8692d7ab64810d26bc85b2664cea30aa1c1b684aeb9a6ed72dfb2d159fa340e3e3e00c3408030b24
 EBUILD gentoo-sources-4.14.22.ebuild 742 BLAKE2B cb1e61d51391de39ccda1844ce4c204f5951e0e7708b61c792ed64e7b9b4d69928a8466072c896de2703d060037496d34c538d5f0be0089f8fc05a54047cd905 SHA512 c01ed4b5aeeb09c3d05dc55cafcf2f105b24842f8007e2379b9410c1477651f89ebb7e405c33e62f60f769c62e5e13773c4d6ae1ab7a6b5f23a10c51b82b9f2f
 EBUILD gentoo-sources-4.14.23.ebuild 742 BLAKE2B 981b150b7fbd36b2f94ae708538fb614d1c558e5d7e3086a69051756b3b1b09e1a58c739f453c4eabff9ac01bf6879dfb90e93518ac38437f1c2684efd2d24b8 SHA512 cc741dfff9d6819c612478b202509d1546e9c6b5b077dac001231f7cc3ec5bfa99dea8d79d2cfc807aeaa82ce4e3083bbae3fb8f82f0ecd16ff56367aca3e524
+EBUILD gentoo-sources-4.14.24.ebuild 742 BLAKE2B 7b492f8ad3f984ada2c439a1157dffd42b765b1fe7dfaacba081bdaef3414aa5a017ffc668c30dfa84d05f9d5ce220c431825f7b727345eeb8a7caa58656eb62 SHA512 6f096d9a5d41d6a86010438995fc6fa6f5a7c25d5528011c2ec6cb2f517aed8c3f5ca6f7fba23e50be9d38b6b748733b3da64ba89e9bbff06ed9300b9620346e
 EBUILD gentoo-sources-4.15.0.ebuild 741 BLAKE2B 6cccd19877bc0d5bc677ea794fd4669268c654d01c156b62f24cc1a7cf89c54db8685b78fc2ba941c9b48602847f3b9c9d5c05a358015e1cabead653c0f4476d SHA512 8daf880f336464e106ea015594b1ee8f476e8391dac6f698327b2c48faacaf0f4c864b6b2bbeb2b723d0cd0ea1e88041e3b23010748baaa313962028453c7164
 EBUILD gentoo-sources-4.15.1.ebuild 741 BLAKE2B bdd6a645dca7b8cb96832f43ba52604d095b4074326e482a08a46bebccfcd88dba40dee9de1d01f55e41d32209b20e99cf632bc8bb4189e97efde854275613c1 SHA512 d3101818abccdb94c1ca8a070301a2261027b655b376d3ee4eebf3ce78e88848efd3c4d770857a9657ceaadba2c34b1f220f5d48accd7f2534d37109b69edc4d
 EBUILD gentoo-sources-4.15.2.ebuild 741 BLAKE2B 2eb00d59aa519bd1ce81391f509a492a74fb5026947883f638c5f0eae7f7b78e86310997497db063f18398f3f7c7543c1913f6d5552c986443ec75724895d13f SHA512 a369ec39bdb9c4f320fc140f92109aac23067610d99250c298d033248be9b324f07f07dbbcbac52e9be01666bfc111c121346813b267ace82f6fa8690940124e
@@ -233,6 +243,7 @@ EBUILD gentoo-sources-4.4.116.ebuild 743 BLAKE2B 4716cc340fd1ffd3e584dbce1eec57d
 EBUILD gentoo-sources-4.4.117.ebuild 743 BLAKE2B 0d66754762d040e72e0254af3d1778bfc68d1a76d139fa7a75b0c83167e236af0aaea804deb532159d05074491b8aa43a8f4a336f6fb579531f295bb95353e59 SHA512 ed2ed024c9cb498d10ea95de3107ad72fa3c395f5daa990268a72fe9b499082727c33ef95a8013ca3ac25dd2639cc83a0240d427d1275cf169fc3f27ec88711b
 EBUILD gentoo-sources-4.4.118.ebuild 743 BLAKE2B df51ed12fcc8c79456b03972a34a1bdd9c2278d582deb95355d12c7015a7efda33ee44bf7c65c99cdf3da924ef3c84656d6850935ee0861abb6add7d6f65e333 SHA512 11ae9347b175bb9d260f0350a0ace71223d9f24fd00931a96d175587905e3fdd30dd8b3a16a897ff68c5f6558c83b6b150f88e402d03433921f3d7a87c5c2dfd
 EBUILD gentoo-sources-4.4.119.ebuild 743 BLAKE2B bca9e86d0e32a66395c2fb43c34c1d2e98f46940a08c56d00071f8d48c2fd3bd0d837a335ff5f175350f86a03c4c88bc9016db69f11359636f1c57f9ffd4b4b4 SHA512 2f95177fcdd33113387b3f0ffcf5baab91a7021c9b85198aca27e1e4c377c866bade5f08a8e8c4ca8e2d90e2d957042a198753f529f474afc577c4010e0d145a
+EBUILD gentoo-sources-4.4.120.ebuild 743 BLAKE2B df2e388bef224bf84820c1c13992120fee5ce1c029dc115027082a7b9f72a1a09b19c9a370a4d12e76fb64ced961726eaaeadcfec340ad1ea8d39d551392173c SHA512 31fc815881a47f39a97bb82a11d3fcae200ce99172c68fe0333cf1bd85c33d983b0ef7c9238754f1cbf801f4d229e72a6bae67273e351ed0684d45016e90b625
 EBUILD gentoo-sources-4.4.87-r1.ebuild 734 BLAKE2B 1f1cb7f7355792bcb664b74c7476e9f8d0e90ca648b819ad44e0a4339210867658584a206beb21842633b7537b2b7f58d43b391d4c4f98fd700280a72662423b SHA512 3a59950c522313a2f9722ae6d4801cd03ddb9430b58f17ab9e8a500fb9a083dc59369de7ad59de1064412f82bdc21396c7280a6af6fcb0a4524ac93f758d85ff
 EBUILD gentoo-sources-4.9.49-r1.ebuild 734 BLAKE2B 169d43bf5276e6d398a72a22b968f571d6122d6b88f61e757f27ccc3d732b171bcdffc27d502c440818e93da732495c258844f047f2f64672fca5b595d15b906 SHA512 8a42455eb119e89f3df16a675486efc5ba208a94ac255b0f4033cb699dea75b9ad7fe28acb1df044b73f16f1bb50c08bbc09bb59e541286893048190c5a74a8e
 EBUILD gentoo-sources-4.9.67.ebuild 742 BLAKE2B 86d65f90024085652859b5e3091f097e556be4a69fa24045fcf98f54000e7d48da3a822a9fc294417665b48f6b49a4e0cc9c3f746c1ea9330725b37529f75b07 SHA512 d444a40a62974d90dccb589d0098e8066615f6e32088fdf5a24bf7063df96d9b720d704ba805291160a030e5e240fd915e442c680f11feb7838e1dee9f9bb439
@@ -255,4 +266,5 @@ EBUILD gentoo-sources-4.9.82.ebuild 742 BLAKE2B 6571045d5b61fc2ae49c1c0341a261a4
 EBUILD gentoo-sources-4.9.83.ebuild 742 BLAKE2B 88f2ce0b507d811baec75c9b8bcc30493b2c7e5a0465f8585fe81a2bc80b14feddfa1862371a33dce47a8fe777a83654e992ea4274d250f7faa7f1e10fd5508a SHA512 e51363cd787e0f1d4c4c4b7be93aa2b6f21bc960a8066e23306b2a6e72b7f17d4c0d0d542b03e9b6d70429712b7acd1a9517d4edb24d8ae1780fcc3ed7796d20
 EBUILD gentoo-sources-4.9.84.ebuild 742 BLAKE2B 877f0c71b3a03d36c07b407233af03e98d4ac9ea04afb7e68d02f694f03a1138e60ddd08bc677871a02c564c298a17449ba3d6291934d41fe050fad4c942043b SHA512 0b1d780495acc8d4ce077f2df5191ea46ee3d838b86cb10ef3122d95079d6dd43a76e870c3e4cd2864fc55c78e0b9f51240e451117eef6a9e768ce53703c9e83
 EBUILD gentoo-sources-4.9.85.ebuild 742 BLAKE2B 32f0a8b4eca09a44ad3c5c825cb40b0999f8d9f9e4d6bce90829bbad1efc16c40e8efd71a152085a454823602ba23fbdaa94e462c5b6911ea3a49a7fa9c8eca2 SHA512 8316593a2b7fd44be1ef7f43cacc2c238381aa3ab10f15a54f4439f16f8a60cc21937ce0262307a1b1112b66df790c51d640b67dfa8ee83c5e60f75254c96711
+EBUILD gentoo-sources-4.9.86.ebuild 742 BLAKE2B 0ff3fbd99e90e097acba49e2ab35815448a4fee2fa826320ebd68126bce480298ddb703d15a95e8eb69334fe028b351a5c10b8a989d7312573d1d8291e550492 SHA512 31cb5d395cfdeda95c7eabd4d55a882bc6b5e6a10b7a1805d6f7d8e57fbe84d73d17ae762ab96120f9545e6d682408b283e3936c2c6ee4feb22600b1520ee5de
 MISC metadata.xml 500 BLAKE2B 0876bc03bc9d32afee87523a55415ba549942acc4e9a1b65511ced2aa4038557854fd9f570dd1afb6d94ecd899d9cc48034911f547eb88ef76457cdfa62845e4 SHA512 c01d2263a3faff75c3b1f01eef806a9b0c0950c904c28c11b057cfdf2f5c302b95b20f45e649a3749c4ffafa6dafd759e7738bd8e807f23e49d2febaa212ec6b
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.24.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.24.ebuild
new file mode 100644
index 000000000000..16acc3e02770
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.24.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 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="29"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.120.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.120.ebuild
new file mode 100644
index 000000000000..46b0423cf7f0
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.120.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 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="124"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.86.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.86.ebuild
new file mode 100644
index 000000000000..5b4672b46954
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.86.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 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="89"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index e1096b354d90..8ec48cc0c328 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -2,7 +2,9 @@ DIST linux-4.15.tar.xz 102181404 BLAKE2B 5fd831356c2174d2779ab31033caec6929b2f47
 DIST patch-4.16-rc1.patch 165143143 BLAKE2B 9c373b51ffb514eca21c01dad33d2b236ca0b38e70cd2059afdc39a1a39cd70112ba975f3632da788f58e4bcc6951229f0a7121eedfa4b0d70d07b011a4e7c1c SHA512 fc2e21bd93e0364bf06f5b8fd7512704bffec214a8448e028f72e1037d35f521adf5ca421e38a77fb6481a52df4b3b4e56a77be210600abae6c4730edb759b09
 DIST patch-4.16-rc2.patch 165456194 BLAKE2B c62bd783fda3305d455d8b40d27dee82bee3d6cc6ec4eb58c82e78094c3813bc37677fe69c6843464d939a21502abbc42d5f370b68b9c5ea22d09a37eedb498a SHA512 36af7d64f4ab716b8ab1d21e77e0f4d78d2fb06d3792dac62d998b3889c9d25231182919142be2309fca96963631a815da748ff24e21faf706c37429a2acb7a4
 DIST patch-4.16-rc3.patch 165801482 BLAKE2B 2c4c113a45b08ca742feea938e0ff90e473a94475808e9a51a281650c059bb60caa8666bae24aa97f6aff8573cc663912c2e29f9b0ad3fc0fcf508b8a29f9536 SHA512 b5b4bc53a245725806d7f46d53e5715e8b8505536c96465cd8ea9dc506ed7b1c02a518114c3025786d10ab72c1454c03e85380bddd753f48946ca71bc0ed6f17
+DIST patch-4.16-rc4.patch 166128228 BLAKE2B 739531176f5f171bfde598076de48645f53ad7d7cadef65a0193b45bb0967f7435c71de7a1ebdac97172dae4e992ee90dee90f84c945a2e2eccbbcbaeed6f0cb SHA512 94e0f940a9d75c80f1ebd99dacc5ebf4774d341f3ed2819ffc8f9019505af695d8e516a16124af27be005d02c12b0f8c622b159c2726d4f10a8ebd114e33c447
 EBUILD git-sources-4.16_rc1.ebuild 1179 BLAKE2B ff9f1f6d3076137b621091d11964fd812e5f40ccb86cd4cc244113e4a2b30294a6b25dc1adf5870c9adbb8de559f596dae4589b722a77b96440c6b378ffc28fd SHA512 379402177143e0719bd645ee825aadd90d48b33edee91c86a11a76642e4744db6cc20da21d97d39ab8ce1142ddf28c7f10cecdba954686c47e82b38617a1b21b
 EBUILD git-sources-4.16_rc2.ebuild 1179 BLAKE2B ff9f1f6d3076137b621091d11964fd812e5f40ccb86cd4cc244113e4a2b30294a6b25dc1adf5870c9adbb8de559f596dae4589b722a77b96440c6b378ffc28fd SHA512 379402177143e0719bd645ee825aadd90d48b33edee91c86a11a76642e4744db6cc20da21d97d39ab8ce1142ddf28c7f10cecdba954686c47e82b38617a1b21b
 EBUILD git-sources-4.16_rc3.ebuild 1179 BLAKE2B ff9f1f6d3076137b621091d11964fd812e5f40ccb86cd4cc244113e4a2b30294a6b25dc1adf5870c9adbb8de559f596dae4589b722a77b96440c6b378ffc28fd SHA512 379402177143e0719bd645ee825aadd90d48b33edee91c86a11a76642e4744db6cc20da21d97d39ab8ce1142ddf28c7f10cecdba954686c47e82b38617a1b21b
+EBUILD git-sources-4.16_rc4.ebuild 1179 BLAKE2B ff9f1f6d3076137b621091d11964fd812e5f40ccb86cd4cc244113e4a2b30294a6b25dc1adf5870c9adbb8de559f596dae4589b722a77b96440c6b378ffc28fd SHA512 379402177143e0719bd645ee825aadd90d48b33edee91c86a11a76642e4744db6cc20da21d97d39ab8ce1142ddf28c7f10cecdba954686c47e82b38617a1b21b
 MISC metadata.xml 596 BLAKE2B 967f959eca5873ccd58ab34aeabf965ec03e9ff41850fa4eb1c49f908ed7ad090ad2f5d7904f350c84cd47d99109e977835a2b216bb8605001b4098cdbdebda5 SHA512 c3476f5b64efc298e0df021b00dc4978a34ea48e5839a9cfee583291a4b5fe7ccc35db89a335db81e9c2cded36663691e6324dcabc90d0b287213d0fccddb227
diff --git a/sys-kernel/git-sources/git-sources-4.16_rc4.ebuild b/sys-kernel/git-sources/git-sources-4.16_rc4.ebuild
new file mode 100644
index 000000000000..de404a4af084
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-4.16_rc4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="4.15"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.5"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 43eb441a2543..1f52d0706842 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -5,18 +5,18 @@ DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97
 DIST linux-4.15.tar.xz 102181404 BLAKE2B 5fd831356c2174d2779ab31033caec6929b2f47857f0bb82ef43ad1140c639d0dc5553e64d062f67486eeff780d5df8d971051fd5a626b51bed170067fea11e0 SHA512 c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
-DIST patch-3.16.54.xz 1892168 BLAKE2B c9b9d3bc9100c60de8969acb0c6950854e7bfabff77339bc7454f3f97094d37fcd4cd86498431a7c2bc769f8ff5afa703af846b43639a38503e1439e47d5b74c SHA512 87556ae9b5cefa2745b7368da7f1e7f665a538c1228f2ddd56166d14a6eba20765dad6758d6f0debfd7052a00a7619ffdf1cfd9743f80880297d83735eb0487a
-DIST patch-3.2.99.xz 1884484 BLAKE2B b6b552c4baa07db0d9ce2a2f2cc28c76fb6fab14eaa9ada7f35bd455b3bf7f04cd43ab6bb4a693dbe5e26ceec5f055e5de4043e1ba13369e913f6853912792ff SHA512 11ecddef327d873a1d9dcc6bc4b2bade4f64efe7826d75ed01694429d5eccf5e73651185b5348a95a0f6c8eed5f13c02e88251d68f132cbff0a550f4943a8877
+DIST patch-3.16.55.xz 1935212 BLAKE2B 0f954866032b5486e2b0cb1d043323b2604638538bb15e56293244473ac15fcd5a65d0c0bc96a78aab2dc5ee3e79e9043fe16519b096595c3156cb677082372f SHA512 a80745b271cbb2dbcee3f696a73238fcef3fefc8bcb4b49f4c1de234cbd78f6b75995b48c13b2687e8bbffad3c14114a036bdafdd68c535d5691fbe45a4c899f
+DIST patch-3.2.100.xz 1910332 BLAKE2B 16ff861ced5a622e424798bb2df220636c3f930913a7d6af28042be68ec50010b615a9779b6ecc9216c5b866a8e05e33dc1af2f872504f485add430abcbe2d26 SHA512 cb78568ce2da2322b90033a9ac6ad55ddb5c8b72031f2f1b4d178a5f3c2b82c915faf35b9a99669f5e794a07e639a9b838b14550cfec4679b88d979d99caba0d
 DIST patch-4.1.49.xz 1337256 BLAKE2B 3252613e08b734e282f7b2034da65b873e925e9244cb011d995913a1dc9829bcb1f374e21bcf785b97f05474b1b5a104c61adbf430eb7f75d8dadd854627d9d4 SHA512 e10f3186b94bfa2ee7189bf4527d4129bb89f23829a480bee87fddfb1d31533ffc1a97ee860a159828c0853e6579d6a4537fa646e977f0f66daf7d304a99ef8c
-DIST patch-4.14.23.xz 723396 BLAKE2B 7fa6d2a466c094bcb678909b73d5e3c8d8f36197e1fdf78e378437958268a8e31957e15b23b92ae17e21673a3b978a7920199b906501128817b02b0eeb380f9e SHA512 b77cbab30baba094fc8fa2a612b1a007ff758ffebb8405380e4f55622ebc105bfbfee89c8f27ab6d0a9f69a2d04362d10901e1459bf3c1f5e353eb7182c678cb
+DIST patch-4.14.24.xz 750320 BLAKE2B 48bb32db9a73c8b42f6b376f8823e0873777682dad0bd47f5fdca3ac57ee0fc80d91fb3d36b5647988b51372a5f0b849a16f01bd727b648ad2fcac6fa09abfd1 SHA512 e1979dc36fcad133980a438685bbb0f02f369fba37b1c8d4e47c3ca3274f4bf9eba0af795a7625f04d5f1e1279c28f27882b80aa7ac7f1a82bd244c2b8db1600
 DIST patch-4.15.7.xz 202364 BLAKE2B 984aee45063ede9a40d61de73c7d6eeb17c879605a7194fd83afc28eddcce9f31986a8d49e1e21061708bb7ea2e187a1762cd900be9eb2373dcb0d90d480e2dd SHA512 4215a356a61c3af20352fd60f3ec4e4a74a3d4d6223c7bd5c1b8283bc4d786a5e1c29a770518cb6a136f42841c637648835a54a46f11e552d1aa7b867999ef1a
-DIST patch-4.4.119.xz 1712580 BLAKE2B 1b54fb484e9b3f0805e9a3ecee425f79c5df376e2cde423054a24fd7709c518f239acceeed195de0c87b2b6f9fbcae5c73c3c57038f7a594fd4a6ca0661471c7 SHA512 78604acfd4727378b47cdfbebac791ee21c4ab333ec5230e710f72c3d07fe6068b14642814c652ed79aabbd75e666c37095ec5fc355de7ae9baba82d2b189793
-DIST patch-4.9.85.xz 1521036 BLAKE2B c3a859a417b18c95c719b79427bb0315deab15e5640d28f848fe793850c4f5eaed95699c97f9585d4b208a7d13880eb0ef67ba3be7a460eaa2d8fc01468d759e SHA512 209f53af782740f820dce9cae1f0010567856b691062592a85bcc0cffaff7b419d7448ed7c0ecab384ab4452903fe12c024ed579e3229391197c49fc2203a887
-EBUILD vanilla-sources-3.16.54.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
-EBUILD vanilla-sources-3.2.99.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
+DIST patch-4.4.120.xz 1718956 BLAKE2B 06df2a0f9ce7ec7d813e6101a5fe5704adf6303c516193d8f53f5f3486a4f9b16c3842797ffa99d9e8daa5f3c1b20366ef2971c8f22aed1de443f4958946de6c SHA512 dd879f449840f380287bda06fe27453768b65493edee8f162cf17d3268f838acbbea375633412f1c0f8bc24b41fe153d610cbbca205cd7c8891bfe8f398f3ec2
+DIST patch-4.9.86.xz 1530748 BLAKE2B f23d5321758057fd0d2e08f8326c83392dac2714f87b917c4a56ca12619da2fe5c963e8802f0886aa4db337a79e4003313861f95ad4f77538406870182e8325e SHA512 64db94862faa4217ce0d815f6cb7274c9ee0c45703cec1374eea08e657bd8a3d7db88ea9435939c49f22a2d4fd9a773b052401f97d5ebb55e116f99f7520476f
+EBUILD vanilla-sources-3.16.55.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
+EBUILD vanilla-sources-3.2.100.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
 EBUILD vanilla-sources-4.1.49.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
-EBUILD vanilla-sources-4.14.23.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
+EBUILD vanilla-sources-4.14.24.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
 EBUILD vanilla-sources-4.15.7.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
-EBUILD vanilla-sources-4.4.119.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
-EBUILD vanilla-sources-4.9.85.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
+EBUILD vanilla-sources-4.4.120.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
+EBUILD vanilla-sources-4.9.86.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
 MISC metadata.xml 642 BLAKE2B 6aa41c5f612d15c0b53c6aed058b2dd01bf9d7dd1ef8abb188f85cad84b43be94b3279d7c7ba50b3ac1b112c385ce01a8a8bf77d3a85dfd8e18838d7def5031d SHA512 b7e1d4e4e6a4a75046ace025fa1b42a38068dcbdafddf2b468287e9280832173617202c036b1ad1fb42c2f2e16920c44f0580039e3844cbb73402143361f764e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.16.54.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.16.55.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-3.16.54.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-3.16.55.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.2.99.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.2.100.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-3.2.99.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-3.2.100.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.23.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.24.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.14.23.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.14.24.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.119.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.120.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.4.119.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.4.120.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.85.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.86.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.9.85.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.9.86.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 0160d10e3a3d..1a79384f37b7 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 23b3cca5e2a7..53458eefb0b0 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -72,15 +72,15 @@ EBUILD db-4.5.20_p2-r1.ebuild 5100 BLAKE2B 8306f6d5c563d782347d5ddc1c2405404cb83
 EBUILD db-4.6.21_p4.ebuild 4829 BLAKE2B 669e22398bcf581b01e2d2d049e55949ddf58e17da9c8ae5e03898f4c72c7d563a044ea439c27eebf6472064d4207ffc44f99e69c23f4b7032a27162e9624861 SHA512 bea9f25513d3496abf35199c1749ab3262688f43dd9f71043ac6c3011e4c4dcd673616942c58fcee063ea8db28efcf215674a12c521a72e94495bf4b77e722ea
 EBUILD db-4.7.25_p4.ebuild 4279 BLAKE2B 217822eb27f4c99d19797ece71587b2cf963638aaa9a29f53cf93a4c8454f6a00ea64c99253f0094a7bb050ea6bc7739ba4d38efba1b7a586894f60d8748bf06 SHA512 236c9cbff1c703a66ad785a6542337853a7fcc11db3b2fc89a607b761175e1e03ad69b1f9db542804ade020e68dd254fb1a7071c8605223b82bd7024c57d5a58
 EBUILD db-4.8.30-r2.ebuild 5045 BLAKE2B f2abed6d90ee517f6beaaf564aa5f3e1407fe4b51c8322806a6f4fa4693dab860feead37883df48f923a33013fdc72f7bd1179958812e7b94f7ef810ea5c51fe SHA512 0e74b6db501a68c5ebd51a953cdd46a506a76816e2825a98315101db272ee5f36d5be8cf8ba6f317f92e6b21bd8f1815ca6ab4ca8e9c53524c8711ded70b995c
-EBUILD db-5.1.29-r1.ebuild 5455 BLAKE2B de1dc56b313f6b4e896e0c159225295d3f6e43e7d0037db1d99a9e9dbccbc58128bebe9b2d7db466b821afc74c3a40e366ab8e1aff2f541493aa353c31de2546 SHA512 339062eaaf7a7aab1f940622d5d51169698fe40b0db1b45af40a3217dc0d46ba9466244a814c7d59985594358ae56165602dca46b0924af1b60f814f40942a58
-EBUILD db-5.3.28-r2.ebuild 6613 BLAKE2B 924488bfd7a060f726c6a29a750d3e0d4b8ce37112a49df72ef5bb4801b9d40d2e41f63e4f74d1c663a44fa69f9563a476f45386d6f0b8ab37d4dbd2a1f8eaad SHA512 afa7530823330c870b3dba4a0f02a7e1d7451d7b3ef5bc07b446f80f272d1db19103b806270a6a1b15f1afc4eba15450ac8c9240c9b23eb5c2abcd400d3b2169
-EBUILD db-5.3.28-r3.ebuild 6718 BLAKE2B c734b962cb5efe7c2732e5c995515635c3d002d7623dbdba71d8aca21bec4c009b572f9d94ab00a8554bbef30a9b18ee02cc777cefd3a73c138b5c0aa671310f SHA512 91b650cf78b2df6f4392095bc5e31128876c393b79b6767e30f2fd4c31ab0e686e0d47b96b92ad7f874bbcb489cdab815685a8449efb1cc0749a9c89babc6380
-EBUILD db-6.0.35-r1.ebuild 6723 BLAKE2B 17910c7f395dec78a10bf0895d2d4719aa9910ff88cc76b879b048755671a8e33ac5f170b6a08122e11b7c09cd79a76f738a444a967c481bbcd5f6ed52892e21 SHA512 078cf4e67c8e4568a221fa4a5731f803aa92a95b283d811f3ec70da8dec85ad949f2602191713cadcc4ca43af0dada9f3d92107fce4007c87a83bc1935a9d071
-EBUILD db-6.0.35.ebuild 6627 BLAKE2B 1d55909a3c360bba43f2a6ddfacb643c0d3ad4f0c6d8df1a488b26fdd7529724330ee1477c31d32a7601785b4e94af9db1bd1eafc0a3777e8d0e5fd4fca3e5e5 SHA512 9b9588cc4b4df9b7edfa81bf66f73bcb41eb640f915595c0c6d99406245bc5e413dfdd6c626d26365d81adfd7231d1fd07fd90abcb1c3adfdae7d7b17664ead5
-EBUILD db-6.1.29-r1.ebuild 6723 BLAKE2B f2b2821bf924c6c1ca9da548800c256a02da558ef9b9696215bc9eb83edc2dcda040248a82dcf8daeff0fe802f55e74f5d50cd44f612befc3868bcf5633fae9a SHA512 8f2002dbb102436a187047b6dafd7eea64936152c755b5dbc67a65bda80740a891660162679efd413e2d4047aa37cc77818820d311bbdd803ebf2ac3248d695f
-EBUILD db-6.1.29.ebuild 6627 BLAKE2B 26e9ec779a3e24d85436904364c657b55b9352f2ed0466d9da48cd4886a81933a0c9b0eae9c84d213ece2dabdfe14a62bbdcfab44687dd9af53447f71f62bb2a SHA512 c1534e27e7c0fbc94e2c55ffe721fb2e8754228447ef65950b88ceb095653bcf69bb70d6eeaa2de76c7c4f535eb902552afe2219f8953fadd4f24e278a0cfb34
-EBUILD db-6.2.23-r1.ebuild 6738 BLAKE2B 996aa674b541d5881a1d68d420154cbcc219b13f2b5e4ef1b4ec13653a766c91e99937c4645c63e12d43b778348981ebca75b3dc7f0d3be2838048994c60b404 SHA512 e3acd982dcffe370fc7324d4ae2bb8b973eb08c22379f70cfe708588982e568e23d2473844d532ed027c719de2924bd0fcd9854ac9984d7681e67debddff5d5f
-EBUILD db-6.2.23.ebuild 6642 BLAKE2B e491865da9186b92e80e21eb30bb6713776f97695287638ae80ac0dc1ccc98ebe8ac06d83533afcf0c55e7a0cb23469653d98a40ea977ae6a389234fd616a164 SHA512 627dea1e5bcb9eb8e120996f8b15e8b0eba3bbbfd19771d5882824a27a32cfaf09f96f083adef5091ace6f1572bb96224c9a47df720f78944530949c9b4acbbc
-EBUILD db-6.2.32-r1.ebuild 6741 BLAKE2B deb43b6c21c904abba2cd2c6e21e959994726038e6c46f57326bc74db1cd5a4b5603a0c0ffb1ffa6f18e256e08ec0ae2c6af168cc465195f731859cedd154db0 SHA512 aae7b1543883d91311fae58906be0080f03fee7c7e42f7c245a06f1287b900e7b1f6e6cad44fa11adc163d06a6157b88d9bf70673ff62e1507ac005bb4955499
-EBUILD db-6.2.32.ebuild 6645 BLAKE2B d2f1a53bd602033e53f27611a825349e3bfa3c09eb62fb5faf153858e2f10f1a112450c992593cd340072b98147850e6bac97280c4781ad4027ea26b48e471d1 SHA512 78bd6a8f1cc0f13af9bac055963f17dca151df3b80a2be4189ad950a254fc6e467b23e5072a824eb1c93be5b2a9e2bef92619a5246be9693d7574017dd11ef18
+EBUILD db-5.1.29-r1.ebuild 5651 BLAKE2B 77c87e5eb5ceff56dd7cb5ba779d9f51ea91bbbacd02d8200de03fa6d8c35a5dd8286a7146833d16fa2d7e4b0b335037ac0654371e97692d4add9a1c596f0aec SHA512 c8aaa4bf390f607e5d10dab041d4d99593a59b602312a3cdad118de8c1f505e592faa136bd9ce6e7d1e78eef6a15d6073767c703d465b251509e3eb73593267c
+EBUILD db-5.3.28-r2.ebuild 6809 BLAKE2B dbeb45916d9def31e13c60849442ea55651ab9f9afb2ac8e095e7773da7bf0ab710bb16becf0e90996288645a17abea9438ca09ce3f1c9a3f15d66fd750d48b0 SHA512 af41a98f236eea0e8b0670be903b4a3eb73b039bbac904f096925d6293a220442aa288182e1e05da6f74a172861d2b2b6785ea4568e04e37fee2b0a4fd41efb6
+EBUILD db-5.3.28-r3.ebuild 6914 BLAKE2B e7ef8755621376253f4009eb38fc7b8021702f0d356c825b4e6c50112434c733dccc7b028409e361300d1d6c35743dacf87ea9a828d12c974c35ad8b5c46fb79 SHA512 529c7710722df83879cedad52ae0f20c58575e2a2e03943cafcf7813c3e80b5b9b8da97ae4345e0fb6e6262a9f5dea8c65b715a4745525b015fa0c1a0a03a992
+EBUILD db-6.0.35-r1.ebuild 6919 BLAKE2B aee72ced7f38b0f2da59ab92a506ac99505b2ee2f88e9fda5f07392d3c7b87b0623c016e26e4d299a70c286890464edad1b7a9db6669df3e5b4d083727eff0f4 SHA512 259bdcab39f5bfaf74f8b9fba6edfe20433003398b2ba2b347dd4d1bd20fbbb242413b15236f5a0f75c7bc00a8875974d49a08ddec15811b19f89ea81dab381d
+EBUILD db-6.0.35.ebuild 6823 BLAKE2B 73dbef05a3b91c77cecf49de9221c60270b1bfb21c0088130b60c639acaaece2b8610a1da27a1f2ea529ecf61889573cb41ca8f7dffa14571627011e660ebd13 SHA512 2ade05fa85cd41c48d885a817e17b3c7adcc2b586c0dd92c10a340eb5304f59762562009613fce72ccdbfed9813206216cc08319362c01d4aa4dcb5a92eb7220
+EBUILD db-6.1.29-r1.ebuild 6919 BLAKE2B bb82b012927ab0e9503ef52deedf980044be143086296f54d5cadd43ec294f3e15dd42d731c5c3e9f112a4d2a022803bd264b379c28bb7ed832aaa80cf25cf45 SHA512 5613105b8e6a0e89a6bc26e249d4f6e31b0a281b1f8296c4e75f9131cc50e2130f6b6267c9747d89e3be94a490d498807c6674350f81cc813bfc204984e32032
+EBUILD db-6.1.29.ebuild 6823 BLAKE2B 0ab1607502d4cf614ad2a8726d5c9f7376915a46a86dade83ee8db4bb1291a32e7dbc7b24eb4610ee99515b615c08a0b89d6b0636bc4b6582429aa6794b95988 SHA512 5ba0a00a132365eb37493b868e095c75a20bdf116f9c624158b5229a9bbadfcbe8be9222b1a2dcb632927e89a2974c1d52b2bf3927511d108761b8da6d8b7c46
+EBUILD db-6.2.23-r1.ebuild 6934 BLAKE2B 378826f3740601b8b928d7777c7a17ed8f0db353e49b565f0310f7fa5545c93b9e4f9d57567bd44c72ea4bfd0d8143d83c9305a4c22a13c344ecc2020ded8087 SHA512 ea61d76938196841eb13a2a4cef4932937d38fecdcb3f7006063b38f17e9a134e2f1382cd1bd1303d669cf45918577787cae4cb316657efc632896f361e4e854
+EBUILD db-6.2.23.ebuild 6838 BLAKE2B ef5fc8f68050b2101380a9c9cf9f37e240bb8abbce41a078a4bce4de99c1801510b0ada26f440d56b5d60af0fdbd533c4d7e3609766da16f28bd72b447f2a46a SHA512 a8aed19eb3ce017c90adf4eed3e1622519d3ce52457a1272f8d53888214e12af274ad1c938a16750f919fac19eb2b941f2aa596fcee8a313ad69c15a144e255d
+EBUILD db-6.2.32-r1.ebuild 6937 BLAKE2B d5df63055e7d8ee528bf8c7425b08cf2dd8f2044ac2a9c5dc7e600dcea47fd44791c687adee9504f4084ceacfe558c9364319c3c33e9582bdebabdd414d66f80 SHA512 cd49a5a95b7b686d0a96d0cd416c9676b0158e9511b1ab7c8d56f1b88d78d2de288beabc04396ac4de9f8a544d831e3f98a5e9b6ef14bfd22f56f57bec02fb8c
+EBUILD db-6.2.32.ebuild 6841 BLAKE2B 620590f12ad2a8c93431a7c1a8b9fca6987ef44c03f78903e52200d3256197b2908558ddfc59d630f285ccf8a3c87036cc9516bc1f5c5b4ab43b47654b035d0a SHA512 48987bb9ecf7df0ffd43f29e699c2078545cff08aa277d98a6dd6b59127060b949d3a67412845257b78ceaae1e9b388ba7b1f5869fcbe2ee5aa7d63186252806
 MISC metadata.xml 1323 BLAKE2B f954567067cc1490d6804dd9d7b612dd90733c7ab84546cbedc0075f8f3ef1faf6f1bb70bae31e83b0aa17666bd6711999b67ce4fe6c15bcffc3ba5bd8d004b7 SHA512 36f8b6db241ef960b2ac0f7bd19738066e3daadd90efbf7edc54a4774e491506d69a2207738f53643a3e52f1f35a900e4717747744bd30ca682265f50cb8884c
diff --git a/sys-libs/db/db-5.1.29-r1.ebuild b/sys-libs/db/db-5.1.29-r1.ebuild
index 815bcac9ef94..a00e96a4a1b2 100644
--- a/sys-libs/db/db-5.1.29-r1.ebuild
+++ b/sys-libs/db/db-5.1.29-r1.ebuild
@@ -94,6 +94,12 @@ src_prepare() {
 		local ev="__EDIT_${v}__"
 		sed -i -e "s/${ev}/${!v}/g" configure
 	done
+
+	# This is a false positive skip in the tests as the test-reviewer code
+	# looks for 'Skipping\s'
+	sed -i \
+		-e '/db_repsite/s,Skipping:,Skipping,g' \
+		"${S_BASE}"/test/tcl/reputils.tcl || die
 }
 
 src_configure() {
diff --git a/sys-libs/db/db-5.3.28-r2.ebuild b/sys-libs/db/db-5.3.28-r2.ebuild
index a4ef2e665c3a..90433d195b8b 100644
--- a/sys-libs/db/db-5.3.28-r2.ebuild
+++ b/sys-libs/db/db-5.3.28-r2.ebuild
@@ -103,6 +103,12 @@ src_prepare() {
 		local ev="__EDIT_${v}__"
 		sed -i -e "s/${ev}/${!v}/g" configure || die
 	done
+
+	# This is a false positive skip in the tests as the test-reviewer code
+	# looks for 'Skipping\s'
+	sed -i \
+		-e '/db_repsite/s,Skipping:,Skipping,g' \
+		"${S_BASE}"/test/tcl/reputils.tcl || die
 }
 
 multilib_src_configure() {
diff --git a/sys-libs/db/db-5.3.28-r3.ebuild b/sys-libs/db/db-5.3.28-r3.ebuild
index 6906ac2db5a6..757a78b281ed 100644
--- a/sys-libs/db/db-5.3.28-r3.ebuild
+++ b/sys-libs/db/db-5.3.28-r3.ebuild
@@ -103,6 +103,12 @@ src_prepare() {
 		local ev="__EDIT_${v}__"
 		sed -i -e "s/${ev}/${!v}/g" configure || die
 	done
+
+	# This is a false positive skip in the tests as the test-reviewer code
+	# looks for 'Skipping\s'
+	sed -i \
+		-e '/db_repsite/s,Skipping:,Skipping,g' \
+		"${S_BASE}"/test/tcl/reputils.tcl || die
 }
 
 multilib_src_configure() {
diff --git a/sys-libs/db/db-6.0.35-r1.ebuild b/sys-libs/db/db-6.0.35-r1.ebuild
index d3d38fabd1a2..8a69554b06a9 100644
--- a/sys-libs/db/db-6.0.35-r1.ebuild
+++ b/sys-libs/db/db-6.0.35-r1.ebuild
@@ -101,6 +101,12 @@ src_prepare() {
 		local ev="__EDIT_${v}__"
 		sed -i -e "s/${ev}/${!v}/g" configure || die
 	done
+
+	# This is a false positive skip in the tests as the test-reviewer code
+	# looks for 'Skipping\s'
+	sed -i \
+		-e '/db_repsite/s,Skipping:,Skipping,g' \
+		"${S_BASE}"/test/tcl/reputils.tcl || die
 }
 
 multilib_src_configure() {
diff --git a/sys-libs/db/db-6.0.35.ebuild b/sys-libs/db/db-6.0.35.ebuild
index 9b9497e4426f..0797982c6614 100644
--- a/sys-libs/db/db-6.0.35.ebuild
+++ b/sys-libs/db/db-6.0.35.ebuild
@@ -101,6 +101,12 @@ src_prepare() {
 		local ev="__EDIT_${v}__"
 		sed -i -e "s/${ev}/${!v}/g" configure || die
 	done
+
+	# This is a false positive skip in the tests as the test-reviewer code
+	# looks for 'Skipping\s'
+	sed -i \
+		-e '/db_repsite/s,Skipping:,Skipping,g' \
+		"${S_BASE}"/test/tcl/reputils.tcl || die
 }
 
 multilib_src_configure() {
diff --git a/sys-libs/db/db-6.1.29-r1.ebuild b/sys-libs/db/db-6.1.29-r1.ebuild
index 97730d015517..4f3570a788d8 100644
--- a/sys-libs/db/db-6.1.29-r1.ebuild
+++ b/sys-libs/db/db-6.1.29-r1.ebuild
@@ -101,6 +101,12 @@ src_prepare() {
 		local ev="__EDIT_${v}__"
 		sed -i -e "s/${ev}/${!v}/g" configure || die
 	done
+
+	# This is a false positive skip in the tests as the test-reviewer code
+	# looks for 'Skipping\s'
+	sed -i \
+		-e '/db_repsite/s,Skipping:,Skipping,g' \
+		"${S_BASE}"/test/tcl/reputils.tcl || die
 }
 
 multilib_src_configure() {
diff --git a/sys-libs/db/db-6.1.29.ebuild b/sys-libs/db/db-6.1.29.ebuild
index c993478412f2..5a93fb270c1c 100644
--- a/sys-libs/db/db-6.1.29.ebuild
+++ b/sys-libs/db/db-6.1.29.ebuild
@@ -101,6 +101,12 @@ src_prepare() {
 		local ev="__EDIT_${v}__"
 		sed -i -e "s/${ev}/${!v}/g" configure || die
 	done
+
+	# This is a false positive skip in the tests as the test-reviewer code
+	# looks for 'Skipping\s'
+	sed -i \
+		-e '/db_repsite/s,Skipping:,Skipping,g' \
+		"${S_BASE}"/test/tcl/reputils.tcl || die
 }
 
 multilib_src_configure() {
diff --git a/sys-libs/db/db-6.2.23-r1.ebuild b/sys-libs/db/db-6.2.23-r1.ebuild
index e79ae1d3d07c..eb10afdca6a0 100644
--- a/sys-libs/db/db-6.2.23-r1.ebuild
+++ b/sys-libs/db/db-6.2.23-r1.ebuild
@@ -106,6 +106,12 @@ src_prepare() {
 		local ev="__EDIT_${v}__"
 		sed -i -e "s/${ev}/${!v}/g" configure || die
 	done
+
+	# This is a false positive skip in the tests as the test-reviewer code
+	# looks for 'Skipping\s'
+	sed -i \
+		-e '/db_repsite/s,Skipping:,Skipping,g' \
+		"${S_BASE}"/test/tcl/reputils.tcl || die
 }
 
 multilib_src_configure() {
diff --git a/sys-libs/db/db-6.2.23.ebuild b/sys-libs/db/db-6.2.23.ebuild
index 9d99d958c710..8189e375cba1 100644
--- a/sys-libs/db/db-6.2.23.ebuild
+++ b/sys-libs/db/db-6.2.23.ebuild
@@ -106,6 +106,12 @@ src_prepare() {
 		local ev="__EDIT_${v}__"
 		sed -i -e "s/${ev}/${!v}/g" configure || die
 	done
+
+	# This is a false positive skip in the tests as the test-reviewer code
+	# looks for 'Skipping\s'
+	sed -i \
+		-e '/db_repsite/s,Skipping:,Skipping,g' \
+		"${S_BASE}"/test/tcl/reputils.tcl || die
 }
 
 multilib_src_configure() {
diff --git a/sys-libs/db/db-6.2.32-r1.ebuild b/sys-libs/db/db-6.2.32-r1.ebuild
index 9682a4394c9d..59706d362b93 100644
--- a/sys-libs/db/db-6.2.32-r1.ebuild
+++ b/sys-libs/db/db-6.2.32-r1.ebuild
@@ -106,6 +106,12 @@ src_prepare() {
 		local ev="__EDIT_${v}__"
 		sed -i -e "s/${ev}/${!v}/g" configure || die
 	done
+
+	# This is a false positive skip in the tests as the test-reviewer code
+	# looks for 'Skipping\s'
+	sed -i \
+		-e '/db_repsite/s,Skipping:,Skipping,g' \
+		"${S_BASE}"/test/tcl/reputils.tcl || die
 }
 
 multilib_src_configure() {
diff --git a/sys-libs/db/db-6.2.32.ebuild b/sys-libs/db/db-6.2.32.ebuild
index 8fa1fd1ece68..4c2b280e1fc6 100644
--- a/sys-libs/db/db-6.2.32.ebuild
+++ b/sys-libs/db/db-6.2.32.ebuild
@@ -106,6 +106,12 @@ src_prepare() {
 		local ev="__EDIT_${v}__"
 		sed -i -e "s/${ev}/${!v}/g" configure || die
 	done
+
+	# This is a false positive skip in the tests as the test-reviewer code
+	# looks for 'Skipping\s'
+	sed -i \
+		-e '/db_repsite/s,Skipping:,Skipping,g' \
+		"${S_BASE}"/test/tcl/reputils.tcl || die
 }
 
 multilib_src_configure() {
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 15607c56a7e4..8b666adcc85a 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -17,6 +17,7 @@ DIST gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 8064097 BLAKE2B 3cc5c82cd57d0fbd26d
 DIST glibc-2.18-patches-4.tar.bz2 95165 BLAKE2B 70280e0f5fd0b1ee13cd0464aafaa9c9324528d0bee8024e6529d67d908991012066db6d8257b66983a1f52e32b3aad7718612fdab9ea199fef845db93347168 SHA512 d881c9c5fe32b967694d4ca5185ff5ffc964449f2ed49fd062e5d57a3c6d9f16eef2f591d2d8e98a1a95a6487f3436ef031839ed8766fd085404b288340b7933
 DIST glibc-2.18.tar.xz 11150148 BLAKE2B 7848a5a50abedbd17085e05b6f6835959adb5e55a424d95fa8a49eeec999a6dd81a9382db85ef7e852ef1d7743c5d312dccbf42024e95edf0e802eb32928dfe5 SHA512 27218d2e7dd3bf3908d7af171c490933680e958c579ebd27b43b661e223fd5de2219cc1cf699170405280808c84de476d0ad86dbba35a488ef404e9438552327
 DIST glibc-2.19-patches-3.tar.bz2 80664 BLAKE2B fb348c711941c1bd4dadd905e172dc4f239d8b63af1a1d14dcf4ec45c504bd47e10e9b24b38f9e01796016f2e97caeeb693213ae08147274ed0a4d9501293be0 SHA512 d281d6a2757920124cf8a3f02b97e75192598b08d96ae48840df34c7ffdcb212952d171f233e6f12a429b19437d0a296212fe1f2eae164d6a1c6793cb3cb69f0
+DIST glibc-2.19-patches-9.tar.bz2 24584 BLAKE2B a96e930a5bd20fa75d9f259cc2117fa5ce98072274a24a5823bf877e3739fa4c001a94d7865e065ee0527f3974430d27da8038e042340a451ad2052c62724f26 SHA512 a95b3063ade974a3556480b798b317d33c7423a8cb9e69f67249ffb8b3d3c671d70d2d5f782c1efadc0bec4cc49a96d4fe89911f3dfcd85b459f69f3b4f38f0e
 DIST glibc-2.19.tar.xz 12083312 BLAKE2B 9dc03346e0f0df4bf009a92d894b0a9f964ff92b7f4c9663cedf1cb6cf90435f28a15539d33791ecf43ee578fa4e26f916af0367651312ef8f9c1c38ce0dafa2 SHA512 9e021fcb3afbb9ace2a0e37fded231a62de861bd766e29d47163a03182e37add718b7acc3963d1c525f9556773e842297725715acde48dcfbaab6e756af1a23d
 DIST glibc-2.20-patches-5.tar.bz2 55986 BLAKE2B bad714bd088fb8759ee84d33f22c0bba01a78a401c54828dc413c7ac2a08ae53fba9b07280996e54091f2c918658bb502aeb45f734022c1ab36e1be215381324 SHA512 409f59a028127e02f0c9f91107715b540d8d234475830adc17108a02664be232098d119b43bcc8df9b328ab50c1fffb0868d510e6487ce1c34ec2c7c7a78375b
 DIST glibc-2.20.tar.xz 12283992 BLAKE2B f2db06a06e47942e9f5aaad5c4b603d63bb9a3ba624dc1c973e864d65cf893adb7568a18516c0b915b772d2ca30e95899a4d5c03ff9b3ad23e1e276a1d535f39 SHA512 7a8eea8b71d3ccba766c3f304cab61055446d451ef063309476b26dc40d880562dc33b1b68fbedeedb4b55b84c26415b9202311aaa71ef8c141b6849a814d2fa
@@ -30,7 +31,7 @@ DIST glibc-2.24-patches-10.tar.bz2 73586 BLAKE2B f42cc78b907e7cb5c8ba1672c845cdc
 DIST glibc-2.24.tar.xz 13554048 BLAKE2B 9f93ac00f68eb88e3a2272752624163fac25dd064170e336143aa697908fba2b27ed926582f978da99c6c2489c0ce34d3eb266b5d00be69d27b36126bc2c8efb SHA512 a4cb28a2c51a0cc029ed69da7cba11931a615ba897235590b4f7fad2eaabec9042f8250eaac2a5860997437a69ab13304f10a634000e52c0336b5593b7969adb
 DIST glibc-2.25-patches-12.tar.bz2 65396 BLAKE2B b23d5d681314c03b8dd5ad20516324c1ce5b24deb4d9ce03970dce97b524ee9d3f5d5463f2d6b7693e4c9ef25d006847f960993f55ca082fc961268d05f937ca SHA512 6af8c304ba70b42dfda294873d9a138d6c98e7a46496e305b2cac99a085d1ad3d00315162d1e1458e651de95e158bd35be74406a3f44fde13182e30baa663fcb
 DIST glibc-2.25-patches-13.tar.bz2 71481 BLAKE2B bf5691afabf03b579b8d634da30a2a967ab62d5e470a23b0946ff3354aa974b3b65821aca2f33dd30dd864a82459f4750178bf6ae01a5117ccfde62efd8f594e SHA512 7c80e4aba9edf0310e1707b03a6945f657d71267a4d0d67c24b979c841544a6a623d7c2dbb0a0d55863e25831439d717d096ecf377f936b731baeb04f21704a7
-DIST glibc-2.25-patches-14.tar.bz2 78564 BLAKE2B 5ec6d5178c56a2cdcf7f231b0fd28d6e7dbd152eb7f937357b7486ddefc8371c16e6d55ba5ad65d1fcb0cef2b5dbe7e2a4bc220402ab3b388f0748b99ccb9836 SHA512 50ad28d15294cf551cab8040974a090681e14d28e3ab707425f54ea85661e64a1fc5a3809cd7d0ecfd531a28e2e54e45bf4a5d0e0725088eeed7e6e7c983573a
+DIST glibc-2.25-patches-15.tar.bz2 78320 BLAKE2B 70c62cc10db13e2844de4d8a18972e0f4d01ba52fbd40db57c11d7b1c2c0d571b894f01e762bb26632fd696a77c299ef0766e2f129d2eda896f58325a754a13c SHA512 7204218ea82b677e0f278c4752ddb90aa0c08ac2349d061de81ec91dac204b0f10fe223d7b1055b9e0c21dac97c835f913a90c0168a5000d3be00dd20027c185
 DIST glibc-2.25.tar.xz 13873900 BLAKE2B 73ef792fff059f6ad154c9af2155ea15b7869ec1b93e557b6c58129bfb50f863c06f8b49425d75fd2df537dd9c4a68bad790cff770c50a6889732d66f507d349 SHA512 5b7a2418d5b8a1b6a907c6c7fb6477ee2a473151cb45e03d0d4cdd9a33497c90b1ee39e2e7e885e2b25743dcd3747336ef114b4a73eb001da1fd79f29e0f9a6e
 DIST glibc-2.26-patches-5.tar.bz2 357699 BLAKE2B 98a0cb231bf35a132747f1fa6e654a9ad2eff8b445f002a0239c9a45f5a896ad490570aedee2b43e6cfa94794ae5c8b5e312e369838c3770823f28b61b51b592 SHA512 0040469e4a85f5c2aac972e42aeb06b0adfc3a132b32b19306be9f1877339fe6651a2fbd4d90d502b07ae4460f74efbd1cd103d38a2038df9402b0a380f03c2a
 DIST glibc-2.26-patches-7.tar.bz2 413976 BLAKE2B 18263201cf33abf911eb7b802ed539b217391156f897a8db50f65a69627d8f8cceded78414168986ee98eba038364a6b2f3599b23f95e7b0ad2643481c399718 SHA512 0c812a343fcc68c10d92117cb2a0cf1c255470e81f0a7a04d6db2fe35445e410ef37f15162f145c2eb772b08ab55af246f5b52f5e57c2e91038181f6f027abc3
@@ -40,13 +41,14 @@ DIST glibc-2.27.tar.xz 15395316 BLAKE2B ea206d304c8c9aa86d69db981a14bea008602cea
 DIST glibc-9999-patches-5.tar.bz2 15979 BLAKE2B f59b4d7096fd876c9176f6ebdd9a4a510f3c6c90dd69a1fbb092a18f296767759d8d73dc7a81e29e3f6152043a4179056d5e224896c7bb96cc09ede2e2dd16e1 SHA512 c29ad59977b2c4dfd58ee16d0898a1c16e6cde974d5c29c3a7a55e0dee4ade7f1a3d45c9481c1d35df7fcedbdb67267f5d61759cacab677b6288b5ece3871a4b
 EBUILD glibc-2.18-r1.ebuild 5514 BLAKE2B 2b007c0f935df77d35d74adceab874eeab55306c1fc69eee3c0f45a5d9cd02e6b4dcf7ab25d2bb450fd07fe7f20a827a774a6e15322f7b8a447726acdf31a3f7 SHA512 b306c31227f15cbf0dbf518195736856f30949544dac12fb4b5b0aabd3e421f040663aacea159181b61f92777a19519241f5c05f6e65576b26f6406df85ef83b
 EBUILD glibc-2.19-r1.ebuild 5471 BLAKE2B 8531139c723de6358daa971e96f98db628eec14c696b004a4e8a4a7efc8a0c610d713625655c55293c94898d13ac9aea5ae1a58134aedb30b1b695859748a964 SHA512 aae5bcdaa10cf6a3026e28b406046bd7297fdacfa8d0ace60f76177aa2efed6b0f82b639f5e6db6bd42d99440d12644d62e9b14cf49ced7284f011cb3c406775
+EBUILD glibc-2.19-r2.ebuild 40701 BLAKE2B 3b2f97f43f5585b934f9dbe1acceec3a80c222371a3b9cfa308c0de91995934154e16c41d5bf85dd8ba0cc87c6068de103e2682420a705fb891ec964a2dc7c6d SHA512 3578ec2fc4b34008d4e44140c5d4fb867e7c3c4449aac3430cf731c0098fb8ea776392b2175ce65eabe5d004912dfe982d7777640ce6eb68487d29ccb4ec4669
 EBUILD glibc-2.20-r2.ebuild 4947 BLAKE2B 24062f002678df912ced724a3d919bc2f07476c98000092cb3fa3f2be1836db57348c88b6fc1da7a9364103136eecbe687fe365d131f10c82de3cb0edd3eb8c5 SHA512 ff76e9173ab6bfccb1c659f79cefb93f6fa6266adab40a3816f56acddb7866cee67ba6bfa8d1b9988eff755e9d1a879e62973fc332566c185f019af5e17a9f1d
 EBUILD glibc-2.21-r2.ebuild 4922 BLAKE2B 99bd1be39a3643f845c0daff4f7b19a0abb37de95a8494b4dc9d29aaee74281d4a252792010ff4935e5d661a7240cf4d5944907267e9059ce208b59891528085 SHA512 ff896f5bb20502db03f00d1438a06a026e0940106e368b4bb27abb72bb927fb235371a5a6b01130e35906f17c478e79e44bec6dda02bd5fedb30552bf4a6cc86
 EBUILD glibc-2.22-r4.ebuild 4973 BLAKE2B 6f4f632413cacf34a2a011d8cc83d0a92deaa0980aa9b6fe0d11cf45850a7bec482b77c8a0aa00b66a2103d4ff03ca16b0b7d38cd089b8f010039faaaf26d76b SHA512 1a056e465dc38dc4956b4707ff9fc9da8df4046d95edeb3dd6ae36fc229545acefdd317c50961a153ec83f21cba3d645d1e45b526157f8209a932242c2b08c33
 EBUILD glibc-2.23-r4.ebuild 4975 BLAKE2B 9a0d3a3689896fab9f71fa20a83be5f2563f023040563f85385f8d28d32d6eee7f144acbdf4a35d6c1a65d56289ae72813b1d7f561f514e391e95dd4e43a4902 SHA512 9662308abee890c1eeaa45a49c4238448c62400d8b8661fc7588cd78aa58cbe044a0c15f46a6e8d161a203f3645600385fc2200d4d6434c24e496781aa06b04a
 EBUILD glibc-2.24-r4.ebuild 5011 BLAKE2B 71050f0449074652d4fabc709326025b4de2e6642fdde87898acfde6f99cce95f4d7b9e1e7f9eedcdf6d2fd70ebf3c2860599ec36ccf68e0e633ec794f8ce0e8 SHA512 1cb3bcbd7d9d7f7c095bdff7c81d0acc3b4700c0b8a9d4fd0499cbf53abb55c67ca3bc3cce125916d238eb8cf6f6d69989af27defd6f194aaa5ac27cdda94eb9
-EBUILD glibc-2.25-r10.ebuild 5004 BLAKE2B 21a9a1c04e356ae054a262ada87ef1a87f4dd6157473dff82f6922c8779882b3f3cc203fcbfda7a7506a9db13eaffa33b2bc3998130e339b1d4e35be22bc603e SHA512 7fc910513514e555d7ce8f472f8466ce0fc7a8e86919bbfdd42eebd4a9e9838967737ad61420a03e7f328f3c34302c6e13a9d1abe2975916e253496f1859a152
-EBUILD glibc-2.25-r11.ebuild 5059 BLAKE2B 3bba7b26a7b00e28397ce12f7ec269df805301661b3d9e784eef1c9dcfdb0cf1df3480259f977b80756741d92779f43ef5743505346c12728e3191259b19f0ab SHA512 45085a55eda6aae14cd40451d04f14ff089656ae3647a6c48176d4c2ef0564eff8bc49b53a4153781cdfdebda3c0edd56b679ee534f0d6298979517fcfc032ad
+EBUILD glibc-2.25-r10.ebuild 5003 BLAKE2B a3a94f16c7a240ae4db9b430a4c054b91d864c10c291d4e9839bd847e289c74d4038045e4c389f1362cd3c24dc6bf024e731f1046c9254833e9edf2cda0de94e SHA512 2186eb7d9bd5088d805a27aba9aab8190f6253d2b8727969307194a62e681a293ed79f5e3aef9dc3bb796e53784ebcf1a51298d527553f7f529625fbddd81bb2
+EBUILD glibc-2.25-r11.ebuild 5059 BLAKE2B 03ce708c9c856707174918cfc54f1cefb3d064a2e9441fdb5a675b17d15a1bcce5b4248fd91f963c501d0950aeb305dbaf18c374d3ea85e0375f130169944114 SHA512 8ad6b26cf1b1b1fed79f7eb3f91ba121089f11903aa0cee597c76e193afeb6888b2300360fd0eb519b5563f5838042cff15f55bad8f00806da137893a2088034
 EBUILD glibc-2.25-r9.ebuild 4999 BLAKE2B 6c0784aa614374954c0747deb7a33fdba0f8b1935cc28c62af29880d64991cc93740eddefe8dca971d6c1bbba14161e10db75e00a91d73282e0c0bf094004b94 SHA512 3b5dc2073ae44e6cf5a4f8f64a3c3fd837ebaa222009ee617105259765ff4222fb3960be1c537d4fde6c7e928bd85325d9070cb668b31cb6afb03368c079141f
 EBUILD glibc-2.26-r5.ebuild 25260 BLAKE2B f28cc4e685eb88a500655c60de886dc862495499413a27034bcb6e49db4a5737df081f813cdc1bf06f763fc03b652ad8ccf0b9d0cad3f975b8d7cf9309af1506 SHA512 a1a40a8b076dbaa71d1f778a3e17d1ff2267dddde68c69e2db68a860f6186eeaab083fad5935113d12ed86fd0d0f20ded0c662df29391e211728ec887f3a6260
 EBUILD glibc-2.26-r6.ebuild 25256 BLAKE2B 2ee690c964c690d9cb0b4e7da1ed883f26da6e99f5dc86df8b3f6334f36fed90755022a9d4ffb934461f7e0807655f54c85aeb235eedf89595aebf35d2462ac6 SHA512 34ae6b2d21f4816df026e8cee0bb2b925d0a407a28863d10c51e09250e4d6fc144c7920bc71b601aacf3e4c935fbf7c360de5fa510bc21d35fff57ebd057a1e1
diff --git a/sys-libs/glibc/glibc-2.19-r2.ebuild b/sys-libs/glibc/glibc-2.19-r2.ebuild
new file mode 100644
index 000000000000..e4a5ff90de62
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.19-r2.ebuild
@@ -0,0 +1,1393 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit prefix eutils versionator toolchain-funcs flag-o-matic gnuconfig \
+	multilib systemd multiprocessing
+
+DESCRIPTION="GNU libc C library"
+HOMEPAGE="https://www.gnu.org/software/libc/"
+LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
+RESTRICT="strip" # Strip ourself #46186
+SLOT="2.2"
+
+EMULTILIB_PKG="true"
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
+	inherit git-r3
+else
+	KEYWORDS=""
+	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
+fi
+
+RELEASE_VER=${PV}
+
+GCC_BOOTSTRAP_VER="4.7.3-r1"
+
+# Gentoo patchset
+PATCH_VER=9
+
+SRC_URI+=" https://dev.gentoo.org/~dilfridge/distfiles/${P}-patches-${PATCH_VER}.tar.bz2"
+SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2 )"
+
+IUSE="audit caps compile-locales debug doc gd hardened headers-only multilib nscd profile selinux suid systemtap vanilla"
+
+# Minimum kernel version that glibc requires
+# Everyone except hppa could also use 2.6.16
+MIN_KERN_VER="2.6.20"
+
+# Here's how the cross-compile logic breaks down ...
+#  CTARGET - machine that will target the binaries
+#  CHOST   - machine that will host the binaries
+#  CBUILD  - machine that will build the binaries
+# If CTARGET != CHOST, it means you want a libc for cross-compiling.
+# If CHOST != CBUILD, it means you want to cross-compile the libc.
+#  CBUILD = CHOST = CTARGET    - native build/install
+#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
+#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
+#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
+# For install paths:
+#  CHOST = CTARGET  - install into /
+#  CHOST != CTARGET - install into /usr/CTARGET/
+#
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+# We need a new-enough binutils/gcc to match upstream baseline.
+# Also we need to make sure our binutils/gcc supports TLS.
+COMMON_DEPEND="
+	nscd? ( selinux? (
+		audit? ( sys-process/audit )
+		caps? ( sys-libs/libcap )
+	) )
+	suid? ( caps? ( sys-libs/libcap ) )
+	selinux? ( sys-libs/libselinux )
+	systemtap? ( dev-util/systemtap )
+"
+DEPEND="${COMMON_DEPEND}
+	>=app-misc/pax-utils-0.1.10
+	!<sys-apps/sandbox-1.6
+	!<sys-apps/portage-2.1.2
+	!<sys-devel/bison-2.7
+	doc? ( sys-apps/texinfo )
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/gentoo-functions
+	!sys-kernel/ps3-sources
+	!sys-libs/nss-db
+"
+
+if [[ ${CATEGORY} == cross-* ]] ; then
+	DEPEND+=" !headers-only? (
+		>=${CATEGORY}/binutils-2.24
+		>=${CATEGORY}/gcc-4.9
+	)"
+	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
+else
+	DEPEND+="
+		>=sys-devel/binutils-2.24
+		>=sys-devel/gcc-4.9
+		virtual/os-headers
+	"
+	RDEPEND+=" vanilla? ( !sys-libs/timezone-data )"
+	PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
+fi
+
+#
+# Small helper functions
+#
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+	is_crosscompile && use headers-only
+}
+
+alt_prefix() {
+	is_crosscompile && echo /usr/${CTARGET}
+}
+
+# We need to be able to set alternative headers for compiling for non-native 
+# platform. Will also become useful for testing kernel-headers without screwing 
+# up the whole system.
+alt_headers() {
+	echo ${ALT_HEADERS:=$(alt_prefix)/usr/include}
+}
+
+alt_build_headers() {
+	if [[ -z ${ALT_BUILD_HEADERS} ]] ; then
+		ALT_BUILD_HEADERS="${EPREFIX}$(alt_headers)"
+		if tc-is-cross-compiler ; then
+			ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers)
+			if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then
+				local header_path=$(echo '#include <linux/version.h>' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o '[^"]*linux/version.h')
+				ALT_BUILD_HEADERS=${header_path%/linux/version.h}
+			fi
+		fi
+	fi
+	echo "${ALT_BUILD_HEADERS}"
+}
+
+alt_libdir() {
+	echo $(alt_prefix)/$(get_libdir)
+}
+alt_usrlibdir() {
+	echo $(alt_prefix)/usr/$(get_libdir)
+}
+
+builddir() {
+	echo "${WORKDIR}/build-${ABI}-${CTARGET}-$1"
+}
+
+do_compile_test() {
+	local ret save_cflags=${CFLAGS}
+	CFLAGS+=" $1"
+	shift
+
+	pushd "${T}" >/dev/null
+
+	rm -f glibc-test*
+	printf '%b' "$*" > glibc-test.c
+
+	nonfatal emake -s glibc-test
+	ret=$?
+
+	popd >/dev/null
+
+	CFLAGS=${save_cflags}
+	return ${ret}
+}
+
+do_run_test() {
+	local ret
+
+	if [[ ${MERGE_TYPE} == "binary" ]] ; then
+		# ignore build failures when installing a binary package #324685
+		do_compile_test "" "$@" 2>/dev/null || return 0
+	else
+		if ! do_compile_test "" "$@" ; then
+			ewarn "Simple build failed ... assuming this is desired #324685"
+			return 0
+		fi
+	fi
+
+	pushd "${T}" >/dev/null
+
+	./glibc-test
+	ret=$?
+	rm -f glibc-test*
+
+	popd >/dev/null
+
+	return ${ret}
+}
+
+setup_target_flags() {
+	# This largely mucks with compiler flags.  None of which should matter
+	# when building up just the headers.
+	just_headers && return 0
+
+	case $(tc-arch) in
+		x86)
+			# -march needed for #185404 #199334
+			# TODO: When creating the first glibc cross-compile, this test will
+			# always fail as it does a full link which in turn requires glibc.
+			# Probably also applies when changing multilib profile settings (e.g.
+			# enabling x86 when the profile was amd64-only previously).
+			# We could change main to _start and pass -nostdlib here so that we
+			# only test the gcc code compilation.  Or we could do a compile and
+			# then look for the symbol via scanelf.
+			if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' 2>/dev/null ; then
+				local t=${CTARGET_OPT:-${CTARGET}}
+				t=${t%%-*}
+				filter-flags '-march=*'
+				export CFLAGS="-march=${t} ${CFLAGS}"
+				einfo "Auto adding -march=${t} to CFLAGS #185404"
+			fi
+		;;
+		amd64)
+			# -march needed for #185404 #199334
+			# Note: This test only matters when the x86 ABI is enabled, so we could
+			# optimize a bit and elide it.
+			# TODO: See cross-compile issues listed above for x86.
+			if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' 2>/dev/null ; then
+				local t=${CTARGET_OPT:-${CTARGET}}
+				t=${t%%-*}
+				# Normally the target is x86_64-xxx, so turn that into the -march that
+				# gcc actually accepts. #528708
+				[[ ${t} == "x86_64" ]] && t="x86-64"
+				filter-flags '-march=*'
+				# ugly, ugly, ugly.  ugly.
+				CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}")
+				export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
+				einfo "Auto adding -march=${t} to CFLAGS_x86 #185404"
+			fi
+		;;
+		mips)
+			# The mips abi cannot support the GNU style hashes. #233233
+			filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both
+		;;
+		sparc)
+			# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
+			filter-flags "-fcall-used-g7"
+			append-flags "-fcall-used-g6"
+
+			# If the CHOST is the basic one (e.g. not sparcv9-xxx already),
+			# try to pick a better one so glibc can use cpu-specific .S files.
+			# We key off the CFLAGS to get a good value.  Also need to handle
+			# version skew.
+			# We can't force users to set their CHOST to their exact machine
+			# as many of these are not recognized by config.sub/gcc and such :(.
+			# Note: If the mcpu values don't scale, we might try probing CPP defines.
+			# Note: Should we factor in -Wa,-AvXXX flags too ?  Or -mvis/etc... ?
+
+			local cpu
+			case ${CTARGET} in
+			sparc64-*)
+				case $(get-flag mcpu) in
+				niagara[234])
+					if version_is_at_least 2.8 ; then
+						cpu="sparc64v2"
+					elif version_is_at_least 2.4 ; then
+						cpu="sparc64v"
+					elif version_is_at_least 2.2.3 ; then
+						cpu="sparc64b"
+					fi
+					;;
+				niagara)
+					if version_is_at_least 2.4 ; then
+						cpu="sparc64v"
+					elif version_is_at_least 2.2.3 ; then
+						cpu="sparc64b"
+					fi
+					;;
+				ultrasparc3)
+					cpu="sparc64b"
+					;;
+				*)
+					# We need to force at least v9a because the base build doesn't
+					# work with just v9.
+					# https://sourceware.org/bugzilla/show_bug.cgi?id=19477
+					[[ -z ${cpu} ]] && append-flags "-Wa,-xarch=v9a"
+					;;
+				esac
+				;;
+			sparc-*)
+				case $(get-flag mcpu) in
+				niagara[234])
+					if version_is_at_least 2.8 ; then
+						cpu="sparcv9v2"
+					elif version_is_at_least 2.4 ; then
+						cpu="sparcv9v"
+					elif version_is_at_least 2.2.3 ; then
+						cpu="sparcv9b"
+					else
+						cpu="sparcv9"
+					fi
+					;;
+				niagara)
+					if version_is_at_least 2.4 ; then
+						cpu="sparcv9v"
+					elif version_is_at_least 2.2.3 ; then
+						cpu="sparcv9b"
+					else
+						cpu="sparcv9"
+					fi
+					;;
+				ultrasparc3)
+					cpu="sparcv9b"
+					;;
+				v9|ultrasparc)
+					cpu="sparcv9"
+					;;
+				v8|supersparc|hypersparc|leon|leon3)
+					cpu="sparcv8"
+					;;
+				esac
+			;;
+			esac
+			[[ -n ${cpu} ]] && CTARGET_OPT="${cpu}-${CTARGET#*-}"
+		;;
+	esac
+}
+
+setup_flags() {
+	# Make sure host make.conf doesn't pollute us
+	if is_crosscompile || tc-is-cross-compiler ; then
+		CHOST=${CTARGET} strip-unsupported-flags
+	fi
+
+	# Store our CFLAGS because it's changed depending on which CTARGET
+	# we are building when pulling glibc on a multilib profile
+	CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}}
+	CFLAGS=${CFLAGS_BASE}
+	CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}}
+	CXXFLAGS=${CXXFLAGS_BASE}
+	ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
+	ASFLAGS=${ASFLAGS_BASE}
+
+	# Over-zealous CFLAGS can often cause problems.  What may work for one
+	# person may not work for another.  To avoid a large influx of bugs
+	# relating to failed builds, we strip most CFLAGS out to ensure as few
+	# problems as possible.
+	strip-flags
+	strip-unsupported-flags
+	filter-flags -m32 -m64 '-mabi=*'
+
+	# glibc aborts if rpath is set by LDFLAGS
+	filter-ldflags '-Wl,-rpath=*'
+
+	# #492892
+	filter-flags -frecord-gcc-switches
+
+	unset CBUILD_OPT CTARGET_OPT
+	if use multilib ; then
+		CTARGET_OPT=$(get_abi_CTARGET)
+		[[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
+	fi
+
+	setup_target_flags
+
+	if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then
+		CBUILD_OPT=${CTARGET_OPT}
+	fi
+
+	# Lock glibc at -O2; we want to be conservative here.
+	# -fno-strict-aliasing is to work around #155906.
+	filter-flags '-O?'
+	append-flags -O2 -fno-strict-aliasing
+
+	filter-flags '-fstack-protector*'
+
+	# Starting with gcc-6 (and fully upstreamed pie patches) we control
+	# default enabled/disabled pie via use flags. So nothing to do
+	# here then. #618160
+	if [[ $(gcc-major-version) -lt 6 ]]; then
+		if use hardened && tc-enables-pie ; then
+			# Force PIC macro definition for all compilations since they're all
+			# either -fPIC or -fPIE with the default-PIE compiler.
+			append-cppflags -DPIC
+		else
+			# Don't build -fPIE without the default-PIE compiler and the
+			# hardened-pie patch
+			filter-flags -fPIE
+		fi
+	fi
+}
+
+want_tls() {
+	# Archs that can use TLS (Thread Local Storage)
+	case $(tc-arch) in
+		x86)
+			# requires i486 or better #106556
+			[[ ${CTARGET} == i[4567]86* ]] && return 0
+			return 1
+		;;
+	esac
+	return 0
+}
+
+want__thread() {
+	want_tls || return 1
+
+	# For some reason --with-tls --with__thread is causing segfaults on sparc32.
+	[[ ${PROFILE_ARCH} == "sparc" ]] && return 1
+
+	[[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD}
+
+	# only test gcc -- can't test linking yet
+	tc-has-tls -c ${CTARGET}
+	WANT__THREAD=$?
+
+	return ${WANT__THREAD}
+}
+
+use_multiarch() {
+	# Make sure binutils is new enough to support indirect functions,
+	# #336792. This funky sed supports gold and bfd linkers.
+	local bver nver
+	bver=$($(tc-getLD ${CTARGET}) -v | sed -n -r '1{s:[^0-9]*::;s:^([0-9.]*).*:\1:;p}')
+	case $(tc-arch ${CTARGET}) in
+	amd64|x86) nver="2.20" ;;
+	arm)       nver="2.22" ;;
+	hppa)      nver="2.23" ;;
+	ppc|ppc64) nver="2.20" ;;
+	# ifunc support was added in 2.23, but glibc also needs
+	# machinemode which is in 2.24.
+	s390)      nver="2.24" ;;
+	sparc)     nver="2.21" ;;
+	*)         return 1 ;;
+	esac
+	version_is_at_least ${nver} ${bver}
+}
+
+# Setup toolchain variables that had historically been defined in the
+# profiles for these archs.
+setup_env() {
+	# silly users
+	unset LD_RUN_PATH
+	unset LD_ASSUME_KERNEL
+
+	if is_crosscompile || tc-is-cross-compiler ; then
+		multilib_env ${CTARGET_OPT:-${CTARGET}}
+
+		if ! use multilib ; then
+			MULTILIB_ABIS=${DEFAULT_ABI}
+		else
+			MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}}
+		fi
+
+		# If the user has CFLAGS_<CTARGET> in their make.conf, use that,
+		# and fall back on CFLAGS.
+		local VAR=CFLAGS_${CTARGET//[-.]/_}
+		CFLAGS=${!VAR-${CFLAGS}}
+	fi
+
+	setup_flags
+
+	export ABI=${ABI:-${DEFAULT_ABI:-default}}
+
+	local VAR=CFLAGS_${ABI}
+	# We need to export CFLAGS with abi information in them because glibc's
+	# configure script checks CFLAGS for some targets (like mips).  Keep
+	# around the original clean value to avoid appending multiple ABIs on
+	# top of each other.
+	: ${__GLIBC_CC:=$(tc-getCC ${CTARGET_OPT:-${CTARGET}})}
+	export __GLIBC_CC CC="${__GLIBC_CC} ${!VAR}"
+}
+
+foreach_abi() {
+	setup_env
+
+	local ret=0
+	local abilist=""
+	if use multilib ; then
+		abilist=$(get_install_abis)
+	else
+		abilist=${DEFAULT_ABI}
+	fi
+	local -x ABI
+	for ABI in ${abilist:-default} ; do
+		setup_env
+		einfo "Running $1 for ABI ${ABI}"
+		$1
+		: $(( ret |= $? ))
+	done
+	return ${ret}
+}
+
+glibc_banner() {
+	local b="Gentoo ${PVR}"
+	[[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" p${PATCH_VER}"
+	echo "${b}"
+}
+
+check_devpts() {
+	# Make sure devpts is mounted correctly for use w/out setuid pt_chown.
+
+	# If merely building the binary package, then there's nothing to verify.
+	[[ ${MERGE_TYPE} == "buildonly" ]] && return
+
+	# Only sanity check when installing the native glibc.
+	[[ ${ROOT} != "/" ]] && return
+
+	# If they're opting in to the old suid code, then no need to check.
+	use suid && return
+
+	if awk '$3 == "devpts" && $4 ~ /[, ]gid=5[, ]/ { exit 1 }' /proc/mounts ; then
+		eerror "In order to use glibc with USE=-suid, you must make sure that"
+		eerror "you have devpts mounted at /dev/pts with the gid=5 option."
+		eerror "Openrc should do this for you, so you should check /etc/fstab"
+		eerror "and make sure you do not have any invalid settings there."
+		die "mount & fix your /dev/pts settings"
+	fi
+}
+
+# The following Kernel version handling functions are mostly copied from portage
+# source. It's better not to use linux-info.eclass here since a) it adds too
+# much magic, see bug 326693 for some of the arguments, and b) some of the
+# functions are just not provided.
+
+g_get_running_KV() {
+	uname -r
+	return $?
+}
+
+g_KV_major() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	echo "${KV%%.*}"
+}
+
+g_KV_minor() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.}
+	echo "${KV%%.*}"
+}
+
+g_KV_micro() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.*.}
+	echo "${KV%%[^[:digit:]]*}"
+}
+
+g_KV_to_int() {
+	[[ -z $1 ]] && return 1
+	local KV_MAJOR=$(g_KV_major "$1")
+	local KV_MINOR=$(g_KV_minor "$1")
+	local KV_MICRO=$(g_KV_micro "$1")
+	local KV_int=$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))
+
+	# We make version 2.2.0 the minimum version we will handle as
+	# a sanity check ... if its less, we fail ...
+	if [[ ${KV_int} -ge 131584 ]] ; then
+		echo "${KV_int}"
+		return 0
+	fi
+	return 1
+}
+
+g_int_to_KV() {
+	local version=$1 major minor micro
+	major=$((version / 65536))
+	minor=$(((version % 65536) / 256))
+	micro=$((version % 256))
+	echo ${major}.${minor}.${micro}
+}
+
+eend_KV() {
+	[[ $(g_KV_to_int $1) -ge $(g_KV_to_int $2) ]]
+	eend $?
+}
+
+get_kheader_version() {
+	printf '#include <linux/version.h>\nLINUX_VERSION_CODE\n' | \
+	$(tc-getCPP ${CTARGET}) -I "${EPREFIX}/$(alt_build_headers)" - | \
+	tail -n 1
+}
+
+# We collect all sanity checks here. Consistency is not guranteed between
+# pkg_ and src_ phases, so we call this function both in pkg_pretend and in
+# src_unpack.
+sanity_prechecks() {
+	# Make sure devpts is mounted correctly for use w/out setuid pt_chown
+	check_devpts
+
+	# Prevent native builds from downgrading
+	if [[ ${MERGE_TYPE} != "buildonly" ]] && \
+	   [[ ${ROOT} == "/" ]] && \
+	   [[ ${CBUILD} == ${CHOST} ]] && \
+	   [[ ${CHOST} == ${CTARGET} ]] ; then
+
+		# The high rev # is to allow people to downgrade between -r#
+		# versions. We want to block 2.20->2.19, but 2.20-r3->2.20-r2
+		# should be fine. Hopefully we never actually use a r# this
+		# high.
+		if has_version ">${CATEGORY}/${P}-r10000" ; then
+			eerror "Sanity check to keep you from breaking your system:"
+			eerror " Downgrading glibc is not supported and a sure way to destruction."
+			die "Aborting to save your system."
+		fi
+
+		if ! do_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' ; then
+			eerror "Your old kernel is broken. You need to update it to a newer"
+			eerror "version as syscall(<bignum>) will break. See bug 279260."
+			die "Old and broken kernel."
+		fi
+	fi
+
+	# Users have had a chance to phase themselves, time to give em the boot
+	if [[ -e ${EROOT}/etc/locale.gen ]] && [[ -e ${EROOT}/etc/locales.build ]] ; then
+		eerror "You still haven't deleted ${EROOT}/etc/locales.build."
+		eerror "Do so now after making sure ${EROOT}/etc/locale.gen is kosher."
+		die "Lazy upgrader detected"
+	fi
+
+	if [[ ${CTARGET} == i386-* ]] ; then
+		eerror "i386 CHOSTs are no longer supported."
+		eerror "Chances are you don't actually want/need i386."
+		eerror "Please read https://www.gentoo.org/doc/en/change-chost.xml"
+		die "Please fix your CHOST"
+	fi
+
+	if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then
+		ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS."
+		ewarn "This will result in a 50% performance penalty when running with a 32bit"
+		ewarn "hypervisor, which is probably not what you want."
+	fi
+
+	use hardened && ! tc-enables-pie && \
+		ewarn "PIE hardening not applied, as your compiler doesn't default to PIE"
+
+	# Check for sanity of /etc/nsswitch.conf
+	if [[ -e ${EROOT}/etc/nsswitch.conf ]] ; then
+		local entry
+		for entry in passwd group shadow; do
+			if ! egrep -q "^[ \t]*${entry}:.*files" "${EROOT}"/etc/nsswitch.conf; then
+				eerror "Your ${EROOT}/etc/nsswitch.conf is out of date."
+				eerror "Please make sure you have 'files' entries for"
+				eerror "'passwd:', 'group:' and 'shadow:' databases."
+				eerror "For more details see:"
+				eerror "  https://wiki.gentoo.org/wiki/Project:Toolchain/nsswitch.conf_in_glibc-2.26"
+				die "nsswitch.conf has no 'files' provider in '${entry}'."
+			fi
+		done
+	fi
+
+	# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
+	# we test for...
+	if ! is_crosscompile ; then
+		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
+			ebegin "Checking that IA32 emulation is enabled in the running kernel"
+			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
+			local STAT
+			if "${CC-${CHOST}-gcc}" ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
+				"${T}/check-ia32-emulation.elf32"
+				STAT=$?
+			else
+				# Don't fail here to allow single->multi ABI switch
+				# or recover from breakage like bug #646424
+				ewarn "Failed to compile the ABI test. Broken host glibc?"
+				STAT=0
+			fi
+			rm -f "${T}/check-ia32-emulation.elf32"
+			eend $STAT
+			[[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
+		fi
+
+	fi
+
+	# When we actually have to compile something...
+	if ! just_headers ; then
+		local run_kv build_kv want_kv
+
+		run_kv=$(g_get_running_KV)
+		build_kv=$(g_int_to_KV $(get_kheader_version))
+		want_kv=${MIN_KERN_VER}
+
+		ebegin "Checking gcc for __thread support"
+		if ! eend $(want__thread ; echo $?) ; then
+			echo
+			eerror "Could not find a gcc that supports the __thread directive!"
+			eerror "Please update your binutils/gcc and try again."
+			die "No __thread support in gcc!"
+		fi
+
+		if ! is_crosscompile && ! tc-is-cross-compiler ; then
+			# Building fails on an non-supporting kernel
+			ebegin "Checking running kernel version (${run_kv} >= ${want_kv})"
+			if ! eend_KV ${run_kv} ${want_kv} ; then
+				echo
+				eerror "You need a kernel of at least ${want_kv}!"
+				die "Kernel version too low!"
+			fi
+		fi
+
+		ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})"
+		if ! eend_KV ${build_kv} ${want_kv} ; then
+			echo
+			eerror "You need linux-headers of at least ${want_kv}!"
+			die "linux-headers version too low!"
+		fi
+	fi
+}
+
+#
+# the phases
+#
+
+# pkg_pretend
+
+pkg_pretend() {
+	# All the checks...
+	einfo "Checking general environment sanity."
+	sanity_prechecks
+}
+
+# src_unpack
+
+src_unpack() {
+	# Consistency is not guaranteed between pkg_ and src_ ...
+	sanity_prechecks
+
+	use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2
+
+	setup_env
+
+	if [[ -n ${EGIT_REPO_URI} ]] ; then
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.xz
+	fi
+
+	cd "${S}" || die
+	touch locale/C-translit.h || die #185476 #218003
+
+	cd "${WORKDIR}" || die
+	unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.bz2
+}
+
+src_prepare() {
+	if ! use vanilla ; then
+		elog "Applying Gentoo Glibc Patchset ${RELEASE_VER}-${PATCH_VER}"
+		eapply "${WORKDIR}"/patches
+		einfo "Done."
+	fi
+
+	if just_headers ; then
+		if [[ -e ports/sysdeps/mips/preconfigure ]] ; then
+			# mips peeps like to screw with us.  if building headers,
+			# we don't have a real compiler, so we can't let them
+			# insert -mabi on us.
+			sed -i '/CPPFLAGS=.*-mabi/s|.*|:|' ports/sysdeps/mips/preconfigure || die
+			find ports/sysdeps/mips/ -name Makefile -exec sed -i '/^CC.*-mabi=/s:-mabi=.*:-D_MIPS_SZPTR=32:' {} +
+		fi
+	fi
+
+	default
+
+	gnuconfig_update
+
+	cd "${WORKDIR}"
+	find . -name configure -exec touch {} +
+
+	eprefixify extra/locale/locale-gen
+
+	# Fix permissions on some of the scripts.
+	chmod u+x "${S}"/scripts/*.sh
+
+	cd "${S}"
+
+	if use hardened ; then
+		# We don't enable these for non-hardened as the output is very terse --
+		# it only states that a crash happened.  The default upstream behavior
+		# includes backtraces and symbols.
+		einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler"
+		cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-stack_chk_fail.c debug/stack_chk_fail.c || die
+		cp "${FILESDIR}"/2.25/glibc-2.25-gentoo-chk_fail.c debug/chk_fail.c || die
+
+		if use debug ; then
+			# Allow SIGABRT to dump core on non-hardened systems, or when debug is requested.
+			sed -i \
+				-e '/^CFLAGS-backtrace.c/ iCPPFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
+				-e '/^CFLAGS-backtrace.c/ iCPPFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
+				debug/Makefile || die
+		fi
+	fi
+}
+
+glibc_do_configure() {
+	# Glibc does not work with gold (for various reasons) #269274.
+	tc-ld-disable-gold
+
+	# CXX isnt handled by the multilib system, so if we dont unset here
+	# we accumulate crap across abis
+	unset CXX
+
+	einfo "Configuring glibc for nptl"
+
+	if use doc ; then
+		export MAKEINFO=makeinfo
+	else
+		export MAKEINFO=/dev/null
+	fi
+
+	local v
+	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX LD {AS,C,CPP,CXX,LD}FLAGS MAKEINFO ; do
+		einfo " $(printf '%15s' ${v}:)   ${!v}"
+	done
+
+	# The glibc configure script doesn't properly use LDFLAGS all the time.
+	export CC="$(tc-getCC ${CTARGET}) ${LDFLAGS}"
+	einfo " $(printf '%15s' 'Manual CC:')   ${CC}"
+
+	# Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548
+	export CXX="$(tc-getCXX ${CTARGET}) $(get_abi_CFLAGS)"
+	einfo " $(printf '%15s' 'Manual CXX:')   ${CXX}"
+
+	echo
+
+	local myconf=()
+
+	case ${CTARGET} in
+		powerpc-*)
+			# Currently gcc on powerpc32 generates invalid code for
+			# __builtin_return_address(0) calls. Normally programs
+			# don't do that but malloc hooks in glibc do:
+			# https://gcc.gnu.org/PR81996
+			# https://bugs.gentoo.org/629054
+			myconf+=( --enable-stack-protector=no )
+			;;
+		*)
+			myconf+=( --enable-stack-protector=all )
+			;;
+	esac
+	myconf+=( --enable-stackguard-randomization )
+
+	# Keep a whitelist of targets supporing IFUNC. glibc's ./configure
+	# is not robust enough to detect proper support:
+	#    https://bugs.gentoo.org/641216
+	#    https://sourceware.org/PR22634#c0
+	case $(tc-arch ${CTARGET}) in
+		# Keep whitelist of targets where autodetection mostly works.
+		amd64|x86|sparc|ppc|ppc64|arm|arm64|s390) ;;
+		# Blacklist everywhere else
+		*) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;;
+	esac
+
+	[[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
+
+	myconf+=( --enable-kernel=${MIN_KERN_VER} )
+
+	# Since SELinux support is only required for nscd, only enable it if:
+	# 1. USE selinux
+	# 2. only for the primary ABI on multilib systems
+	# 3. Not a crosscompile
+	if ! is_crosscompile && use selinux ; then
+		if use multilib ; then
+			if is_final_abi ; then
+				myconf+=( --with-selinux )
+			else
+				myconf+=( --without-selinux )
+			fi
+		else
+			myconf+=( --with-selinux )
+		fi
+	else
+		myconf+=( --without-selinux )
+	fi
+
+	# Force a few tests where we always know the answer but
+	# configure is incapable of finding it.
+	if is_crosscompile ; then
+		export \
+			libc_cv_c_cleanup=yes \
+			libc_cv_forced_unwind=yes
+	fi
+
+	myconf+=(
+		--without-cvs
+		--disable-werror
+		--enable-bind-now
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		$(use_enable profile)
+		$(use_with gd)
+		--with-headers=$(alt_build_headers)
+		--prefix="${EPREFIX}/usr"
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--libdir='$(prefix)'/$(get_libdir)
+		--mandir='$(prefix)'/share/man
+		--infodir='$(prefix)'/share/info
+		--libexecdir='$(libdir)'/misc/glibc
+		--with-bugurl=https://bugs.gentoo.org/
+		--with-pkgversion="$(glibc_banner)"
+		$(use_multiarch || echo --disable-multi-arch)
+		$(in_iuse systemtap && use_enable systemtap)
+		$(in_iuse nscd && use_enable nscd)
+		${EXTRA_ECONF}
+	)
+
+	# We rely on sys-libs/timezone-data for timezone tools normally.
+	myconf+=( $(use_enable vanilla timezone-tools) )
+
+	# These libs don't have configure flags.
+	ac_cv_lib_audit_audit_log_user_avc_message=$(in_iuse audit && usex audit || echo no)
+	ac_cv_lib_cap_cap_init=$(in_iuse caps && usex caps || echo no)
+
+	# There is no configure option for this and we need to export it
+	# since the glibc build will re-run configure on itself
+	export libc_cv_rootsbindir="${EPREFIX}/sbin"
+	export libc_cv_slibdir="${EPREFIX}/$(get_libdir)"
+
+	# We take care of patching our binutils to use both hash styles,
+	# and many people like to force gnu hash style only, so disable
+	# this overriding check.  #347761
+	export libc_cv_hashstyle=no
+
+	local builddir=$(builddir nptl)
+	mkdir -p "${builddir}"
+	cd "${builddir}"
+	set -- "${S}"/configure "${myconf[@]}"
+	echo "$@"
+	"$@" || die "failed to configure glibc"
+
+	# ia64 static cross-compilers are a pita in so much that they
+	# can't produce static ELFs (as the libgcc.a is broken).  so
+	# disable building of the programs for those targets if it
+	# doesn't work.
+	# XXX: We could turn this into a compiler test, but ia64 is
+	# the only one that matters, so this should be fine for now.
+	if is_crosscompile && [[ ${CTARGET} == ia64* ]] ; then
+		sed -i '1i+link-static = touch $@' config.make
+	fi
+
+	# If we're trying to migrate between ABI sets, we need
+	# to lie and use a local copy of gcc.  Like if the system
+	# is built with MULTILIB_ABIS="amd64 x86" but we want to
+	# add x32 to it, gcc/glibc don't yet support x32.
+	#
+	if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib ; then
+		echo 'main(){}' > "${T}"/test.c
+		if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c -Wl,-emain -lgcc 2>/dev/null ; then
+			sed -i -e '/^CC = /s:$: -B$(objdir)/../'"gcc-${GCC_BOOTSTRAP_VER}/${ABI}:" config.make || die
+		fi
+	fi
+}
+
+glibc_headers_configure() {
+	export ABI=default
+
+	local builddir=$(builddir "headers")
+	mkdir -p "${builddir}"
+	cd "${builddir}"
+
+	# if we don't have a compiler yet, we can't really test it now ...
+	# hopefully they don't affect header generation, so let's hope for
+	# the best here ...
+	local v vars=(
+		ac_cv_header_cpuid_h=yes
+		libc_cv_{386,390,alpha,arm,hppa,ia64,mips,{powerpc,sparc}{,32,64},sh,x86_64}_tls=yes
+		libc_cv_asm_cfi_directives=yes
+		libc_cv_broken_visibility_attribute=no
+		libc_cv_c_cleanup=yes
+		libc_cv_forced_unwind=yes
+		libc_cv_gcc___thread=yes
+		libc_cv_mlong_double_128=yes
+		libc_cv_mlong_double_128ibm=yes
+		libc_cv_ppc_machine=yes
+		libc_cv_ppc_rel16=yes
+		libc_cv_predef_fortify_source=no
+		libc_cv_visibility_attribute=yes
+		libc_cv_z_combreloc=yes
+		libc_cv_z_execstack=yes
+		libc_cv_z_initfirst=yes
+		libc_cv_z_nodelete=yes
+		libc_cv_z_nodlopen=yes
+		libc_cv_z_relro=yes
+		libc_mips_abi=${ABI}
+		libc_mips_float=$([[ $(tc-is-softfloat) == "yes" ]] && echo soft || echo hard)
+		# These libs don't have configure flags.
+		ac_cv_lib_audit_audit_log_user_avc_message=no
+		ac_cv_lib_cap_cap_init=no
+	)
+
+	einfo "Forcing cached settings:"
+	for v in "${vars[@]}" ; do
+		einfo " ${v}"
+		export ${v}
+	done
+
+	# Blow away some random CC settings that screw things up. #550192
+	if [[ -d ${S}/sysdeps/mips ]]; then
+		pushd "${S}"/sysdeps/mips >/dev/null
+		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=32:' mips32/Makefile mips64/n32/Makefile || die
+		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=64:' mips64/n64/Makefile || die
+
+		# Force the mips ABI to the default.  This is OK because the set of
+		# installed headers in this phase is the same between the 3 ABIs.
+		# If this ever changes, this hack will break, but that's unlikely
+		# as glibc discourages that behavior.
+		# https://crbug.com/647033
+		sed -i -e 's:abiflag=.*:abiflag=_ABIO32:' preconfigure || die
+
+		popd >/dev/null
+	fi
+
+	local myconf=()
+	myconf+=(
+		--disable-sanity-checks
+		--enable-hacker-mode
+		--without-cvs
+		--disable-werror
+		--enable-bind-now
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		--with-headers=$(alt_build_headers)
+		--prefix="${EPREFIX}/usr"
+		${EXTRA_ECONF}
+	)
+
+	# Nothing is compiled here which would affect the headers for the target.
+	# So forcing CC/CFLAGS is sane.
+	set -- "${S}"/configure "${myconf[@]}"
+	echo "$@"
+	CC="$(tc-getBUILD_CC)" \
+	CFLAGS="-O1 -pipe" \
+	CPPFLAGS="-U_FORTIFY_SOURCE" \
+	LDFLAGS="" \
+	"$@" || die "failed to configure glibc"
+}
+
+do_src_configure() {
+	if just_headers ; then
+		glibc_headers_configure
+	else
+		glibc_do_configure nptl
+	fi
+}
+
+src_configure() {
+	foreach_abi do_src_configure
+}
+
+do_src_compile() {
+	emake -C "$(builddir nptl)" || die "make nptl for ${ABI} failed"
+}
+
+src_compile() {
+	if just_headers ; then
+		return
+	fi
+
+	foreach_abi do_src_compile
+}
+
+glibc_src_test() {
+	cd "$(builddir nptl)"
+	emake check
+}
+
+do_src_test() {
+	local ret=0
+
+	glibc_src_test
+	: $(( ret |= $? ))
+
+	return ${ret}
+}
+
+src_test() {
+	# Give tests more time to complete.
+	export TIMEOUTFACTOR=5
+
+	foreach_abi do_src_test || die "tests failed"
+}
+
+run_locale_gen() {
+	# if the host locales.gen contains no entries, we'll install everything
+	local root="$1"
+	local locale_list="${root}/etc/locale.gen"
+	if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
+		ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
+		locale_list="${root}/usr/share/i18n/SUPPORTED"
+	fi
+
+	locale-gen --jobs $(makeopts_jobs) --config "${locale_list}" \
+		--destdir "${root}"
+}
+
+glibc_do_src_install() {
+	local builddir=$(builddir nptl)
+	cd "${builddir}"
+
+	emake install_root="${D}$(alt_prefix)" install || die
+
+	# This version (2.26) provides some compatibility libraries for the NIS/NIS+ support
+	# which come without headers etc. Only needed for binary packages since the
+	# external net-libs/libnsl has increased soversion. Keep only versioned libraries.
+	find "${D}" -name "libnsl.a" -delete
+	find "${D}" -name "libnsl.so" -delete
+
+	# Normally upstream_pv is ${PV}. Live ebuilds are exception, there we need
+	# to infer upstream version:
+	# '#define VERSION "2.26.90"' -> '2.26.90'
+	local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h)
+
+	if [[ -e ${ED}$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then
+		# Move versioned .a file out of libdir to evade portage QA checks
+		# instead of using gen_usr_ldscript(). We fix ldscript as:
+		# "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP ( /usr/lib64/glibc-<pv>/libm-<pv>.a ..."
+		sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" "${ED}"$(alt_usrlibdir)/libm.a || die
+		dodir $(alt_usrlibdir)/${P}
+		mv "${ED}"$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
+	fi
+
+	# We'll take care of the cache ourselves
+	rm -f "${ED}"/etc/ld.so.cache
+
+	# Everything past this point just needs to be done once ...
+	is_final_abi || return 0
+
+	# Make sure the non-native interp can be found on multilib systems even
+	# if the main library set isn't installed into the right place.  Maybe
+	# we should query the active gcc for info instead of hardcoding it ?
+	local i ldso_abi ldso_name
+	local ldso_abi_list=(
+		# x86
+		amd64   /lib64/ld-linux-x86-64.so.2
+		x32     /libx32/ld-linux-x32.so.2
+		x86     /lib/ld-linux.so.2
+		# mips
+		o32     /lib/ld.so.1
+		n32     /lib32/ld.so.1
+		n64     /lib64/ld.so.1
+		# powerpc
+		ppc     /lib/ld.so.1
+		ppc64   /lib64/ld64.so.1
+		# s390
+		s390    /lib/ld.so.1
+		s390x   /lib/ld64.so.1
+		# sparc
+		sparc32 /lib/ld-linux.so.2
+		sparc64 /lib64/ld-linux.so.2
+	)
+	case $(tc-endian) in
+	little)
+		ldso_abi_list+=(
+			# arm
+			arm64   /lib/ld-linux-aarch64.so.1
+		)
+		;;
+	big)
+		ldso_abi_list+=(
+			# arm
+			arm64   /lib/ld-linux-aarch64_be.so.1
+		)
+		;;
+	esac
+	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib
+	fi
+	for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do
+		ldso_abi=${ldso_abi_list[i]}
+		has ${ldso_abi} $(get_install_abis) || continue
+
+		ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}"
+		if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then
+			dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name}
+		fi
+	done
+
+	# With devpts under Linux mounted properly, we do not need the pt_chown
+	# binary to be setuid.  This is because the default owners/perms will be
+	# exactly what we want.
+	if in_iuse suid && ! use suid ; then
+		find "${ED}" -name pt_chown -exec chmod -s {} +
+	fi
+
+	#################################################################
+	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
+	# Make sure we install some symlink hacks so that when we build
+	# a 2nd stage cross-compiler, gcc finds the target system
+	# headers correctly.  See gcc/doc/gccinstall.info
+	if is_crosscompile ; then
+		# We need to make sure that /lib and /usr/lib always exists.
+		# gcc likes to use relative paths to get to its multilibs like
+		# /usr/lib/../lib64/.  So while we don't install any files into
+		# /usr/lib/, we do need it to exist.
+		cd "${ED}"$(alt_libdir)/..
+		[[ -e lib ]] || mkdir lib
+		cd "${ED}"$(alt_usrlibdir)/..
+		[[ -e lib ]] || mkdir lib
+
+		dosym usr/include $(alt_prefix)/sys-include
+		return 0
+	fi
+
+	# Files for Debian-style locale updating
+	dodir /usr/share/i18n
+	sed \
+		-e "/^#/d" \
+		-e "/SUPPORTED-LOCALES=/d" \
+		-e "s: \\\\::g" -e "s:/: :g" \
+		"${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \
+		|| die "generating /usr/share/i18n/SUPPORTED failed"
+	cd "${WORKDIR}"/extra/locale
+	dosbin locale-gen
+	doman *.[0-8]
+	insinto /etc
+	doins locale.gen
+
+	# Make sure all the ABI's can find the locales and so we only
+	# have to generate one set
+	local a
+	keepdir /usr/$(get_libdir)/locale
+	for a in $(get_install_abis) ; do
+		if [[ ! -e ${ED}/usr/$(get_abi_LIBDIR ${a})/locale ]] ; then
+			dosym ../$(get_libdir)/locale /usr/$(get_abi_LIBDIR ${a})/locale
+		fi
+	done
+
+	cd "${S}"
+
+	# Install misc network config files
+	insinto /etc
+	doins nscd/nscd.conf posix/gai.conf nss/nsswitch.conf
+	doins "${WORKDIR}"/extra/etc/*.conf
+
+	if use nscd ; then
+		doinitd "$(prefixify_ro "${WORKDIR}"/extra/etc/nscd)"
+
+		local nscd_args=(
+			-e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd | grep nscd.pid):"
+		)
+
+		sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd
+
+		systemd_dounit nscd/nscd.service
+		systemd_newtmpfilesd nscd/nscd.tmpfiles nscd.conf
+	else
+		# Do this since extra/etc/*.conf above might have nscd.conf.
+		rm -f "${ED}"/etc/nscd.conf
+	fi
+
+	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
+	doenvd "${T}"/00glibc
+
+	for d in BUGS ChangeLog CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do
+		[[ -s ${d} ]] && dodoc ${d}
+	done
+	dodoc -r ChangeLog.old
+
+	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
+	# creation of the "factory" symlink in pkg_postinst().
+	rm -f "${ED}"/etc/localtime
+
+	# Generate all locales if this is a native build as locale generation
+	if use compile-locales && ! is_crosscompile ; then
+		run_locale_gen "${ED}"
+	fi
+}
+
+glibc_headers_install() {
+	local builddir=$(builddir "headers")
+	cd "${builddir}"
+	emake install_root="${D}$(alt_prefix)" install-headers
+
+	insinto $(alt_headers)/gnu
+	doins "${S}"/include/gnu/stubs.h
+
+	# Make sure we install the sys-include symlink so that when
+	# we build a 2nd stage cross-compiler, gcc finds the target
+	# system headers correctly.  See gcc/doc/gccinstall.info
+	dosym usr/include $(alt_prefix)/sys-include
+}
+
+src_strip() {
+	# gdb is lame and requires some debugging information to remain in
+	# libpthread, so we need to strip it by hand.  libthread_db makes no
+	# sense stripped as it is only used when debugging.
+	local pthread=$(has splitdebug ${FEATURES} && echo "libthread_db" || echo "lib{pthread,thread_db}")
+	env \
+		-uRESTRICT \
+		CHOST=${CTARGET} \
+		STRIP_MASK="/*/{,tls/}${pthread}*" \
+		prepallstrip
+	# if user has stripping enabled and does not have split debug turned on,
+	# then leave the debugging sections in libpthread.
+	if ! has nostrip ${FEATURES} && ! has splitdebug ${FEATURES} ; then
+		${STRIP:-${CTARGET}-strip} --strip-debug "${ED}"/*/libpthread-*.so
+	fi
+}
+
+src_install() {
+	if just_headers ; then
+		export ABI=default
+		glibc_headers_install
+		return
+	fi
+
+	foreach_abi glibc_do_src_install
+	src_strip
+}
+
+# Simple test to make sure our new glibc isn't completely broken.
+# Make sure we don't test with statically built binaries since
+# they will fail.  Also, skip if this glibc is a cross compiler.
+#
+# If coreutils is built with USE=multicall, some of these files
+# will just be wrapper scripts, not actual ELFs we can test.
+glibc_sanity_check() {
+	cd / #228809
+
+	# We enter ${ED} so to avoid trouble if the path contains
+	# special characters; for instance if the path contains the
+	# colon character (:), then the linker will try to split it
+	# and look for the libraries in an unexpected place. This can
+	# lead to unsafe code execution if the generated prefix is
+	# within a world-writable directory.
+	# (e.g. /var/tmp/portage:${HOSTNAME})
+	pushd "${ED}"/$(get_libdir) >/dev/null
+
+	local x striptest
+	for x in cal date env free ls true uname uptime ; do
+		x=$(type -p ${x})
+		[[ -z ${x} || ${x} != ${EPREFIX}/* ]] && continue
+		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue
+		case ${striptest} in
+		*"statically linked"*) continue;;
+		*"ASCII text"*) continue;;
+		esac
+		# We need to clear the locale settings as the upgrade might want
+		# incompatible locale data.  This test is not for verifying that.
+		LC_ALL=C \
+		./ld-*.so --library-path . ${x} > /dev/null \
+			|| die "simple run test (${x}) failed"
+	done
+
+	popd >/dev/null
+}
+
+pkg_preinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	# prepare /etc/ld.so.conf.d/ for files
+	mkdir -p "${EROOT}"/etc/ld.so.conf.d
+
+	# Default /etc/hosts.conf:multi to on for systems with small dbs.
+	if [[ $(wc -l < "${EROOT}"/etc/hosts) -lt 1000 ]] ; then
+		sed -i '/^multi off/s:off:on:' "${ED}"/etc/host.conf
+		einfo "Defaulting /etc/host.conf:multi to on"
+	fi
+
+	[[ ${ROOT} != "/" ]] && return 0
+	[[ -d ${ED}/$(get_libdir) ]] || return 0
+	[[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check
+}
+
+pkg_postinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
+		# Generate fastloading iconv module configuration file.
+		"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}"
+	fi
+
+	if ! is_crosscompile && [[ ${ROOT} == "/" ]] ; then
+		# Reload init ... if in a chroot or a diff init package, ignore
+		# errors from this step #253697
+		/sbin/telinit U 2>/dev/null
+
+		use compile-locales || run_locale_gen "${EROOT}"
+	fi
+
+	# Check for sanity of /etc/nsswitch.conf, take 2
+	if [[ -e ${EROOT}/etc/nsswitch.conf ]] && ! has_version sys-auth/libnss-nis ; then
+		local entry
+		for entry in passwd group shadow; do
+			if egrep -q "^[ \t]*${entry}:.*nis" "${EROOT}"/etc/nsswitch.conf; then
+				ewarn ""
+				ewarn "Your ${EROOT}/etc/nsswitch.conf uses NIS. Support for that has been"
+				ewarn "removed from glibc and is now provided by the package"
+				ewarn "  sys-auth/libnss-nis"
+				ewarn "Install it now to keep your NIS setup working."
+				ewarn ""
+			fi
+		done
+	fi
+}
diff --git a/sys-libs/glibc/glibc-2.25-r10.ebuild b/sys-libs/glibc/glibc-2.25-r10.ebuild
index 128bcf1085b3..a286da5e6469 100644
--- a/sys-libs/glibc/glibc-2.25-r10.ebuild
+++ b/sys-libs/glibc/glibc-2.25-r10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
 HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
 
 LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 RESTRICT="strip" # strip ourself #46186
 EMULTILIB_PKG="true"
 
diff --git a/sys-libs/glibc/glibc-2.25-r11.ebuild b/sys-libs/glibc/glibc-2.25-r11.ebuild
index 1fb31b726993..45016dbcfc93 100644
--- a/sys-libs/glibc/glibc-2.25-r11.ebuild
+++ b/sys-libs/glibc/glibc-2.25-r11.ebuild
@@ -28,7 +28,7 @@ case ${PV} in
 esac
 GCC_BOOTSTRAP_VER="4.7.3-r1"
 # patches live at https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo/src/patchsets/glibc/
-PATCH_VER="14"                                 # Gentoo patchset
+PATCH_VER="15"                                 # Gentoo patchset
 : ${NPTL_KERN_VER:="2.6.32"}                   # min kernel version nptl requires
 
 GLIBC_PATCH_EXCLUDE+=" 0005_all_sys-types.h-drop-sys-sysmacros.h-include.patch"
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 43525a0f3d83..59a714fbcef1 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -15,7 +15,7 @@ EBUILD libomp-3.8.1.ebuild 1368 BLAKE2B b686505a85cd3a343808fa1343d0fa6c31c8e66c
 EBUILD libomp-3.9.0.ebuild 1264 BLAKE2B d47970eb3edd24601f97770c326f9274849425ae33aa745cb3544f91a0475944bd1d637b7a50fe3ef0f4643f7fb7adaa91756ca79acf556216362e8c8e1c53b1 SHA512 e0772254fd1ccf735a4325a41bcd30eaaeec30063a541b9f77a5295e1674e0b4a38af86738bfc9a71f4196b81945cd7c08655fc468105aa11d24c38d303aac0a
 EBUILD libomp-3.9.1.ebuild 1326 BLAKE2B 4e1c5178e66a3d4371556bcb26fab5ea84e2bac1ce0abb127d68bbe09f4e735d6d8ed4404f19bb6d8cb4808a782a5b72c9425e4acd2fe2cc97ebc3372de1c72c SHA512 99afa3364dfe73c52792e1f0c4cc19c9beb1fdb28d7fd009a778c351f86fd1759a1c4bfcd46194890b51f227844c063fed53085d78c0b91351858ed517e42794
 EBUILD libomp-4.0.1.ebuild 2527 BLAKE2B be262aa449e8d3c2392793b8af597c7d9a02e624f0d57ad8b24ef822bd57f6d243200ccee1022c18dcc52fc2d198d6aa2cfe83a1224f614ce0b2305f3f6bff69 SHA512 ca34a666e1aa6e767cd979866bcdcaf55da75dc8faa80d062e718ceda56576c3ebec88972787ae5dc4532bfdeb2d7f34f233b8c4983bfb1bc89bbd443ac54ac7
-EBUILD libomp-5.0.1.ebuild 2374 BLAKE2B ce1c736adf6fc48ce5ca50e167f64a6599a02ee633001ac0395a4eff020fc58a2eebad227155d2ec65684797e5c4c92dc4ff2cf7e9603925f72e202873c1eb9a SHA512 a3ec9c48c1ada76cbe2b6333354074a6d18e9f6430a787848d558df0ab7b5af7c763ce0ef939ed7073e6d97fb30db38cf8c7b9c9d082d3883d22f541e5d3f534
+EBUILD libomp-5.0.1.ebuild 2385 BLAKE2B e887b48183a5e2d8f4f5476579ec88f99d0b709ea4136914978014e51b8d63451d62c5216690b908d7e853141266831a560a1802945d88fe5940d30100b6cbdd SHA512 a36ce91d70d506f9baa07f2aca394325e382b794e0797ecdb308eb98fab38079ec8b5ca10d1c7368ec06275b76c1487f581a4196f0499645edab4b34e974a594
 EBUILD libomp-6.0.0_rc3.ebuild 3123 BLAKE2B 4bf63520787935ba5ab25eaa0b0f1e452c7fea5c977364d00ea402c52082f0af1e1ff4c205c1cb6692216747b95cbe153d9b9704f1b60ba20f6e41fa382f94d9 SHA512 438c4a0a565f7ff2e02f5cdb3e9c5981340f4f66943a2297a994ff3bdcc31825b8f7979ef90bd8df5ab9b1a48bf405f18f5a465edcd11104f11bf8eba7b0179a
 EBUILD libomp-6.0.9999.ebuild 3152 BLAKE2B cd49f1915259f6809d6ea0cf9982c2341303eb77d9ee43659e610e32f5f259371a3be13ab18a6abd966b492734821d9a6d2dca186f0ed4c6ff55677f5a113132 SHA512 013720ff9620d5ae03d8e4278a5f59661aa4bc16514858f11592378794cea992171d0296101ee25b90b3dcbacffc8330232c244e3211de29edb9aae487f9b58d
 EBUILD libomp-9999.ebuild 3127 BLAKE2B 883bd819cb626b80d8b0b8fb89b8673f344ba7beb087c7385b065602c1e51997e0086390181eaa8e3b26ea9714b1bd27b593c87a5f68c6afb3a74432a4c61a3d SHA512 66f06b08baed4b556baecc3809be85b5c3900555cf45792a296e5095fb3b4b039c6d653594a55e30c4063599b07a6413e610aaada592e2dddf7e301420e05ec9
diff --git a/sys-libs/libomp/libomp-5.0.1.ebuild b/sys-libs/libomp/libomp-5.0.1.ebuild
index 2f44396ca635..ff6a18b94d8b 100644
--- a/sys-libs/libomp/libomp-5.0.1.ebuild
+++ b/sys-libs/libomp/libomp-5.0.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/openmp-${PV/_/}.src.tar.xz"
 
 LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x64-macos"
 IUSE="hwloc kernel_linux ompt test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/libsmbios/Manifest b/sys-libs/libsmbios/Manifest
index 1af1a05d089b..26d8103e52e8 100644
--- a/sys-libs/libsmbios/Manifest
+++ b/sys-libs/libsmbios/Manifest
@@ -2,10 +2,10 @@ AUX libsmbios-2.2.28-cppunit-tests.patch 350 BLAKE2B c735096c5fe0e33eec728e28009
 AUX libsmbios-2.3.0-doxygen_target.patch 305 BLAKE2B ba3e149fd8a792a1b589938fbe6cd895e30298685c4ceab61e45ff34c171126389ea0e1c15a18661ef1b4528f41587ce4bc7f5fd7f076e099894ebe19de0a5dc SHA512 f1f85f052265d88f4735a18ce0205a56256dba5416e6153291d27a4f958bbe9618401b1b70a5e462d12287490a42fe5a6e5e196091b9ec2afa01728a7910815d
 AUX libsmbios-2.3.3-doxygen_target.patch 351 BLAKE2B 100ca4d508b8441bdf6c678768fe67a8c91ee9a1d1b353bd5ba856ff1df1ea3cf503b922b9474f7b3d79a9ed504d9f9b9a10a259194c53cbb2a7a3e3fa5263f2 SHA512 d86df4b1c3ab389360d07f4fab84219bb03e270e77984996d7c53d55b4a0e5a29e2d097e79da5a49f7be0ff9118722aaa955acdbffd4d59cbefa7a1a0ad6f1c3
 AUX libsmbios-fix-pie.patch 816 BLAKE2B 73d2e9611bd672332bed58adee52cbac6285d1e07b259ffbcd3d37374b772a59355c49f231dcb4005b7897f12d847f58eed8139531f250906fd0a1db05843cfb SHA512 2567fe1dfe2e858103c3732e7059888731c207234022a24c1cd4b158253330699af6b2e90cf98881e57e0b7cb8c70a8627fe1d7eb370f2cbb3969189538baf7e
-DIST libsmbios-2.3.0.tar.xz 830840 BLAKE2B 1ddbddd5c9837a44cfbd97bdb1862a90137ba6caf7c19fe4cdde1e7dceef1a6f2c9bcba6329a5dde6736d6b252e37cbb100ba9f555d0dc15a0946fb1717c7f3b SHA512 944df2dde0df8a02d4c5a84ff6e535e112e6d72b81177c8faba7c45b349ec8c8b2149439c4dc6ea834c5eedad1ac59d8bf073a3d48bf7caccc73d0317f00e216
 DIST libsmbios-2.3.2.tar.gz 800862 BLAKE2B da888dbe3b3dfa10b39fbc4da90fe643982abc49f756f033d492f29d06631c722da7ec11a2b77780c06a74b7b0e3f70d5d3fc1ce895be7a7c8d136f654a22f7e SHA512 6ef3d71892e157d81fc466689b67c19b83567ee1c4893816da935cfc42738cf958f972eed811aad375fee5bb7d4a6b4e13fb1b5760cd0d7cdb5e65170ebeb129
 DIST libsmbios-2.3.3.tar.gz 801164 BLAKE2B 22d04d4071ec3111d80acbbc10dbd51c15e5f8db06575f3079654da42e33dbbfcb364e1bdc8470d2a66475159da1179cafc9ae5284be0c35c4199dc5b16a1a2e SHA512 d4ee556fc0b734827e1a0def9c9914e79130ce9f164f62a5aa752276772f9ed27874fd8a285b65e016f16f001cdfa23c7c9d228533bb8a03134db90b9cc4f96d
-EBUILD libsmbios-2.3.0-r1.ebuild 1825 BLAKE2B 18f23c34caa95ecf756ad2662b5425ca22156c2a2862f7508cc28ff2b62b60e18e9d04b6636ddc5d8521243f85233af6d2dc3c7fd4fdc1c386b6652746aa4311 SHA512 62b0a7bca4d2c04f529f379eaaf3e8b68bf8932f8bd9700be223a25a98040d26ce1a075dcbeef254cf5da784fc088abe32af8f75ca0e15527da4d2f9b10bee41
+DIST libsmbios-2.4.1.tar.gz 667796 BLAKE2B 119198783004215c269ae0846aad58fafcdd0ee2148e0014f77271c38511cc61430db2b81c43bbc0da507b40342c923731e06c61829f9604b84b26f7f527b37a SHA512 dd71e45f8047480a669b70efebb9bdbbea4870f96437fc45eb4088fd66331d117b29a65c45cee2e5c4628d0536072a5939eb83f1905857a85bd0567b3d1c22fb
 EBUILD libsmbios-2.3.2.ebuild 1894 BLAKE2B 1c42418d45133004c8c47570541794f74fcb07f336db9142f9ac88d814e571ac86a0af316ed9ebb68a96503d0e0a5ea3cfa1855bf1845fd62d9deb5ccbe48c57 SHA512 2b3faf9733451392aaacb4e6859b64673b41d1aa19e5a4cad815a67dfce39bac07aa3c4f7ab20104024312d830320ba1dda9d372475be7c2055b0042554a85a8
 EBUILD libsmbios-2.3.3.ebuild 1788 BLAKE2B b2798a0e24b8ca2b3d9d2125632a2286371a382417bb2ae12db5e167bd6cb2167cd7b20f20f4701d927819c739fda5b482657c81ffdb9999774ff38a9caacc9c SHA512 be969d82ec9f0d5f18b0b9c397bde36ee5eea184c1a41320cce25427f2d6eafa2d9565ad14c029222b978e20038d17071e345065cb6c2c9cf3e72f3639f4b354
+EBUILD libsmbios-2.4.1.ebuild 1721 BLAKE2B 9283623af15e10736a53b0916159e80bc4539a838a0c352353a2e3d47797641a9dbfe0afa5750f3d550d571a219deaa4bba142193d1fd5d35b079efa33e5ce30 SHA512 92d3f1ff5b9ba0fb79321ba675689928a01f1fb97b8834f0360d4c34a7d305f5650f4947d64965c3936ea1fa307ad822bdb50710dbbfdaa10e550139cb725848
 MISC metadata.xml 564 BLAKE2B bc9809af663bd6abb97b0fd1e91b520e3827f8d6656f774093944217907c2246bcaf55cb123dca43b2acdcee5aa24657dda9384d3f081c45e82d3c4f5e05e61e SHA512 d32499f8dc915da23ef8ce3b0f799d213d5cf700da8b80c83a94770d7fef72bc22ddbfbecf92e49c8ea0f56c4c2b718e53563a450870a77d7cdd3d3c5f610b1a
diff --git a/sys-libs/libsmbios/libsmbios-2.3.0-r1.ebuild b/sys-libs/libsmbios/libsmbios-2.4.1.ebuild
similarity index 59%
rename from sys-libs/libsmbios/libsmbios-2.3.0-r1.ebuild
rename to sys-libs/libsmbios/libsmbios-2.4.1.ebuild
index 9c7ce6e794e9..b69287953702 100644
--- a/sys-libs/libsmbios/libsmbios-2.3.0-r1.ebuild
+++ b/sys-libs/libsmbios/libsmbios-2.4.1.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 
-inherit autotools eutils flag-o-matic python-single-r1
+inherit autotools flag-o-matic python-single-r1 versionator
 
 DESCRIPTION="Provide access to (SM)BIOS information"
-HOMEPAGE="http://linux.dell.com/libsmbios/main/index.html"
-SRC_URI="http://linux.dell.com/libsmbios/download/libsmbios/${P}/${P}.tar.xz
-	http://linux.dell.com/libsmbios/download/libsmbios/old/${P}/${P}.tar.xz"
+HOMEPAGE="http://linux.dell.com/files/libsmbios/"
+SRC_URI="https://github.com/dell/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 OSL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ia64 x86"
+KEYWORDS="~amd64 ~ia64 ~x86"
 IUSE="doc graphviz nls python static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -29,9 +28,7 @@ DEPEND="${RDEPEND}
 	test? ( >=dev-util/cppunit-1.9.6 )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-fix-pie.patch"
 	"${FILESDIR}/${PN}-2.2.28-cppunit-tests.patch"
-	"${FILESDIR}/${PN}-2.3.0-doxygen_target.patch"
 )
 
 pkg_setup() {
@@ -51,12 +48,14 @@ src_configure() {
 	#Remove -O3 for bug #290097
 	replace-flags -O3 -O2
 
-	econf \
-		$(use_enable doc doxygen) \
-		$(use_enable graphviz) \
-		$(use_enable nls) \
-		$(use_enable python) \
+	local myeconfargs=(
+		$(use_enable doc doxygen)
+		$(use_enable graphviz)
+		$(use_enable nls)
+		$(use_enable python)
 		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
@@ -64,13 +63,15 @@ src_install() {
 
 	if use python ; then
 		python_scriptinto /usr/sbin
-		python_doscript "${ED%/}"/usr/sbin/smbios-{{keyboard,thermal,token,wakeup,wireless}-ctl,lcd-brightness,passwd,rbu-bios-update,sys-info}
+		python_doscript "${ED%/}"/usr/sbin/smbios-{{keyboard,thermal,token,wakeup,wireless}-ctl,lcd-brightness,passwd,sys-info}
 	fi
 
 	insinto /usr/include/
-	doins -r src/include/smbios/
+	doins -r src/include/smbios_c
 
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	einstalldocs
 
-	use static-libs || prune_libtool_files --all
+	if ! use static-libs ; then
+		find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+	fi
 }
diff --git a/sys-libs/slang/Manifest b/sys-libs/slang/Manifest
index 691ec2163401..75a1e36d93f2 100644
--- a/sys-libs/slang/Manifest
+++ b/sys-libs/slang/Manifest
@@ -3,8 +3,8 @@ AUX slang-2.2.4-memset.patch 1054 BLAKE2B a4d013b70719de8ab92fbd04afbde87b6be519
 AUX slang-2.3.1-slsh-libs.patch 761 BLAKE2B a0bc1a573fa1031e44c998bb75c80113ccd86be47f7d0b80da0ba53c7fa066d780ebb86b9cc5ff503e0d4c99b49fe75cb4c916088cc7b18a5a6c1670cbca4ba3 SHA512 77516f0b0373a08fbf61765e4eb83cbfa91b29a58a41e0006d1041672c6107dc5a2410056d65dd64fe68de40e01c211feb9f748a8238473cd5c98dfe2125f7b2
 DIST slang-2.3.0.tar.bz2 1532986 BLAKE2B 92fe1338c2f07e78fbffd0435252a75d8158ae0ce6da9cf95cc553bcd8bdd393b7f1c975d516ab732805a006a03db963651736027e052c156910393443053934 SHA512 0b04d916409c59f66301877c078bcca63c8b71e5dfa6c1d804353e41949bca16e664a79381c4156068b1f878c333e618f1de165e4059b09831fa83a794613050
 DIST slang-2.3.1a.tar.bz2 1577749 BLAKE2B e3149502a7d6e6d13800f3d3df6e56f176da089b9e9a24d23ddd4958cbc43c729e42326b9e487f6356989434ad3029c1c7ae27b49b60b8e9598053cb24f043c8 SHA512 e7236a189081ebcbaf4e7f0506671226a4d46aede8826e1a558f1a2f57bcbe3ad58eadeabe2df99cd3d8bacb4c93749996bcbce4f51d338fc9396e0f945933e7
-DIST slang-pre2.3.2-23.tar.gz 1990343 BLAKE2B 3b5ddb9dd5238f4db69afbebae1d72facf8691521a55edb59d1b1e41c0c177c8275f1fff7854a94fde50eca15b5d5efc87e4d1e5b114d93c9d8c65693152b5c7 SHA512 8f8c7fa0c8a89d15648b4bbc93c39fe9915a118676f0a4d69a92a85dd5335b3c413e6068f43bc827844f83d8f26a1d6885c8250d050f337f36dfa3bb4623b277
+DIST slang-2.3.2.tar.bz2 1586720 BLAKE2B e923a431e6273f1783c40dc09b2e324ace22e41a163fd46dcb8ab16c9ef27f190651df8da24432edc75890b83cd95051a835d5e582385bb23e36cd8ae18e6d24 SHA512 35cdfe8af66dac62ee89cca60fa87ddbd02cae63b30d5c0e3786e77b1893c45697ace4ac7e82d9832b8a9ac342560bc35997674846c5022341481013e76f74b5
 EBUILD slang-2.3.0.ebuild 2266 BLAKE2B a94234aff5114d0615cb99c594542bef50ee738bd59a6b6ccb864ebcc243774296f04351b45e80d045c90b68c638fdc3b85860b5670ccb01a0477ca8a14c0e14 SHA512 3a9544b8fdcb2d2faa4a3becd0dc60402886f677180d87d5148ed857a25cfad6ed62eb49a334b287ba36fc10ae5362d01dbcda482526e9c4f92ce430eed85661
 EBUILD slang-2.3.1a.ebuild 2264 BLAKE2B 54a95855948ad64c5dc9f630641ad669f879c3acf0a7e2ff15121aaaf4564878619e45ad2205a6b2d52a7a1b90262b6e13d074bfddc65e7a55c0d37a31c62c77 SHA512 409f754626c1384bca2fafd3ee96c51985968be22a2bb0076650adb1c069dc0e9a13cb6a2420f871ddacf4ac40ac81b852a107dbc524aa017c0f932b87a983fd
-EBUILD slang-2.3.2_pre23.ebuild 2302 BLAKE2B 94f3bf407f5b5b33b2836accc9b2dd4c52b1be894fec16895afc7f00c22865ec8582fe3b35656f6bbf382ad20a815bab9f96c6c8e566e0b269868f3d02143c59 SHA512 c3c5a4b4b0453c1d60da857e4676ed4ce964f94e0f613d9dc62395d70d643c594923348c477a984fe744bc045116836f07a0c42439a418ba682c96d5c34bb75f
+EBUILD slang-2.3.2.ebuild 2296 BLAKE2B f6c22842d0a5824755f2b254bf463ad89b4cd0da748f490f887ae519515f240a6931b02497e1705b01fbdd5d75eb45a5644aa7bfe015c594fdbd938e72e0b09e SHA512 05a689115ccec6f041e92a6ed4509ea89a63f3788dae60a005cea5dfca21cf7ff290c8d6834a8268ed48d7cd5359c65891b6ce7afab08cc93e123ade3bacf5b5
 MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/sys-libs/slang/slang-2.3.2_pre23.ebuild b/sys-libs/slang/slang-2.3.2.ebuild
similarity index 89%
rename from sys-libs/slang/slang-2.3.2_pre23.ebuild
rename to sys-libs/slang/slang-2.3.2.ebuild
index eee22b8362b8..b8bca916348a 100644
--- a/sys-libs/slang/slang-2.3.2_pre23.ebuild
+++ b/sys-libs/slang/slang-2.3.2.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils multilib-minimal
+
+inherit multilib-minimal
 
 DESCRIPTION="Multi-platform library designed to allow a developer to create robust software"
 HOMEPAGE="http://www.jedsoft.org/slang/"
@@ -13,11 +14,10 @@ if [[ "${PV}" = *_pre* ]] ; then
 else
 	SRC_URI="http://www.jedsoft.org/releases/${PN}/${P}.tar.bz2
 		http://www.jedsoft.org/releases/${PN}/old/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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 ~x86-solaris"
 fi
-
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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 ~x86-solaris"
 IUSE="cjk pcre png readline static-libs zlib"
 
 # ncurses for ncurses5-config to get terminfo directory
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 2e85519fc23e..5fbe656ba815 100644
Binary files a/sys-power/Manifest.gz and b/sys-power/Manifest.gz differ
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index e1e1aca8271a..0151b6c9b70f 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -6,7 +6,7 @@ DIST upower-0.99.6.tar.xz 432056 BLAKE2B 7e62a2649806ac6bd59547aedd04572080ec9ba
 DIST upower-0.99.7.tar.xz 447832 BLAKE2B 3342f38552a5eb6abffc6b15803db0e8a24e6a3345fe1007f3a5fa66dd06ddebacf2352a751f7a3adf7ee0fe28797d7a1c5b3ec27cd190aabed17e2c7070a438 SHA512 a1ad200e715284eae815580bba3faad480f7f13401f6ff1a2e7446172796a2413990ce2b553de713ddc530849b2dff1f0ddc12fbd2fd9b55510bbb644d2340a4
 EBUILD upower-0.99.4-r1.ebuild 2218 BLAKE2B c7ad4d6e42460dd9d51dcd2b1e9a2bfa1ecd6cf21d580851048b554d1342d916a2c6698da044f3a6b9f372118a37016ce952a7c54dbe196a152a764497dd3116 SHA512 8f27db0656fbbb61940e00fe99931e8ef4ad6d3794c119df33536d77d8b50fe0916ff2847f1f81306254e5cb4f1a1b1f019255a9aa85630fde22a7770d71dc2c
 EBUILD upower-0.99.4.ebuild 1872 BLAKE2B 1c676bd031b13eaef52474dde27e0549e2bfbb1a79485da2dccc5ba44b9b00959def6b455a123324519a16084a9e034b051cf26b27e6b0296d4ac4429aa8db9e SHA512 35eb5ccc6cc440604b5f250e75f093992170cccada7f0089082e246f80a3c86380d068258e1ba7d239d135efd055fcfd84be9509404f10736f0731dd718f9891
-EBUILD upower-0.99.5.ebuild 1946 BLAKE2B 1b33a3a625ca93e652e9d83ede53044253df47a9a128f16e49017f1a377dfbf6e4eefd1540c0479850a4fbad038d1215055411ea4ae06d589284ebb851fb90b0 SHA512 0dda7ec29b9cb880a419827e34eb8bc64404e50596b4341cdbc1f7d5824f63f7e1bf64996c93bf892970de259ba73fd1c89b44be40d266c1e7f8d081d377f190
+EBUILD upower-0.99.5.ebuild 1945 BLAKE2B b36bd996e21184e7c8d28b41b87ee5a151312a22419183741c8fa293cdb5c709ba05b2fc48d28669e0dc635857feaae73d2b1628eba425dc389c59a97df62f4d SHA512 9cdf80221dc68092df16ead6523e011f3584f09adab74e5d437848ce663ba450c7b5d8f25b49ffd39de58092c1a19b2348805d8d0f9a27b7dbd9dff6c2823d6a
 EBUILD upower-0.99.6.ebuild 1953 BLAKE2B a8fd547d07beac2fe4116a68a7484504bdf3d43ea09d22e21e2c7bc44884db19d75f4807a1c91b4c1ed15dfdd1cd610474bb3574eee6008038b7ae60e167a9ec SHA512 49677f9bbf9efc4d6cb57ab1f9f085b5acab1986cd0d8955370792641d36ada0ea87a8bd983a13d03e8b91341a031264364669e92e8694eee4db10da555fa4c0
 EBUILD upower-0.99.7.ebuild 1953 BLAKE2B a8fd547d07beac2fe4116a68a7484504bdf3d43ea09d22e21e2c7bc44884db19d75f4807a1c91b4c1ed15dfdd1cd610474bb3574eee6008038b7ae60e167a9ec SHA512 49677f9bbf9efc4d6cb57ab1f9f085b5acab1986cd0d8955370792641d36ada0ea87a8bd983a13d03e8b91341a031264364669e92e8694eee4db10da555fa4c0
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/sys-power/upower/upower-0.99.5.ebuild b/sys-power/upower/upower-0.99.5.ebuild
index 81dc9d79fa24..2b214839bb83 100644
--- a/sys-power/upower/upower-0.99.5.ebuild
+++ b/sys-power/upower/upower-0.99.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/3" # based on SONAME of libupower-glib.so
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 
 # gtk-doc files are not available as prebuilt in the tarball
 IUSE="doc +introspection ios kernel_FreeBSD kernel_linux selinux"
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 6720bd5822b8..ca5a4e4ea2ca 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index ddbb07342a0f..32003fb47df6 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -10,6 +10,6 @@ DIST audit-2.6.4.tar.gz 1078677 BLAKE2B 056d9f269926d9b0d74f7187f833f1e94d4e03a5
 DIST audit-2.7.1.tar.gz 1099083 BLAKE2B 10f72ac3273ce9e23e1fb8ad8d57dcae772ba1f861f519867399d95e14f4809897637969de45566d62a73a35e5674260155773daf8de00481fcbd1b9c3138f96 SHA512 37964d81deee8608fde5f90d5d096727d3eb009e084be34749adcb0662e607e35c49c80bd83ce38b17161f11363b691721c8a8aa5dea832d320c53ab0ebb7483
 DIST audit-2.8.2.tar.gz 1121970 BLAKE2B bbec694ed1177a8590d035c2d6d197e49343fc370b101589e58736042c3b12cabb68fe796422f3133feb79068ab7d5931efa5414d22edead10c8871fefcd2549 SHA512 888ebf5e8e9d285b82d87377fc8836886d7a8b089c1be4091420a77a0250c9baf09aebb7a6330ff5043fb35f51eb6baf8d4491e26da7ad0811f0087e395b5012
 EBUILD audit-2.6.4.ebuild 6194 BLAKE2B 5e159665e671092224196d91478246d2f9f56092dac4be65d86d6094bc535c276d90f2635be17214bc9fbae94aa9d4e58d1b538766eda940260c00ce9be66591 SHA512 5769b0f13bd033b5b465ca36d707c4324338fb2ce43948a2d656ebdb76d5004030e5a10057aa8d9f532d13484fdc1819f5633ce52a12c20dd301d0b4b7eaffe5
-EBUILD audit-2.7.1.ebuild 6198 BLAKE2B d5f2d4000bd3a2e63a4a540c3061d88dc604ac80cec831b589f47185a7713ad2c7df77cfc20f35d41da1f8d773b7bcc3692b9cf76763a75f88a833e06e554331 SHA512 0059ee87e4b404b907c97f0f3e2e334f00803735bc66f3a4de9c1a192587d91c3ab04e00fb6aca034fcdb49bcf90250b8d231e161befa9a2d507df2e95e03e34
+EBUILD audit-2.7.1.ebuild 6196 BLAKE2B 9cd6721cdaa2470867e6f0e979516f1b236c0646740793aff418837f0b9e37d9c0d147843c08c6496fcfe621ae168a139bf6bbd7606b435b691475f6a4b24b60 SHA512 c45068aea2477d8ee2498db3b6fc61fc4529646e28e95c32cb2d6c214b2fb7df8604e0bf19708813777b9af70b4adcb7bdc8e7da15e57545a797203d88ac2a36
 EBUILD audit-2.8.2.ebuild 6205 BLAKE2B 82d223206cf3e14c58ce4bbdec2df18e5ad874eb440b4208a7c7463305ec2ec8039783e6436dff0623478db3dcb0d7909b4f077a819bee494d086f162d455e34 SHA512 ee1194da6ee59e8efb3d625853dfd98b0b4e034282aa72cd5f38860be7023c0e8d795c6898313551fca0b8477912a3d7608d821d74f66851136786620abdd630
 MISC metadata.xml 284 BLAKE2B c99c67d5591687a10bb380f1264dd1cde6370ff3a96864093cb41c7c17617bed826652b7651490b6a4634a7429589bbd137402afd7cf8e79cfd5f636c86baa52 SHA512 84f04c94a976c0e2c7db9a7c8c392b6c714e37650efefe2db9807688c28a8cdb64722064be23b89d0263c82c5de7b7dc412ae13f95b42c97ae928c00bb584fac
diff --git a/sys-process/audit/audit-2.7.1.ebuild b/sys-process/audit/audit-2.7.1.ebuild
index 6e590fb0f6c8..549371894d20 100644
--- a/sys-process/audit/audit-2.7.1.ebuild
+++ b/sys-process/audit/audit-2.7.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz"
 
 LICENSE="GPL-2"
 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="gssapi ldap python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # Testcases are pretty useless as they are built for RedHat users/groups and kernels.
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 8731d3d6bbc5..7e69acc49f19 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/libgudev/Manifest b/virtual/libgudev/Manifest
index da18f987ed8b..6accabf29304 100644
--- a/virtual/libgudev/Manifest
+++ b/virtual/libgudev/Manifest
@@ -1,4 +1,4 @@
 EBUILD libgudev-215-r3.ebuild 751 BLAKE2B b0f4f40f27b42761143e6902b37792e44aea3847c99ac68546720671be0761e4f3c7066ce8fe9406a8ae4c00816c74871456d3805ad45f7a397d9d1564c67c4b SHA512 78133167bb7bc75752945273a89cda970219707f34a06c8d0bf569a497463135469078019329bbab24d85b1b4d82a065cfc1f5c5899d7396366fc58701f2a8c0
 EBUILD libgudev-230.ebuild 396 BLAKE2B 38ed14c2feeab8dd49f26473727739e7725fa1e728fc009596ad46a2b075a58e2ba56867116329ebf7945f8d032528adc35c905d4e549abdf3652a2676e2736d SHA512 d23ba1b095a43089554ffc8c098abe3e10384e4103a233f3686f49da9490d8286ac0c92f9784dadd0e2588ef8a06a7f24da1d89c03b92a4ed0083e533137c3f3
-EBUILD libgudev-232.ebuild 406 BLAKE2B 6533fc51f1108d5d83ad31f3cf4d55c487dcd45ba8b763252d0787c641fdbc254e90c1907187d74cf049d0411fcd619cf24fb10c03e1a31ff797b5a9277413c5 SHA512 c8233781473064501518455718b6746a1f1919392e2ffac46414c412aaca2c11ba5fc9e21dbd5bf656a3cbdd522b1afd2c5da6193eb07c759c34b8a37fd8f58a
+EBUILD libgudev-232.ebuild 405 BLAKE2B 0ca12045db3a322ad3c4fc05d2c61f683936259dee43d41eedd3c9dfd7b77123ec4b2c0bae46d36df7bea0019e819b5bbb69f48959089c13bf0e664a527ec0e4 SHA512 97ba778f977bf019a7badcfede4b63db0267ff90f29555924a68995890a6a673badfa3d3db8ee9d90ff2712ded0493fd3dd4d0f93bd1804c75cb226e0360ecdb
 MISC metadata.xml 379 BLAKE2B 5b6f06cda07bf27984ccc9d28751ffffab6debce45c8d883d963334f4295e6fdece7de2175290b4ba807aa417c0e0f3ca4c21f262185968f66c76d3f8ac8d0c8 SHA512 8353b418ec271a0ae9ae0d0a6bad81eb941610a989a5497c940929f14c622bf8199ffbc5061bc723977aa3c01aacf66a37f72311cf1f69082982f27503b17013
diff --git a/virtual/libgudev/libgudev-232.ebuild b/virtual/libgudev/libgudev-232.ebuild
index 91d1d30efbf4..8539323385f8 100644
--- a/virtual/libgudev/libgudev-232.ebuild
+++ b/virtual/libgudev/libgudev-232.ebuild
@@ -6,7 +6,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for libgudev providers"
 SLOT="0/0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86"
 IUSE="introspection static-libs"
 
 RDEPEND=">=dev-libs/libgudev-232:0/0[${MULTILIB_USEDEP},introspection?,static-libs?]"
diff --git a/virtual/python-funcsigs/Manifest b/virtual/python-funcsigs/Manifest
index a21f5d2eb48c..3798fe604e48 100644
--- a/virtual/python-funcsigs/Manifest
+++ b/virtual/python-funcsigs/Manifest
@@ -1,3 +1,3 @@
 EBUILD python-funcsigs-0-r1.ebuild 539 BLAKE2B e7924924816656e6c5d87b9481b8ec467b638db775791fcf019f3b8a76aac63909dd38a37ede6a49de1751bc04036c837ff8adafc2cac8ca37b3b21920cacbab SHA512 0b6fc1666828fe6a9c3eaf9c7882b20fe4ea8d5e8d9a9c975e6a339aa3fbb03f06bbac00fbc97f294d919c6dd11c11e47599bc45b73f384d1c0a6aae8b7f32c2
-EBUILD python-funcsigs-1.ebuild 560 BLAKE2B fb8db58f7ec98fddcca62e6bce07219dd6f17f02b7e8d919844f5c4c397f62c06ddbd107ca6bd05e72039d9139c121777bebcb5651dcc71f15e9eab1fc36e231 SHA512 f109e6f83376ab05bc178696d2a476492826c69beb49aece78ced431deccfb580d83d82b452f17bd9eda2f5df94434f4680a0981541d78b4290f61f51527f8ff
+EBUILD python-funcsigs-1.ebuild 559 BLAKE2B 141816eafa45cf5a96f5dc68deb255da67aaddbfb9a9bcd6457370ab3da9d17aa126ad00474a91535a44e39a5829309e805c3bc842fcd6fb915f32e4f2d939ec SHA512 9f5f21396b9f34052b369214fbe8474c05eb0bddc2ef1b151716df736eca41ea8d03123ee9b7c181dc3de46ce8c7a931c471271b1e43444dd5eccddd2fdd242d
 MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/virtual/python-funcsigs/python-funcsigs-1.ebuild b/virtual/python-funcsigs/python-funcsigs-1.ebuild
index 897f2518d2a9..e35cd1ef4ca5 100644
--- a/virtual/python-funcsigs/python-funcsigs-1.ebuild
+++ b/virtual/python-funcsigs/python-funcsigs-1.ebuild
@@ -9,7 +9,7 @@ inherit python-r1
 
 DESCRIPTION="A Virtual for Python function signatures from PEP362 (py3.6 variant)"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/virtual/python-pathlib/Manifest b/virtual/python-pathlib/Manifest
index 13b8f69ccb2d..fd9d262dd815 100644
--- a/virtual/python-pathlib/Manifest
+++ b/virtual/python-pathlib/Manifest
@@ -1,2 +1,2 @@
-EBUILD python-pathlib-1.0.ebuild 441 BLAKE2B 0715393b55ade510dfe6b89b2bcc6020175ae97e908bf6f7281928487421a76c0e7f1ac6c51116f0aae821f2d3744def8ddfa10d869482f7d5836da0db55bdbe SHA512 ba2a2ccfd4ca88adf3edee4a4101deeb06af4b1363decc8d72cd43a749735610fd71c4b4f5a13591e12f55f26245224e65d4b21ea188793a8dd870774f6f98c1
+EBUILD python-pathlib-1.0.ebuild 447 BLAKE2B 1f506fa2bf03c0b9661df9af0f04b1250661db5c81ec925d5b3d578e42d8fb64f3a89dbeeac11194d1b1ab3cd949c5ec18f2592e3439454fe4a37161718b0d38 SHA512 e1508aa1c4a224849dd0d0abf1fdbdbfc3112abef175b9fa187a4884d4b8cbdd42e34d3d2a6b8232b97057097d69e6c119a4e8afa625297e9b2757fbdfa0b434
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/python-pathlib/python-pathlib-1.0.ebuild b/virtual/python-pathlib/python-pathlib-1.0.ebuild
index 2f61f8376fc5..a4fc11ec14a1 100644
--- a/virtual/python-pathlib/python-pathlib-1.0.ebuild
+++ b/virtual/python-pathlib/python-pathlib-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ inherit python-r1
 
 DESCRIPTION="A virtual for Python pathlib module"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ia64 x86"
+KEYWORDS="amd64 ~arm64 ia64 ppc64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 8efcedd3734c..0b0aa72a1604 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/roundup/Manifest b/www-apps/roundup/Manifest
index 0a79af18e2ea..7885543997ef 100644
--- a/www-apps/roundup/Manifest
+++ b/www-apps/roundup/Manifest
@@ -1,3 +1,3 @@
 DIST roundup-1.5.1.tar.gz 2618886 BLAKE2B 5ccca10ce7f30b35b0875340c4cae87aa19e5384e6e5973576ea8e2de79eb83d32447580944f472d73e7cdb5f43a4ed7f805d51242e22cc2f756b3deae4004b2 SHA512 d7cdeaafb682ce7f202cacddeb1a42312f22778a2c83b52b4e838c27b1e7141a94b2ac2b670b0edee0efcfe27d74e31e6f267ae1380e90359def27385ca68d58
-EBUILD roundup-1.5.1.ebuild 1227 BLAKE2B 324d8fa2494f9c78096a337c1ba952206df73369ffa52dc08172385fef0546c69723b04baebdb79a62af07a75eb647fbe199e868c323be322c50f1b9a6a902b1 SHA512 fe8a296bbb8713e76cf34b1f8e1bb1dfa26c5c58d9c393893f1181b148237534ce4d88d520b3624b74d468ab6b01b464a85540fab55ad1b306e580257c410085
+EBUILD roundup-1.5.1.ebuild 1226 BLAKE2B 05670cb3eea88970febd3dad0eadfc09b9e08d6adb834b83232796beafff2fb08c8b44dfb5d62e8a271230d92b649a01729a901a0fc310e655b26f71bc4e601b SHA512 84af0feea6dea3126a8b7197c1db55bf0ad879a3c5b7e5dfa5d8b721aebd921224a3c9b6800e22d4a82850b11fbced5247288ba1a211e4271d0125f3c5813dad
 MISC metadata.xml 477 BLAKE2B 558f76b13892756e818b9931e72c1e9f2262bd214c1a8d08cd48775a474e6dd95b3a4099e5bd8ce7582560f40804fbbe93006932ac245b72f90aa54a78c9e909 SHA512 2a8912d94be88771ed0044ae823fb2027fb3f403256f8d3045b01a46f9595866a9129e85cdbc05e601a18d264b92c88648e8acc78a50ce52a4810ee7d5532999
diff --git a/www-apps/roundup/roundup-1.5.1.ebuild b/www-apps/roundup/roundup-1.5.1.ebuild
index dd40a00a4804..e3693ce0fb5a 100644
--- a/www-apps/roundup/roundup-1.5.1.ebuild
+++ b/www-apps/roundup/roundup-1.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT ZPL"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
+KEYWORDS="amd64 ppc sparc x86"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index ed2e4118b7e5..bafd13dbff82 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 2112fdbfbf53..83dc71b31304 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -3,8 +3,10 @@ AUX chromium-angle-r0.patch 3364 BLAKE2B de869d1aea64b426477cba0d1941e3745930bc3
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
 AUX chromium-clang-r2.patch 731 BLAKE2B 6a0560107c89ab4406d62700312bb4437b49b5b1feace304c6db309460b74f630dd59c424f152ebf6a1d88025c14b7162d14a38afde6e74a87ca04d3424fd9b6 SHA512 f5edc9b573269a7a6944e17019fa858e7162c548400eceabdabe695d7e10d3179b7593415ec3eaef226defdd1628fd8c9cc66c0b46ebe6ac1afe5035a319c379
 AUX chromium-clang-r3.patch 361 BLAKE2B b0f833153a11a15b498bb5892119e1978573ba250ff10e555a7b7393bad5d00959611702beca58f88453a933eb66a8a456048aaf1e934876af40a601a4f7b2c8 SHA512 ed5ad35dbd43eabe5fdca518975c5c775d1698f2c8d5b2c74e52616532f62c83e60001bffa02cdea536af31f29021db6ada7e037e2c8f92cbdf1dc500090f070
+AUX chromium-clang-r4.patch 363 BLAKE2B 4c776d4823eef90f69bb42b1fc2ed5c314fcb60cdc2da44d90bd3faf6d9a9d3fdf8367a85f6e735b59fe440f7de5582a974b3e04f4ff46683242f368e68b1503 SHA512 78fa7d69b2b8bdd5a755baff7d5474943ad373d2cc9673db61f501b0f8150bbdf795b3c2afa557d637564276dd5b4edda282daa7cbb7b5ea9366bd81f8989ab0
 AUX chromium-cups-r0.patch 1350 BLAKE2B 91c32a88d5a03ba4f16e54a4498cf6de121b8d6dfbb76630afc69925bfa192c456f6d1349e0ba0b9f71373608ce983910630bf2f278ca884ec8bde4d132b9201 SHA512 404aea01f732132c65fc66c60926c671daad0a1d9446422d36eb6788820f1d23a2bea9d81971f7341f4c36d157bfc9c840b58d7f5f62a913b789d00362c7d005
 AUX chromium-ffmpeg-r0.patch 830 BLAKE2B be12eb6ce7aa66667122ebd7abe31dc18d3997c309b034c46771158848c9f7472731e3e0e66ccc4d7ff029c9295bedeabc82ce05c21e5f8944b6d8e5e037436e SHA512 7cdd79d04447029ac4981df06c2c16a3674420925ba9e210a676fe32e9424ea4d475a73d4d3e265bdfc10a36936124764315b11fb4efae22e9dffc39ffdbceb5
+AUX chromium-ffmpeg-r1.patch 528 BLAKE2B c6cbbbb13093b10d0d8e95bd382dbc7f9afb6634802f6560a7b5886482c912cb493aed4c231b4c781b89de6dcf4200b17ba9315e337a3f73e8fdca12dceb80fb SHA512 1dc7dd844e8e0aec379ace3a163200735bbab0644f9d02fa0736f91a4156e9cede5b66eb6a015f8679ecd26dab2345b82ed181591bb78a1e88d3cc0174237ea0
 AUX chromium-gn-r0.patch 1233 BLAKE2B 53c0a3cd692d19eac60be0f5aa61f9cbda7d473e42adc0cd95fc78dd44c39ead9825b862347314351133b5c80f9b2fd58daacdc9568efeccefb1dd0ec6526d85 SHA512 de085e2e159ea1fb14c39d630e77459f0e67497479169ce3253bc098a06deea75020289c091e816df1ee81ccec9de695ecd59f29e9d847c20693ef2710659dcd
 AUX chromium-launcher-r3.sh 1199 BLAKE2B 85f57b380cdc25bd000cf57d3c129b67f6e55d96dd958190040b0680f8d4d358ac777e0c1ebd6a1b32dd3821a377bcf9f598e073584528d0480460978c4c1fb1 SHA512 f1909314ae74985c85740d26c9bfab694f3202de8ccc392a1c4ec5c8760db21b6cc46146c78a9abebd09e6d24f37e19466f0c4d2d61815400b48d859f8ce154d
 AUX chromium-math.h-r0.patch 1092 BLAKE2B abdef69cacaa5af0cd84b293b300fa5db631b7df8d4f1237449e858dc3ff56589a3f46d8228fc0c969552f41bd9cf2a0c2cbf4a1936c2729f701aa1d4ad86b94 SHA512 91a0d74ec51a6776bfc4212a132963fbc4688c47ee1da40cfbebf696ef26a766f5189cb0a972ef2cf4338daa5355ce79002d624b5f30a7c2de36e40b07355f8d
@@ -15,10 +17,12 @@ AUX chromium-widevine-r1.patch 428 BLAKE2B 07b5ab48a2233986f60c91192557e0454eab5
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
 DIST chromium-64.0.3282.167.tar.xz 482246360 BLAKE2B b4785c20f33081015ac31fed9dbd108dc78160d95c4ea7055b8fffdb714fe9ef120727cd6b88d4e4a15b0c429f04c7c512cca90c5313128e0001a4ae5b908b6f SHA512 1bee80d2e8d4332cfc307efdac8eb11a48e42f3927e63e7a9d5ff2bbad6c4534926669f21defbf0553160f5bb28596723be8bd0e3dfa19ca9a1e854bcf42fd77
 DIST chromium-64.0.3282.186.tar.xz 482247144 BLAKE2B b59c5afeeed33fe081f35d0ee228a0d67a97fc1370c7d3ab90304ea6e236ee0f7fecd2c36df0acbdf384f42e2f90926cbdd56e683afc95e78d4bdc64b6d24453 SHA512 a8a435ee8506cfefaaf2df7447010df5db69fa6907844872d00643f55723a9bd7771649658f5151c857ac037adcbc8bdf2a5375dd105f78d068277ef021af7d8
-DIST chromium-65.0.3325.73.tar.xz 570268564 BLAKE2B 8d1a9cf38f12ea3566463f42772671268de68d8c49170d60733be8eee7492850be739f19377365366740dcbad3414538eb00765281c966b6cedb85b74709448f SHA512 96ed3862c3fc21afac8d18f4b43f98d29a086e83dfe25af54b6358e139a8b3c9ec761cc463ce287b04a9082c5e62dbc605d4c97f8ec358599a24c7830c890418
+DIST chromium-65.0.3325.106.tar.xz 570309916 BLAKE2B c579e62207f15d0715f76434712e963d498c3e446f3759f31222ba74d0942469484664afd66515a48f994d6c964f8b8abad498dcacaab8e176220630204fdce5 SHA512 a035d5d0d2499d5065da9bb606769e50e5334de3e095fa020fd8f7c040aad2f4868626e68b32932563aa49f7816739f5761bf4dfd7649bed83752169a16f9b56
 DIST chromium-65.0.3325.88.tar.xz 570275184 BLAKE2B a08ae19acfd7a80ae43c0654432588bfa7ea09a0b0f14583cf8e79b3c5997a348bcba12e52002d79214576030574695d32069cbe7037b53dad120aadf6c2a830 SHA512 5166e64f96e5b2bd30b28ed769a8c93b2c1de3eb52c18776222b16758002b6d87ca241bd95c7b37316e1afc5379ff49b77fbf552ab9c0ea868105d66ce400070
+DIST chromium-66.0.3355.0.tar.xz 582642152 BLAKE2B 16a89cc99984b566741770f9081a738596ac0b031e916073df417ac42406a96a8f874278720f3462fba827218dff141eddd614cf2ca494ec3d38577744e7c441 SHA512 324902e3e8ec7c22dbb95f2d8f97069dac97f702f528130c06eb7a246e495e51b069f4ce09a7ca875ff511e0bf992207b55b1f887aaa3a438179618c206df436
 EBUILD chromium-64.0.3282.167.ebuild 20382 BLAKE2B fd9418350769258f0d509656bf529ffd748707b45d176d1a341c4b8572c77b9437e02713b0af65f57e9448df0aa16c9a724a2530036306f2e9583da89ed08b66 SHA512 2eb14c821275918b9fc8233ccddbd1a3ec53b559162e2283cd93afc1b111a8d1320f81933c1aae4f0efe55c5b08a90eceb74e4d7dca0c7d1a404496e392f02a4
-EBUILD chromium-64.0.3282.186.ebuild 20383 BLAKE2B 8a4d61ebeddca6263a76dde876d9f90238279d095c74b8db75f2cbdacda534289f329d05e1269ec05fbcfc9a9c70a1ac4d453e04902d2f9f6e551e83161eaf65 SHA512 224ddaf94c439efe0e93f3f8f72659b60c8abc25d51277a5b1abe33dda4a7e6197046bf302f11870bc9c5161169f588ff5f58f43e829d665574cd48ab222398e
-EBUILD chromium-65.0.3325.73.ebuild 20818 BLAKE2B df933acd00f0d7ff2176ce5969887a9acec86708f62e7c424596ed2cdfd25bfdd9002708eaaf464ab91c444e78434b98d2e0d6917dc105d924658a9f1277c329 SHA512 1351ee669870c4b3ee5be1b5f8de29cc11df1d3c81d1d6f6c5778a705705fc8fed287ba9b576aed519c0a28ef71122a5402b0b9b2c15439bf97cbc3ed7b2ba5c
-EBUILD chromium-65.0.3325.88.ebuild 20818 BLAKE2B df933acd00f0d7ff2176ce5969887a9acec86708f62e7c424596ed2cdfd25bfdd9002708eaaf464ab91c444e78434b98d2e0d6917dc105d924658a9f1277c329 SHA512 1351ee669870c4b3ee5be1b5f8de29cc11df1d3c81d1d6f6c5778a705705fc8fed287ba9b576aed519c0a28ef71122a5402b0b9b2c15439bf97cbc3ed7b2ba5c
+EBUILD chromium-64.0.3282.186.ebuild 20382 BLAKE2B fd9418350769258f0d509656bf529ffd748707b45d176d1a341c4b8572c77b9437e02713b0af65f57e9448df0aa16c9a724a2530036306f2e9583da89ed08b66 SHA512 2eb14c821275918b9fc8233ccddbd1a3ec53b559162e2283cd93afc1b111a8d1320f81933c1aae4f0efe55c5b08a90eceb74e4d7dca0c7d1a404496e392f02a4
+EBUILD chromium-65.0.3325.106.ebuild 20857 BLAKE2B b81cb7ecf903bd45ab8d73525cc44a2c2df73f556b219da09f0c15228bb3e643a5ebedf04aa7aecbf1f5e000c72f2349e6c0aa8e665417eb08532333e1d8d965 SHA512 d0b579df26079e450df39d4ae50995b8cd2e4359203c352cfe35e13f837e265e71af01eebafe8331237247d1c32c82ffd2cd28ce86e76f79ec2475f723ea258e
+EBUILD chromium-65.0.3325.88.ebuild 20857 BLAKE2B b81cb7ecf903bd45ab8d73525cc44a2c2df73f556b219da09f0c15228bb3e643a5ebedf04aa7aecbf1f5e000c72f2349e6c0aa8e665417eb08532333e1d8d965 SHA512 d0b579df26079e450df39d4ae50995b8cd2e4359203c352cfe35e13f837e265e71af01eebafe8331237247d1c32c82ffd2cd28ce86e76f79ec2475f723ea258e
+EBUILD chromium-66.0.3355.0.ebuild 21037 BLAKE2B a94ffccec8d31d6e495fd72864b93f8004f969c6c156de432ed9d9011c9fe6df849c4de9bf555063d2d47d021e42e8bb510bf6c983bdb42edbe2e1733d2b5aea SHA512 0d474c45afe1695ebf464c7aed5640ce8a7b4bc50a49dc1d04b5f972908839bba82e0439cbf2de15e3af3c8a4c9cac89a92192287b80135106ce324630f6a8c0
 MISC metadata.xml 1418 BLAKE2B 0fd718bd70dc0fa890bf7e0efa2f6a186df446617f36bb5e4689989c4766da4016b5325d8a81f8959e887fc182ff792bb10909b5724df8c4fcaade221b289d8b SHA512 1c68218f5cab5787a7524823975474065794aa18f8301e9efe066847b9a566b870a68a3768cee925a3ad6543fb182575043c1cb45e145db67382c502a535d039
diff --git a/www-client/chromium/chromium-64.0.3282.186.ebuild b/www-client/chromium/chromium-64.0.3282.186.ebuild
index 1f79ba7bd6fa..a87d5daac9e1 100644
--- a/www-client/chromium/chromium-64.0.3282.186.ebuild
+++ b/www-client/chromium/chromium-64.0.3282.186.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
 RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
 
diff --git a/www-client/chromium/chromium-65.0.3325.73.ebuild b/www-client/chromium/chromium-65.0.3325.106.ebuild
similarity index 99%
rename from www-client/chromium/chromium-65.0.3325.73.ebuild
rename to www-client/chromium/chromium-65.0.3325.106.ebuild
index ede298f25fde..11bbb4b77805 100644
--- a/www-client/chromium/chromium-65.0.3325.73.ebuild
+++ b/www-client/chromium/chromium-65.0.3325.106.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
 RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
 
@@ -380,8 +380,9 @@ src_configure() {
 
 	if ! tc-is-clang; then
 		# Force clang since gcc is pretty broken at the moment.
-		CC=clang
-		CXX=clang++
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
 	fi
 
 	if tc-is-clang; then
diff --git a/www-client/chromium/chromium-65.0.3325.88.ebuild b/www-client/chromium/chromium-65.0.3325.88.ebuild
index ede298f25fde..11bbb4b77805 100644
--- a/www-client/chromium/chromium-65.0.3325.88.ebuild
+++ b/www-client/chromium/chromium-65.0.3325.88.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
 RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
 
@@ -380,8 +380,9 @@ src_configure() {
 
 	if ! tc-is-clang; then
 		# Force clang since gcc is pretty broken at the moment.
-		CC=clang
-		CXX=clang++
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
 	fi
 
 	if tc-is-clang; then
diff --git a/www-client/chromium/chromium-66.0.3355.0.ebuild b/www-client/chromium/chromium-66.0.3355.0.ebuild
new file mode 100644
index 000000000000..4c8e080b09ee
--- /dev/null
+++ b/www-client/chromium/chromium-66.0.3355.0.ebuild
@@ -0,0 +1,699 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+
+COMMON_DEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-arch/bzip2:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	dev-libs/atk
+	dev-libs/expat:=
+	dev-libs/glib:2
+	system-icu? ( >=dev-libs/icu-59:= )
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	>=dev-libs/re2-0.2016.05.01:=
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	>=media-libs/harfbuzz-1.6.0:=[icu(-)]
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
+	>=media-libs/openh264-1.6.0:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? (
+		>=media-video/ffmpeg-3:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		!=net-fs/samba-4.5.12
+		media-libs/opus:=
+	)
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	app-arch/snappy:=
+	media-libs/flac:=
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+"
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND="${COMMON_DEPEND}
+	!=www-client/chromium-9999
+	!<www-plugins/chrome-binary-plugins-57
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+# sys-apps/sandbox - https://crbug.com/586444
+DEPEND="${COMMON_DEPEND}
+	>=app-arch/gzip-1.7
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-6.9.4
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	>=sys-devel/clang-5
+	virtual/pkgconfig
+	dev-vcs/git
+	$(python_gen_any_dep '
+		dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+		>=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	')
+"
+
+# Keep this in sync with the python_gen_any_dep call.
+python_check_deps() {
+	has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
+	has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
+	has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
+	has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+"
+
+PATCHES=(
+	"${FILESDIR}/chromium-widevine-r1.patch"
+	"${FILESDIR}/chromium-FORTIFY_SOURCE-r2.patch"
+	"${FILESDIR}/chromium-webrtc-r0.patch"
+	"${FILESDIR}/chromium-memcpy-r0.patch"
+	"${FILESDIR}/chromium-clang-r2.patch"
+	"${FILESDIR}/chromium-math.h-r0.patch"
+	"${FILESDIR}/chromium-stdint.patch"
+	"${FILESDIR}/chromium-clang-r4.patch"
+	"${FILESDIR}/chromium-ffmpeg-r1.patch"
+)
+
+pre_build_checks() {
+	#if [[ ${MERGE_TYPE} != binary ]]; then
+	#	local -x CPP="$(tc-getCXX) -E"
+	#	if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
+	#		# bugs: #601654
+	#		die "At least clang 3.9.1 is required"
+	#	fi
+	#	if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then
+	#		# bugs: #535730, #525374, #518668, #600288, #627356
+	#		die "At least gcc 5.0 is required"
+	#	fi
+	#fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="5G"
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		CHECKREQS_DISK_BUILD="25G"
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	eshopts_pop
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	default
+
+	mkdir -p third_party/node/linux/node-linux-x64/bin || die
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	local keeplibs=(
+		base/third_party/dmg_fp
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		buildtools/third_party/libc++
+		buildtools/third_party/libc++abi
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		third_party/WebKit
+		third_party/analytics
+		third_party/angle
+		third_party/angle/src/common/third_party/base
+		third_party/angle/src/common/third_party/smhasher
+		third_party/angle/src/third_party/compiler
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/trace_event
+		third_party/angle/third_party/glslang
+		third_party/angle/third_party/spirv-headers
+		third_party/angle/third_party/spirv-tools
+		third_party/angle/third_party/vulkan-validation-layers
+		third_party/blink
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/cacheinvalidation
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/polymer
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/devscripts
+		third_party/dom_distiller_js
+		third_party/fips181
+		third_party/flatbuffers
+		third_party/flot
+		third_party/freetype
+		third_party/glslang-angle
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/jinja2
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libXNVCtrl
+		third_party/libaddressinput
+		third_party/libaom
+		third_party/libaom/source/libaom/third_party/x86inc
+		third_party/libjingle
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libudev
+		third_party/libwebm
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/llvm
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/markupsafe
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/modp_b64
+		third_party/mt19937ar
+		third_party/node
+		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+		third_party/openmax_dl
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/pdfium/third_party/skia_shared
+		third_party/ply
+		third_party/polymer
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/qcms
+		third_party/s2cellid
+		third_party/sfntly
+		third_party/skia
+		third_party/skia/third_party/gif
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/spirv-headers
+		third_party/spirv-tools-angle
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/subzero
+		third_party/unrar
+		third_party/usrsctp
+		third_party/vulkan
+		third_party/vulkan-validation-layers
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webrtc
+		third_party/widevine
+		third_party/woff2
+		third_party/zlib/google
+		url/third_party/mozilla
+		v8/src/third_party/valgrind
+		v8/src/third_party/utf8-decoder
+		v8/third_party/inspector_protocol
+
+		# gyp -> gn leftovers
+		base/third_party/libevent
+		third_party/adobe
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+		third_party/yasm/run_yasm.py
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg third_party/opus )
+	fi
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+	if ! use system-libvpx; then
+		keeplibs+=( third_party/libvpx )
+		keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
+	fi
+	if use tcmalloc; then
+		keeplibs+=( third_party/tcmalloc )
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+}
+
+bootstrap_gn() {
+	if tc-is-cross-compiler; then
+		local -x AR=${BUILD_AR}
+		local -x CC=${BUILD_CC}
+		local -x CXX=${BUILD_CXX}
+		local -x NM=${BUILD_NM}
+		local -x CFLAGS=${BUILD_CFLAGS}
+		local -x CXXFLAGS=${BUILD_CXXFLAGS}
+		local -x LDFLAGS=${BUILD_LDFLAGS}
+	fi
+	einfo "Building GN..."
+	set -- tools/gn/bootstrap/bootstrap.py -s -v --no-clean
+	echo "$@"
+	"$@" || die
+}
+
+src_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local myconf_gn=""
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	if ! tc-is-clang; then
+		# Force clang since gcc is pretty broken at the moment.
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+	else
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+	fi
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=$(usex component-build true false)"
+
+	# https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md
+	myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)"
+
+	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		fontconfig
+		freetype
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libdrm
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		openh264
+		re2
+		snappy
+		yasm
+		zlib
+	)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg opus )
+	fi
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if use system-libvpx; then
+		gn_system_libraries+=( libvpx )
+	fi
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=true"
+
+	# Optional dependencies.
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+	myconf_gn+=" use_cups=$(usex cups true false)"
+	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
+	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+
+	# TODO: link_pulseaudio=true for GN.
+
+	myconf_gn+=" fieldtrial_testing_like_official_build=true"
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
+
+	# Disable forced lld, bug 641556
+	myconf_gn+=" use_lld=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
+	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
+
+	local myarch="$(tc-arch)"
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		myconf_gn+=" target_cpu=\"x86\""
+		ffmpeg_target_arch=ia32
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		myconf_gn+=" target_cpu=\"arm\""
+		ffmpeg_target_arch=$(usex neon arm-neon arm)
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
+		fi
+	fi
+
+	# https://bugs.gentoo.org/588596
+	#append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	if ! use system-ffmpeg; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	bootstrap_gn
+
+	einfo "Configuring Chromium..."
+	set -- out/Release/gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
+
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	if use widevine; then
+		# These will be provided by chrome-binary-plugins
+		rm out/Release/libwidevinecdm*.so || die
+	fi
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	doins out/Release/*.so
+
+	if ! use system-icu; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser \
+		"Chromium" \
+		chromium-browser \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/files/chromium-clang-r4.patch b/www-client/chromium/files/chromium-clang-r4.patch
new file mode 100644
index 000000000000..8d5122f70c3d
--- /dev/null
+++ b/www-client/chromium/files/chromium-clang-r4.patch
@@ -0,0 +1,11 @@
+--- a/device/fido/u2f_ble_transaction.cc
++++ b/device/fido/u2f_ble_transaction.cc
+@@ -131,7 +131,7 @@
+ 
+ void U2fBleTransaction::OnError() {
+   request_frame_.reset();
+-  request_cont_fragments_ = {};
++  request_cont_fragments_ = base::queue<U2fBleFrameContinuationFragment>();
+   response_frame_assembler_.reset();
+   std::move(callback_).Run(base::nullopt);
+ }
diff --git a/www-client/chromium/files/chromium-ffmpeg-r1.patch b/www-client/chromium/files/chromium-ffmpeg-r1.patch
new file mode 100644
index 000000000000..53d61e8f38b8
--- /dev/null
+++ b/www-client/chromium/files/chromium-ffmpeg-r1.patch
@@ -0,0 +1,22 @@
+--- a/build/linux/unbundle/ffmpeg.gn
++++ b/build/linux/unbundle/ffmpeg.gn
+@@ -14,8 +14,8 @@ pkg_config("system_ffmpeg") {
+   ]
+ }
+ 
+-buildflag_header("ffmpeg_buildflags") {
+-  header = "ffmpeg_buildflags.h"
++buildflag_header("ffmpeg_features") {
++  header = "ffmpeg_features.h"
+   flags = [ "USE_SYSTEM_FFMPEG=true" ]
+ }
+ 
+@@ -30,7 +30,7 @@ shim_headers("ffmpeg_shim") {
+ 
+ source_set("ffmpeg") {
+   deps = [
+-    ":ffmpeg_buildflags",
++    ":ffmpeg_features",
+     ":ffmpeg_shim",
+   ]
+   public_configs = [ ":system_ffmpeg" ]
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index b0dd81a194ef..02cca4e180a9 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,3 +1,5 @@
 DIST opera-developer_53.0.2880.0_amd64.deb 54207438 BLAKE2B 0e2f9dd67b3e10badad0ae15d940637a54a8d490eb0522a6e257d161e12a73776aed8b78f8d1e87a7632126fdea8864cf3220a0df16396b0bdcb1c9554a341d7 SHA512 25b49c1aabf9e05d47cb19847f224b53ad3053217c033775b7eaa728eba3f3ba0019997cf88f985366f7c5092bbfc2b3b75cf7c1de4a452c2a2cb9a347751413
+DIST opera-developer_53.0.2885.0_amd64.deb 54539420 BLAKE2B adda26647ef8b194ce1c99f0ad3d963ce35c2a7957a3150c01bc420b6eef59806a1ab807f49d64931c72e23e215db5f99d5aadbb72de680c2a7ea9619c1799ae SHA512 ef9398b3c090e7a77654943a2b394960604859d4daf133f1bc1b713523edfb4eafcd8e7f9b3023142a9115043ce3bedb6a9db0fc48d27007c145dedf8455c4d0
 EBUILD opera-developer-53.0.2880.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8
+EBUILD opera-developer-53.0.2885.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-developer/opera-developer-53.0.2885.0.ebuild b/www-client/opera-developer/opera-developer-53.0.2885.0.ebuild
new file mode 100644
index 000000000000..12a41bce61c8
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-53.0.2885.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
+	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+inherit chromium-2 gnome2-utils multilib unpacker xdg-utils
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="http://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="
+	http://download1.operacdn.com/pub/
+	http://download2.operacdn.com/pub/
+	http://download3.operacdn.com/pub/
+	http://download4.operacdn.com/pub/
+"
+SRC_URI="amd64? ("
+for uri in ${SRC_URI_BASE}; do
+SRC_URI+="
+	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
+"
+done
+SRC_URI+=")"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	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
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	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/libXtst
+	x11-libs/libnotify
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+		x86)
+			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
+			;;
+	esac
+
+	rm usr/bin/${PN} || die
+
+	rm usr/share/doc/${PN}/copyright || die
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index b95d5a3ea0f6..26557dadfd92 100644
Binary files a/x11-apps/Manifest.gz and b/x11-apps/Manifest.gz differ
diff --git a/x11-apps/appres/Manifest b/x11-apps/appres/Manifest
index 7f86ccf3afc2..c48b6d1ea3ca 100644
--- a/x11-apps/appres/Manifest
+++ b/x11-apps/appres/Manifest
@@ -1,3 +1,5 @@
 DIST appres-1.0.4.tar.bz2 117949 BLAKE2B a1938ffd3a3ecf279e35fd85c39f79550b9da0d2155d4ba08708fddff0b6cb9cb97a8174fcfb701ff13e929bd551405c3eaeae516d15e4d7ea31ef50aa6a5d29 SHA512 f07e672bd335308e58495685e5e7748684283aac28a96ea716edefe99ff281ec1f9b264e853ec0ce0f64cf54d9208d70dd3112a5a4219e0a38bfdc0fab8c9d98
+DIST appres-1.0.5.tar.bz2 124531 BLAKE2B 0d3e497afb3ab7d3565451c0da6594b4e608fa20e1a225162c4347d672db6a94823b5961c112b414e55c86a6b53a684709ddd109991f0545b6897bf276824da8 SHA512 70825563cd80f0f433c48ab2fdae888072939c1b22fb22340b70b9444c97916275ed92c9e5bf9a06bb76c32a5371b89ff7c0211a9a47a227c88311078c2c4137
 EBUILD appres-1.0.4.ebuild 417 BLAKE2B e77f5c45fb0444427d8794544cb9fe69cf1e82b8e66d383bf2cdbfcce8fa8b02ebec3213e7066a5f684366b02b6ebeddfe5e872aa6aff3069c5c40ad50195530 SHA512 06ab50907861b37147cfd96450152e4aef0a38f087b855c0843798e708828552ff3f9155196187f1ab204b38ec4c56a8a00b8ee934d4419abe26385e85f8cfd3
+EBUILD appres-1.0.5.ebuild 417 BLAKE2B 9d2033ad87507ad372e2b29fc21c7fa023e93b65ab32af599becc9f881d2c8a97e0d92c62bfe0e8bb69d9c6a57a77abc8ec11f5cc6fd34cefb149f77689bb639 SHA512 65ae4d2b5c655773f3f5816aa6974d9dc5acab4e64e1a68b201a35d4bbfb829d2f369e934b821c59da7057116f39f1fe251e4215acaee2a2f6cc325f138497b0
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/appres/appres-1.0.5.ebuild b/x11-apps/appres/appres-1.0.5.ebuild
new file mode 100644
index 000000000000..0500fab48375
--- /dev/null
+++ b/x11-apps/appres/appres-1.0.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="list X application resource database"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/editres/Manifest b/x11-apps/editres/Manifest
index 0674d6938faf..8b794284a262 100644
--- a/x11-apps/editres/Manifest
+++ b/x11-apps/editres/Manifest
@@ -1,3 +1,5 @@
 DIST editres-1.0.6.tar.bz2 156155 BLAKE2B b36ba85cd7c58a580e682e058d81af1d0f7bef044334fb0bb799fef7778af53055b592e0c67ee1b8c116573585d7699aaf2050310994b76c9b4aef1e43d9cd47 SHA512 c070709ce926802696d43d27256cea125c04021ad7555e1ea6c90650bf9e9fdd8da7786ebc99d6cf6a2dac73db041d489d34e6b2f6ceb6b396b6e96711b1c510
+DIST editres-1.0.7.tar.bz2 166429 BLAKE2B abaa0764bfc3419e17d5cd222bbe20f5591f7bc8431444aa6739cdc067cfb81f606370df19562410aa54820a0249828ccc9d506a9607031b453a7993af634f60 SHA512 b9c928b556116bf50cf4b6ea779bdc9fedf29f5db3e6a8cc75c122578c92e1cc530a81b226ec24aad183b8ebc2de570f200314b0d9ce7883b6e3306007365b32
 EBUILD editres-1.0.6.ebuild 367 BLAKE2B e6b6c0d18dfaf68abc91ecc00837084727398c90d8a19e63ae53a82798992a72054aea7ca2d02e81649f4635d94d551f28c4799d0c89d877f0f9bbf820bed47f SHA512 5722330943d002690a150b5a93c94f44f28e2bf8b2c06a4ea659c7632a9fa09f6e8eaf6177f62e866773b9ad145ad16239ef1d29b98756412f5ea02d2f5e66f0
+EBUILD editres-1.0.7.ebuild 367 BLAKE2B 0d70cd30bafeb031bfe3626424c215f3613a0767bbc7eff9005bb6ce749a415a1b55aefc486d51dc0cc92ed1968466cdf2fb51065f22822a0873b45aba0bda76 SHA512 8db8262993ea215fa4524ec7c667a2e6c37bc4c3a03508ae50caa9b9d6f40734c2a6932a927d690c5eabb1e41f221afa68308841837a755ab2ea7db57282ff1b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/editres/editres-1.0.7.ebuild b/x11-apps/editres/editres-1.0.7.ebuild
new file mode 100644
index 000000000000..464eec9afe16
--- /dev/null
+++ b/x11-apps/editres/editres-1.0.7.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="a dynamic resource editor for X Toolkit applications"
+
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXmu
+	x11-libs/libXaw"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/iceauth/Manifest b/x11-apps/iceauth/Manifest
index 8f48152b5f13..d93701d7eb67 100644
--- a/x11-apps/iceauth/Manifest
+++ b/x11-apps/iceauth/Manifest
@@ -1,5 +1,7 @@
 DIST iceauth-1.0.6.tar.bz2 133531 BLAKE2B 23119747e42b1901c08bc1e10605ca49200bcfd497f7609ea0b4cbe4c18a9cfd4950fe425dfc9405272e3614f171560c2f158a9602f7724500ca7a8160fbd6e0 SHA512 45a89d9742570f837225313032a63d66e658c379e7f6b776836e5aeed17443b26faa48ff23645517bf32353fb346de13b62c61d43f1fb1b044686d9fd4c4578d
 DIST iceauth-1.0.7.tar.bz2 135656 BLAKE2B 4a17fb2b7a1f2ac1604131c9a91c9c78c7c6e480573dcb68c06c5a300ab8474dcbf6782672c3147bf848a81e6bf20fb602375497cc141ed465d3aa5e59d68b8a SHA512 4fe08b3137904c99219456716879cbdf5b49ca9bf390011ffb44b1e896f9a6e008b5f761346a533e682f5cfbf18d18a859c74ad4268ec8d40002ffb79c33bcd7
+DIST iceauth-1.0.8.tar.bz2 137905 BLAKE2B 8fb2e29e5f4fee57e5c1f86eb78ce518519f04301e8aa81778e0de6589f62f32478a7cae05db831177f4425eb388f7b666f697314d5ab967ea3e2b6ac7b47d56 SHA512 9d4520adf951b16a3e784349dbb70d5d8176b74b956f8adc63abf55d049745c113b03ccfa60a281fc39b487db3742302dc6287c9985ce83a0157bf4674df2af1
 EBUILD iceauth-1.0.6.ebuild 434 BLAKE2B a1b47af20ef7508f72827030c794128e122c1326073566a0c87bc536265005ff302c5198ec56451f1df6394059602079dc943024450dd0b320d565fc048fa614 SHA512 ee373963f28ab08c1c477ddb3947e6b7d184df9718648d8d2d51b7832830ce2644462a8cef6efefd91951750209c724cf457d092f1a12892a6eec35fbd473a1a
 EBUILD iceauth-1.0.7.ebuild 427 BLAKE2B f05e8a5675392ed6e73f49c5d92f14c9ea733947ab751ae5f7f41bfefe5ae07adf1bac6bcb30255bd4821bc159b38861d001473076dbd5babd3ac4f50eef0c4d SHA512 736552cd21600a814d3b880e9b145db70df5e955dd0e34c6e44e408d75f7f1f7528c742d53ebe72ee8703004a02d6c495aa1a86e599af28c3b82cbf6d3811642
+EBUILD iceauth-1.0.8.ebuild 427 BLAKE2B 0cb1c47032f4b6e0af4c276db95b5858a08ef7a40e0b34a878849cb79dbd8e517f35cbd90886ace0895e646d91e8e69f8674a18ebd6c038ea6bac840678608c2 SHA512 d54c748dbbc570ec61998f286677a35be4ed30f28afcb7be7118d8c3b547bf5d041b83ce7fc0c0aa5ac7a015f1c4b91420c3a943bee8f1fd3f1a2487df17ce5f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/iceauth/iceauth-1.0.8.ebuild b/x11-apps/iceauth/iceauth-1.0.8.ebuild
new file mode 100644
index 000000000000..91065bd578f1
--- /dev/null
+++ b/x11-apps/iceauth/iceauth-1.0.8.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="ICE authority file utility"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="x11-libs/libICE"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
diff --git a/x11-apps/listres/Manifest b/x11-apps/listres/Manifest
index 5fe05f8cf8fe..3ff361902684 100644
--- a/x11-apps/listres/Manifest
+++ b/x11-apps/listres/Manifest
@@ -1,3 +1,5 @@
 DIST listres-1.0.3.tar.bz2 115429 BLAKE2B e4cc1e627d2331595e88ce6610c5cffa50eed0f2f8c898b3b9bfd93d1aeb66346d33079b1c25fd23e6694f47d5f7a3484ffac2f0dfb2043d6688820dded3eb89 SHA512 999156e9fcf1636fd4a398dc3940749eeab3b514141b9dc5125bbbb4c611c0fca9d4afa7e3b127bd9e7d3e3f94b942ef3be6aa79636eaf89bef75353c8203c22
+DIST listres-1.0.4.tar.bz2 125472 BLAKE2B 99865e682eb2894b7af1a84a6fd29bf16f0345b8660bbb61060dbb7927bf376591c7403356b97cff13ff3392321d52f34388f49fd2aac6dab52592317818010c SHA512 925bceab6ff96fcf91f58ba2f858905d6e2eff7074ba29cfc02def7c19fb493545837884f1070dc004422451f749cd459000c01e8c9bb51a7cce7f7ab4067b8a
 EBUILD listres-1.0.3.ebuild 336 BLAKE2B 9db3d2d63c03d9c0bdb9b02aeea7bd45c61d23b235bd59add58667bb92bf5c7f5ae61f0e2e8b6c1d484bb2187d9235b8dadaeb39c1adab9399c900737545b530 SHA512 8a40929741355112ea57e33a6b67c2538a01536ba56d6e65869a4c8900a8b08c7f58bcf29a73432b2559e4db9d8c2e4d4f6632b3ab2482162434c46ec1ed90cf
+EBUILD listres-1.0.4.ebuild 336 BLAKE2B 075eaba7cf254aab6e44632734afcce458004d6925b1d7acea3f84a00313055760dfd67bcf29baa7a370da3bd9171dbe4ed2f97841c5a49c00ff7177ae1fd8cd SHA512 06e59504299c060d6aa89f97c6a55fe0dc89700e6d3c5517fd2654810daeb842dc07296228f2411cb2afe35d5565ba245fda818d18cbbdba1fd2df3641021f02
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/listres/listres-1.0.4.ebuild b/x11-apps/listres/listres-1.0.4.ebuild
new file mode 100644
index 000000000000..5e74d8d310e1
--- /dev/null
+++ b/x11-apps/listres/listres-1.0.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="list resources in widgets"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXmu
+	x11-libs/libXaw"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/viewres/Manifest b/x11-apps/viewres/Manifest
index e217cc81afa5..b16207f6ee5c 100644
--- a/x11-apps/viewres/Manifest
+++ b/x11-apps/viewres/Manifest
@@ -1,3 +1,5 @@
 DIST viewres-1.0.4.tar.bz2 126186 BLAKE2B 355d1d7813f72cf2d8366fff83fbf8fcffe496ea70cd974b4a1257223b4cb056b98b131749db07f3092d8a11aceaffc7f31ca4bc1eab559babe0b8195a48ce1e SHA512 79edf987cb6232f604e31320fd6737325d2559dd6f0eaef667731b5790a709c81519b41ff5dc8f9aabb49a2a245b10584ed85c94c24ab82f466c776c182aa9f0
+DIST viewres-1.0.5.tar.bz2 134793 BLAKE2B 9dad0d6e21ddc8d927836d20b601d29c05eb9a0f7f7a4d95a8d6aab5304635c98849249dc4366c46a3ef10b01bd771c359cb8b0010f103fb7c98e45b7c064011 SHA512 fe573e9b5ae679b65eee95733cbea20c86c92089c3a2dadfe977bc9c54d1f58c5e5f4663e51a1cf206543a43592b3a3c266da1769279f08be85c66b0aa5b0f7f
 EBUILD viewres-1.0.4.ebuild 328 BLAKE2B 17e0a21acecc14195f538a8d096538da791851d2156d472d819ad0968f9aca89d1e79f2a55189dbbc4b2924de66a786ef575f427966a0ce92954855d34dbfda4 SHA512 36eba34a20fb8ce00d385f7b5ed29127efa24fae58e6e1b0dd1e6e63515ecfb5ab100ee65ee76cc229686a45eb36032c26f6bf76a25ead78fcec743d5bd65cfd
+EBUILD viewres-1.0.5.ebuild 328 BLAKE2B 3f318add1b75044157a55f724d667646939cdb2e2b2d689cae8ff0b64e77d79a5ce21ff9803e42b3aea786ffefc3c965511d36e493502faa275c4b2c53616850 SHA512 d63ae5b6f8f4e522728fcaadb1196ce04004bee0d8643c6fcfd203f4f1b939945a383e411078fddd6b57ecb2d101c4eb155bedb6f47e9bbc3198c9d2632ab66d
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/viewres/viewres-1.0.5.ebuild b/x11-apps/viewres/viewres-1.0.5.ebuild
new file mode 100644
index 000000000000..4161830948eb
--- /dev/null
+++ b/x11-apps/viewres/viewres-1.0.5.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="graphical class browser for Xt"
+
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+	x11-libs/libXt
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}"
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 934ec2672ddb..106d346f74c0 100644
Binary files a/x11-base/Manifest.gz and b/x11-base/Manifest.gz differ
diff --git a/x11-base/xorg-proto/Manifest b/x11-base/xorg-proto/Manifest
index 9d46712684e8..2f1701b06244 100644
--- a/x11-base/xorg-proto/Manifest
+++ b/x11-base/xorg-proto/Manifest
@@ -1,4 +1,4 @@
 DIST xorgproto-2018.4.tar.gz 493597 BLAKE2B f25a637317ff2d7ba34d416368261b5afb617e42a1fb642cc78ab3e877752a81291fe0523d1af6cd0fe27399676b14a70ceea7178d521187423bb503c9b1c63b SHA512 f79a47fc3de04d7258769869c11e99eff7fa4a4b5925cf60f9f7579f946d7d0e737224e9a54d18e439a3586126e66e0764c0f09ed50987c781955b9b9a1e0362
-EBUILD xorg-proto-2018.4.ebuild 1791 BLAKE2B 432cc9ffb6bb4ef6a15a5adf0d5c92aa53cec51613e5c2a9102c9bbc40362d1a427ebc698689cf45fa571d2dd089254b6a4cd3b001a92d67206e0b4a195b4433 SHA512 2e499c8df536d931470d2b25096f20a39281b1992d0233db640e7a653ec782012cb51ff9d8b0786754ff13d00766e8c5741bb8aada2aae77ada9372e73e77483
+EBUILD xorg-proto-2018.4.ebuild 1804 BLAKE2B d64b345ee20a60a5dd346dc059c94412cb9344df87d406d677b2855287b498047e4ed9c3092b81d20f312ee6780aa44bd69d64efdd4bb489dd3947dec416c386 SHA512 405553080f7eb5f48a768c319430cdfec64dd0983c132a74d5177f988b8f4050d85e1c09a3530da18852ac891e41335358d1d726129715553413adbbeda136da
 EBUILD xorg-proto-9999.ebuild 1779 BLAKE2B 80ae4a59428a02d2cd6d282b46eabfb9d5722a4e131303ec99c648f03d24431ba430468d570fc9099fbf012d83236f4211f9b88238ba50e0fa77e7dd0b016491 SHA512 f5cbce5ea638fb9c0520c5572e0fc39c47ed3b2c3cfd6fe105d2641136f240acd377bfaf9efc336decaf3670ef31b0bfd0d67e1305966a0a0279450d3383f685
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-base/xorg-proto/xorg-proto-2018.4.ebuild b/x11-base/xorg-proto/xorg-proto-2018.4.ebuild
index 12f9e848211f..297fb78f3466 100644
--- a/x11-base/xorg-proto/xorg-proto-2018.4.ebuild
+++ b/x11-base/xorg-proto/xorg-proto-2018.4.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://cgit.freedesktop.org/xorg/proto/xorgproto/"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x64-solaris"
 	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 fi
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index e9a80b795059..12ffd86a9fa6 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -9,5 +9,5 @@ DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 23375793ea4459a962f412440e307081
 DIST xorg-server-1.19.99.901.tar.bz2 6131851 BLAKE2B 5b3588fe7c42d10eb89fa4ebea5ab6f2c7fb25f876ec6a5c5b523062f5c712c52c20767aa60b607847b50aa12ec75307b8715d63aa92331b70a1971c8d740670 SHA512 c2fbe4868788cd0d6d5fe546acb8c2ddec39ac3e851f352ee438a785a248a048a87073972f51ff98ef36a35a6753f8c2f22c2ecfc719d47dd9bb3c453fdb3ae5
 EBUILD xorg-server-1.19.5-r1.ebuild 6481 BLAKE2B 7188ba3c7f817474511de8d06050a13b56889f4346db5aadc281abc88b72af9781cf99f9c793f63cbe0666d2c9abc333c229f40ffd500b5f1e09cc63fb487456 SHA512 937fbc0858228d52542ac8f8d22eabdd3787d6ea477ef5275cb9675a3de0fe10adeee83e51cce50397e713523fae907a14ab2080803076d8f5af368bd50f9ba9
 EBUILD xorg-server-1.19.99.901.ebuild 5485 BLAKE2B a98f38dc9f0293623e350202f0f8ea10edc73c3724ad3c7b9a8f216371fadafa6798b4420d2b2f89b8340d124d1cc43feb36a232c5e2c95a62d6a161104a232b SHA512 9bd6eab4c84b29bc6636d4911d8522332e7cf6484461940dba3b8e782026c0d58075cbd020d26d58d23c63a963ad42534989a3386556520d8b0866743ae8842a
-EBUILD xorg-server-9999.ebuild 5497 BLAKE2B b84a611a1e59fc757fed88013047608a087634efc216e38450bf3172e102343ff7b5d99de8c89a5752fd416ff2f2ec982409a1ec1f47eb75bc23f4ff9a4c61b0 SHA512 66ab85e2a0169f1f0be9e906fa54b128bcf10c3052c18759442c6412f8abfac1156a7ff567b26defdf67bdf72165dd6d52f22537df4919b6b573234aaf58334f
+EBUILD xorg-server-9999.ebuild 5497 BLAKE2B db336086785d717268fe6ed174b679fc03890e902360adf88a9be890baf106e9cfae206a92e94ecdd95971027e9c3b7ef6517b7d44567c7153c9e358cf40778d SHA512 596696ce4251bd9ff508483f2e653e188d15e75f2f111548f429547730ca6ec5953db219bc05846603be221c89f647d6f608e604ced391cec69c20f15fdd8aec
 MISC metadata.xml 934 BLAKE2B ffffcceb822cadfd48ff18063acd7adfeba6b651099c91f14159b2af4486b1475578da54865d99ef0acc78e34bfc3b1e7e6bca1d179ab7f151417c53c1a05a35 SHA512 97fffbdf402a70c9cb84062ac6c906b8a9d35ceebbe35b28547387e4a9e2706c595f842f64bee92925415bd49593f3a3b0213072ff2c0ab22209dc37e243d4ac
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index e85854fdf4e3..04dd3ce93361 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -23,7 +23,7 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0
 	>=x11-apps/rgb-1.0.3
 	>=x11-apps/xauth-1.0.3
 	x11-apps/xkbcomp
-	>=x11-libs/libdrm-2.4.46
+	>=x11-libs/libdrm-2.4.89
 	>=x11-libs/libpciaccess-0.12.901
 	>=x11-libs/libXau-1.0.4
 	>=x11-libs/libXdmcp-1.0.2
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index be6167070433..035543396c9f 100644
Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index d141c348c80f..facef0d17c85 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -5,5 +5,6 @@ DIST xf86-video-intel-2.99.917_p20180214.tar.xz 951544 BLAKE2B 57df523168c6bf650
 EBUILD xf86-video-intel-2.99.917_p20170216.ebuild 2026 BLAKE2B 05fd1e40a10b0e19b18daa1179b04f81c123a2ce2ddd2c29a50353b6567126d16f23041a74b45a9120a0c4cee6e40c5f6671b1e7ef7a54fa877797fd35912118 SHA512 abb8b5d657adec5fecfbe755653e6db8fad74326559167fef6be298ea180b16a7e3c67c6b318828a0be28d01eab22de5dda214549828edd07428cac6ca6f6b9e
 EBUILD xf86-video-intel-2.99.917_p20170313.ebuild 2026 BLAKE2B cf9f383a6b7235ae3789e5d6c0b509b34d4ed4bbe9697494c1e34f2dffc7fcc0bd85f4d639ff99ae40a9ba8b78cdf2c0abe6116c242c55532f67f295fb891669 SHA512 07bd71490a5a1a09d455e7d5016a06804a43f9c4fe8919a21c71853f20ba80069909db6b807682e2dcf20f6043df4c3dab3ab58ab8c84d06e177c2516abb80dc
 EBUILD xf86-video-intel-2.99.917_p20171018.ebuild 2028 BLAKE2B f2dc7438a200e02f219ee743ad9df3b5344e5825abd0564762b6c5e23444972dfb47b5e61428b000a9ab0592fd97de2731646dd595a842d2f38869b5a05300a3 SHA512 ff658165596783eff221a42a2eb7ced6afd085ad4787585c2ceb5e55d973299b9ddd19343ec61fbc093d134cbd2433889395c705779dde9d13cd2315fc93ca46
-EBUILD xf86-video-intel-2.99.917_p20180214.ebuild 2045 BLAKE2B 2063759a3f33d1633a5fa9bcff1b660a4d5cbd51bd7698fe6347bf3b5bcb04d4d9feb620f16bc00a106b35be4195fb1493f415fb139e15635400f8f9c8415d8f SHA512 8a3d50af03ec31dd6dce5444240abb1388a7a4880691563223189a8e5d14038ba933e6b8a1fdbdc9575c6d8bf93578e71adf0be7b6fbef974796a6f9a33da54b
+EBUILD xf86-video-intel-2.99.917_p20180214.ebuild 2099 BLAKE2B 8b0ea02e55d7bb8f2e11d140fef444cee00c329bb32268d216d342dc7c0af83baf244264008246faf4df59828da5403197b7969c174bff4bfb60a48e6ed791e9 SHA512 a8c0255b0a6e162c8893a28814aff5fbf7080ae6e158858240735123f1324a341080dc251fbc931cd5fc10cd0b9bfcf3ef0aa729ba9722fc61e258dded8939a3
+EBUILD xf86-video-intel-9999.ebuild 2059 BLAKE2B 860127fd5b3c20a1dfb2d2d48455f743b0756d8d899e8e6fe0afbc221f1f2c102a5cd32fa88021872a940e9966a66aacc6dc6dcac90336c44830d33e92071782 SHA512 cd8ff7b98351f062439a08a227d1ea5d849aa53535537087e4f47bc6903f9116a69aa2ebc8d7e280140e107a9880d4b7fee35a9828ef28dc1f97a90f538c269f
 MISC metadata.xml 716 BLAKE2B 9c0d0d8f69b50931cdc0cbb9de69722531918bec055e0bf460dd00dd1fc551054233a99f479856036b2ce129adda1dc4468879eb2903a97e8b1a682004e9265c SHA512 11c95d0fd78c1c38b8398fbeb1b8fd2c6e3e02b0aca2e771cabf6a935e3ef40ec344f0a906268e39094496782ba530a6004c5d7527e6ecce009ef384302c258d
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20180214.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20180214.ebuild
index 78b5b23c9cc6..7f39adc016a4 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20180214.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20180214.ebuild
@@ -7,14 +7,18 @@ XORG_DRI=dri
 XORG_EAUTORECONF=yes
 inherit linux-info xorg-2 flag-o-matic
 
+if [[ ${PV} == 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~x86"
+	COMMIT_ID="75795523003798d789d417e82aaa81c7ea1ed616"
+	SRC_URI="https://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/${COMMIT_ID}.tar.xz -> ${P}.tar.xz"
+	S=${WORKDIR}/${COMMIT_ID}
+fi
+
 DESCRIPTION="X.Org driver for Intel cards"
 
-KEYWORDS="~amd64 ~x86"
 IUSE="debug dri3 +sna tools +udev uxa xvmc"
-COMMIT_ID="75795523003798d789d417e82aaa81c7ea1ed616"
-SRC_URI="https://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/${COMMIT_ID}.tar.xz -> ${P}.tar.xz"
-
-S=${WORKDIR}/${COMMIT_ID}
 
 REQUIRED_USE="
 	|| ( sna uxa )
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
new file mode 100644
index 000000000000..b076e21d496c
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_DRI=dri
+XORG_EAUTORECONF=yes
+inherit linux-info xorg-2 flag-o-matic
+
+if [[ ${PV} == 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~x86"
+	COMMIT_ID=""
+	SRC_URI="https://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/${COMMIT_ID}.tar.xz -> ${P}.tar.xz"
+	S=${WORKDIR}/${COMMIT_ID}
+fi
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+IUSE="debug dri3 +sna tools +udev uxa xvmc"
+
+REQUIRED_USE="
+	|| ( sna uxa )
+"
+RDEPEND="
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXScrnSaver
+	>=x11-libs/pixman-0.27.1
+	>=x11-libs/libdrm-2.4.52[video_cards_intel]
+	dri3? (
+		>=x11-base/xorg-server-1.18
+		!<=media-libs/mesa-12.0.4
+	)
+	sna? (
+		>=x11-base/xorg-server-1.10
+	)
+	tools? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/libXcursor
+		x11-libs/libXdamage
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libxshmfence
+		x11-libs/libXtst
+	)
+	udev? (
+		virtual/udev
+	)
+	xvmc? (
+		x11-libs/libXvMC
+		>=x11-libs/libxcb-1.5
+		x11-libs/xcb-util
+	)
+"
+DEPEND="${RDEPEND}
+	>=x11-proto/dri2proto-2.6
+	x11-proto/dri3proto
+	x11-proto/presentproto
+	x11-proto/resourceproto"
+
+src_configure() {
+	replace-flags -Os -O2
+	XORG_CONFIGURE_OPTIONS=(
+		--disable-dri1
+		$(use_enable debug)
+		$(use_enable dri)
+		$(use_enable dri dri3)
+		$(usex dri3 "--with-default-dri=3")
+		$(use_enable sna)
+		$(use_enable tools)
+		$(use_enable udev)
+		$(use_enable uxa)
+		$(use_enable xvmc)
+	)
+	xorg-2_src_configure
+}
+
+pkg_postinst() {
+	if linux_config_exists && \
+		kernel_is -lt 4 3 && ! linux_chkconfig_present DRM_I915_KMS; then
+		echo
+		ewarn "This driver requires KMS support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Graphics support --->"
+		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
+		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
+		ewarn "	      i915 driver"
+		ewarn "      [*]       Enable modesetting on intel by default"
+		echo
+	fi
+}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 188bcffb6465..38c922be92be 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/gl2ps/Manifest b/x11-libs/gl2ps/Manifest
index 0a2dd058f57f..ce306b239b17 100644
--- a/x11-libs/gl2ps/Manifest
+++ b/x11-libs/gl2ps/Manifest
@@ -1,4 +1,6 @@
 AUX gl2ps-1.3.8-cmake.patch 2410 BLAKE2B 044a2b9cfd4b108e5e766f062123fec8ea9fe0ca51518419a76f70915501d5ba2e20301a80e92803dccdf90d33a086365e75b0b040bc5cd42ad0a7c9517e1b64 SHA512 9ae64f280ff72e88cccd8daedec283ffef3403a02dbfa5872ec8991a1b6f0c6e0afaa1ff5009ada99cf9a3bb051dccf61614a77947728140b516081de8a624bd
 DIST gl2ps-1.3.9.tgz 294907 BLAKE2B b8473f9f3fc6cefa2374f6fdd94fb98d73ea79b9c0087ccc573f6b66eafe11098fc4312d8ff121abe2a8d6c9a3474f69dcb321ef978f8777b6dc077e5504621f SHA512 e6770c27d4832a300b4e16a9f98deb8557e7875460e7aa7e655fdb796f5dfffd5eccdc8b15f5a3ae151713fc46f97dacad48ee7550c41373b6fc8cfd21a437cb
+DIST gl2ps-1.4.0.tgz 300339 BLAKE2B bda8742dea6c1b4eb3e3a3492e6f38229feb6480131ce69e3512e9c558f7817a34bc76985311c3879cfcec5f715f36f0b8300300dd26025cdb7e72478802aa7d SHA512 420b21a5b4397c9a9a2323a8686b8635c2683354c94762d2d0172c661fc36c4298042498dd8ef2323adf32f45aa4e0a3dba146058ccde597e5a46c2027cbf7ce
 EBUILD gl2ps-1.3.9.ebuild 1247 BLAKE2B ef60d1f74da711a1497ad44427e6c74b59f523ed306c3a844d4ccb0f8c2bbf2a807438b8181a46d94bc0eb784ea90d0a47a6bd318567b93051fc047a4d2583fe SHA512 02328e81109ab6dd6307174217d105f49de9dcc30fcba6ceeda219ae00927eee27e4991aff6dbf8cf5ac72344c210f3545a5cf75a7d2d445a3263d57a457b9fa
+EBUILD gl2ps-1.4.0.ebuild 1240 BLAKE2B f367ea59dae36e5406444df3a8e8160c614ee30e742a7a7e471cade787996ce4fd0aec6bec00267df983e2f2492979e78e71085638db3a3a1c05888834c29a55 SHA512 7e1f233e1f6ec156aa1c7b7cb93f69287b2a2793266aa2b8a6c17fe2c00313336ce73f3e80eb315433e5a68fcabf6a4a615cac06d3ee4bda52449e66544069a8
 MISC metadata.xml 722 BLAKE2B 357dece0405ffb4a0714a534246c0f119a6b19d08b0d9867695d178af5e68bdf40b55824d35817c44ae85094f1900368ddf167752bc97c184cde687fca631a84 SHA512 0cd6f7dc51149def7310418cf775980f8287b9e40bde438e03dde020623f19b49648662f12e06233be7686eda4a5b75f79e92730dfdfd1a3ae6da80d6413efc9
diff --git a/x11-libs/gl2ps/gl2ps-1.4.0.ebuild b/x11-libs/gl2ps/gl2ps-1.4.0.ebuild
new file mode 100644
index 000000000000..2fcb4189a4e8
--- /dev/null
+++ b/x11-libs/gl2ps/gl2ps-1.4.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils
+
+DESCRIPTION="OpenGL to PostScript printing library"
+HOMEPAGE="http://www.geuz.org/gl2ps/"
+SRC_URI="http://geuz.org/${PN}/src/${P}.tgz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc png zlib"
+
+RDEPEND="
+	media-libs/freeglut
+	x11-libs/libXmu
+	png? ( media-libs/libpng:0= )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-tex/tth
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended )"
+
+S=${WORKDIR}/${P}-source
+
+PATCHES=( "${FILESDIR}"/${PN}-1.3.8-cmake.patch )
+
+src_prepare() {
+	cmake-utils_src_prepare
+	sed '/^install.*TODO\.txt/d' -i "${S}"/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DENABLE_DOC="$(usex doc)"
+		-DENABLE_PNG="$(usex png)"
+		-DENABLE_ZLIB="$(usex zlib)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		install_name_tool \
+			-id "${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib \
+			"${D%/}${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib || die
+	fi
+}
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index 7629ccfdaf95..e7ec2e4edf58 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -5,5 +5,5 @@ DIST gtksourceview-3.22.2.tar.xz 1596384 BLAKE2B d638cdec2aaa510c0039d9cbda3105e
 DIST gtksourceview-3.24.6.tar.xz 1623288 BLAKE2B 2332b31534f4fb7e4115e3827c3d57fe4d465eda67c977d238521fc68e0390809e1f0fc46e75adec2b966c83fe5ce0caa3cf312eba97bba76b9b7719b94ca42b SHA512 1b7621dbc1effc979fe08af8e6683ef43cc25563aab37a87abce15a0aa74bd0698bf10377a3fc2539b0cba1ad2f4bce2bb3981ef2dd4245bfe2fcba866d72f5d
 EBUILD gtksourceview-2.10.5-r3.ebuild 1353 BLAKE2B e019389cd3e530c9f1d696d3574d7641125a0e10ad542d61949eb89d4a4f46bbfba1f37e2565f938228c43bba9cf34e611eadec8c222530c113ec17766e55c6b SHA512 1d8dfed14a7bca7114fd4641949144781775cf02344e4b4fc886c82374f92a73b61a81666cd1c7ab5ff75daaff71ed368d4f80a18480237a32129b17ce086fb6
 EBUILD gtksourceview-3.22.2.ebuild 1323 BLAKE2B 8ecf0ab49a768d96515df5c4790c30cb6a1d8382b45c9aa2110c392274af1f9b05987ace8ba9e5c787cae3b7c4248c37c33aac2070cfd7d9d60654e212191e2b SHA512 ff2ca2a7344608b335d59bb2391e85342e082a523ef1a799dd47c4c989f8e7bb294027f551b13546c2d84aac35913b2e0d122d52a1df03b5df289b652159fc45
-EBUILD gtksourceview-3.24.6.ebuild 1327 BLAKE2B 9529674cf02d832782a27f24dc5d8f7e446f569cb591d4cad96eddb7f3fb2510953c19aadcf0bdabbb20c8d7b19768a44499d60335abff9749b492fd684a307f SHA512 25026157b2e70fdb7787d40320af80187598cdd425ebaeaa8ea398deece79c66e0a1cd190530c06eb7f7711234afed248aff430f6944ca6ca89a63897f1681ba
+EBUILD gtksourceview-3.24.6.ebuild 1326 BLAKE2B 39641d239897a36bb7e5abb0d780a4a08c65ebe1dbe66bd4da8a0b44c32ff753b9c92819fcaebf6597542097a99567259150f59fad05383873e4a54cebf25a36 SHA512 97f5116b1eb70b39e1cd1a7f53aa2f80f86df29770db6be6761958bcf3b8bc75cae5dbaebc2111203d1977531cd4ce217dc86457d4a4a423c0bb1236ef05f748
 MISC metadata.xml 318 BLAKE2B 63b73a76e8f01503afd3f29f3329056ce6b95614aceef233ee4308ab7589dd5f0f35b84f317ecdf5829847a01bdf18987ca87e345ea7e92bf9556d81b15dde1f SHA512 c0954dc93b8b12dbad5d31805afc40d8075c55aafc209d6292cdbc50727f4e17a24353d115004e1e6974fdbb4bdfdb1588ff86ad93b6a60cd1ed430c13865ac5
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.6.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.6.ebuild
index 264ff9c5d555..e753010ac046 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.24.6.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.6.ebuild
@@ -16,7 +16,7 @@ SLOT="3.0/3"
 IUSE="glade +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.48:2
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index ee428a39ca89..e1e2f78bbc62 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -2,9 +2,11 @@ DIST libdrm-2.4.82.tar.bz2 754053 BLAKE2B 83d0a7203826c093bfb6b3ce4836f3ec6182a7
 DIST libdrm-2.4.88.tar.bz2 796583 BLAKE2B 4130633fea39e12514e6c6e7a926ca7ccca618ecb15a67cd27ee577a4ad56ecf6d09e20a323546a2b9698d7e41bd28377e7e04e8f478a3ca957868e1ac51cf98 SHA512 0d9d4bcc0d9be1fb6b1ca075339b22b0f927288a4c02bbcbf95406b5c095051890f3d2e0d32e529ef9b6952ce1250afd1e0765ad3188c2bac924dda8c33afabb
 DIST libdrm-2.4.89.tar.bz2 792940 BLAKE2B 86c8227a06060e827f39da9f1debae54784e38e34becfb3ace1329f68b0fa4cfb90532606cd3618987af2cb48b53f0277e4032055eccc164f7e6b910d3c055e0 SHA512 380e4e46cd3971a73264bd1b482791fab0503268adb65ac81b674df009662cfb8ef5741e362f19670b2a43b1c46f022d857706c9a4bebed2b1cddaa317b7706d
 DIST libdrm-2.4.90.tar.bz2 822164 BLAKE2B 043428cea0f74b69577f79b3b9422546821945bb1120390d22b01a9e2a6460014eeb3902ee84241da8ba2c7683e76eb81d117a4f312ef3b8eb69647773d09710 SHA512 3d32d60c44ffdcb58667d0926e6af8d375332add1f243d8b2d37567aeef4e4b26d786294aeecf46c3dea94fc002fb73756567c457300703acfc21e32ffbd458c
+DIST libdrm-2.4.91.tar.bz2 815419 BLAKE2B 7df2a4bdb4b2708cc00b71173e7e261ab7f8645a473984a7cbda2c7073f14b7f87d53eb39cc075b743e72e4cda03b2c4fca6b9df6c7d5db2c739398a13f13f35 SHA512 07578c00c121ba37033db7172590e26d1545f81c242bbce2cfb7fb904bde504822c275d6468e5c5d20360d0046ae73d9b058aa0459ba35eb11927141cc998772
 EBUILD libdrm-2.4.82.ebuild 2038 BLAKE2B 684c6a522fe07fb77bbbaa6f06a45db8055898368e420c6ad555afc795957a789b03a5c2a3a4480d00314b4c9e3a1bb239242c0e2031a4534814ea0f7a6149b8 SHA512 ddb3b11965a574dc79e135df8d6f6b7cd93460fb45f86e7855fb4be704dbf40b18ec15a8cba6154e4c72bd3a1f0bcf0d895cc40906ee95748916846d7bb04d37
 EBUILD libdrm-2.4.88.ebuild 2040 BLAKE2B c2ad4b1562f73e6c2d8ef2f92a56ed3fd6e641987f7cd141b8bcbc7135569dad2e7deedd53b28706318f6d27e2f2daeaec78b8f66717e1bf03b4c5ccc8dc65d8 SHA512 6549f96311d070c6b7cb1284b203c540a285f6167eb3f5587bb85ea37d31a44314e6bc57a78df96047b40e0117ad0e0e5ebc93dc5484018d5678fb82b5b5a4f1
 EBUILD libdrm-2.4.89.ebuild 2048 BLAKE2B e96061f71c45f1f8dcb4e934457647bd39de3993c8f9f2ec2e8f461d1fd0db31e64fede53a2d6b14c28ab5be67e6f0aed306ea54d25eb7c312b2d6d3e2e0865e SHA512 b22d6d45e3655ec8e59206494258517e16bb5845f8f9c7741664308e9a3bea2bfd7fb5e819d7942a0f57dc0a6fa041af7f15d8fbe4d576c1883b8185f958783a
 EBUILD libdrm-2.4.90.ebuild 2048 BLAKE2B e96061f71c45f1f8dcb4e934457647bd39de3993c8f9f2ec2e8f461d1fd0db31e64fede53a2d6b14c28ab5be67e6f0aed306ea54d25eb7c312b2d6d3e2e0865e SHA512 b22d6d45e3655ec8e59206494258517e16bb5845f8f9c7741664308e9a3bea2bfd7fb5e819d7942a0f57dc0a6fa041af7f15d8fbe4d576c1883b8185f958783a
+EBUILD libdrm-2.4.91.ebuild 2133 BLAKE2B 0bf395bc04e02b7768c51004d2f54f0020dfb30640438ff288988243b990b4e9886a227a083a28427b662a98bee8968e34f771aeb1651de7dee67f592fb55161 SHA512 f864cbbe4e81f23c7baf508c48fe6fd06b0ae8eb068e51b54985d341025dbb19842451bf4b8be5679f23085aa4a6ecbc5551700a5f807c6234a533766f575777
 EBUILD libdrm-9999.ebuild 2133 BLAKE2B 0bf395bc04e02b7768c51004d2f54f0020dfb30640438ff288988243b990b4e9886a227a083a28427b662a98bee8968e34f771aeb1651de7dee67f592fb55161 SHA512 f864cbbe4e81f23c7baf508c48fe6fd06b0ae8eb068e51b54985d341025dbb19842451bf4b8be5679f23085aa4a6ecbc5551700a5f807c6234a533766f575777
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.91.ebuild b/x11-libs/libdrm/libdrm-2.4.91.ebuild
new file mode 100644
index 000000000000..e516fe208c88
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.91.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit ${GIT_ECLASS} meson multilib-minimal
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="https://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+fi
+
+VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
+RESTRICT="test" # see bug #236845
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[${MULTILIB_USEDEP}] )
+	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		# Udev is only used by tests now.
+		-Dudev=false
+		-Dcairo-tests=false
+		-Damdgpu=$(usex video_cards_amdgpu true false)
+		-Dexynos=$(usex video_cards_exynos true false)
+		-Dfreedreno=$(usex video_cards_freedreno true false)
+		-Dintel=$(usex video_cards_intel true false)
+		-Dnouveau=$(usex video_cards_nouveau true false)
+		-Domap=$(usex video_cards_omap true false)
+		-Dradeon=$(usex video_cards_radeon true false)
+		-Dtegra=$(usex video_cards_tegra true false)
+		-Dvc4=$(usex video_cards_vc4 true false)
+		-Detnaviv=$(usex video_cards_vivante true false)
+		-Dvmwgfx=$(usex video_cards_vmware true false)
+		-Dlibkms=$(usex libkms true false)
+		# valgrind installs its .pc file to the pkgconfig for the primary arch
+		-Dvalgrind=$(usex valgrind auto false)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest
index 7001b3b553b5..4408673361d5 100644
--- a/x11-libs/libwnck/Manifest
+++ b/x11-libs/libwnck/Manifest
@@ -3,5 +3,5 @@ DIST libwnck-3.20.1.tar.xz 693932 BLAKE2B 6a411ce9aa721ad158ba4c6cde6ca33892f834
 DIST libwnck-3.24.1.tar.xz 821508 BLAKE2B 18bc01a08107e0b2b040cb6036a80cb289955aa9365b7568292aa1c29dc77758bc9b11caa57b8cff6bebb75dd1d0bf7135b0cebed1e42c6ccc1c1372c6a224b5 SHA512 e8a31ab2dc0c282f1e0994ce6a2ccd18678dc5c140943399262e795052b7f5da2d6a5d388a74f4b10f8fac66ab138983a9caaee4e72c92a17c01ca5c39b731e1
 EBUILD libwnck-2.31.0.ebuild 1259 BLAKE2B edd3433c026c1403b11f3fb7a7dc75c1c2110e843f025db21a00590549ce060349b6f10dd689b1d28b04aec7d9eaa835f80ccedb806af78f0a302b404f53629c SHA512 f950573e13c676f6f7a802a7773b2b5bf1e6fc09d9c87e106edb4e94322ba3ae22fe39d1944803cba9011dc0ed05ab9e05230f31051a36f0c6d3b9288556f908
 EBUILD libwnck-3.20.1.ebuild 1165 BLAKE2B 20830076f1e238c26302ff8caa9174684f452598835f990b9c9cdc2dc8bcbccb2cd556fa30712d6d8de174949dea0ac3d162197bc640be37e9dbe513f4663e48 SHA512 32f9bca3d0a1b8dcfc3a086f0572d8a042ef7779dba599304caef2bdbf717565d05cae8ad3205cdd48a744e7a18429506c1b44c9325a542b4e682d78a841f25e
-EBUILD libwnck-3.24.1.ebuild 1159 BLAKE2B 7a02b46e748ad75cd88d57f1a2b2262bf80117f528973b2056a3e1827edd14f10cd184dc61892aa9c15b8005f6946d0d0bd67992213cbe01f33b35d1c30d8040 SHA512 1c76b98e868a42b308896ba6b61d717a4165a5dbdecf1e3c8563e4b973f583527aa82eab7410b58b3d1969eaf4a5a04962dba21611eb9767d7a31af204529d46
+EBUILD libwnck-3.24.1.ebuild 1158 BLAKE2B 198d86108d5dc4747f9c070fb5dbd4e2bd987df914ae911c8beef59c4a31fdf293f9e229605b313dd32a55df1dd96f25a71f0b5b49b6498fabc734212afc207e SHA512 5963b6d2f991aac211d9fbbe98a60d3979a18fdba6c16845bb7a3d1275e068d55bc3c1a954a1caf0735e168ebdf2ceab8dc42bce2d89a1849adc0167cc65ce55
 MISC metadata.xml 364 BLAKE2B c8583191e40b2bf98262fbd4401a0ac47e53ec64294178a919499695b014f3ae8ee623de803cfffde58b4d63eda4572035703c5f1d550f14f4dcc974e9035c65 SHA512 47cae64c0f13376c312169703c6213582e37ccc70f00599754d7fa3daf0511e5da4221cd659e9ad98fe90d7791b0d513db45d2d0b7f1d833ef125f64ba40f2ce
diff --git a/x11-libs/libwnck/libwnck-3.24.1.ebuild b/x11-libs/libwnck/libwnck-3.24.1.ebuild
index 2cd5fdd0c245..86bc04fc1882 100644
--- a/x11-libs/libwnck/libwnck-3.24.1.ebuild
+++ b/x11-libs/libwnck/libwnck-3.24.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://developer.gnome.org/libwnck/stable/"
 
 LICENSE="LGPL-2+"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="+introspection startup-notification tools"
 
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index 37f24787c4ab..132c5b6b05be 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,5 +1,7 @@
 AUX libxcb-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch 8094 BLAKE2B 1c5938cfc89201682ed1b4e777ea534ce5e1dd9d66cdcc452a641fa56b95d76b48756cf1e70ef5f03f693505e9c2e70b58c19f109839c239efc380ffb046658e SHA512 0775a4c98bda6d37a44c83ed67d8ec7c8bece1d4a7b0f3d06d7f7c16596cb5de27a77e1ef1f40921555a60a3054124c8c1192c8b4747a3a84d16d847341379b7
 AUX libxcb-1.12-fix-inconsistent-use-tabs-space.patch 2515 BLAKE2B 74b2969e976ce7736232a5caa35d7ab525cefdcc7915db2ea5a3333aa356e7995935a40ed0b1362abbe2d72e3ef5a847aa22d780a9267cf785a8540257967a4a SHA512 ad3b9d9b16b42756a72e583b7d42bd670ef581b614cf185de667badb6121524b84f2738933d2ea1e5da3d135b3a5f2296eb62206463bedc9e4d3f8343f476f85
 DIST libxcb-1.12.tar.bz2 613822 BLAKE2B 61f164ba6fb9493fe0692badc74a2866ee08ce3c3499773be0bddf742d0ffc69bb876233aae46a7e76cb9263485eb007d105b16091a73750d490da0528482ff2 SHA512 4ce3e3f62b7e1c3a9e61c149c720ef2a4a760539ea615d7d52ae39e7f5a08456dc87d7a1ac5d85ca15dcc468a9a02d56fb8f8f6361c959af9b8780f011995896
+DIST libxcb-1.13.tar.bz2 510453 BLAKE2B 2bdae7610cb8b3fdefeded6cf457e1c397666d235114439caba114b9e7a6b2af50f2cd8363ebaa3ddfa5c5040b8cdf2960150e1f4db141c572e12b1a2fb0ca9a SHA512 d99bbe386a65f60fcc0cc2935e4a365bc0577b5e90433e18778a665a5aee8ebc8e9e8cb0aedac0ac4a276147c0507e759a716874ea4f80792b2fc18eefbc128c
 EBUILD libxcb-1.12-r2.ebuild 1794 BLAKE2B 24394da85015f4ea44aa0d13fdaaaea5d481af559b1eb436fac25d147eb1b45ac8863f50d90dbbf2cefb74a75095e623b5b3e8d85d0216422dee87239aee4597 SHA512 7f1d8573eef31fbb309d5914c0b31df5c5f43083446263b7d88ef3683535f1f2e7e8194ee0b8e9a633eb1d52a3533a1f967d317b2e42589443269abc9c94dce3
+EBUILD libxcb-1.13.ebuild 1492 BLAKE2B 28cf78fc62ff5004af2d40415c078cae7ac980a0d9ef68a7626a842c107108ca7c5e1c600c387055ad594d425ab490e32b939be167dfbfc7031bd07a88747a6b SHA512 c0548c152c6a399f6efdacc0f73b99aa0493b82b801153dc83eb20168be63db7a7ef528df7305c0b533582599675b4f49deb3687f73a5bc243d95dc932dec5ec
 MISC metadata.xml 319 BLAKE2B 8dc76aaf5b8760a5b4a1b6785de5c77cac259c44ec88e41a02834e240cabb2037cf90117462c9aeadbd73502f63e8fdd1223e7dd07fdbfa11fee2c6eb6659cc2 SHA512 099359a62cca3897168fb9cbdb25f48feb8ca3524bde0c7f36b271059c84e567bba9fa6e47d999ba8effb2969e0a918bb52ede5e1a8737d9ff5a13a69f709a5e
diff --git a/x11-libs/libxcb/libxcb-1.13.ebuild b/x11-libs/libxcb/libxcb-1.13.ebuild
new file mode 100644
index 000000000000..a8f6ab111833
--- /dev/null
+++ b/x11-libs/libxcb/libxcb-1.13.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE=xml
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit python-any-r1 xorg-2
+
+DESCRIPTION="X C-language Bindings library"
+HOMEPAGE="https://xcb.freedesktop.org/"
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/libxcb.git"
+[[ ${PV} != 9999* ]] && \
+	SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc selinux test xkb"
+SLOT="0/1.12"
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]"
+# Note: ${PYTHON_USEDEP} needs to go verbatim
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check[${MULTILIB_USEDEP}] )
+	doc? ( app-doc/doxygen[dot] )
+	dev-libs/libxslt
+	${PYTHON_DEPS}
+	$(python_gen_any_dep \
+		">=x11-proto/xcb-proto-1.13[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
+
+python_check_deps() {
+	has_version --host-root ">=x11-proto/xcb-proto-1.13[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable doc devel-docs)
+		$(use_enable selinux)
+		$(use_enable xkb)
+		--enable-xinput
+	)
+	xorg-2_src_configure
+}
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 2e1e546dd2c5..4f852a8b19b6 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -2,6 +2,6 @@ DIST pango-1.40.12.tar.xz 856228 BLAKE2B c6fe562f64ac7b641b5b8519f831b999418ab06
 DIST pango-1.40.14.tar.xz 858388 BLAKE2B 1afcff08c38aa59ec57cdf43aa503e70a8c03b7d59c730060c9e3537f78ffe9a63e3aa1cb74ce9ce8d72541b5a5be8becb951f665f4663b108114686c41452c8 SHA512 35ba7bc8be3992f206ccc2cc5aca0b94e2a3832f887fc9c45b0e29fddcb9051ce05a74377de0ca4ff95a87983b15688fa5d379d592faf87aa8eaca25ac18b7ea
 DIST pango-1.40.3.tar.xz 1061044 BLAKE2B 79acd03144b58a3c160888cf4e3638faaf622cfcb406ddcd6a17907bddb7b3c6bf8c4a8ffbedb095664b7d19daa6837239e317d03e9a485f01b832227d1c3b7d SHA512 ff82395e8487624dffe212975b72b3383dcebb197a8675c8b409665e3e2e30fc23d9a6c25c3129a115adb7182b2a71a49550dbe881eb7ee9bbc572de6ba18d27
 EBUILD pango-1.40.12.ebuild 1701 BLAKE2B 08661b1dbc7dac4666817a1ab895b5eb0d7d30e2312c7bafe95c608bee0db22d2600480061461c4d59d6d0039ef7eb0b24573b7ce7090ec2d3d351038c0c1fc4 SHA512 285956d3935c0ac69d0ce7279bed589b6005342081deb22f5bc5708e08b289135c32a3edfde903ad34b2aeec45a829c0fcc48f1ab3cb00f60985b1e6e2faa771
-EBUILD pango-1.40.14.ebuild 1705 BLAKE2B 93bdb57b1966dbabbd9361d2126b2cb987d857666ce9a22a7c70e198ece9dfb7cbc4eeac75cc597c08161197bed5110d05b2db566e52ed87084e1e2b0ad547d4 SHA512 4cd0502045020a710125b96725d02f2f02f4bf56dc3336541ecd3eb78f980ec9671ca6f0fca833f26f5afaa65aad8e804ddecda018d429275e84a516ade30f66
+EBUILD pango-1.40.14.ebuild 1704 BLAKE2B 618e82511f1048037a8830a8dc3bc9a2aec4bb632eb4a6dc3a07e770740eade68f3050cd4508d85e0ee5c3b69459983666921a5783807dee3dc8594dff381603 SHA512 3ba494439d5a2b13bcfc0e1c80b68bf76c95a5197a3d3d507a2fa01bf9677cb61b0cbbc83c533ebd01a03e2b2941794b67f1326cd5736691d28e6a91d25d4466
 EBUILD pango-1.40.3.ebuild 1710 BLAKE2B bf310621d2b86abf1162aa80788b5d6c6db33bb05ce13f398705cb0fe45389007f7494ecff8f1d6fb6f1752ef94ee358b27baef1052e4bdb725a6c47c820da70 SHA512 6fbbf1ba010f5d5d527822ff2f4f43a6184dbb61b4c3c9e61507bf65c17f815caea1bfa8793dacd7f902d0d42c66d1beb31ec66ac70452730b6c1d08f6a1f139
 MISC metadata.xml 412 BLAKE2B a35a48a5b045c8d88090806f3ae50702a22a89828429c18682810ab492f743b4c1ef48369a7cb3b2a473eb059da899d20810d7533a63295ae848ac1b1c44f490 SHA512 bf95749c7606d0556904e6a6db1636fe93a919b35c6ab8252087f11658c40dcb08aa0dfce74fafe67e609b2c20f9e8ec632dc878a80e467442b7994d03dea27e
diff --git a/x11-libs/pango/pango-1.40.14.ebuild b/x11-libs/pango/pango-1.40.14.ebuild
index 13c1af228eea..7d7599fff5b8 100644
--- a/x11-libs/pango/pango-1.40.14.ebuild
+++ b/x11-libs/pango/pango-1.40.14.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.pango.org/"
 
 LICENSE="LGPL-2+ FTL"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="X +introspection test"
 
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index e83cc934217a..f8cf0d68b88b 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,5 +1,7 @@
 DIST QScintilla_gpl-2.10.1.tar.gz 2663446 BLAKE2B 720ce990b4e3dd65d47cd26b473bffc07240d76b2c10d393cba41331c6f160472d87b9b22985fd45b5b8064d5358b3b25f0decfe8759542a9c987381249bca42 SHA512 ea9b95ca371a8af9262493ab59ecaef77e1697ba21d1d594aab39e836917884fd829aa4f6c4e72cce60b0d3f40eac654157cc507d027945f0034881855123ccc
 DIST QScintilla_gpl-2.10.2.tar.gz 2665138 BLAKE2B 1c6349ea717997681e678cdfa6cc590a6a1cfbe652f2dd52d57fefff71229251c46cd4554b546d2e272deb7c3f970c44f657966ad08e45279813215a775c637d SHA512 755f486d62275acb5908262c4a50ad31dd9d8fca0501eb1eeec1aa2181872f8d16179b42f4213b207fd6b46fd8a72d25af7ce6c5cc10eabb363a92c0600ca972
+DIST QScintilla_gpl-2.10.3.tar.gz 2721287 BLAKE2B cc85eea17e563ae5f4a130d26ca88bec3e1a6cbff7bc0af096c63789384d03149105641d6324f53b37a2bd8ab4681a285ccb76e6063a06e5db30d070d3fd8219 SHA512 a1b9d6869797ec074e4e0727164804779792fb77b2230aae80e6d6b5fb3a3ff9d84e17d775d18ab74c97b78bac454511fd2cb49be1fa36f71d9097abf88045b6
 EBUILD qscintilla-2.10.1.ebuild 2392 BLAKE2B 8949f6e08aa13e41ec7ba1d8a0a2d029b3601c8cdb3c71e44a34a728cc05a923b5162c2f657df06bc564bd4042760f1229409f2e9e8420441731e769251e1522 SHA512 c53488e751beb5a52dfc6e9903442f436e976f26afaa4a765e9bada3d0621fec6acecf4df5c98e7434f206f04336b21f0a07dccb09372cd8a693ac6c0930ebec
 EBUILD qscintilla-2.10.2.ebuild 2396 BLAKE2B 28f458ac59aa6a8fe3dea42ad42e4fb0e85d0f385c72c6afc8e67c64e95ae18c65b0b92b9498a8d7fd6808b430fbf74c82eb7e2e2dfaf962fc4d2f48f996b540 SHA512 ec04a36a7db01686439adb97aad938eb966928c4ba1b3f7df23365f59e2401efe35fff12de86016937cf1cb4fc03c9e5f2e3226d5410b13bda0c1d8d1f85c4e8
+EBUILD qscintilla-2.10.3.ebuild 1795 BLAKE2B 36847c597a849c37bfdb2d4cd9d230dfdef8acd08b75a7acfb1f0508edc3742e705c0db20e9a867102ecd4858f3dccafd253e5ccef9c8e5b6028c1ccba571cae SHA512 934d5063e87b917059e3d49b01230f57b00b7272310bf1ee55c12a9962a76f274e877ab5e6362e47466729d3f832fa4435ab35f0c5a20cdba7760acef270ba64
 MISC metadata.xml 741 BLAKE2B 0ad895f5e6b73a5a89f527ceea61f323c13ec9329352b84a78982594a2bcdca2bd13bd67f4a4f60f21786cebef6da2bb233718fe0a90376c703de510b25e416f SHA512 393c6b16b403a5f14180ca4b010bd74b62dea7043dabaf463e6995690226105f872556d3df54e0cee1a6dfe2140b033aad25998fc65414e7380f41894201f43a
diff --git a/x11-libs/qscintilla/qscintilla-2.10.3.ebuild b/x11-libs/qscintilla/qscintilla-2.10.3.ebuild
new file mode 100644
index 000000000000..1b74d6e22141
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.10.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic qmake-utils
+
+MY_P=QScintilla_gpl-${PV/_pre/.dev}
+
+DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
+SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/13"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="designer doc"
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	designer? ( dev-qt/designer:5 )
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	default
+
+	# Sub-slot sanity check
+	local subslot=${SLOT#*/}
+	local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/Qt4Qt5/qscintilla.pro)
+	local major=${version%%.*}
+	if [[ ${subslot} != ${major} ]]; then
+		eerror
+		eerror "Ebuild sub-slot (${subslot}) does not match QScintilla major version (${major})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${major}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+}
+
+qsci_run_in() {
+	pushd "$1" >/dev/null || die
+	shift || die
+	"$@" || die
+	popd >/dev/null || die
+}
+
+src_configure() {
+	if use designer; then
+		# prevent building against system version (bug 466120)
+		append-cxxflags -I../Qt4Qt5
+		append-ldflags -L../Qt4Qt5
+	fi
+
+	qsci_run_in Qt4Qt5 eqmake5
+	use designer && qsci_run_in designer-Qt4Qt5 eqmake5
+}
+
+src_compile() {
+	qsci_run_in Qt4Qt5 emake
+	use designer && qsci_run_in designer-Qt4Qt5 emake
+}
+
+src_install() {
+	qsci_run_in Qt4Qt5 emake INSTALL_ROOT="${D}" install
+	use designer && qsci_run_in designer-Qt4Qt5 emake INSTALL_ROOT="${D}" install
+
+	DOCS=( ChangeLog NEWS )
+	use doc && HTML_DOCS=( doc/html-Qt4Qt5/. )
+	einstalldocs
+}
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index bab2d7ae8597..637ba2bb33e8 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -10,5 +10,5 @@ DIST vte-0.48.4.tar.xz 1008296 BLAKE2B 9f946d6909d38896ec80db2a02666d809155997b2
 EBUILD vte-0.28.2-r208.ebuild 2973 BLAKE2B 7ee8e830fd6499df69012a9d69cfe21343f46c0c114e47bebba9de573443a60f0def0660e359660d672398c469e61d9804d53e02ebfd6396e28d2fbd361cc821 SHA512 c8711b4777911936c2c2154eaa620f4ccbcb5df491a1943d97bb2bc1179ab333ee422fcf26f56a7f76170941b6d6bdb21b881fffb0c7af96a37cbf7eb63ca560
 EBUILD vte-0.36.5.ebuild 1695 BLAKE2B 3d83e03aa9a8aea1e17db966f44f33e500a60a99c0d2e8fe9113f66ff3b30e8cc9800f5889b6b94140b096bffc8103bc105c6ed9556fa680558b98cdbe52dcb3 SHA512 b0665651664f07d69741836d0e870710ec271807fd2da982b544eab42d48da74bb5800324c91cce1ca21080488606d2f5e3263ed3e73357812d5680f3cad91ba
 EBUILD vte-0.46.2.ebuild 1898 BLAKE2B 663e631d3d2b638b0bc1f1f5d8cd30bf9509bb8419b0293cc14b49b65a0548e2a218ccaf05ef7942210ddb69fb4b21d47e99b7dd16d6e1d6404e048b31d965dd SHA512 e966d45f6d46ca821ee4891fdfc7f03d01db9c64327b2146178407cf1adb8730d02723c205043d7bda68ec49d851d34412d4bb8d35908dcaebaf733e3ee5021d
-EBUILD vte-0.48.4.ebuild 2327 BLAKE2B 59ad38c8ff19665a1b5029e90ca3b58fbdd5dcc22905bf92c94429abb67037d47ea44b7fc804e5797a569cac6fa264fa3cc5f15e989b5df1a7c3a460a2c7a8cd SHA512 0272ae6aaeaaa51055a7861693f0b8c41d6592d7b854dae5f3f17ec0dad265ecb0abd94b806aa092474b289d53791a6b36de889e605f8fed2cb935ee4dbfd370
+EBUILD vte-0.48.4.ebuild 2326 BLAKE2B d815ee25d630183e49d6acdab930f917868ce56715d5fc623f7e491977f1cc75b449605be150160a2c1a74601aa429acab008f55aaa94ce595d1fb2b92028d69 SHA512 a5926f2eb0feb737b3d3babd6c3d026946b2ecd15db462b007814414960d3f11875ac9ae60648666e86961062426605fdda3dec00984679752852971955564dd
 MISC metadata.xml 348 BLAKE2B 3bf56ab8eced6c72e3d4dcb9979464b9652010b09d6576da3f1b9061f92b508d9bfa11ae081083ff07b2d7ec05c8e72123e25d6ec8c6edfa738b241a9f4339cb SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4
diff --git a/x11-libs/vte/vte-0.48.4.ebuild b/x11-libs/vte/vte-0.48.4.ebuild
index a50e8b6db3bc..e621eeff3220 100644
--- a/x11-libs/vte/vte-0.48.4.ebuild
+++ b/x11-libs/vte/vte-0.48.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
 LICENSE="LGPL-2+"
 SLOT="2.91"
 IUSE="+crypt debug glade +introspection vala vanilla"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
 REQUIRED_USE="vala? ( introspection )"
 
 SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~eva/distfiles/${PN}/${P}-command-notify.patch.xz )"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index c050999e942e..1beeee976ca5 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/util-macros/Manifest b/x11-misc/util-macros/Manifest
index 20380745d8ed..0ad2f2a179ba 100644
--- a/x11-misc/util-macros/Manifest
+++ b/x11-misc/util-macros/Manifest
@@ -1,3 +1,5 @@
 DIST util-macros-1.19.1.tar.bz2 83274 BLAKE2B 014cf10cb1389809c4de793d28aa7941403734bc0abb28d920b22be3f05b7597a7106d716b0f3b5de5dc945fa23095dfd032e103711dbcd0711b8634a5153b7e SHA512 d69a415d5922f072bab1ddf8984c98bc349a24ffc7a60184320a12992a76b04d7cb773b426b1a7000e6dc7983d59df51bbc8f2ff25273d63e4e238b4cd91eb38
+DIST util-macros-1.19.2.tar.bz2 84139 BLAKE2B 94eeeca771042671c6915c562e055c8b965f874c3a5aa1c8107abe38ca984ee32293f68a51ca73d65ac82d245dec6e02ddd62939ab14aee12b4b6fbf350b8c39 SHA512 3f51504b27f0478c136126f15110cf3cdbba218c4d74a8e974cca1381c6e8364609bd0c444f2fb19aa86a7f4e848dfce4f4da940463b224036f75a60b3d88619
 EBUILD util-macros-1.19.1.ebuild 483 BLAKE2B cf7ad79fa74ce7a9f3d50a4f4981970d85e11029bc2d05a1f2d1ae3964088255bbbb14aa99339e6055d093a698191c73876d2c2379064df2936b7e2e1b6689a3 SHA512 6107a49a06da5d5f508528eb4d0cb92559e33f0944f690bbf412b0858f3e2d6629c2a2286ae521b55f769ab69d0338873be05182a55d7a44fcf9d357ead14c64
+EBUILD util-macros-1.19.2.ebuild 483 BLAKE2B f34920bd902ab608681c8510efd5dfc20c37270654d4a4417fa1cb728ee21793098526b2ba55f99d4a5fb67bb9ea4cdaf6620587eae05333086b2971a2ebbda3 SHA512 72147a6fd78028456455adbf8ffbc135d70b87e3608859024244970809ddbaa8c66bcf046b560dfd760af027d8fc0fabb7d816bc1bd548b4c533130c87f4c3ed
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/util-macros/util-macros-1.19.2.ebuild b/x11-misc/util-macros/util-macros-1.19.2.ebuild
new file mode 100644
index 000000000000..65cada7e3812
--- /dev/null
+++ b/x11-misc/util-macros/util-macros-1.19.2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xorg-2
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/util/macros.git"
+DESCRIPTION="X.Org autotools utility macros"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 31ed8bab0491..130fd546dc45 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -11,5 +11,5 @@ DIST xscreensaver-5.37.tar.gz 10598833 BLAKE2B 44462bdf735c0eeb460e400b260340a61
 DIST xscreensaver-5.38.tar.gz 10712548 BLAKE2B 02630aa7daa3faf8aa7ff453218bed5e3db287b7c4d9b564a6d8822db8b2e1ae6be7843342d585f2d2900d2bd0e7fd2a12d49748d81bf10818fa5bc4254f6ef8 SHA512 9014571505afd3a116f541334ea37737659f63f4cbb267a56be451e2c353d9e57218119670a44297d36d140672ea423d0682433401b17749138ab6baf6507561
 EBUILD xscreensaver-5.36.ebuild 3521 BLAKE2B 6dcb3156b850b3f9ab210ab0d5c030c355c6ef6f90639c23316f71d20602cda04176bdb598af4b90f41edb3e5e51ce8195803974752ad128b85b395fb9d88d12 SHA512 085ce103e700f04014a8b769ab9e625763b62fda74d38f474c576eda8dce3b1143769a0662252997c9d4f652d2c0bda483af327b15f9798674eb62812dd2c438
 EBUILD xscreensaver-5.37.ebuild 3530 BLAKE2B 08cf24c2252e4965a07ab3f8bc5728a40a82f287bb1343db2bede836de1d77c6b138478dace70bf54d703ce3d4b209d0bd6b018cf62532890ed6d05cf3b10a63 SHA512 fe2fc361b059b944e94f06013a3c99854f9f4b33fd25f7f75e07e249a88f13899f3c74982e7e0dfde43523474b7b48c610ff63dfcdb08f28f6b9164eee3af68e
-EBUILD xscreensaver-5.38.ebuild 3526 BLAKE2B 68d851db2598bf2a41a6feef3be9503d0e903f24f7677c12309ebe4db78efca3572668ee4102c88b3f1ea3a156a5827604cc9b5a99b67d22398d3dee08c6f2bd SHA512 b6a5df337c1a937d5c8a303010be2dd7a0ab6128d7d53c94bab04c49a8513dd6bfd0f55cd78245aeee3140709b25dfdb19160d62264eb0042f657f674aa3f1b9
+EBUILD xscreensaver-5.38.ebuild 3525 BLAKE2B 2d4c9bd0387406a11162c1b7ccc07df05b3f71869e295b346842ce480233492118f85aa5a070152aa5dd04d66d757f6ff251cdda46fe3056669a54fed564d982 SHA512 73c18c6dfed0f49d6d8e08b0ee376e02260c57c2cfadb704d13172349fd35d80f689aecbb16ae0387459dad746e9e5bb5b6bed59b7e28558d724142aa454d9ea
 MISC metadata.xml 660 BLAKE2B f720a7df804148568927cc909ec46013c8de0087f2ab5751bd3852cf310161c328d43f29db22105e46b4c142db3e84fa5a2c943bae63779156bfe569726bf12b SHA512 ecc2b0423bd77d7713db654875f5d112c90c278653248298c877a84104db40430fcdaffaac2cbb972bb6ae6ce970b498d4d086278ba85c519dedeb3586bcd41b
diff --git a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild b/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
index 3022d9313c1d..11d09676b005 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
diff --git a/x11-proto/Manifest.gz b/x11-proto/Manifest.gz
index 86495cf75594..f219ff627f53 100644
Binary files a/x11-proto/Manifest.gz and b/x11-proto/Manifest.gz differ
diff --git a/x11-proto/xcb-proto/Manifest b/x11-proto/xcb-proto/Manifest
index dff65653ddcb..b0a55edadd18 100644
--- a/x11-proto/xcb-proto/Manifest
+++ b/x11-proto/xcb-proto/Manifest
@@ -2,5 +2,7 @@ AUX xcb-proto-1.12-make-whitespace-usage-consistent.patch 8518 BLAKE2B 599038dc8
 AUX xcb-proto-1.12-print-is-a-function-and-needs-parentheses.patch 3328 BLAKE2B 30b6fd8e44056b62a67442612c905f2ac2dea5ff67f549326ef3c00ad526efac13c0a4708b38434497c8106b84d369f49812095dafb6d6a286a2c5075a24945c SHA512 b541295721d8cf87d1079c3366401dff3830bc953082b9f9c0376163ef5893a1f111d278904caed8d54f2796b255c6f12043d7353bd3605e040a2a355e76f15e
 AUX xcb-proto-1.12-update-xml-schema.patch 6196 BLAKE2B 86026b2845d897fa58101915433a73e733fae54f9526892f2bf5ed0cfd710e5b06219054f8668df8ae4a9b6d8df7fab5491f3f1fef50651423453c4bd0ddc024 SHA512 7b4875e528fa0bd07a1d4ab214b7fa059ae8180b02262ca608bb6d07f98ef05bc66e5188b84cb2ab795589328d2ab8a63282785611d073f09e31b554d264fab4
 DIST xcb-proto-1.12.tar.bz2 153890 BLAKE2B cdb4b245e838ca56bfdcaa9a0618ce45e5d4da8ee10f7ae3389ff297325c3d81ba446a6385737cc9b053ecb06a0c829d99ab27dceecfec49ac1591c25c832c46 SHA512 1f427eaf223971b25b56c9f641350e03f5ebeb17a1fc212ce2a0c892de7aba7e53d5e3958b073a122bb344c387c0ff394cf96f542ff046f33de4e1cd27fb9e5c
+DIST xcb-proto-1.13.tar.bz2 151981 BLAKE2B 04d90838f8a892103e6d7aa807f1b0b6794f1538c6c986ad3cba67cff3a963ff680e45c2137c5d6330736a3aa1a387d61fc247f23487de9dada2f4013590b4a1 SHA512 002aa2aa0ad503977e03419c6f136f1e3aa8c787916830ce6d6be8f81ca99edc1d8fc5f71ce8c592b490cc767bf6567695f0bafe55fe3f743076bcddbaac07f7
 EBUILD xcb-proto-1.12-r2.ebuild 1711 BLAKE2B 4116201d5e1d186318a5bb1f8a4866ccd46be9ce1c99c6c4ead5bddc731e1140f9ddf1912f3f8e2d7baf0bb0261cfa8a1b5c6dc673cc2c00a47361288831e70d SHA512 6345ebc3a9c0e1cabacc05050ca5f3888bae6d5c4ee23c58f7efe15655b64e7679efc4653ec9288b48a382a3ab94ff79e3b37d42e2f11cf815a263e92fcf5cb4
+EBUILD xcb-proto-1.13.ebuild 1537 BLAKE2B c72c3fc1355aea6d220ce6d59bf890990ff8334ccac2108f7ece6a138b1529367b6c6a9416b65399cd44a61f0597c6e01572d9498f6f9c9ddaa78381275b3b12 SHA512 d15fa2e4974ab9ba1f36918e8cde97c16974774e2ba6855f530ae1b7eee7c2b31025932d12ee9f5b01ee5d70933641aa90b9fca4d1221667ba7e901878f6bb81
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/xcb-proto/xcb-proto-1.13.ebuild b/x11-proto/xcb-proto/xcb-proto-1.13.ebuild
new file mode 100644
index 000000000000..81add3e7b94f
--- /dev/null
+++ b/x11-proto/xcb-proto/xcb-proto-1.13.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+XORG_MULTILIB=yes
+
+inherit python-r1 xorg-2
+
+DESCRIPTION="X C-language Bindings protocol headers"
+HOMEPAGE="https://xcb.freedesktop.org/"
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/proto.git"
+[[ ${PV} != 9999* ]] && \
+	SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_configure() {
+	python_setup
+	xorg-2_src_configure
+}
+
+multilib_src_configure() {
+	autotools-utils_src_configure
+
+	if multilib_is_native_abi; then
+		python_foreach_impl autotools-utils_src_configure
+	fi
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi; then
+		python_foreach_impl autotools-utils_src_compile -C xcbgen \
+			top_builddir="${BUILD_DIR}"
+	fi
+}
+
+src_install() {
+	xorg-2_src_install
+
+	# pkg-config file hardcodes python sitedir, bug 486512
+	sed -i -e '/pythondir/s:=.*$:=/dev/null:' \
+		"${ED}"/usr/lib*/pkgconfig/xcb-proto.pc || die
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi; then
+		python_foreach_impl autotools-utils_src_install -C xcbgen \
+			top_builddir="${BUILD_DIR}"
+	fi
+}
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index a203bba643c6..7fe82797e2c7 100644
Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ
diff --git a/x11-terms/eterm/Manifest b/x11-terms/eterm/Manifest
index acf795fcbc15..fbb65c6d36fb 100644
--- a/x11-terms/eterm/Manifest
+++ b/x11-terms/eterm/Manifest
@@ -4,6 +4,6 @@ DIST Eterm-0.9.6.tar.gz 831756 BLAKE2B cd309f2bd74c44066d5811845c2cfe7407064186c
 DIST Eterm-bg-0.9.5.tar.gz 1883627 BLAKE2B eef174aa7734dc4795c76213468ae2465d5d484aee73d7d6a09e181547614b9ac23dd55b3991e1d5daa7defd65e91d40a0e01e7a44c64968e94fc6ace3ed18d6 SHA512 2d58d1342c7750f8dde93451b732cff3a0580d76635054632728cf2d8e5c5298732c855672981810cf21a8d1f5d46626abe1f35fbf33e2b713cc5d6bc82d10f8
 DIST Eterm-bg-0.9.6.tar.gz 1883627 BLAKE2B eef174aa7734dc4795c76213468ae2465d5d484aee73d7d6a09e181547614b9ac23dd55b3991e1d5daa7defd65e91d40a0e01e7a44c64968e94fc6ace3ed18d6 SHA512 2d58d1342c7750f8dde93451b732cff3a0580d76635054632728cf2d8e5c5298732c855672981810cf21a8d1f5d46626abe1f35fbf33e2b713cc5d6bc82d10f8
 EBUILD eterm-0.9.5.ebuild 1794 BLAKE2B 09c5d2701044052c9464253380d2e017369589bdde628cf1f745bbef25dac1f300e2aebf4e22881212384b68d180597c1d30bb77563ae8b0e68123bf8ede3864 SHA512 168196e0f14619982ca99e63bca7d697d7893189513a3974b6c903fb8f942e42a2eeb58cc172c512acd52a31094c1152359947995c695473f50d9d393f00076a
-EBUILD eterm-0.9.6-r1.ebuild 1509 BLAKE2B b3f8765b5d8a9127bb58603b44f4b36cfd1cd3fe47ca5fffe15c6b38afd38d9557127a51746a309e12d5df2c63860599ac6126b776e61d0ca6613fdcf77ebe8a SHA512 98d5e61846b1f556d22de6ac7207fc8f932ecaf0986cf95e494c1327bc0c41e140b061ef45ae3f27ecf597583d9c8c318726862650d6de0061dedcfc01105261
+EBUILD eterm-0.9.6-r1.ebuild 1508 BLAKE2B 6ad61d4b3ea09217fe431355e9528976a687c4fe8961e2057ec53356b94723483992af8945b726c995f7410d40cd2e62bdf391cad2f2fc112b3a35419ce09fbc SHA512 18a803083b0dac2b8928e30c61507cf3a743a4696822e2274e84ff6048b96b5003f1b1f5ccdd3d0944281d062d592f4e53c42762ff3d43e2a3aea4e73fdf4c0a
 EBUILD eterm-9999.ebuild 1234 BLAKE2B 9d3f80e2a63823451b8ead0cba5340d02fbf5136fd01afd7aaee62a9afadf6fe0368bc5397161be77a6ca3315286ffbdb63010b7fa3363c320abfe7fd7eee573 SHA512 7a497ea960be119407540fc0a0f95ccee51135cf625b78c674e1045a056f8ae93543653084221f82d1531bdb0b0a58263706dcee9a957a9435ca882b3a1163ce
 MISC metadata.xml 812 BLAKE2B c3f47ef367d27e0ad69c54e22fdbda24d3673208561b9a7827f612d1d487e4ab2ffd05c02832b112ef8c599921bc3a59c3296b50874a2bf52218fc5dbf76f960 SHA512 86f0b751166e5ccf7de8e65a8acc6c74a189be1d692b9e470c9142a351de2f436a7e62237dea218d1e143b0a2e5423e419d194cbbc911a5e1f5787bf570aba7a
diff --git a/x11-terms/eterm/eterm-0.9.6-r1.ebuild b/x11-terms/eterm/eterm-0.9.6-r1.ebuild
index 977fce0b8ea7..f7d66b42b042 100644
--- a/x11-terms/eterm/eterm-0.9.6-r1.ebuild
+++ b/x11-terms/eterm/eterm-0.9.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x86-macos"
 IUSE="escreen minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode +utempter"
 
 RDEPEND="
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 1cd16df6d1a0..9c7d16b77728 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/adwaita-icon-theme/Manifest b/x11-themes/adwaita-icon-theme/Manifest
index b91261564fab..9cf984bc61f7 100644
--- a/x11-themes/adwaita-icon-theme/Manifest
+++ b/x11-themes/adwaita-icon-theme/Manifest
@@ -3,5 +3,5 @@ DIST adwaita-icon-theme-3.22.0.tar.xz 18395856 BLAKE2B 8b6a7f10b1598803db431eb43
 DIST adwaita-icon-theme-3.24.0.tar.xz 20717972 BLAKE2B cce76731e7c33d42330eb2e0039979db3f2280fe84ef427ac6295244f750eedb93584efddb4299260846facb7c3afb9d1baa86a5ddd8d36f3d81220d18dc49a1 SHA512 d415859bc46deb3dcf5e845af88689c507d6b110d6312af75145d6c46cc277ca2d17ae6a0f506c09ca7d543c5eca47b2506169bb0482ae68f2e3baef70889090
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
 EBUILD adwaita-icon-theme-3.22.0-r2.ebuild 1488 BLAKE2B db0463bdc5502471613fc6cf96406db5cc75654975e19f14452cf64d8447848f5a36b5c5cd6b9bbc3703256e083117e68fdaedf8d21d9e02b2419aa5bab5026f SHA512 49569b7fcd8a51e573bb8213344c27ddcde529f7f87b4cb1a9288cc423f98220e5b5f3f991cafca177027c645df55c8d28b89bbef14bef3b6c92e0c6a9ca5cfe
-EBUILD adwaita-icon-theme-3.24.0.ebuild 1691 BLAKE2B 6e8189caae2b93e23dacb867c9a6787801d94cc6338833da2868ec8455130d469d6716bd055f237ce661fdf55983f297b87801d1d208ce67f7e690835465a78c SHA512 767a27129d310ff5ba64d86e0f44e0158252e4d4b2da470703c763e8eef4a968a3b4b6f54434b804f2d71ba99b8ecab12f526ea57dbaf3ec383ee72e9a616764
+EBUILD adwaita-icon-theme-3.24.0.ebuild 1690 BLAKE2B 94a4c577cc67ce7ae19cc938ccc4294ef93f2913146f132893c6543dcc2db38c3119421dda90b0f6e674b00fc587877e5ba4ecbe21aca55cc5112d488bb473fc SHA512 4a36e51af3a62626154b577431b1291af32f7e54ff243fdec259ff02d228c390980279e28e1a683fa69eafdbc06a80c1292cab79e47782f281dbd3a971498ddf
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.24.0.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.24.0.ebuild
index e82c4fdaf0a3..2768aea7c8d2 100644
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.24.0.ebuild
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.24.0.ebuild
@@ -17,7 +17,7 @@ LICENSE="
 "
 SLOT="0"
 IUSE="branding"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 # gtk+:3 is needed for build for the gtk-encode-symbolic-svg utility
 # librsvg is needed for gtk-encode-symbolic-svg to be able to read the source SVG via its pixbuf loader and at runtime for rendering scalable icons shipped by the theme
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 8a81af1caa85..2918a11ccaf6 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/afterstep/Manifest b/x11-wm/afterstep/Manifest
index e87d9424702b..b2e6c33170ab 100644
--- a/x11-wm/afterstep/Manifest
+++ b/x11-wm/afterstep/Manifest
@@ -1,5 +1,5 @@
 AUX afterstep 29 BLAKE2B 9bd4a8ece18d1192c4b36c18c4ec8920069f8e7b82f0812bef902657bf0029137dc6a0f5bdaf1c5dd3102dd3c70697410a8edfb094292fbed375633ae59d2f88 SHA512 194b2af81df48b4c87704bee1db1d01c4cfac3a529f76d8d073fb1358aa95eb9e84a9c2a7da12983a64d61b63e2689b93a79b778007bb8bcdfad8574086ba852
 AUX afterstep-2.2.12-gcc5.patch 9374 BLAKE2B c80a928feb81c3cb53322add051c28fed30cca8bb54813ba1655fc7991e308086ada771ce87db0567c31274594060bfb986c0a805424f5d02d5f73de65605bdc SHA512 81f0998409d9d45f8a25d66cd1c0ae07d23f6ed40f77f56241aae9085d0098510058807f24310c557825ebd67a513cb0c67ff0430cb2f33d2e355e6482c2b491
 DIST AfterStep-2.2.12.tar.bz2 6132233 BLAKE2B 44a597f55bd500f4bb34f499cc5f6f6a011b421d27fc118775fb9f3ff64d9553f5cb9e62aabcc8d0461ef53351e318ed0b6c0385654c40b2cc94d098e2040b05 SHA512 5cac6ce74b24cbcc5b8e8a6f7cc9308e110f0d09597af1fa0a8730d5f5111932a23332629bc4d372fc8d9583a514d97e35f747b17decf8d4ebfe5e3f20cdbbee
-EBUILD afterstep-2.2.12.ebuild 3478 BLAKE2B 68162aa83bb77a90811ca89c038d3bca8ceb95cf190b1c0230b720922d09db64f16d10a19de55c097a311393c9c0a161c2621b350b5cada3732a833cc80ad5f1 SHA512 9d802b3eb03f890eb88be174771e4dda75e65d04320ecc822bf8faa7a7ce2100141aa2e6c9af2450080c406297e0bf4d78c36cc5c68b0b15fb11edc3b50dc95f
+EBUILD afterstep-2.2.12.ebuild 3477 BLAKE2B eef54ee52c1ec62ddfab0f0c7ac829886a28755dd2d0743ade9e97f8d4fbf0bcaa58a8fb363e11c8d5a2f1b7905defd553d57186d3f9500df43c1918ff24eabe SHA512 8dc8fc041b1f1f4a0b34c8195e0c7e4fbf0cfeba59d6f29e86fd4e24061849dfd9a5fdf3959e12c74502c5860c1a0c09fabf0fe656065b7ceb2fed7f7632b812
 MISC metadata.xml 245 BLAKE2B 6621b0f12423f517bfd4000262c79e57c5f68cd2ce8e47f1d9518998a4f273b6db6f7125d163dbbb09636a46e39e0203675438a7e54f88e644480c88a54d71c5 SHA512 9e09ae84ab10dd84251f53e570c7d5bef4a7e3cbfcbba3548d8e3f2a00545b69fb3d01a5905c0d95826b6d0bef822c5c20158c0e70314be191d1d47456aa9a43
diff --git a/x11-wm/afterstep/afterstep-2.2.12.ebuild b/x11-wm/afterstep/afterstep-2.2.12.ebuild
index 00b9f27fb2fd..3d2ff1ce70f1 100644
--- a/x11-wm/afterstep/afterstep-2.2.12.ebuild
+++ b/x11-wm/afterstep/afterstep-2.2.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="alsa debug dbus gif gtk jpeg cpu_flags_x86_mmx nls png svg tiff xinerama"
 
 RDEPEND="
diff --git a/x11-wm/stumpwm/Manifest b/x11-wm/stumpwm/Manifest
index d4f915b40986..34c6bb43c48c 100644
--- a/x11-wm/stumpwm/Manifest
+++ b/x11-wm/stumpwm/Manifest
@@ -1,7 +1,5 @@
 AUX 70stumpwm-gentoo.el 84 BLAKE2B 12ce0e9a1b53a1c1c84a9f350484b9620a2db9a30eaefb11bb409b89aae7f1226173930c52d018ec8a845c8e6ff69efd5570a369444537d070d21427a6960c09 SHA512 2e67f51dd6840f850aa1c0e3f2e8c2453203603f174f3ce97feacd2658cf6168bf557eb6ee83499b8c60fb107fdd527caccdda7ab5692646a33f96ad1350bcd1
 AUX README.Gentoo 1894 BLAKE2B 23dd829621f92b2e5ab22bd3d54d9338d1034bd55d4adcfde24f6c0a780e41dddd747ee2baecdfd9b03a54de7e4acf08d903205dcdc68851afea5317401681aa SHA512 c187fcc12bbb4c10718e708a4b17a9adc89f1268270f231e8b5feeea881149482d8b70ac0f5eb78b7e0b93700d6cd5133bf7d844f97736bee793405de9a25a09
-DIST stumpwm-1.0.0.tar.gz 200794 BLAKE2B 656d5f72fe578f12725c3a1a66c56e42175a33d9b1f9d9e83f3b323da17d9e1bc00e0dbea546a8298da7ecbb4c9893da74efe8b7f14475863e670254248d6ca2 SHA512 eb5bf48a5d185d982e8a9ec7639958f14fd912e0f4c89da205f0bcb0c10a61c3953bce5029c2a301fdcd29fe05c505601d4db30fc50b34b7082ce69bd25b43ac
 DIST stumpwm-1.0.1_rc.tar.gz 197530 BLAKE2B 2883ee8a0f75d3c673f6b6f65675c98e9fad8ef181b3ed9cf8bbd5eed7c0d63f3f48d021d056265d4e6c14dd0594bfe3a36492cd9bcdf2b3379d2aa62eba1f67 SHA512 3ba68987e61bdb46fde9c6bbed82b630be1db3272bdfb844a9d7abf3f810e94e560a28d4951308cab5af1f93b35710b10bb1a1a35450a8445a1b959888266df2
-EBUILD stumpwm-1.0.0.ebuild 2000 BLAKE2B d17ed1017fbcb27fc4c1fe952c5f3c05ee70f74aea1928f44b821db141e5391002360fc192d1d8b46e4fb4f887a255cd878617e30cfaea5d00c8f04b80e245f2 SHA512 5ef81d50b544bb0df49e14dec44d3b88573b8938efddb870d8522329e2929a1d766453d8e0d537fae17b42ee430295afe106672982a44226d90b6ef8d2986f89
 EBUILD stumpwm-1.0.1_rc.ebuild 1720 BLAKE2B a6289438611ad9fbc80574180ecc3c1e8a7f69e043e092c9bf65011bd8f302dcbb22eb3eefce1cec3a3ae4a62370456bde525df4f3463ef56db5bd77bd3c0fb9 SHA512 3a384f1a61caa62bd8ed598ef546d43a842beaf19cce966c319d6b8ae371f23ac1d0da5ff57a34078b112d051695a69ce512ae401ec64eadc4ac100513676b1d
-MISC metadata.xml 2521 BLAKE2B f2a96ef826d48affe3abd410f9a82df2cf2bf40d2495c9ccd4f3014d72dee7e249033ace3ef7b2f7897da04a693fc27c569a3cee2ae0f90557d7cbe942da5515 SHA512 98a39ff560bb2317766cdd3b3360a55542c9d1ca4c7f8d814863f133744636c300cea4622886dd8318390d17b75ba2a42151ad5e9273bfb7054e4581f9d33e89
+MISC metadata.xml 2359 BLAKE2B 386ce110aa8b0cd933edaa6fa1dcd7f26d5ff8245317a77af546af6cbe89c9671bdf1c4810654fa0157c8220a04f0cd88e3dad482aab5402032a55d842ff93f2 SHA512 77068f2b6f1aa4b812c6b5251b9b4a0d0dabd08c1c868310c5c9a100ff7d159bb890516395bd7cbda9f6cd014f682d3c0cb2a03afa28e12ce4b2c5575c9c1eda
diff --git a/x11-wm/stumpwm/metadata.xml b/x11-wm/stumpwm/metadata.xml
index 280080d2f50a..735e47be73d7 100644
--- a/x11-wm/stumpwm/metadata.xml
+++ b/x11-wm/stumpwm/metadata.xml
@@ -51,9 +51,6 @@
     <flag name="contrib">Install contrib modules</flag>
     <flag name="doc">Include documentation</flag>
     <flag name="emacs">Add support for GNU Emacs</flag>
-    <flag name="clisp">Use CLISP for the runtime</flag>
-    <flag name="ecl">Use SCL for the runtime</flag>
-    <flag name="sbcl">Use SBCL for the runtime</flag>
   </use>
   <upstream>
     <remote-id type="github">stumpwm/stumpwm</remote-id>
diff --git a/x11-wm/stumpwm/stumpwm-1.0.0.ebuild b/x11-wm/stumpwm/stumpwm-1.0.0.ebuild
deleted file mode 100644
index ebb4b56c5712..000000000000
--- a/x11-wm/stumpwm/stumpwm-1.0.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit common-lisp-3 autotools elisp-common xdg-utils
-
-DESCRIPTION="Stumpwm is a Window Manager written entirely in Common Lisp."
-HOMEPAGE="https://stumpwm.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="contrib doc emacs clisp ecl +sbcl"
-
-RESTRICT="strip mirror"
-
-RDEPEND="dev-lisp/cl-ppcre
-		sbcl?  ( >=dev-lisp/sbcl-1.0.32 )
-		sbcl? ( >=dev-lisp/clx-0.7.3 )
-		!sbcl? ( !clisp? ( !ecl? ( >=dev-lisp/sbcl-1.0.32 ) ) )
-		!sbcl? ( !clisp? (  ecl? ( >=dev-lisp/ecls-10.4.1 ) ) )
-		!sbcl? (  clisp? ( >=dev-lisp/clisp-2.44[X,new-clx] ) )
-		emacs? ( virtual/emacs app-emacs/slime )"
-DEPEND="${RDEPEND}
-		sys-apps/texinfo
-		doc? ( virtual/texi2dvi )"
-
-PDEPEND="contrib? ( x11-wm/stumpwm-contrib )"
-
-SITEFILE=70${PN}-gentoo.el
-CLPKGDIR="${CLSOURCEROOT}/${CLPACKAGE}"
-
-get_lisp() {
-	local lisp
-
-	for lisp in "$@" ; do
-		use ${lisp} && echo ${lisp} && return
-	done
-}
-
-install_docs() {
-	local pdffile="${PN}.pdf"
-
-	texi2pdf -o "${pdffile}" "${PN}.texi.in" && dodoc "${pdffile}" || die
-	cp "${FILESDIR}/README.Gentoo" . && sed -i "s:@VERSION@:${PV}:" README.Gentoo || die
-	dodoc AUTHORS NEWS README.md README.Gentoo
-	doinfo "${PN}.info"
-	docinto examples ; dodoc sample-stumpwmrc.lisp
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	xdg_environment_reset
-	econf --with-lisp=$(get_lisp sbcl clisp ecl)
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	common-lisp-export-impl-args $(get_lisp sbcl clisp ecl)
-	dobin stumpwm
-	make_session_desktop StumpWM /usr/bin/stumpwm
-
-	common-lisp-install-sources *.lisp
-	common-lisp-install-asdf
-	# Fix ASDF dir
-	sed -i -e "/(:directory/c\   (:directory \"${CLPKGDIR}\")" \
-		"${D}${CLPKGDIR}/load-stumpwm.lisp" || die
-	use doc && install_docs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}