import portage-20160924.tar.xz
diff --git a/app-admin/drush/ChangeLog b/app-admin/drush/ChangeLog
index 9178729..c3d48d1 100644
--- a/app-admin/drush/ChangeLog
+++ b/app-admin/drush/ChangeLog
@@ -104,3 +104,10 @@
 
   Bug: 575810
 
+  24 Sep 2016; Agostino Sarubbo <ago@gentoo.org> drush-6.7.0.ebuild:
+  amd64 stable wrt bug #592258
+
+  Package-Manager: portage-2.2.28
+  RepoMan-Options: --include-arches="amd64"
+  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
+
diff --git a/app-admin/drush/Manifest b/app-admin/drush/Manifest
index f96f843..a6c5d35 100644
--- a/app-admin/drush/Manifest
+++ b/app-admin/drush/Manifest
@@ -2,7 +2,7 @@
 DIST drush-6.5.0.tar.gz 509643 SHA256 0e6bfb8a4bd75846dbca25f6d3e3130a706546f6a62edadce2eb00099750e2a7 SHA512 4afd348c025b9303386131687205af4219a77e6c822518b079a3f0475cbd7ed03647797d613300c7a281e2354f0d855435222fe1afe13447153cdbd6a4393add WHIRLPOOL 1f2a1a725e1c0f89cac90a1338e1541e587c7834560fd23d1a44341696be320e65cf93508d4841f02ca9b30ac62f3fed7de772e00f4eaeea64f287cf19682fcc
 DIST drush-6.7.0.tar.gz 511581 SHA256 f3ba2a6847f83b1b8a61207b1a514617612a75261e7b39ffc2606b6958f79e8c SHA512 203870190dd8987ad3da71f7625476c1f94bc75513447a740fd8c16268fb9705bcbc3b2bffc49a44045998e3fa49fd5ee9d4c0634a1fb39605ba8e10b7373fa5 WHIRLPOOL 87eb20be4b6bb8280dd1e91c422bdfc7a2181d6eabd37a212ce7b95ef863cd7c526531d98eca09d032f8e8cf3201d746dd615dfcb858dfadfaef41869dc22500
 EBUILD drush-6.5.0.ebuild 1714 SHA256 6e32cb527a1d2678ee1faa0d1c3beb59320e333d7b41e193fe79298bdcd98c40 SHA512 7c56968ab2aa0dac06b105f37e131734077ca69714192ec7b6322c378a3d5fd4fa196e7ce1d2319835952f31b1e8534625f660077d0130c6306f76753b2f9443 WHIRLPOOL d66ab1b248a4a74bac5221d3d50bbaad2da38fdc63cf0352165cf113f337f926a0fdb2291e8d657c48b478267facbe01b4bdcb1d42eebefd08ade6e7fe7ec391
-EBUILD drush-6.7.0.ebuild 1716 SHA256 7157a33e598550c445e2821d161d3e4324b605140c8ed88d77d841c5b80cac1e SHA512 b5f35f03e0f663efc53c1e17b3cd465dcb3fe20d322b9eb7312e28574b1c27ec3db9d6e4b623ad52aa423c51a07b9bfefe1a64aa8edd05c2319282dad56d93bd WHIRLPOOL 701669bcf36ae33fc0a11aa860db58080b9444e2fc010872a846c2d0fdf1624b9465e371345d33fea74b7f6f808cd0faa695dad45d2a5b53b4179986b332c84a
-MISC ChangeLog 3584 SHA256 95a53dc87fa450dd8f93ad9eabaf89f7d9ee4af8402a72b4c8aceafece25b637 SHA512 a48d926dc7d3cca7ef8f030311de34b3c3d40bab804028abf0b2cd32b3ca0239914cc34a1a72df65ab226aa1dc3a0f51737caa5ef725954bd6d7034889a4c120 WHIRLPOOL 83b4c09789477d2c7fb488e4160e57bf2cf7b28e02a15ff689bbb1e456f224476e06fedc562c1c9838418005232d24f052eb048b9b067b12979c0f829a1b1773
+EBUILD drush-6.7.0.ebuild 1715 SHA256 721e2cbfc348da50e1dcc9acbe47bf53bf05f1bf7d8a44d46b5f29a65f05dc39 SHA512 6fb4dfbbc9b00dba5848d5f14a77f2bcb3b55759f3d6244232b772bb5e9af2506532f8b0a418bec02075c4faca994f86fec16285ccfe0d9bc40c89fc99025d02 WHIRLPOOL dc66983459acae4f87d550da5863f2b6afc2364e200c302f94992342ff55e0ca7208fd8bcbeb22976d83457dbdfca6a5ef321fca4e96f5a2b122201d96a652ae
+MISC ChangeLog 3815 SHA256 3bbb7eb24eb6591527ed4a0f470ecf73b8d69a003ea6fe87575aff0dbde8a21e SHA512 834a41587144468e22127d08cc399673f2f774fea5688271882c0d9c93ff1b040e817e83a1126d9984bb9447d8d6855a6c243e85b785705c8c5ccea79561ffd9 WHIRLPOOL 5ff8653d006f6207c23f281c3bf1e74cb40117a2c2bc602e6f7f8bdad5b6f4ba2604a78b7c8551b47206e18325de3ea0baad7198fbba243b5c1eb0dc8254115a
 MISC ChangeLog-2015 2376 SHA256 1c59279d88781a3f927086c2c692aea5666e149a9604ad6eb89fd326f5f901fa SHA512 8f5948a9e05a96934c07df74a612d0740419e11143b732a2817c39119326fdb71bbf884726a0976ec665714c727ccc7b552dc55cede4ac90dc60b694760f69c8 WHIRLPOOL d81b2c1f8ae62a6fead1a361b9b9fb33a7cc24ff2205c721d12fcf11e912b0f4166f41728f107e195593529eb832a780bcf256a64b5531a59d57feb2387a1b50
 MISC metadata.xml 531 SHA256 c177512601aafe47fff0e583e71ea0a02b9bf3b75378d37bb6f0b641b4801441 SHA512 27cfde1e0c618050f645abf589511ccf87675ac00da8eb147b6a38d1e48d0d688fef2310ec015d394a202b56b3f09aca32b6d6c9bedaab98e469139349472aa4 WHIRLPOOL 9a5f730e1139e26422d23df83499053f0ac70b95cd086de3b39ee7a1a1f7cb3d883f8203c8762b64183ca004e27cd392cb2b36e3d41689748e321e3ff3fcc9be
diff --git a/app-admin/drush/drush-6.7.0.ebuild b/app-admin/drush/drush-6.7.0.ebuild
index 4737c38..e06a93e 100644
--- a/app-admin/drush/drush-6.7.0.ebuild
+++ b/app-admin/drush/drush-6.7.0.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-admin/puppetserver/ChangeLog b/app-admin/puppetserver/ChangeLog
index 59f23cb..ec72637 100644
--- a/app-admin/puppetserver/ChangeLog
+++ b/app-admin/puppetserver/ChangeLog
@@ -218,3 +218,10 @@
 
   Package-Manager: portage-2.2.28
 
+  24 Sep 2016; Agostino Sarubbo <ago@gentoo.org> puppetserver-2.4.0.ebuild:
+  amd64 stable wrt bug #586500
+
+  Package-Manager: portage-2.2.28
+  RepoMan-Options: --include-arches="amd64"
+  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
+
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 09f9a87..a0f1179 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -4,9 +4,9 @@
 DIST puppetserver-2.5.0.tar.gz 33907947 SHA256 d058d49133b3adba86c8b01c7ab5c1f4511c191fd50e75be583b28ddfc824cd5 SHA512 c822d320a9ce98c6e96e4838770fc52760f08aab9fee26e62174762947b9ccb09234cb1edba0a5e17f4c08e76adccec83d8353f5aa47d08864c5bb9b2dab2574 WHIRLPOOL 1d2fde7aade7e9e6c5117d8d2c88d787a93d1aacdea81ad3235fdb90384d8578739a54ccfcff28e217a86bd5d29c48c4dbbea4d38d3e34c4099ecf21adc9f995
 DIST puppetserver-2.6.0.tar.gz 34157248 SHA256 633ad9d1a4da7fa514edd7be6501aa61f779b50e7ec40aeedbc955175945f771 SHA512 3702321a99d8e9f528e2457ceb7bff513619db31687c54884fcf9b47626b680628879b65488c3cad45fa5b3b1d0af9967e40adf1c313b7eb6e0de8c8697af659 WHIRLPOOL d63c3579b4a9f6de94b44d526489509efd7b420bc6fcd4d8ba8c57a7d3d31a209a94b919143f90426a0151224c77ba694d22530cb98169dc94f0b4548d3bb2ba
 EBUILD puppetserver-2.3.2.ebuild 3813 SHA256 a95c3e6e2f82660b88ca491c36ec8fa2cf5130d053f3f0f77d292156a51cfdf8 SHA512 8e761c3aaece4e31b1d2f16c897aa732fa20814d6d02e2bfe35127cfbeaf38a8058571abe654a650da23ebd5b0db176fd05e90cb9b00c3c36299f6026672cce6 WHIRLPOOL 7365ec6eca39affcfd592229f53d7c8c1ca748f7167799fea0334621438ebb860bb61a7a33416cc5823ff3c11c3f573c55644347550cca4c3c3ac6fc6882b550
-EBUILD puppetserver-2.4.0.ebuild 3815 SHA256 07f791e7b4634f1ad1377b0ca29d91c01d98e398c8c24b9a60f390b21b776020 SHA512 94bd37964f53852c490d114cd2df90a114ba031a2fc6171ad445ec72b57e1423327a7cc84daa404895a6df256f575892aabbea186834b4004efdb7647cf7a0a2 WHIRLPOOL 9afd785681417e579dd6510c92813ca7dc3192aa2eae32a09f460d6ff057cd40b4da996f818a34a07b06e3c717535b949a5f7d5a96247443c80d059e0d3bae1c
+EBUILD puppetserver-2.4.0.ebuild 3814 SHA256 201620974c153b7f7014462a883d4334ade93ff1d6ac6658c2b0516f47f1fde7 SHA512 905101daeabecfe7bf235b420b14cb436d04f8a6dff7dbba910166a7b20def4bdbeaaef4882f98b0eaebbe66c122cf75994b5cf066e428b73beaf6e678535ca1 WHIRLPOOL de6f239869663e7b0a4c43ff4d7325ab2f8e5c76dcfc8d0b6609506179d6a526bdaca919ee276696a928246aff8cdea88a0e4c3208723e45cba5808aeeacbfbf
 EBUILD puppetserver-2.5.0.ebuild 3984 SHA256 33a2e6546efe2104618043e614a9c36e100a01471b95e31ab11f1dab0b2a0245 SHA512 ab0a0410a71eab432de8872f5989639e7f17de0f1eda53ee67f76fbe6cec1dff1393619e3e11afdbc53eb0f4ae9a7aa7ec6c60452000b9f6fc049b4fc38e826b WHIRLPOOL 4e53df3c666d92835bd097445ad8551c9df7747fecf3898e04c18887af2cc904917f8aa6c64b473aae528dcd09c4203a0135f22a5c01ac943eb5ab12ee92956b
 EBUILD puppetserver-2.6.0.ebuild 3984 SHA256 33a2e6546efe2104618043e614a9c36e100a01471b95e31ab11f1dab0b2a0245 SHA512 ab0a0410a71eab432de8872f5989639e7f17de0f1eda53ee67f76fbe6cec1dff1393619e3e11afdbc53eb0f4ae9a7aa7ec6c60452000b9f6fc049b4fc38e826b WHIRLPOOL 4e53df3c666d92835bd097445ad8551c9df7747fecf3898e04c18887af2cc904917f8aa6c64b473aae528dcd09c4203a0135f22a5c01ac943eb5ab12ee92956b
-MISC ChangeLog 6368 SHA256 35d41ec6c3793bb34267000f5c3a6ebbcf32599531fdb85446d7675f2d7444c6 SHA512 794415a2ea4129d93e4af675acb983890394bae8c779822951f8db74eeac22a23edcd0acdccf2646d0575a330d5b5d012b2fb91f067088fc080949f26e0d8358 WHIRLPOOL 83b5c9c3e4b7d36cce10e768c549416feae0cfdc92bbfe7c85152d23c42b5623faa777629adb300538dbe6ea8a0c395f3cbe1bb1c8cabc093bfc5b8c14d7b0bf
+MISC ChangeLog 6606 SHA256 9b0f19e2efc6da7fcd1269a00a0090b2686ef96a14cb861a88985389ef653268 SHA512 180112f025d203310620597ef740986b94a1d7351bf8b2b9f64a124a237cb7962269088908aed27a68aeb4869b82b15085f4265899c2db04e954a88f4c21726f WHIRLPOOL d36eb25987cf1276363c7b2b0832c802e11483a20c978ef3b234bb3dda845e9ae947d120c521accb76e079cbc2c83c5ca989fcddefa6e15f670978a6d8bd609b
 MISC ChangeLog-2015 878 SHA256 55c43d296cd6cf910139ea29afe0d041358cc5a8ea0366936dfb75ba21640eae SHA512 5ad7c7171faf5a1c05cb9afaf307880e37744cdf472b1f6f1a72c1ab98f58f2e2150d8582ad72ad0ab9b45a075b7c1ce700603c942b183328a18cee505a186b7 WHIRLPOOL 7c5aaee9bea21577e2864ccc6c31d5accafd4a74ebb79d4f73388a0b3995de84471ed7b18c896747c8730349236136cd23f44f5c71a7aff3a08ef13ef42cc682
 MISC metadata.xml 468 SHA256 cedfad43df11b56dfc9042bc532da2c772f94202ca8819f38fd9cba9e3341107 SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c WHIRLPOOL 356c70f8cfbd446e22a6849124d474ef9ce0663da00694accad62fab22458f69802bb06a247c61950a6e2c384996f6b067c0440499ddfa667342fbe8d627721d
diff --git a/app-admin/puppetserver/puppetserver-2.4.0.ebuild b/app-admin/puppetserver/puppetserver-2.4.0.ebuild
index ec9a531..bdd1a47 100644
--- a/app-admin/puppetserver/puppetserver-2.4.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-2.4.0.ebuild
@@ -14,7 +14,7 @@
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND+="
 		>=virtual/jdk-1.7.0
diff --git a/app-admin/sysstat/ChangeLog b/app-admin/sysstat/ChangeLog
index 5685a49..cdf06f3 100644
--- a/app-admin/sysstat/ChangeLog
+++ b/app-admin/sysstat/ChangeLog
@@ -252,3 +252,10 @@
 
   Gentoo-Bug: 593920
 
+  24 Sep 2016; Agostino Sarubbo <ago@gentoo.org> sysstat-11.4.0.ebuild:
+  amd64 stable wrt bug #593920
+
+  Package-Manager: portage-2.2.28
+  RepoMan-Options: --include-arches="amd64"
+  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
+
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index b158f36..4720065 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -12,7 +12,7 @@
 EBUILD sysstat-11.2.4-r1.ebuild 1956 SHA256 20b1acbc12bd2281fd83b42e8d99d2437055d30a58b1daeaf51430cc8c1546e7 SHA512 a89cc4a69f5311750408ded205e8fe1a16a5f639dc4c92394d0b0811a5e97be5e70bd4379656685272dc3bc8ab2199b451b90cc9c30f6ba7fbc6e3db9162d005 WHIRLPOOL b3181c03d4316d3d05488ce55fc0223a87b4c3233247b60bf87b93efc14de1a5525246b8a15b56f198700258c0ff898fd22adb1b36a1a5ccf30c50af7fc3e014
 EBUILD sysstat-11.2.5.ebuild 1959 SHA256 51e4921d7fb09de3ae8c9247b481faf1d203fc4d3654c1fa1811a1eaaad19b1a SHA512 6ad7910181cc8829bcbb781625cd92a5b7c3e5d267d7f04df67288760d26932215cb35a09d19c11a2a87dcf118259a68d762e38884bbad57ed654deb98129f15 WHIRLPOOL 3f89e0b1c4e3e2cb95e4c78b5ac3f3c7c3deadb864625155e28fb1fda77f5085497df6cf36006362ebb4316927ddeffc22d46e45171359af88b1dc78c0efabcb
 EBUILD sysstat-11.2.6.ebuild 1959 SHA256 51e4921d7fb09de3ae8c9247b481faf1d203fc4d3654c1fa1811a1eaaad19b1a SHA512 6ad7910181cc8829bcbb781625cd92a5b7c3e5d267d7f04df67288760d26932215cb35a09d19c11a2a87dcf118259a68d762e38884bbad57ed654deb98129f15 WHIRLPOOL 3f89e0b1c4e3e2cb95e4c78b5ac3f3c7c3deadb864625155e28fb1fda77f5085497df6cf36006362ebb4316927ddeffc22d46e45171359af88b1dc78c0efabcb
-EBUILD sysstat-11.4.0.ebuild 1958 SHA256 26759c957d82135fe9d4407366bf6f1d99052031a5a8766e92d6a2533d35ec30 SHA512 35f4b07b116ce4cab7a3345c4200af89294eb03748891dad843e3008e0513e52ac5b85b8ae4e5bc42e7bc1ad079b7ddd628468dc327286459a158076ab57be13 WHIRLPOOL f4137567b517df352bdeb82bbf0e52429ee7732805f7bec4671d6fb51447f7663fc6ca652473ade08a76520f93a306da66d6ef9be00f9f6f5a96a076bb38db6b
-MISC ChangeLog 7339 SHA256 ccf64e1127e9cbfd0afb680d78cf0a1f52799bf7e61694bbd4204f4deadbd434 SHA512 d906dce1d4abddbde97f1c146852a72d58522ee9c924ea2350f074a44631cc23b04e1418eb53c5a4e82afc622d64218ab839195a7416a971214facede1578b5f WHIRLPOOL 7e2503a68bb13693e712d48f14342622e621af6d2ad01aa93f42cd1100367962acaa13cf96d214f02d78184fd345bc6651a9195f1c2ee5beb3edc182be8f273a
+EBUILD sysstat-11.4.0.ebuild 1957 SHA256 c12c73433b613985aa63541da489cb206b651b6a7f0a92d9a9988956327d0e8a SHA512 49d95a879d029f84b699856993052a115d22324a68fd1cb5dfbdb3f9bf2b7abbbef6d7d889706431dcb102565d2101cab7ed3b4a4c80953b321ff9ea0ff923eb WHIRLPOOL 99a04d8d142a4565ff9e09f0a1748b1bac0c017d47827e62cde51a0e3e7f2a8a1e63aa6a3fe96b51d1d2b800ff2f6b2009f24c43012cac8a858ad56e1a6ab17a
+MISC ChangeLog 7573 SHA256 0472541088a56749acf7b31b63fb66b41a7b4a465dae1d3cb8f083e772c0b4ae SHA512 c25b7df7ad514863adb10befe0e052cc487640a6b0a986599b68f9ba6a580211502b7b1dc9a6fa948fa576d09f3a131d186ceb3fd5514cc05c5a28f1cde0b459 WHIRLPOOL 7c7a31fcbd25a8aebff8551a483ce4f3f0501ba4245971aa955198320e210406be0141f53bfb8e80a0c61dea506159ab0b0c6e5a71e057c30b014ee084a5f4b9
 MISC ChangeLog-2015 37518 SHA256 f020b27cf6b458e9fce1b9cd3294ca030b9a5992df7801e12c23ea3e3e8adb22 SHA512 13251666a2fdd4cf4efb042e997c24d4fc9090c387d75b46ff4d6e29074d9f96a05353903f278319987800c8b130f54962ed49974f3ed68f554bac51543029bd WHIRLPOOL 94424ca038660ae939574de7ea313c6e2c05a26749dcad1d376489567256b272e671d099bdff2de90efd2604782e3060ec85521603eb0868887ec1071eacf05f
 MISC metadata.xml 421 SHA256 2d15cb6714c6d7bc0afa6d46960ffa53118f089e6af46063930dbe5fcf2eb969 SHA512 8dd6a61f7ecffaac68af39b297cb541b6851a5cce18570e0a8a83fa6b4fd53b5da8f131f7da9970dcf1078a605eeb23a2b8f19c804409f1e64638c1d010c4ac9 WHIRLPOOL 9dd14783144f2f0d3e912548ed10eaa0cfe2e2476552eb69c5369c471983d0883a4dd390c0e6d65608a8cade8e3e3de17515e590fc5630a1c6f00f2b19347bd0
diff --git a/app-admin/sysstat/sysstat-11.4.0.ebuild b/app-admin/sysstat/sysstat-11.4.0.ebuild
index 6bad79d..01c1be6 100644
--- a/app-admin/sysstat/sysstat-11.4.0.ebuild
+++ b/app-admin/sysstat/sysstat-11.4.0.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="debug isag nls lm_sensors selinux static"
 
 CDEPEND="
diff --git a/app-backup/rsnapshot/ChangeLog b/app-backup/rsnapshot/ChangeLog
index 1c52d20..6eff657 100644
--- a/app-backup/rsnapshot/ChangeLog
+++ b/app-backup/rsnapshot/ChangeLog
@@ -140,3 +140,10 @@
 
   Gentoo-Bug: 591860
 
+  24 Sep 2016; Agostino Sarubbo <ago@gentoo.org> rsnapshot-1.4.1.ebuild:
+  amd64 stable wrt bug #591860
+
+  Package-Manager: portage-2.2.28
+  RepoMan-Options: --include-arches="amd64"
+  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
+
diff --git a/app-backup/rsnapshot/Manifest b/app-backup/rsnapshot/Manifest
index 9aa3874..e84aea7 100644
--- a/app-backup/rsnapshot/Manifest
+++ b/app-backup/rsnapshot/Manifest
@@ -4,8 +4,8 @@
 DIST rsnapshot-1.4.1.tar.gz 489481 SHA256 fb4a1129a7d3805c41749fd0494debfe2ca2341eba0f8b50e4f54985efe448e8 SHA512 a99e639bd706aafac82d2a4a40fc6c7fa026321c527ad5826a4fc7917cadea5962c4c7988c98efbe06833ef70db081605aa47a6d77c04dcf6077cc232c078cbf WHIRLPOOL 999979b7d438c336203298a4bce2d49fb7e6166428356d0d3ee93369244856970faa496528a673df44ab21c5ce6fa694d83df9fe45075d62436c24fb97f7a435
 DIST rsnapshot-1.4.2.tar.gz 487959 SHA256 042a81c45b325296b21c363f417985d857f083f87c5c27f5a64677a052f24e16 SHA512 621be52715a6c1f70ddb251d7f6103ba3487cd0c6c607411d744866547d3ced571862a8f6b5e40a1d050696703f3a15821bd6e829a3fca057848f04566d0e4a0 WHIRLPOOL 6b7256562cc15f6ce62d05515de4a933d986cef651e9f6a912e760a7feac9ac906c95ea8adef68561db02d494d9774a47f9192d5fdac83366a40b84739a21a03
 EBUILD rsnapshot-1.3.1-r2.ebuild 1265 SHA256 2aba334993df2b0136ed17ece3122cefcddeb3bf124617870418edb5b536f44f SHA512 5c49b3d13072b16a5e6a8d2da6e882285a0b3f16fab1a7391ed858c13ae9ace2160fea3135afd0172fdc2a3c809a95e96b1af9b8127cdf7eb609dba2530e729e WHIRLPOOL 0b491ff62664e40dfa7cfcacc0469f787f5204d602c53bf331fcecd94df4715ae3b597d6493d89e114a45bf549915c7d0060eb9214ca5456c4d6186bb0f75089
-EBUILD rsnapshot-1.4.1.ebuild 1119 SHA256 bb538939f17f6d4273b25227e00678cf5d8f11f40db47f6580a0ceec0b021a39 SHA512 801dfdca829caea026f09b21fc69a63c6936b0634e3ae18d373dfa72955953810e3744965c1a526022cbc9c8ba175d85651706daf9f6e3941438b379dbe4b2e3 WHIRLPOOL 8e1704780d2e0f152b3f9f31173435b6e8b474b989e89c48df051ca1f4d58e112cd4c0c5d753718d2cdd34eb4933f1d4b4771ad5a0a292aac60072432fae755a
+EBUILD rsnapshot-1.4.1.ebuild 1118 SHA256 f6fbe955f165fe685a7dac297d3bc62ca25a655fdb8ea4a648ed143824ff13e7 SHA512 f73c788f28727e0c2f2d259ab5ecf2d83ca963d8dcb879e01507f5ab11a28cb00cf2a0cba98277cb508b8b1c3337c11ee1eedaaea8e44ffb3564e27847fc23fa WHIRLPOOL b8308502a4dda7f66ac46ae17a69bbeec90df11ccf6ed635f5b3310e2aeb749527f01593b54e904294fe2778665bd324280e80501c6c565fc15b13bfc076cd23
 EBUILD rsnapshot-1.4.2.ebuild 1351 SHA256 2f76a6746bc5472b72a796e5eb23e2e647f7a8fca4dee065600fa29b5728fe55 SHA512 f320481d6f72985b41faca3550dd65aade9cf6d1120d6a42bacaf7a898c8281298f99325b6d083983e70d6256db2dfee445a48202fa94ebd56cd839141b2442c WHIRLPOOL 53c9aff749a34d446c1e9a09c6e13ebded1796d4213e16dfefaa1dc1ef565b4f086198d4bd87248eba2f211c2552eab9bfa2f0cf31c9fd136310f08ce2015543
-MISC ChangeLog 4688 SHA256 ab301e5553abbe09c9ac22618578378d476ec259a036d2479bedee655dfdbadb SHA512 36a9cd038d46c8bf801b0f65c9d6b584b41882ef395214356aaa6f88f3d89f5aaec8b8a90e8c29c1e69ede267092eb139186f665f7b36aaa658afd45614e7ec8 WHIRLPOOL d794c9ce7288e550d9f79ad8c54054c04ecab5164faa3b37058301f7149b040a6871985beb8f4b30a88fc3b4a4e07d43eeb4de770a2526e0b324f365b43f04be
+MISC ChangeLog 4923 SHA256 218d950f0e66d0b2b0a2536bd8f42c3c3f4f530767184c904ecf12e651cd0467 SHA512 547522318d4d6d7115b4b741e78cdf884aeb6a8742284e6430567c9e1979d679bd528ec1c50371f2861281f6affc8fbe1d8db5049a3fd5980ab7e0b102d0786d WHIRLPOOL bc7a02d3925f25c4cbcd77cf24358233c87627b9d6c9c5109b57ca65bfbd0c1edd08d92a196defa9db750fd0688be026f255fae35f49bc91bfe1e15422cb78a5
 MISC ChangeLog-2015 9829 SHA256 1432d7119f0d982612aaac1e1802fbe004ecaec73035ee657d9f1d5b71b81699 SHA512 b1a24217010a414a80246a1251689a8b6752c34a0e579fbc2cd7f628e0e91b1f56a10b1800253606bdc7d74b0802772cbe07376104ecceb6151f3500cdcc3c44 WHIRLPOOL 6d55c48aa5d407722b03d84693c46034f7f0c5473743c10dc725350b4503fd474c7d3b92442105aff7f0152a22243e4cc2fe655bafe6117f7861eeba436c74be
 MISC metadata.xml 464 SHA256 e0e2c31f4a7384da1adc650a0b22f5e0d5d33228f6625bb3dd71e872a09838bc SHA512 519adaa6b36a44f19519546e07b9763b2e4b9c0caac3cc0c73f79be4354ea7ae7228a6523e5712d0bb84f57fc225c2592105b55aa5411d8dc340feccba56b066 WHIRLPOOL ef75d7c2b712bc2c81948758f303b4717a7d2b2f141a146df202000d5abdeadce7674b1cee5f25d8c437f7dccb9ca8a45e05cdf68f5b1d911924aa8c9042c3fc
diff --git a/app-backup/rsnapshot/rsnapshot-1.4.1.ebuild b/app-backup/rsnapshot/rsnapshot-1.4.1.ebuild
index 4f2ceee..2375fac 100644
--- a/app-backup/rsnapshot/rsnapshot-1.4.1.ebuild
+++ b/app-backup/rsnapshot/rsnapshot-1.4.1.ebuild
@@ -12,7 +12,7 @@
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND=">=dev-lang/perl-5.8.2
 		dev-perl/Lchown
diff --git a/app-crypt/gpgme/ChangeLog b/app-crypt/gpgme/ChangeLog
index e1b5603..57fb5a8 100644
--- a/app-crypt/gpgme/ChangeLog
+++ b/app-crypt/gpgme/ChangeLog
@@ -101,3 +101,18 @@
 
   Package-Manager: portage-2.2.28
 
+  23 Sep 2016; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/gpgme-1.7.0-build-python.patch, gpgme-1.7.0.ebuild:
+  add python bindings
+
+  24 Sep 2016; Alon Bar-Lev <alonbl@gentoo.org> gpgme-1.7.0.ebuild:
+  even simpler distutils usage
+
+  Package-Manager: portage-2.2.28
+
+  24 Sep 2016; Alon Bar-Lev <alonbl@gentoo.org>
+  files/gpgme-1.7.0-build-python.patch:
+  simpler python patch
+
+  Package-Manager: portage-2.2.28
+
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 49fd05b..38fffa4 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,5 +1,5 @@
 AUX gpgme-1.1.8-et_EE.patch 347 SHA256 1c315576b34f1b68b264b3fc5762d0107c444bc76cd58af04c6304551ed8fb64 SHA512 69577d0a1ae9061277cd502d72c2add13b61def4990c09c6181a14b4792745a4e2e467090019ab1ed8d3dc6df6f09b63230d2d21974e0a802a1e976fe5de18d5 WHIRLPOOL 93e3166033d76cabcfbc4109dd2da8da5a4cb35fb612758a210782bccf1fb8f4c7a8569064d621e6d4d03b7ed242362e605c4d642a833b8e3db5b699d526cb21
-AUX gpgme-1.7.0-build-python.patch 4448 SHA256 78682b0c4c3659b461499473a14e77fcccf040ed013f8eb11543137b2963736c SHA512 e2e4304d1f54c2dc4a32d3a46535d64c781bc757d5169d5c24a6c3ad3638020622e340cb5836e61d0a9b7d2de51c87303ca4da2ea4ac204c8bc9d22395daa41c WHIRLPOOL 440cee19900345e92ac72b5b23398fd7e57e54bf7f9ab6cb5827115733272fab9611b8837c962eead8e961aca9f3ae9915a53863eb93c7726ee2e8868841a4cb
+AUX gpgme-1.7.0-build-python.patch 3446 SHA256 ed394a1fceecc1efb579cf5974f5837c6669e57d2a28c8431d993e62ec1f940d SHA512 748c5d8b05e7cade4d62dad5a4ba4e6fd8ed0c3561b16dfd8985f3f01522d5efb5af792185cda2d1a540ef42ea2876a5159a0d9b06784e6f3aba11a495d89e5b WHIRLPOOL 9627d916631e1bd399dfd109230b6eb318443dc3ba38a434a10245174152d824d5b51deba2dc6f843ce0e0ed4103c349a60731919895f28317e6adcf16d31c90
 AUX gpgme-1.7.0-build-tests-disable.patch 1405 SHA256 3e393acf193550c9bfcfd154d8cfa7d9ce77f7b864103e013d96dfd8b2328727 SHA512 d45dd12dc751f420def49c10431844cf1857c16bf146d27872993af65f8e60ff93f1512a42edc3fb29c7c868479911c9b28da9364ac0d10f896e7d83cb62edcb WHIRLPOOL fd781b8743eef12afe1253dc0819091d68f79e74f2d730ab22b509abba6685237a76c0bf785bc2c8f868f69b929c3df558408da486f8fc1e42750dae03b7e47b
 AUX gpgme-1.7.0-build-tests.patch 2826 SHA256 6b4002338169a756cce2e588593d864fcb65d642a7569ffff0a9ea7177269da0 SHA512 8dab1c8b34e3260cba8f5eebab1d9918e6fc992cfd0fbee71557cbaf2115d6b652d543e6b00dc1efbcb512ca11447471465ff790db0d7b5e17f764c8a9f8b8a5 WHIRLPOOL dac77737de8e0f93730955c32bfc726a06c6307c5738fc1886c740cfc6c30a8009b3c8daa7d0cd4ec28714125020813d59641d138d2c48e22ae26a19ad0781fa
 DIST gpgme-1.5.5.tar.bz2 976383 SHA256 0b3d3d5107680c594777aae65882a1ff6dd1ba629a83432e719c8b82a743c207 SHA512 a01b84c1ae2a7c647b2de793fc05d39c4bf4a2d1b7378934e437857823f11ca9e9c1f3b32302d69a3a84d0be1fee1e1c86874355031b8fa6b40f4ad56ecc72ad WHIRLPOOL f3ad4282a254cf1ab8d01184df787a773fa7963a42157da93bee11430263fa86166f12f051e2b11d13be99ce1f0939d565cb02a8fba93ab6afed73ca7b2c0041
@@ -7,7 +7,7 @@
 DIST gpgme-1.7.0.tar.bz2 1281708 SHA256 71f55fed0f2b3eaf7a606e59772aa645ce3ffff322d361ce359951b3f755cc48 SHA512 8c5891104bd531d555fc4c22086cfdea9f18be6885200f02e087d695d0518e311527a227f2c41e0dc1156cc0985265d0bee6c4504de7e2d2de0bc543a1036b5a WHIRLPOOL aaf60c5a30f9161bf8edb24e583e6a83e4a6e28abe7d9878d1d36b5ab34507ff2a47695dc4856c4fdad59463a5d56de1d8d35dee3315dfa54758c8445d9f706e
 EBUILD gpgme-1.5.5.ebuild 1032 SHA256 012ce557549e39665d589455d86b56738e05e613e5a0a727064507d80b6283b1 SHA512 41da35c60a226b8482dd58d4bf1bb1e8b10f6b28a5333d1675855a1d7b37ce87857fc322e696f363a4f852abf1d154a2ac81ef77ae6ce83d0a42ca9eedb9e972 WHIRLPOOL 0d3ade7fd59a517ac43d167b151ee7855f0186e98ed44550b7e0139cbf4a65aa7188ecf0005df7677ed04d85aa8d347d8127cfed5797d6130dbaa943da112ecd
 EBUILD gpgme-1.6.0.ebuild 1041 SHA256 b4b3bc1454fd4a957dfe7b151c8393c3df912286b7051323971464006cedaa54 SHA512 d2d23cece9a849692914818f5128e9397f75ef34c841f7c6c62f864bfb4a5767667bdaad70d468a87282215d8be4198520b3a2dff9c8be699a8fe9f886bf07f9 WHIRLPOOL 447f8ab253108d3380f380f3bb684876dc5c94acee9787e59361073fea54b95a6dbba233d9fa69ad2a2b88875a89cd4238c4116755e893dcbf71602ed4c4f5ad
-EBUILD gpgme-1.7.0.ebuild 2050 SHA256 29188d770792478378f0ef59a2da960c908114dad2f817f2684ed10233012b00 SHA512 7678e2d1ff7190ec932e822c1b4f96d82ac08604a814d72fed952addd548e293cd66317fcc5c77d46a9e73556a83d1a640e9775c263a1c9e60ce4856fa7273f8 WHIRLPOOL 4e1d71cef477d683bf028b4045f5d5dcc8d0d7e1a330890b2e9ad60edf7449db79b96957b07fd63201a4dbb912641e0d91a3e8461fe5e005c54557ba910f8d90
-MISC ChangeLog 3304 SHA256 76ee8fcde5e712d305b240e81505b7b539d52f17b11b028eb424be438929a0ed SHA512 d0571c94b2f836a7fa87b8e05320cc0020fc44241196fec54efcaa9b39175f236604be34fbb43ae8e1e3569340833b1ee73fc7ca3e7249403fdb51e9973f4e43 WHIRLPOOL 7270bffd7bcfa12c4593f2fa9b45e76a1134873219c59b88df94170b4422f421b044858dfb1f08e59d7d8bb83ab20a394061b6ef6b53fcf3f125d9b7966971c6
+EBUILD gpgme-1.7.0.ebuild 1876 SHA256 dc5347c2515da23994d2f1ba886e8180dac26bffe21490dc92647074d4ba5659 SHA512 2bceec3308d2b963ebaf44bb14ee602e109847d693c363f6b497fe0c281a01154a2736c3d311a98a29e053a08584a4cb544de7e2ea081b0f37e0686d87b0011c WHIRLPOOL 18994ba7e8b031cbec3e6405900fcb18c45707f0ae27266919750558189a5d154f80436691d5f8e0cd33280a73a3254dd1d4fffe6b3ebfdef1ece8ee6a8a2f18
+MISC ChangeLog 3718 SHA256 a24344ac40cc595cea3e3ca14545cdfcd0c9dfbaaa95f335634d7bd762874204 SHA512 d81f02ae704973f5430fb3ae3dc259ffabe86160f9cae62b1423c3f7a6306b6ecbdad2b793c1cf49e60ae587d0b16a94f9956e235ed6f02caf7e9f8ca631e7d7 WHIRLPOOL 57d7330de94d916a5a817eb8afe0b851865ad7bf9c50228685488df0388ac09ceea47d4da06c463b1af9e0f97c7a665c11e19e15c64bfabd92d2becaaf7b990d
 MISC ChangeLog-2015 32588 SHA256 365de278987394de285f4976fb94e094cdfe3d1e48a838209497301f2b108610 SHA512 4e5621b504fa9f9477adf17db0c36c12c9f56de3283015dc4954c4634202641ae0eb738c2449851bf840edf9a1851261243460102a1ae3d9dbdf3a104586e264 WHIRLPOOL bcb8b98517bbc5a2be7732585375d9e079940f19478f6a09f0ca3c2ea43dd0992aa4f482bc3b8dd3d9d683eae9870334768fa1faf44da22b807f9f160db2859d
 MISC metadata.xml 315 SHA256 2090c9e52f91c000c11e53d0215dd327d8274ab13f3a4930340a608afe10c5e8 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334 WHIRLPOOL dfd45c75e635ff36c55dd60b7c31a59ea22792fc07f6ba4cf493e99a4d55c3466e86cab704736a6b1547b9fb0b30670e839150f163643b1ebd9d98d6af814576
diff --git a/app-crypt/gpgme/files/gpgme-1.7.0-build-python.patch b/app-crypt/gpgme/files/gpgme-1.7.0-build-python.patch
index 950813f..d37d297 100644
--- a/app-crypt/gpgme/files/gpgme-1.7.0-build-python.patch
+++ b/app-crypt/gpgme/files/gpgme-1.7.0-build-python.patch
@@ -1,4 +1,4 @@
-From a46cd3926d629da23b365b70b7bf24201c25d430 Mon Sep 17 00:00:00 2001
+From e5bccea346379a70fd9cb910c4ead9642227747f Mon Sep 17 00:00:00 2001
 From: Alon Bar-Lev <alon.barlev@gmail.com>
 Date: Sat, 24 Sep 2016 01:26:19 +0300
 Subject: [PATCH] build: lang: python: cleanups
@@ -9,29 +9,21 @@
    anything. This is handy to enable standard distutils build outside of
    gpgme build system.
 
-3. Treat data.h in similar manner as other VPATH issues, just copy it to
-   the srcdir to simplify build, remove the CFLAGS requirement of
+3. Treat data.h in similar manner as other VPATH issues, just symlink it
+   to the srcdir to simplify build, remove the CFLAGS requirement of
    distutils.
 
-4. Add environment variable (binary_builddir) for setup to use alternate
-   build directory so that for multiple targets same binaries may be
-   used without rebuilding the C part.
-
 The above does not alter the behavior of current build but supports the
 following sequence:
 
-$ mkdir common
-$ cd common
+$ mkdir build
+$ cd build
 $ ../configure --enable-languages=
 $ make
-$ cd ..
-$ mkdir python
-$ cd python
-$ ../configure --enable-languages=
 $ cd lang/python
 $ make prepare
-$ binary_builddir="../../../common" ./setup.py build
-$ binary_builddir="../../../common" ./setup.py install
+$ ./setup.py build
+$ ./setup.py install
 
 Notice the standard use of distutils which is required for package
 manager to control the python selection and build process.
@@ -39,10 +31,9 @@
 Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
 ---
  configure.ac            |  2 +-
- lang/python/Makefile.am | 11 ++++++-----
+ lang/python/Makefile.am | 16 ++++++++++------
  lang/python/gpgme.i     |  2 +-
- lang/python/setup.py.in |  9 +++++----
- 4 files changed, 13 insertions(+), 11 deletions(-)
+ 3 files changed, 12 insertions(+), 8 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
 index 4a29f2f..efa1f19 100644
@@ -60,17 +51,23 @@
  
  echo "
 diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
-index 2271ce0..fb1eebf 100644
+index 2271ce0..9866f53 100644
 --- a/lang/python/Makefile.am
 +++ b/lang/python/Makefile.am
-@@ -51,17 +51,18 @@ copystamp: $(COPY_FILES) $(COPY_FILES_PYME)
+@@ -46,24 +46,28 @@ COPY_FILES_PYME = \
+ 
+ # For VPATH builds we need to copy some files because Python's
+ # distutils are not VPATH-aware.
+-copystamp: $(COPY_FILES) $(COPY_FILES_PYME)
++copystamp: $(COPY_FILES) $(COPY_FILES_PYME) data.h
+ 	if test "$(srcdir)" != "$(builddir)" ; then \
  	  cp -R $(COPY_FILES) . ; \
  	  cp -R $(COPY_FILES_PYME) pyme ; \
  	fi
-+	cp "$(top_srcdir)/src/data.h" .
  	touch $@
  
-+prepare: copystamp
++data.h:
++	ln -s "$(top_srcdir)/src/data.h"
 +
  all-local: copystamp
  	for PYTHON in $(PYTHONS); do \
@@ -85,8 +82,13 @@
 +	$(PYTHON) setup.py sdist --verbose
  	gpg2 --detach-sign --armor dist/pyme3-$(VERSION).tar.gz
  
++.PHONY: prepare
++prepare: copystamp
++
  .PHONY: sdist
-@@ -72,7 +73,7 @@ upload: dist/pyme3-$(VERSION).tar.gz dist/pyme3-$(VERSION).tar.gz.asc
+ sdist: dist/pyme3-$(VERSION).tar.gz dist/pyme3-$(VERSION).tar.gz.asc
+ 
+@@ -72,7 +76,7 @@ upload: dist/pyme3-$(VERSION).tar.gz dist/pyme3-$(VERSION).tar.gz.asc
  	twine upload $^
  
  CLEANFILES = gpgme.h errors.i gpgme_wrap.c pyme/gpgme.py \
@@ -108,29 +110,6 @@
  %}
  #endif
  
-diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in
-index 31892c1..ce06758 100755
---- a/lang/python/setup.py.in
-+++ b/lang/python/setup.py.in
-@@ -32,13 +32,14 @@ library_dirs = []
- in_tree = False
- extra_swig_opts = []
- extra_macros = dict()
-+binary_builddir=os.environ.get('binary_builddir', '../..')
- 
--if os.path.exists("../../src/gpgme-config"):
-+if os.path.exists(os.path.join(binary_builddir, "src/gpgme-config")):
-     # In-tree build.
-     in_tree = True
--    gpgme_config = ["../../src/gpgme-config"] + gpgme_config_flags
--    gpgme_h = "../../src/gpgme.h"
--    library_dirs = ["../../src/.libs"] # XXX uses libtool internals
-+    gpgme_config = [os.path.join(binary_builddir, "src/gpgme-config")] + gpgme_config_flags
-+    gpgme_h = os.path.join(binary_builddir, "src/gpgme.h")
-+    library_dirs = [os.path.join(binary_builddir, "src/.libs")] # XXX uses libtool internals
-     extra_macros.update(
-         HAVE_DATA_H=1,
-         IN_TREE_BUILD=1,
 -- 
 2.7.3
 
diff --git a/app-crypt/gpgme/gpgme-1.7.0.ebuild b/app-crypt/gpgme/gpgme-1.7.0.ebuild
index 7ea80be..2ffe8f3 100644
--- a/app-crypt/gpgme/gpgme-1.7.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.7.0.ebuild
@@ -45,7 +45,7 @@
 do_python() {
 	if use python; then
 		pushd lang/python > /dev/null || die
-		binary_builddir="${S}" distutils-r1_src_${EBUILD_PHASE}
+		distutils-r1_src_${EBUILD_PHASE}
 		popd > /dev/null
 	fi
 }
@@ -71,20 +71,13 @@
 		--enable-languages="${languages[*]}" \
 		$(use_enable static-libs static)
 
-	python_conf() {
-		econf --enable-languages=
-	}
-	use python && python_foreach_impl python_conf
+	use python && make -C lang/python prepare
+
 	do_python
 }
 
 src_compile() {
 	default
-
-	python_build() {
-		make -C lang/python prepare
-	}
-	use python && python_foreach_impl python_build
 	do_python
 }
 
diff --git a/app-emulation/free42/ChangeLog b/app-emulation/free42/ChangeLog
index a675f71..c65a734 100644
--- a/app-emulation/free42/ChangeLog
+++ b/app-emulation/free42/ChangeLog
@@ -93,3 +93,12 @@
 
   Package-Manager: portage-2.2.28
 
+*free42-1.5.10 (24 Sep 2016)
+
+  24 Sep 2016; Chema Alonso Josa <nimiux@gentoo.org>
+  +files/free42-1.5.10-fix-build-intel-lib.patch,
+  +files/free42-1.5.10-fix-makefile.patch, +free42-1.5.10.ebuild:
+  Bump to version 1.5.10
+
+  Package-Manager: portage-2.2.28
+
diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index 3357b33..42a21c7 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -1,9 +1,13 @@
+AUX free42-1.5.10-fix-build-intel-lib.patch 690 SHA256 c59efd29faa88375731c1403db33a8e46c6faf68cad85b7bb9a0f8144d1df2bb SHA512 e00ac76d7c9a90858eefb55132bf8f39d819e32ba672872ad43239a43d8727e93cfc133e5887ad39b2497bb7e13a0b27fe8d33ba96f23c6d3ba77cfcf865a7e0 WHIRLPOOL a3ade20781e90db0310c6bd5f6d25d30f0ee566a0aaa8abb42e98c3d06c2034390c5df8da56d3fab6dda1ff5a6169f948bff9ea821feaeeca00c48d057a03935
+AUX free42-1.5.10-fix-makefile.patch 1201 SHA256 3b3bdcd5c48918bb79cc0b5443a66186d4057c1160427c10461ae59f0c4cf930 SHA512 e1125ea666741cd70e1b6f0fda3f740b9ddc2bbb5f018a562d318a7cec80fb29788aa2058154043cd2e4cb55ef4c7789bd08ff798672f3c39e7bee22d9be5b37 WHIRLPOOL 102fab04ef19dec8f8d4884d673ab08a6aefcd40e67ddd86b084463075cccad32a95fec82c2cbbbd13228dbe7e38d7d6c615389b1e150c864ede5ee018b2c3d9
 AUX free42-1.5.7-fix-makefile.patch 1115 SHA256 ec08ac7eba84f82798686d4563f7f31dd0562f2116e8dece6eb6e4f7b7563414 SHA512 ee0e252b2120c8cc36ad028bf3287f9f3e443d00049d588d92e165a0e2a989aac4c1282c926d278752cb638b4f059e911a571d7d35311420a35eba3dcce57324 WHIRLPOOL 00302e8a734dc451ad6ac7c05d8fa0423eedd7cb3a06e74ff94880932d8e046fbe109984b9e4066cc0bf802cd5178db5fb85045e725d29f311d531a3488e4229
 AUX free42-1.5.8-fix-makefile.patch 980 SHA256 369a36369d9e11df9d54f566091e7b1b465969e9d5174d3a77f27f35594ddfdf SHA512 ee13302328d3163c55dce64b1cfc4a9d7e71df51937ea5b43f2f619ac49766f5424744265288139d9bf3fe151512e186d504f191e4a814d7e620f2eb86c8b79d WHIRLPOOL c8cba98dd3e04c863d34dc02e3f61fba0c7bb9e28b4a183640be0c79d2f320fe14471d2211432c86f93a0c3b750cac93eb6dfeba1ba092e57d4e8f66c1739918
+DIST free42-1.5.10.tgz 22616956 SHA256 960d94cce3d67047d8968b4ee8b4d324bf1257002d67f971bd1f6e2552a870d1 SHA512 dfdcbdb051aa7cf7a60c27e44ae8dc5458dd418e08cd71e79eff443d09f8021efacc87e06531f312521e5b1f5af0aa72e77b0ce18b8d657499ad174b6a12578e WHIRLPOOL 8324418ab0047e05136937aa6741a4faa518f39eae203eec181958fdc6aa42f577c66716deb81b0dc6d833f79e4e49cfda37fc80e3917f0157583feac1b66985
 DIST free42-1.5.7.tgz 8159655 SHA256 63c868880e0c18374f4b309dc19e2ea36b9463471d2d77563f53036eea645316 SHA512 fb18712643f73388512fc4dc069d55ef3597f5e6a4e1b47bcd12ab05224027c4ec981ade2398fd8c1e4534003ee6c4de2b7402bade66a3dbe90a46299e7132a3 WHIRLPOOL 0504da8589d3dbf9270a914b2cb6ad86982b926f40abee43d6bbe3f8ec997efe8b0ae50b9d61952e5acd3f2a70d34e16cf0e665cec06d555b0c92438c7a32a43
 DIST free42-1.5.8.tgz 45400324 SHA256 f8ffa54a5f77b5061e1a983962e989fc6679f7e128d996a0550922e366855f2f SHA512 1abaeea314b55f456b65eef530fe692534d92dde95876982c6df1715853055632a4a2305774dc691ca0af28632a393d8d9872bd86353c09d57d2dc8a0ef6cfe2 WHIRLPOOL 9b0abef9d548f09e567e8debe15f9a0635038d6ef655a64885ebc02eb241a0f577ca40b4bdc39c881fe8b2c6f4d97e5575c715a05ccc06df37f90bc5d28d16e8
+EBUILD free42-1.5.10.ebuild 985 SHA256 8dc175bf4dd2967bcad455a3dcfa5bbcbf89d6c9c462dad6e1588272f6fd56af SHA512 b4182f1fb1836f58abf72f929165b9e488685720480e45e0da5cc825d29a7a52cd64a588c79d2569a0745dcd41b31aa2c86fd505254dc40104324426eafbe617 WHIRLPOOL 231b84d4bcda1b1c0492b7081e6e172a34e5fab51e8b2e18516970f2afb18ba9b7d99d22245182fb2162c5d26b390a2ead3778fe744c50741bb623940cb0c409
 EBUILD free42-1.5.7.ebuild 926 SHA256 02c9c2f21ecbc679471c9b5489144281980d9e79049327de98927a16103107a5 SHA512 b39ddc9876528b408dc2c987cb4da2f7769346a6b856308c857f91f2269cf0592be93d6cfa07e92ac0e0b41133decc66b95954c0da174c7ba800ee8ea43325b6 WHIRLPOOL 67a4997e428201a64a3d03a623ed3f3274b8399d741fe5a92c52e5cd1f23b660c11163bfe8c55ff116244a2c239c4ab671d190946faa49ed10e04b1b3fbc376f
 EBUILD free42-1.5.8.ebuild 915 SHA256 216bbe07c8e64ded3f75849bef78a97166afe29d5473c63966857c29b5afbb7f SHA512 559d90d39286b03ffc3264e84272d5e8a7d263451e5ff5ab863957e10f10a78157ff82a915b9585c87a8e78298ed455931d3fbcd0163ee84a941d04b5da16839 WHIRLPOOL 0ae2de441132d24c71376d31e6f726d78885b0308f04bb48d3d6cefb60496dae9c8ccfabc5f37aab385d2c2a142b66985fd42c19b99e20e8c0ae7b1873f2f7eb
-MISC ChangeLog 3261 SHA256 56516916a1805f5ce3e525e2f7f45fa5e5e137be41de2a9ad372befa767e329c SHA512 cd1fe36968a8b897f49e5846d1a9d2d6f6ae2893de9accc3b20ff3a9223910c46105301198805b99de5547248a7a57fe449c7128ed1d1b0cccdbf75adedcdc87 WHIRLPOOL eff7704d6e345d1b2d4799cb09fa41b0cd13ee4bf0449e51ed72eb06f6054a8c974c29fa66d8625bc2ee020e2c26fa120ff5a755d39c4ee0572f8e90a1260ed6
+MISC ChangeLog 3521 SHA256 d28a2d34359eff879223fe65a3f985cdec70a14a7c18689d557618d12f19d167 SHA512 0c909b0debaf2c0702ac1517b45695e07ca2721541a5e10860745c090346eb58917e3b09064e1f70cbc701aad5acd512eed83081684512de12dfc9841e08a1e9 WHIRLPOOL 3f2c50de861f88b124eed1be862f6d7ba895e26eee62b17b8e79b91e7f35001a1d74eb723ee3d2a033e9294955b7a3ca7999c93b200cb965fccd1eff919edd80
 MISC ChangeLog-2015 4257 SHA256 d76539bb1c895cfd7cd2dc8db0227070ae9b095c19370e59bfff7077b9601672 SHA512 8786752ccb9203b31f629cb48d17eb854aa0c6d1f55d286eeab31a6757c7c81d340b88ee34021f4269e093ea15c1d5fd464955f14f1df981f08f3a4d57031d0b WHIRLPOOL 45a1d888198cff6778e93f99dd330289ac0926b016f51608d15f124aee024b8ac691895a2e10a155dffd5194792392fd2ae5325ca686a0bd0db6ae86fec34486
 MISC metadata.xml 554 SHA256 678bba466793d567beef67661d467532c6c15bbfea57d1fe222a32da7f6c9c67 SHA512 f1035a6c26c5168022e623c83784da4585fa16edd71889bc5b608494eedcb0f34c4a6f478648784f1a30fb64bfdf48b95e31d01213fbe29754b7208ed43e1579 WHIRLPOOL cf8ae24b3e284e8b3c99150d573190bf51cba61dd0361c38021170d99cf619f496ce4149db9108713374db0d8009ebecd7f4da81ab173b47a0cfa217859667fb
diff --git a/app-emulation/free42/files/free42-1.5.10-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-1.5.10-fix-build-intel-lib.patch
new file mode 100644
index 0000000..23641b55
--- /dev/null
+++ b/app-emulation/free42/files/free42-1.5.10-fix-build-intel-lib.patch
@@ -0,0 +1,12 @@
+diff -Nuar a/gtk/build-intel-lib.sh b/gtk/build-intel-lib.sh
+--- a/gtk/build-intel-lib.sh	2016-09-04 18:56:12.000000000 +0200
++++ b/gtk/build-intel-lib.sh	2016-09-24 19:39:49.284126118 +0200
+@@ -4,7 +4,7 @@
+ cd IntelRDFPMathLib20U1
+ patch -p0 <../intel-lib-linux.patch
+ cd LIBRARY
+-make CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0
++make A=a CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0
+ mv libbid.a ../../gcc111libbid.a
+ cd ../..
+ ( echo '#ifdef FREE42_FPTEST'; echo 'const char *readtest_lines[] = {'; tr -d '\r' < IntelRDFPMathLib20U1/TESTS/readtest.in | sed 's/^\(.*\)$/"\1",/'; echo '0 };'; echo '#endif' ) > readtest_lines.cc
diff --git a/app-emulation/free42/files/free42-1.5.10-fix-makefile.patch b/app-emulation/free42/files/free42-1.5.10-fix-makefile.patch
new file mode 100644
index 0000000..3fe1baf
--- /dev/null
+++ b/app-emulation/free42/files/free42-1.5.10-fix-makefile.patch
@@ -0,0 +1,38 @@
+diff -Nuar a/gtk/Makefile b/gtk/Makefile
+--- a/gtk/Makefile	2016-09-04 18:56:12.000000000 +0200
++++ b/gtk/Makefile	2016-09-24 16:13:34.824116365 +0200
+@@ -15,11 +15,10 @@
+ # along with this program; if not, see http://www.gnu.org/licenses/.
+ ###############################################################################
+ 
+-CFLAGS = -MMD \
++CFLAGS := -MMD \
+ 	 -Wall \
+ 	 -Wno-parentheses \
+ 	 -Wno-write-strings \
+-	 -g \
+ 	 -I/usr/X11R6/include \
+ 	 $(shell pkg-config --cflags gtk+-2.0) \
+ 	 -DVERSION="\"$(shell cat ../VERSION)\"" \
+@@ -27,14 +26,16 @@
+ 	 -DDECIMAL_GLOBAL_ROUNDING=1 \
+ 	 -DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \
+ 	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \
+-	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1
++	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 \
++	 ${CFLAGS}
+ 
+-CXXFLAGS = $(CFLAGS) \
++CXXFLAGS := $(CFLAGS) \
+ 	 -fno-exceptions \
+ 	 -fno-rtti \
+-	 -D_WCHAR_T_DEFINED
++	 -D_WCHAR_T_DEFINED \
++	 ${CXXFLAGS}
+ 
+-LDFLAGS = -L/usr/X11R6/lib
++LDFLAGS := -L/usr/X11R6/lib ${LDFLAGS}
+-LIBS = gcc111libbid.a -lXmu $(shell pkg-config --libs gtk+-2.0)
++LIBS = gcc111libbid.a -lX11 -ldl -lXmu $(shell pkg-config --libs gtk+-2.0)
+ 
+ ifeq "$(shell uname -s)" "Linux"
diff --git a/app-emulation/free42/free42-1.5.10.ebuild b/app-emulation/free42/free42-1.5.10.ebuild
new file mode 100644
index 0000000..d1950de
--- /dev/null
+++ b/app-emulation/free42/free42-1.5.10.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="An HP-42S Calculator Simulator"
+HOMEPAGE="http://thomasokken.com/free42/"
+SRC_URI="mirror://gentoo/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa"
+
+DEPEND="dev-libs/atk
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/pango
+	alsa? ( media-libs/alsa-lib )"
+
+RDEPEND="${DEPEND}
+	x11-libs/libX11
+	x11-libs/libXmu"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	sed -i -e 's/print_gif_name\[FILENAMELEN\]/print_gif_name\[1000\]/' \
+		"${S}/gtk/shell_main.cc" || die
+	epatch "${FILESDIR}"/${P}-fix-makefile.patch
+	epatch "${FILESDIR}"/${P}-fix-build-intel-lib.patch
+}
+
+src_compile() {
+	local myconf
+	use alsa && myconf="AUDIO_ALSA=yes"
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C "${S}/gtk"
+}
+
+src_install() {
+	dodoc CREDITS HISTORY README TODO
+	dobin gtk/free42dec
+}
diff --git a/app-eselect/eselect-php/ChangeLog b/app-eselect/eselect-php/ChangeLog
index 858b31a..ee2e3ae 100644
--- a/app-eselect/eselect-php/ChangeLog
+++ b/app-eselect/eselect-php/ChangeLog
@@ -334,3 +334,10 @@
 
   Gentoo-Bug: 592968
 
+  24 Sep 2016; Agostino Sarubbo <ago@gentoo.org> eselect-php-0.9.2.ebuild:
+  amd64 stable wrt bug #592968
+
+  Package-Manager: portage-2.2.28
+  RepoMan-Options: --include-arches="amd64"
+  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
+
diff --git a/app-eselect/eselect-php/Manifest b/app-eselect/eselect-php/Manifest
index 23241ba..5bdc079 100644
--- a/app-eselect/eselect-php/Manifest
+++ b/app-eselect/eselect-php/Manifest
@@ -16,7 +16,7 @@
 EBUILD eselect-php-0.8.2-r1.ebuild 1779 SHA256 877703dd35d755aadbd11a9bf37ee418d3c8681ee7cc8d1da7cc70a0b1d74804 SHA512 fb5b2ac74dce33282ad6e2fd636ab96a61420b76fe8c53086935618e2e698c4f57295681b6a9f6ca2a931020b7f2f90086b8d69375379b8464fb2ee07359f6e1 WHIRLPOOL 29ab04669b8c412bd049f9bd522a53fb646c624b17bf79e857468b8820948a820c3081993345672c7aac1f409586651e49ba5b43797cc09cb317b0119e587a03
 EBUILD eselect-php-0.8.5.ebuild 1779 SHA256 877703dd35d755aadbd11a9bf37ee418d3c8681ee7cc8d1da7cc70a0b1d74804 SHA512 fb5b2ac74dce33282ad6e2fd636ab96a61420b76fe8c53086935618e2e698c4f57295681b6a9f6ca2a931020b7f2f90086b8d69375379b8464fb2ee07359f6e1 WHIRLPOOL 29ab04669b8c412bd049f9bd522a53fb646c624b17bf79e857468b8820948a820c3081993345672c7aac1f409586651e49ba5b43797cc09cb317b0119e587a03
 EBUILD eselect-php-0.9.1.ebuild 2097 SHA256 3d2a7a0af966af199350902259678f9ec567553715d6b6c4119176db7ed2f517 SHA512 db94e209def8455f0ca28a2eb5bb6b8a04e503262fe2489d0e31770e30cec7fdbc795261f711b508db3efa47e3f645dfca972ee34c6e34ad084f14372c5cb0f4 WHIRLPOOL 9cc114f7502466ae7a20f8cc1c21abd1ca2f5aecafec17b89066ee322290fdccbfa67c11732c130f1a5bea3083de7ad356f6e58aa3e4ea53ea67d92d7509cb06
-EBUILD eselect-php-0.9.2.ebuild 1996 SHA256 7fa937218e6a7d743cd95c65e60288b53a336c6beffd2ac7cf11a924855708fa SHA512 775421e65b25c9435ce0e244a3631de400997bf5b1a223e0f871cd86d1bfc35e9c4764b629dd3f5819616758945532eae16bc2371484d1118e3d36dd58c5f4a1 WHIRLPOOL 5239af43710ea4229e2e6382adc43f11f882768034c6a26162470e5273dd43ab8bc2d13c1dd02c08e50ad166a67578f9053de353ddbff95f7ac4cac4f24276ce
-MISC ChangeLog 11717 SHA256 cabe37cbe2f1c0e2776f6b9a6de3c345463383ba1d1a872e836c77b0de158366 SHA512 082436d64009beebb5a2704cddb183ffd02d67cee8a17895955cae05a4bbbbbb0a32689b60e373adea58d8d094ac95aa344d741e045ca654b27a5c54f9d90eb2 WHIRLPOOL bc278f0c1600f49429e06f5a3d4904aee4da8ea143cf21b7102425a859c22182ed4831ace73a573b249b6d8b1a4cdf10ddf92a57dcd7551f888de315400137ab
+EBUILD eselect-php-0.9.2.ebuild 1995 SHA256 f75298b099a807840b44147b02ec7dba65507848f6b3454953bd0cb20d05a0e0 SHA512 97fcb3d592c029c2cf9e79f350fed5c23f982b14a222ab7dbc39df08b8dd1308943954cc27e6d328159e771cffbe18ab41fc20b48ffcbd823b7bbcae4671a372 WHIRLPOOL 715bce8018d38293de4646610391051e5374b216fc6429542b14b529503fbd77f435b89c570244888b3a5b1fab0dc3d9e6d832df30122b756c1be111106c7ce3
+MISC ChangeLog 11954 SHA256 39d4ea056c1ba03922c6fb1227fb739c8fadab5430164047d36629cb6d79b47b SHA512 8b11904f74863b4c232ddd8555f736192bd08624ffecd4d77e7a3ff1a2e44b79a4084532cc09a40f244d8b5c2350bfdda75dc34820106e62ece5a2b0eb0a3d7f WHIRLPOOL 629d37b3d507307bd559a7afc8219937c7a2e0b3483f7c06e535a22e69478ebb3a4fdb4fce1520be057d1f22457caff9a1a4a97abe4b4bfe958a296997fb167d
 MISC ChangeLog-2015 9793 SHA256 34a312c6879a62e1ef1e014dcb7ed39e4c4b7b5a25673a37da2a316c6594f2d4 SHA512 9dbd821886a7ab86c0196a0ccd855bb483c620f01ac2ea4705c3e4297f4970071f66006e293182181a3365b044bedca70eeaef4d33caf25986c33dc71aa74267 WHIRLPOOL 7ad5e2b282e9d845a05b5b225c4afe68728360016219a00292b9f16e3595e112555ce0bf604a7c6edef302ba6598ca229d8aa9eb9392c046fc1227a105ea7ec9
 MISC metadata.xml 387 SHA256 fdc96f369aa373454f8c06dce987092169bf218f49d44e57cfb343a8725e48ce SHA512 80a043e0836a1ac58120f1471e997face2f60117e3a83d490ad259a05cfdc39098c457573e3550c9fc3a7712f28b9faacd427c076e8f46ed3476e42f58f8f1b5 WHIRLPOOL d1c2ba87ec73d3bcf9d4be46e184b1852e34aaa4e2e4a6f497ecef4d321a134ae7e3104c3ee17931b1b1d2d9387323489b04b0094d3040468b72adccc925099f
diff --git a/app-eselect/eselect-php/eselect-php-0.9.2.ebuild b/app-eselect/eselect-php/eselect-php-0.9.2.ebuild
index 9e00a93..6896407 100644
--- a/app-eselect/eselect-php/eselect-php-0.9.2.ebuild
+++ b/app-eselect/eselect-php/eselect-php-0.9.2.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-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 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="fpm apache2"
 
 # The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir.
diff --git a/app-laptop/laptop-mode-tools/ChangeLog b/app-laptop/laptop-mode-tools/ChangeLog
index 64cc055..62e76b4 100644
--- a/app-laptop/laptop-mode-tools/ChangeLog
+++ b/app-laptop/laptop-mode-tools/ChangeLog
@@ -126,3 +126,11 @@
   files/laptop_mode.init-1.4:
   use #!/sbin/openrc-run instead of #!/sbin/runscript
 
+*laptop-mode-tools-1.70 (24 Sep 2016)
+
+  24 Sep 2016; Alon Bar-Lev <alonbl@gentoo.org>
+  +laptop-mode-tools-1.70.ebuild:
+  version bump
+
+  Package-Manager: portage-2.2.28
+
diff --git a/app-laptop/laptop-mode-tools/Manifest b/app-laptop/laptop-mode-tools/Manifest
index b50dd9e..69a9427 100644
--- a/app-laptop/laptop-mode-tools/Manifest
+++ b/app-laptop/laptop-mode-tools/Manifest
@@ -1,8 +1,10 @@
 AUX laptop_mode.init-1.4 1066 SHA256 e76c20f84134d03068770c7521720b2b409a44892052bf1ebf54395eb24a6f27 SHA512 9eee21ae7e6289c925ed4926325f5ad458afe30f2c3d1f5e0c039325676da87437e46eafd3b1265e5608da97055b249a723a58404a28c1b717a017bc526a3eeb WHIRLPOOL ab484a3c8b219769679476dd93e0db2ef675fc716dc5172ed27d532d93edb48fc7f17689c7dcb74866501e2b03f9425bc853f523abd2548c2adce3947212c29f
 DIST laptop-mode-tools_1.66.tar.gz 111175 SHA256 0e8488d6112fa7edfa7e4b1084b16f8c7c6726d935029e4afd7d7034caed5f62 SHA512 8649f70ab63ca0a1e5edf5c4c69062b01dce97b34ef6686a2c044f177aaac59008d4275b237e2c97a2541b6b824c0513d32323c156a43684264ba6d2c5fc8b6c WHIRLPOOL 4fc981f00c4afd74da74e192beb292c5d39e2a3bcc23d77e5daf37c71b75acb4df81c70a68586c0704b47fbe08dce69b1921d0d151777b5451b8d6302bac5b0f
 DIST laptop-mode-tools_1.69.2.tar.gz 115082 SHA256 2db1225cc8b6fb214f221362b9fabfffb1cbd25556d00bef3d3a6db9f3b19a59 SHA512 cc1e2ef7c2dd963f542b2e745fc8f3f046199d848a3c2bc44509fb2f08dc5dfa05ce1f9d70b5c678e6c088ed55ce7875eadf4ac806f006806c5bb1b229f980e5 WHIRLPOOL a563fee8497c390060c8820b5b5efa9c58c2222175fb9075f55344888627b2f054ed8aee3e1ecf415f84f19ab4c9f6c21bf20ea4880b8827949f9c05baccf945
+DIST laptop-mode-tools_1.70.tar.gz 116624 SHA256 12cde7dbec8c35201efab96187be75ec84e0a2424494852413f21be1b7bc6a11 SHA512 755e2d94b63bb2a6e5362365f11181374c5fe159b508076f5def91c4df93983fa3e2553bbd94ae0b5bb4690aa7fb0881eafe3f4dcc7c8e77a8b72de23f6a21c5 WHIRLPOOL a70b0e3353877ffedd87ed3f72f1239addd34e8fecfd0e54b98c328a1f4a48a87a2f278fa4afa227452eb5f874bd58912a1ddf8ae2f385636c6bb3a552ce7b3a
 EBUILD laptop-mode-tools-1.66.ebuild 2585 SHA256 11b2cba85fdb727c22eee5abb259d5e3c34b9ea36a139dd9f63bc05047234f57 SHA512 c5aa7519c3d69c4af9f8580b81a024ed650eda576e9065a3cb5ba65058f8ad93731c479456e237f1d78a7c498d4e5addce81b122e7e7b1d6c8c67f84371c95f8 WHIRLPOOL d2ec0921252d6a5ec988b2a63d97804f1142effa140dc88b619c75ca6eefcb2b6c5ad32ffed5665e73e4d6191699faa9deb7883477aefc35453ab222aa2221ce
 EBUILD laptop-mode-tools-1.69.2.ebuild 2620 SHA256 7191d2e58ff3406ada8c38ced24e718d00e2856de6e81107ca054668a9309ce6 SHA512 0387e9702ca2fb9c38461fefdc3fd14e6298b6a3a5d910ace2dfe108ab274e01bf7f03723313a6bad5c92ee3ba6f65a4a18403ade9c20cbfb4a6c08a3e240197 WHIRLPOOL d1d2c633daff341c417ec7e96ab0f61df7106e1e0daa1f212b0a7074e994b85e27571dbb93b1086092ff68572edaaf86ec2edfd11b09d246010e99ef98812377
-MISC ChangeLog 4095 SHA256 7aa2a03171dd20a27511eb80dac8148fac2fa39f750f5ea3ab7fc3ddd7bf5d1a SHA512 5d8d5364a24688b5a1435e8f904298d587b95c8bcf413f2f902149c9c7f3b4e5861f8db79143214f09fba19d96fb90517d730a5474331433a0bec204ac4e7ed0 WHIRLPOOL 80e0e96cdcbb50976e52a76b0d96d9b1ae3b44928b7694e1b03c2f2da7d48d6ebd8ff376e14889992566c53ca2fb46465a4d6072d166e6d773fc71239d011176
+EBUILD laptop-mode-tools-1.70.ebuild 2640 SHA256 49e87e088ca22e892043a68db6e4915874a3ca08ade3755e968ccdab21758574 SHA512 38aecd32b19862b8f087baf27bcf5fe0b9576078699c60e0464972b74440c815395a5e46aec51c92ce74711f4ad7c069c499e4e301bcc64762d8f95fd23a34c4 WHIRLPOOL 901d771bdb686660c02051025b986f8a92689d38975fceb0ab441f44e12a93adb5c7f067e172661efc0374dd39a60dbd3f89f8bf6092ccc2f5787c91833dc198
+MISC ChangeLog 4267 SHA256 31664ca1d19caa8611bbd78d2516ca7549e3060629d6ae54670bd5d88e08df67 SHA512 60e04444b3ed47353fc5ac9c609169bf092859a1ca7546fe622fb5f9366299922adcf94ba58a6e578840a6cedb6e6fab84527d0a63b28fe4c2608201b8a58017 WHIRLPOOL cd20166e391b9626022c91df8c4e621ecb32396fcd876689b5308da830256f3f5e551817773810631485a56dfa243981a46c755c1601855702b911aa41567641
 MISC ChangeLog-2015 20290 SHA256 4374d8d676d332d3d936c1458572438e8ec440d8d71f56870cd7d70c89de9e91 SHA512 61c4a0421786bcc17d4a3dc695eb7b043a6eb6b50eaedcd2972129f41a1bab6e89a5e0208408299d736de8bef3ce7aca4cecd1be1b7ccd3a737f38674a03e842 WHIRLPOOL 9f0b7344e6316c53cef43364e4eec170306ef40b0704726d54bb87e8a2e92c2b8c8a854e103c4918b9f5f4981d038dab546de2c2174085f7e9d3030b62fedc3c
 MISC metadata.xml 468 SHA256 7108f13273b47debeb357d51bd106832f4eb80efde12ca2307fe419316a46c85 SHA512 c37eae73e3f9610cbcae0a3080ca907f59a35fd3a8080043d9560742a13ddc8d323fb0439c62b5f3441f8b67f76f33224afc148902f8cad6db84581fb9e07fad WHIRLPOOL c37ccc0a74c142a4870ff8426805524e658b9e1274078269880549976a41eac72706a5287e5cb89631216dbfc55aab45ab60497147c80abf3b65543115d81bc5
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.70.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.70.ebuild
new file mode 100644
index 0000000..cfdfd45
--- /dev/null
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.70.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils multilib systemd udev
+
+MY_P="${PN}_${PV}"
+
+DESCRIPTION="Linux kernel laptop_mode user-space utilities"
+HOMEPAGE="https://github.com/rickysarraf/laptop-mode-tools/wiki"
+SRC_URI="https://github.com/rickysarraf/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+acpi apm bluetooth scsi"
+
+RDEPEND="net-wireless/wireless-tools
+	sys-apps/iproute2
+	sys-apps/ethtool
+	sys-apps/hdparm
+	sys-apps/which
+	acpi? ( sys-power/acpid )
+	apm? ( sys-apps/apmd )
+	bluetooth? ( net-wireless/bluez:= )
+	scsi? ( sys-apps/sdparm )"
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	# This should avoid conflict with pm-powersave wrt #327443 and #396703
+	cat <<-EOF > "${T}"/${PN}
+	HOOK_BLACKLIST="00powersave"
+	EOF
+}
+
+src_compile() { :; }
+
+src_install() {
+	DESTDIR="${D}" \
+		INIT_D="none" \
+		MAN_D="/usr/share/man" \
+		LIB_D="/usr/$(get_libdir)" \
+		UDEV_D="$(get_udevdir)" \
+		SYSTEMD_UNIT_D="$(systemd_get_systemunitdir)" \
+		TMPFILES_D="/usr/lib/tmpfiles.d" \
+		ACPI="$(use acpi && echo force || echo disabled)" \
+		PMU="$(false && echo force || echo disabled)" \
+		APM="$(use apm && echo force || echo disabled)" \
+		SYSTEMD=yes \
+		sh ./install.sh || die
+
+	dodoc Documentation/*.txt README.md
+	newinitd "${FILESDIR}"/laptop_mode.init-1.4 laptop_mode
+
+	# See src_prepare()
+	insinto /etc/pm/config.d
+	doins "${T}"/${PN}
+}
+
+pkg_postinst() {
+	if use acpi || use apm; then
+		if use acpi; then
+			daemon_name="acpid"
+		elif use apm; then
+			deamon_name="apmd"
+		fi
+		if [ "$(rc-config list default | grep laptop_mode)" = "" ] || [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
+			ewarn "To enable automatic power state event handling,"
+			ewarn "e.g. enabling laptop_mode after unplugging the battery,"
+			ewarn "both laptop_mode and the ${daemon_name} daemon must be"
+			ewarn "added to default runlevel:"
+			if [ "$(rc-config list default | grep laptop_mode)" = "" ]; then
+				ewarn "# rc-update add laptop_mode default"
+			fi
+			if [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
+				ewarn "# rc-update add ${daemon_name} default"
+			fi
+		fi
+	else
+		ewarn "Without USE=\"acpi\" or USE=\"apm\" ${PN} can not"
+		ewarn "automatically disable laptop_mode on low battery."
+		ewarn
+		ewarn "This means you can lose up to 10 minutes of work if running"
+		ewarn "out of battery while laptop_mode is enabled."
+		ewarn
+		ewarn "Please see laptop-mode.txt in /usr/share/doc/${PF} for further"
+		ewarn "information."
+		ewarn
+	fi
+}
diff --git a/app-misc/byobu/ChangeLog b/app-misc/byobu/ChangeLog
index 0e58a10..173bec9 100644
--- a/app-misc/byobu/ChangeLog
+++ b/app-misc/byobu/ChangeLog
@@ -87,3 +87,8 @@
   19 Aug 2016; Tim Harder <radhermit@gentoo.org> +byobu-5.111.ebuild:
   version bump to 5.111
 
+*byobu-5.112 (24 Sep 2016)
+
+  24 Sep 2016; Tim Harder <radhermit@gentoo.org> +byobu-5.112.ebuild:
+  version bump to 5.112
+
diff --git a/app-misc/byobu/Manifest b/app-misc/byobu/Manifest
index 5e0efb7..9f9985b 100644
--- a/app-misc/byobu/Manifest
+++ b/app-misc/byobu/Manifest
@@ -1,7 +1,9 @@
 DIST byobu_5.111.orig.tar.gz 664384 SHA256 b28c93f72cd9a62e1b1aa11abc8d8863f06c43da2c7089f6529683bbf13a50fc SHA512 f4b20fd3ac01b4361a9ea02428326c3920a8bf728b03c309d491413daf603b3b2807ab1770274034f08299947d66a759777a1b2ddd087d7c9c19c67c7baec48a WHIRLPOOL 32cddcc542137a438bffde637190663d7f56ba44de622110134b79f536b5f33ff3e80a28824d33b12ad792efd27e9bf898ee13e186df7923f46dce29d0a01b44
+DIST byobu_5.112.orig.tar.gz 664274 SHA256 4d67fb7bc18cb6ceb74f800fc312c3a1c6b1cb19c1d6e0e6cfe60fd8900e7b2b SHA512 57545ac86e1f6bf6601250bfd9d46ada17b22728a17453f9810b723c393655db97723d068b2452467dc4b4e9c2d9d52b76011191f4f09c01ad4bb91d93f15bea WHIRLPOOL 5a30f25a50ebf2a6ca30765a18d1850dc1c6433aed39e2dc56d9da1cbd4a3aec3c4d9d8d74fe6b965e912abd52d289b8f801050c9454ff865e508281b9014de5
 DIST byobu_5.94.orig.tar.gz 660103 SHA256 4917013f590110d25b18293a51af02bd1ebcd1c665474f62e2566fb9b8f62916 SHA512 b4e07d7d197f8796c26f33aa08c1d61dab463ce5cd2d646bf32c4c5a4be17ffe2b8996cb305c999ca0be20a1fab81c24dbd0eae5588b74e8da1e7726c293b2e6 WHIRLPOOL d2832c4ecac9d4d6907051d33efb8f51816866ce4bd0d75d5684322dd83a56d0a4717d2b6fd7736a0ca488d5e2e648a0e48a09de6a0bffcd779aa63cefd50c4c
 EBUILD byobu-5.111.ebuild 953 SHA256 b711da5f3525b034c149140333ab747fda88ff1a426cd584048784318869991d SHA512 2f129ca65642289f175468d5733f9ab42c820a12ffb6845c997bd74a211fa50b1c25b12006a981f8fa86d1479ca5032965272c7247792cc3e80b7b05ed3bb26c WHIRLPOOL da84ec19c24bef7f99c61308369e22f97d8335b4b65952bf4849a2a8b61a1544628c3de39b6a59f537e1f729ea4f1c66f6570d392089b4c2bd4043655e4bcc48
+EBUILD byobu-5.112.ebuild 953 SHA256 b711da5f3525b034c149140333ab747fda88ff1a426cd584048784318869991d SHA512 2f129ca65642289f175468d5733f9ab42c820a12ffb6845c997bd74a211fa50b1c25b12006a981f8fa86d1479ca5032965272c7247792cc3e80b7b05ed3bb26c WHIRLPOOL da84ec19c24bef7f99c61308369e22f97d8335b4b65952bf4849a2a8b61a1544628c3de39b6a59f537e1f729ea4f1c66f6570d392089b4c2bd4043655e4bcc48
 EBUILD byobu-5.94.ebuild 941 SHA256 b2fa8a7a3f583cfe35c6dfde636b96c4940fe6ab2fc5823d83808fff4aab32ab SHA512 276609f6e9ae19a191f8dd09d02202e3d0ee9ebb5a9699fcc2f4be35354c447f4614c3af3bc323a041b9e3669cc271050900af8fd81ca8341365ddda0ccb45e8 WHIRLPOOL 5340ce3dfc0581e09fd06ec2cfa0e871f5920e1e7a46870694aad0435ffc64180d9f9f83f2d224fc4bd009c36770fe6386084d7e1f96fdad848858ce7cc3bf70
-MISC ChangeLog 3180 SHA256 2ae7a5b46ade79f788d3bab2e8526284997cc29ad536bec0cc176bd7695dadb1 SHA512 f07f9c5d5ade32fe5718abdf5109ddda59395df494c348e4d4a9fa0471fb4c828efc6256069c18781811f908a7cdeaef670afdd4f5cfae682711eff3070e181b WHIRLPOOL 0e86ef0c36a91a73dc653f61055303f78fdf013d5ea5d1555e5d7089d96676058d3ec27ba197ac83252728dc9dcb3cfb2c03a577467d95d1b2931e065cfaa7f6
+MISC ChangeLog 3303 SHA256 6f99c0d568e6c9c4db5e111d15f3e1f96eb22a754c87f3c852f667074235c45a SHA512 fb4b35901d661cc8d3a9d563215568b634917648729f019dc9661b1bd7f385c07e7b516f7bd871df2ff1cea28502302440a06d899649cca4006ee8023c7fbcb0 WHIRLPOOL dbba50c0ea0f534c200426f32ec7e32c1c417963c717ddc3f3e20f96161aba455ffc11e295bc482b84948957bfdf6d3a371feb98e57677ea7056fc407757da1a
 MISC ChangeLog-2015 12471 SHA256 531852cf207b4352df24e8e700c030bc47a0d99f33bb9600f068a1c8be507cd1 SHA512 9e326973776877400b25d66b6588eda51b8c14d0f88a61f9bf1acc7c3af085f4e190c4ed1f1db7474a58c36997626dfb286dfa138def952be626703fb67e2063 WHIRLPOOL a20bd396a7ff709971e1848c9f010411502f8b09f945c128a2bf2f8a4ed0b7659abaaedf1a8390de743465882a3be26dc1cf0b804704b86ce9608240b058405d
 MISC metadata.xml 981 SHA256 12ed9e6f289257b9736de831582aad543b658b80e1835de42ed0a3def0a721f4 SHA512 6056ce18301ef9147fce0922c07ef455c416d75b78e23bc0aca9154e1765f167ebffbafc8e330f4878f0b575483131d417354f14e392568c91ef04087cf87d0b WHIRLPOOL 64ab86e527a04173c76dd9c21fba8c0ca577761f7fe58401b3181aa5d696188b88de6e35463e19724bf62658fce5d7d269ac092fe790c5c9b6a208e27a025a98
diff --git a/app-misc/byobu/byobu-5.112.ebuild b/app-misc/byobu/byobu-5.112.ebuild
new file mode 100644
index 0000000..7bd23b5
--- /dev/null
+++ b/app-misc/byobu/byobu-5.112.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
+HOMEPAGE="http://byobu.co"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="screen"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/newt[${PYTHON_USEDEP}]
+	screen? ( app-misc/screen )
+	!screen? ( app-misc/tmux )"
+
+src_prepare() {
+	default
+
+	python_fix_shebang .
+
+	# Set default system backend to screen
+	if use screen ; then
+		sed -i -e 's/#\(BYOBU_BACKEND\).*/\1="screen"/' etc/byobu/backend || die
+	fi
+}
+
+src_install() {
+	default
+
+	# Create symlinks for backends
+	dosym ${PN} /usr/bin/${PN}-screen
+	dosym ${PN} /usr/bin/${PN}-tmux
+
+	docompress -x /usr/share/doc/${PN}
+}
diff --git a/app-misc/sphinx/ChangeLog b/app-misc/sphinx/ChangeLog
index 146a920..45a2889 100644
--- a/app-misc/sphinx/ChangeLog
+++ b/app-misc/sphinx/ChangeLog
@@ -141,3 +141,10 @@
 
   Package-Manager: portage-2.2.28
 
+  24 Sep 2016; Agostino Sarubbo <ago@gentoo.org> sphinx-2.2.11.ebuild:
+  amd64 stable wrt bug #591276
+
+  Package-Manager: portage-2.2.28
+  RepoMan-Options: --include-arches="amd64"
+  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
+
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index 6089920..56e15fa 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -8,7 +8,7 @@
 EBUILD sphinx-0.9.9.ebuild 1466 SHA256 d3500c9f0d85e35328d49cb884883502c8171494be326c2fa51d943bd32495c1 SHA512 026f1226c2953424265cc5c0567250e34db22732c544f385ca1da07fd856066f78f77d67795ca3b20a87181de8997481669f7559705e56225038e5c03748e30d WHIRLPOOL 1f9c932c4acd053a7fdde329774aa974b6b655da3c7bbd67c1b4ab33a3fc14af29e7fd097a46a64e1181249668f85084a99e520a2c98774d0098d82e458188cb
 EBUILD sphinx-2.0.10.ebuild 2625 SHA256 8f650229e615bd689a76e92671f1828978401fec2020c4bca30689a396c4e60f SHA512 7b17336dec970348123858aa1dce3c3408bbd88d7f60f5efe49c9df1abaf09fb5e0c7d5318d0b204e543d55cceb1e75a65a6157bce107afa89d549a50b02f10a WHIRLPOOL 0448abd793e51bfc26125335bb160f7f409ab102dc2d827c7c41ced8c4ed6c222c0d750515483e375ba01f782f5e3ee06b87382fb99e00a5785e9bf0d1012e64
 EBUILD sphinx-2.1.9.ebuild 2360 SHA256 b20f60ccf02a77775a4bacd842a201c3358058a298c2930f7705103813d15495 SHA512 9633d54ceee00c46eab3ae87480cdc73040152d501c4db79f9f403d432ed3bc6f37abe2fe261527c844f0b3fedb06b2096e3a9fbb9d8f99cf4c2960ee6aad370 WHIRLPOOL fa498f830e1f292aa9630248ac65030b229bb4d9bca147db560c6dcbdbc4fb49761e62171f1515fd78b0404e730e9345d57b1c340054af6ca4138057a4831af8
-EBUILD sphinx-2.2.11.ebuild 2388 SHA256 cc536e60316d258018fe87214d1f20bc7bf47577dab160bd6bc85b35bceb5441 SHA512 57c36b00105c5773c257d1a9b9569627314a4d89c97fa67ba24d2265ed11925f0ccd97b9d600f173dbdb9f4ce90989330861aaf246236a9cb3a47b608390ef28 WHIRLPOOL 3489b75a30e3a08aa127f638d76e1c24d7d3e1e33df6e7015e0324a5b2250b19f4e7d4f6f63138ee8db478e16b053434df388236e1d90a8249aa8207e29d7277
-MISC ChangeLog 4961 SHA256 5993061947e5e5cf75a050146527b72a0a2d652f851319e795147a9f2ac86ba0 SHA512 9e54a6a99329f4039c056cfbf92e3a8fbe19f7ba65a0b648373eb955b8697ef738a013065bd3e530bab9ec2d68ab9510814ff8ea7099b2dcc4d549d04997785e WHIRLPOOL 8ccee9fe396b1b31d4767f7815232fbe371edf414b708932fd33450fe17615cde3ce2576868993b8089904dc338859de1ae39b05c12846d344cf3db1b2f6a1c7
+EBUILD sphinx-2.2.11.ebuild 2387 SHA256 9fcdaff33eb61dedc662c59f42c7ced5c3c90b9833fe2511074eac376a5dafc4 SHA512 a249015c815be9ded9ae3716a10522e8ccc487374998aa241828c97fde8188bed893d28008aa1def89d1086b67d64d24203016b8f274d640e6e2488b83efe439 WHIRLPOOL f9db0387d1fd1f75f73aec86ff10ed46f9724e11c451dcadee12efde9dd6a98990c927147d4ed1ff3be41b9021cd651623bc8c9b899c629d09aa6aa3917d3c4f
+MISC ChangeLog 5194 SHA256 e1a0f05491e13e252f2a5b7e473c4e4ed2d484a3b2d4bf90716cf48952f6ac34 SHA512 47f780eabfee326a0cbcd11cca701db875c4c52cd2157baa26f9e1ff72d35ba22d435d1d9e1e1329d419aa204e7b3d159d19c41e58fd895391204112ac9798c1 WHIRLPOOL d97c5693dfffe3fb37e2309d3a0c7eedd65995563a290c051ff50f31917c97861b8c0937889be326ba3bedbd4e56f95c4bd026c1cfe7e3a27cb736173cca98c1
 MISC ChangeLog-2015 12848 SHA256 98c9fd5b8b5ed98d0d98cd6adfe521e6330b6f690c55eb6e427ae41c7db3fb2b SHA512 92b78512fc6244a9612674a61f43348cea18b82b74ea0920df04b13d5874034ce30a4fddca0a10b5c179850c6de0b9cc2f3ef9ebb3309617d9d04c3716cfd011 WHIRLPOOL 862389cc878f65af26680eac8d1590e9d2505c268cdbe86faeb5db359220f99d82ece47f425828973456170599effbffbe89679fc412a7a2e4870e2b9c937821
 MISC metadata.xml 436 SHA256 7f7376931be063b65b8536f5643fe49388e5d8327e02539255e05f2a4306e94a SHA512 3083764b80745c3f6dd81c1bc9c2f406edcef6a451d49a79f952969db07c7741447df2b82a82a627b5ebe680f3ea36f99128ae701b553895f15b7bed0d8abecd WHIRLPOOL 55e9c7726a757d8a83803a1fca5fbfb65b608ffec3f9e7cbe35b92fa66d288cf873d7a354a99b9f258fc9449280e953c1d8e97423afc1c81870743cd49439add
diff --git a/app-misc/sphinx/sphinx-2.2.11.ebuild b/app-misc/sphinx/sphinx-2.2.11.ebuild
index 10144bb..90da540 100644
--- a/app-misc/sphinx/sphinx-2.2.11.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug +id64 mysql odbc postgres re2 stemmer syslog xml"
 
 RDEPEND="mysql? ( virtual/mysql )
diff --git a/app-misc/srm/ChangeLog b/app-misc/srm/ChangeLog
index ed1efd0..e5d0874 100644
--- a/app-misc/srm/ChangeLog
+++ b/app-misc/srm/ChangeLog
@@ -75,3 +75,10 @@
 
   Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
 
+  24 Sep 2016; Agostino Sarubbo <ago@gentoo.org> srm-1.2.15.ebuild:
+  amd64 stable wrt bug #591726
+
+  Package-Manager: portage-2.2.28
+  RepoMan-Options: --include-arches="amd64"
+  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
+
diff --git a/app-misc/srm/Manifest b/app-misc/srm/Manifest
index 718ec40..9d262eb4 100644
--- a/app-misc/srm/Manifest
+++ b/app-misc/srm/Manifest
@@ -3,7 +3,7 @@
 DIST srm-1.2.11.tar.gz 124982 SHA256 5105152d1d8e6166a5b1bef6b4ec945fd9dcc03289ff8916e98f44bfa8f25a8a SHA512 4b9b80242242dc64dcf97e4180676a1dc8b64d43f144ad4278d6762716e5e1b77b4c794900c298a919be7bdf1af71dcaf7286d4fae909ec5314752bfb73da8db WHIRLPOOL cf9980c745d79564adf913e5729f223861128d7cb1eea7b90829b09425f4d2e34ccc20d233dca88370467500826ca766f912fa565c16f3b959982c00b43204bc
 DIST srm-1.2.15.tar.gz 132031 SHA256 7583c1120e911e292f22b4a1d949b32c23518038afd966d527dae87c61565283 SHA512 a8ec78473c55b70557fca88f525998ed51df3be58618b9da220e1bb73df013163f4e1563cbe2062b9cf1512152afeb9004b5be0be69cc1278c0d28597310dfd2 WHIRLPOOL 342d3bbdd94ff756a1253df7e8d0040c1d8bc744c695f970c89f2a62dcfd43fbdcaee16a9ac54a87c25d3be02d36b96f659cbb317d090b5fe1b45135865f1adb
 EBUILD srm-1.2.11-r2.ebuild 834 SHA256 6676dd8eb4e766e65af568c83991c5acea0ba096f2c4c67505b208647f75e099 SHA512 18db466f9c4108bf6ab5b2243578e762f6a5d5873518c7d56f1c0c0e9da41a4382729d50d95b7195c6f689983e767021abb1c492024c1a7a07a5035dc3da6a52 WHIRLPOOL f018a3d6f1bebfdde3b58117e3bae63501a8dba784f4822d82921d58861c733d96cbb1bd9ae90b05a9d6774183b1b1c0fd1a085bfee9f34b7be5b4e7ed280ecc
-EBUILD srm-1.2.15.ebuild 835 SHA256 12fb4ad68ded21ed0fd4d552635c7b980f3c6ab527fb364001cfcaf134141db1 SHA512 82d13f85e6b3cf6cf5d0716ede8ccdfee9bd9a4c53d9ef48c70ab1bdbd6471be7f43ec5a42e80c3bd301dd696b6b38e286fa7d8e1009bcc3508d3b92c01b874a WHIRLPOOL c4a9a6d09855f6fd9372ce471d0e71989c6daec28cb697838e0f6ba9c239b212dd16c38786804394f135c37df065e610dd5820d53da598a6eca1b26aed906ab5
-MISC ChangeLog 2797 SHA256 cae6561e590d128bd0251e35f029b6008cf9d75b887726b35361b8ca7536314e SHA512 5be74d91c50951ed3e60265524c31e0db9388bfc93e414c8d5d6209492f6a6109d1555c3d9e5cf83a89fd794b0460bc9a5be93b57dfbffc9bda228597c61577a WHIRLPOOL 3bdee89dcb5d6ec030331475d846f6a42dbe4e486683c23d1cb963a0634902edf59f45ebb67562faf555243cc6f497609152ec4290f9186d746e0de9b24e362d
+EBUILD srm-1.2.15.ebuild 834 SHA256 10472dffb5cdda6e085fb0170ea41f120f52c38e546bb8c123854370b07459f9 SHA512 069510e0848801c305dcda48f525bd335423912ee78c4ccf1265c39dfb04a7d7f2d491205b9fe35ea74c3f2e3b8fdf24fa138353dadf40b72714352f3bfea355 WHIRLPOOL 69f41d0833c9a92047446b6b99374ca7a2011cb63eab3535e9d76130bc9d400ed59853d929d1cb732f4ba6c6e28a9b821635c32f6b032134190b0d72d52dcd84
+MISC ChangeLog 3027 SHA256 d1c1e4354f92b636dc0cece7b093ba3c1469603dacfb3e15d8d39dbcd8fe0b12 SHA512 93c6b927f5ccb3985775362ca3577bc5fee7aad41b65d22e8427ba6c4e1d6cc0500bea33a6db93d09321fec6e2d4185761c0f423a43f51473cbf9139468e9816 WHIRLPOOL 1815ea34376acf43c7892fe549eb9b2f0304247b74f4cfad8df239a1cbd1e31b2ff65710d29107be18a1210bc1aa13e54a94912b210e3d0b0cc1135a6a010749
 MISC ChangeLog-2015 4494 SHA256 104cb1587f6aba4e7ebcfb69fb3217e985bf9077fb5594b8495700f6586703f5 SHA512 d8022c7ec1f7bd42e906a1f8811d8031f4f9defc6e1245f2c3cd0c04ee79be5884b9eedc3597ce614cd38162aa133eba9b4a2ffc37ca46ec2e4f91ca480dfcc3 WHIRLPOOL eeac81a71e193f5dd1b3f1f3b3db2cb1bdbb04857a35ad3de94c9963e5aecae5857ba817ad09b28d5238670310e5629bbb23ef9faadb31190052dde6e347d7c2
 MISC metadata.xml 326 SHA256 626d8c5395f9a24a950467b5d55e97144ada200ea70a3576ccaec9014e568d26 SHA512 721014538f226f65a6d673e52715b7802e714f87fb8c98c74e610ea603f1cd72504da9229d72e15012fee7fc3d17f6c1b702e1ad5ec300b9696f8b717b492293 WHIRLPOOL 279b2c988dbe99f9672b9bb7fe9fb5012462c373b54f96f50d8e1f58de3dc63a61b70c9fefc851aa69692f37d05dbd4d40dfffb5a5a9b9234eee96357fcc12ba
diff --git a/app-misc/srm/srm-1.2.15.ebuild b/app-misc/srm/srm-1.2.15.ebuild
index 35da6e8..f57b41f 100644
--- a/app-misc/srm/srm-1.2.15.ebuild
+++ b/app-misc/srm/srm-1.2.15.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
 DEPEND="!app-misc/secure-delete
diff --git a/app-misc/task/ChangeLog b/app-misc/task/ChangeLog
index d73a285..a1aef7a 100644
--- a/app-misc/task/ChangeLog
+++ b/app-misc/task/ChangeLog
@@ -71,3 +71,10 @@
   04 Mar 2016; Tim Harder <radhermit@gentoo.org> +task-2.5.1.ebuild:
   version bump to 2.5.1
 
+  24 Sep 2016; Tim Harder <radhermit@gentoo.org> task-2.5.1.ebuild:
+  stabilize 2.5.1
+
+  24 Sep 2016; Tim Harder <radhermit@gentoo.org> -task-2.4.4.ebuild,
+  -task-2.5.0.ebuild:
+  remove old
+
diff --git a/app-misc/task/Manifest b/app-misc/task/Manifest
index 740f370..5ad7493 100644
--- a/app-misc/task/Manifest
+++ b/app-misc/task/Manifest
@@ -1,9 +1,5 @@
-DIST task-2.4.4.tar.gz 2352265 SHA256 7ff406414e0be480f91981831507ac255297aab33d8246f98dbfd2b1b2df8e3b SHA512 23565dc21bb5a05af5fe44235756ac5ecbd3b7cd94b2edc2ed0b0bd4efc5a12739cc8e3474174878595188ba726428b865dee3a79f0ad2550d5a0bc25415b103 WHIRLPOOL f071926d77a228289e2fb6a9e5c53e9db9e2d278879bf6249b04b0e7f7afe5f4195f9ea3fb42ac4aac318d0f53eda378ac24c73321d99a83c0f22295ad1dcaf4
-DIST task-2.5.0.tar.gz 900285 SHA256 4d8e67415a6993108c11b8eeef99b76a991af11b22874adbb7ae367e09334636 SHA512 911ed33553c71d0578dda20774ff1c5762700957ed637ed849ef51c4cd00a53feabc18c477dbc4b618371d9ddc8fec71795f96d8474acbec8a91be8bb1ff1bfd WHIRLPOOL e17995f173c6935f46ab476517e16157771a52bb930a6287e3f17b68ebae19db380da0643ae7a1fe6ce549ccb11d8ebe71ed45b5b650eef4343902b70459e1e6
 DIST task-2.5.1.tar.gz 903428 SHA256 d87bcee58106eb8a79b850e9abc153d98b79e00d50eade0d63917154984f2a15 SHA512 ec17e5cefff55ecd2c1cb717801c02683d94030906c8d86450c3c79c0bc5a18d82559a5e9e26a91411a1025a241b78ddbc1de51cafc1a2dd531e8229e5e61c10 WHIRLPOOL e4502a4f545eb5c044943758e3b4710db34c9011ccb58b95e70486c09593620a91cf547100025182867b69c87099cd8614b6bc28e21d5e0c0b88216f6df419ac
-EBUILD task-2.4.4.ebuild 1278 SHA256 6ced1fd126618c7e8ae89aeccfff92b59d0f87d59cb5bfc0cb3094b231c074f3 SHA512 a061170ac2b47709e674a2314399835fbe0b86ae33cda41b808a26eb94d80fa39a384038a6355242ff6471b7b70b24337210ebe0115dbf33db6505ddf2e86b63 WHIRLPOOL 944b6657bb4230656e3b29c9100c8c14eee027a19ff8d6c19bce80622a60f5cf7cefb6e6196bbb48b2ac6d0e81d1b682136c38ed75e01b1feed31f9673a7e1f6
-EBUILD task-2.5.0.ebuild 1280 SHA256 9838619984c168dd9ca6e210ac2a547c07cc0656aa7a37c23843e7f2590e3e4c SHA512 fe2813da2ff94b89c8888cc17eff9d6f32f8d799cd247387b7b139efd64bbfc03407d8ba79299aee809eecd0acccd5414085b4ea4c812c1862e5227cc6bf494e WHIRLPOOL 3c374c1f2adcce3abdfadabcc0e058f1373adf5637a04d6e2c4e404e5b191f07ab6c34d62294811375938fb4d83613eb902180b5a76ce9c8f21de454d42083d5
-EBUILD task-2.5.1.ebuild 1164 SHA256 7d81d4e9a2a460c6f7b3266bd0cb003f07520586036fa24a62ae647ede6a658a SHA512 8708df77b1251ea6cb0b674c7a3acc0e220efe13333907775b0d7b90b7b402c3b66b46b1f09d1d18852172a7a0944669969f157f34e47adcfb90ab353113ea0e WHIRLPOOL b3a23fec042db92895c0b474b8daa0ef6fac96c221c27224e23c932f0127f708e1c96265bb91d0712a40e482d43ef1587f4ae4b6656efe04a30d222bd06e8028
-MISC ChangeLog 2524 SHA256 2c65796391e0b4ce8b0195c4fcfa20e1f6ece40179a043b46a8a24e6e0c0cf62 SHA512 63fa7c17e5c0b84a1c9e65c485a59b1f0cae09d7d9b8522fdf51964baa16be35518f7432d862c4e4c30e690864b86ffcbdbf5137815f447fbf067c19d0952e84 WHIRLPOOL 25b5ca0e75b042129246d3d56482633a4a2e1324c8b4f2e12635d1bf1d208bf5065feb433ac8b66c6c73f12e73d59bb462f849d3a5eee48f071c564ba94222ec
+EBUILD task-2.5.1.ebuild 1162 SHA256 10126eaead7f5c05293346d053efa76e5019e71594aa90e2d7269e251b001d37 SHA512 824d3122fb52cf3496d3e4c54a03183dc7fcfc0167816950d3cedccaca0b1bc82eccd471bcc691d37880f97801a9eee26ead0e9f43e1e01ce17893bd0ca94de6 WHIRLPOOL 80da5a125018ce2dd04b1e4d02966764edec1958db46b30baf9b77828c4a36909a2853c1b3aeaa84db9d4c4d961d17d0942624ad17cd005741b69a678894f533
+MISC ChangeLog 2716 SHA256 9c7c3856fe13386c259df2c0537299f4d769df7008c1d142098c0a85c3646806 SHA512 df009649a672016b481748f7396d8b1fbdd3839cec9841d8f247ee3c7c3f3cc3f02521c2d0bec0a5c4d17376fe7113c542685c1cfb4dc0f76e3abf5763c1d36a WHIRLPOOL 1bc17129f9e03e3f79c1f030abe3990bc109b5e7e7125a7202a9e822886b06fbcf89d7381b85e3745bf5786f37c420a190daaf3f798747b63daec46b232dc67e
 MISC ChangeLog-2015 8276 SHA256 880d518a230421258b64fc4ce49e1f22153a979a2ca9f25749a600e4059c3965 SHA512 e4578903eb32c8d9c46933d4725790e7a7b435a1c895bf945ff60debbd8494e71658d09e884666d033b097a8126cf9ada0aa75dc6c32dbe537006bb8ea36da02 WHIRLPOOL dee0c6a02c9ae3617be4640e28c0c608264a7da89aba63b46c456f86f1abdc758ee3e55b81b81bdf145f0e2a36c2b21c81b9f22107bfcd5e5d6559a6c78b3bde
 MISC metadata.xml 242 SHA256 aff2cb73bbe13a0609631d2aec541275d796c2350ea173bbdc252cdceb79a5f5 SHA512 749de529be32cc7aeff924455c8602b0e6a078813dd0882da7d6b541aa665c120022dba06dea66dc0504021d9abea1237b6878ca35ef0dcd0b488235b36a4bd4 WHIRLPOOL 6e39ff630d156ef36bd5737de44585aec0ef355623170f068566e93bb5dfc5771965825941bf94506fb6a92bc54ea3a05d0eec127e5ef9c1b6fc7834530eaf88
diff --git a/app-misc/task/task-2.4.4.ebuild b/app-misc/task/task-2.4.4.ebuild
deleted file mode 100644
index b3b3f34..0000000
--- a/app-misc/task/task-2.4.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils cmake-utils bash-completion-r1
-
-DESCRIPTION="Taskwarrior is a command-line todo list manager"
-HOMEPAGE="http://taskwarrior.org/"
-SRC_URI="http://taskwarrior.org/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~x64-macos"
-IUSE="gnutls vim-syntax zsh-completion"
-
-DEPEND="sys-libs/readline:0
-	gnutls? ( net-libs/gnutls )
-	elibc_glibc? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# use the correct directory locations
-	sed -i "s:/usr/local/bin:${EPREFIX}/usr/bin:" \
-		scripts/add-ons/* || die
-
-	# don't automatically install scripts
-	sed -i '/scripts/d' CMakeLists.txt || die
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_use gnutls GNUTLS)
-		-DTASK_DOCDIR=share/doc/${PF}
-		-DTASK_RCDIR=share/${PN}/rc
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newbashcomp scripts/bash/task.sh task
-
-	if use vim-syntax ; then
-		rm scripts/vim/README
-		insinto /usr/share/vim/vimfiles
-		doins -r scripts/vim/*
-	fi
-
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		doins scripts/zsh/*
-	fi
-
-	exeinto /usr/share/${PN}/scripts
-	doexe scripts/add-ons/*
-}
diff --git a/app-misc/task/task-2.5.0.ebuild b/app-misc/task/task-2.5.0.ebuild
deleted file mode 100644
index 338e35f..0000000
--- a/app-misc/task/task-2.5.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils cmake-utils bash-completion-r1
-
-DESCRIPTION="Taskwarrior is a command-line todo list manager"
-HOMEPAGE="http://taskwarrior.org/"
-SRC_URI="http://taskwarrior.org/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
-IUSE="gnutls vim-syntax zsh-completion"
-
-DEPEND="sys-libs/readline:0
-	gnutls? ( net-libs/gnutls )
-	elibc_glibc? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# use the correct directory locations
-	sed -i "s:/usr/local/bin:${EPREFIX}/usr/bin:" \
-		scripts/add-ons/* || die
-
-	# don't automatically install scripts
-	sed -i '/scripts/d' CMakeLists.txt || die
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_use gnutls GNUTLS)
-		-DTASK_DOCDIR=share/doc/${PF}
-		-DTASK_RCDIR=share/${PN}/rc
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newbashcomp scripts/bash/task.sh task
-
-	if use vim-syntax ; then
-		rm scripts/vim/README
-		insinto /usr/share/vim/vimfiles
-		doins -r scripts/vim/*
-	fi
-
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		doins scripts/zsh/*
-	fi
-
-	exeinto /usr/share/${PN}/scripts
-	doexe scripts/add-ons/*
-}
diff --git a/app-misc/task/task-2.5.1.ebuild b/app-misc/task/task-2.5.1.ebuild
index 5f3af4a..e60483b 100644
--- a/app-misc/task/task-2.5.1.ebuild
+++ b/app-misc/task/task-2.5.1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm x86 ~x64-macos"
 IUSE="gnutls vim-syntax zsh-completion"
 
 DEPEND="sys-libs/readline:0
diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog
index 0c86f06..95bd5f1 100644
--- a/app-office/scribus/ChangeLog
+++ b/app-office/scribus/ChangeLog
@@ -212,3 +212,9 @@
 
   Package-Manager: portage-2.2.28
 
+  24 Sep 2016; Jeroen Roovers <jer@gentoo.org> scribus-1.4.6.ebuild:
+  Stable for HPPA PPC64 (bug #582334).
+
+  Package-Manager: portage-2.3.1
+  RepoMan-Options: --ignore-arches
+
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 287ef82..5e6ae95 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -10,11 +10,11 @@
 DIST scribus-1.5.1.tar.xz 78032792 SHA256 1882e68713d91c2ab9d6ec7a251dbbe31a4438ee68e63e62d36770541e6f4a38 SHA512 36de951c5aa190f49486971cb08223a4de85ba256a89c2df4ab0fcaba16480065faf499306efa669c623a36a59fbe09aec0c0572b55ce3f9e4107bb54df9c443 WHIRLPOOL c081db19cb39968577f5af9224a87bb2d44caf322b2860c0e3ec9bd32142d6e5f0c1c998c87ee501a3de98f9311c7b543fdef880773bed2cfd290d03a877c9a9
 DIST scribus-1.5.2.tar.xz 74456064 SHA256 ec5eec23aeda655d3a761cffb85853dcd2ede3973b9e62a1b3c28bd1093c74f5 SHA512 c3531bc5ef97e1f7d026ec7cff872ff7a6ea36472c794b632bee1a84fdeea87deaa56e8b9c467fe8e6db694266efc9ec84d822e5feefd2f99b4469d08826cea4 WHIRLPOOL cc1cd41c725aaa240a064149c011cee31f04e738ea386285b75f31aeb200b9351e6e434ed517a2d600c1de694f2f3584012e9213b0fdf094a6497d04c14e3fb7
 EBUILD scribus-1.4.5.ebuild 4057 SHA256 559370b34d92c2aa4bc62f34feb6950e22d0167d6b1aa1c02dfe3599eff32795 SHA512 cf960e09837745af39efac1d01dfa8235f2a238726ba76297f7a07914581f852d5b3a5b4a067dc0b4b7402b30b13498d5b47e4322ea458ff70a22c1a5ed1716a WHIRLPOOL 2643bf94da4b9cfc9af717e6d724f2253a775ff08461f8001d3941de75c632b199dbb7204ccad936e7f9d1c2aad1c44891c308f07668371f24cfa5ff29850673
-EBUILD scribus-1.4.6.ebuild 4040 SHA256 5b792c34e5a79b6764a34e14036484e2dc7d4075a0a3a80c34019bfc057f107b SHA512 f5abcc6416dfcaea077b752d1b3ab32fdaf3b72d7bd61cfd1da3c53b8ace1e45afc72ae7b5a9befa6fa31cd278eb0d8edaaebb63c026c5c51f86cb1a4a4467a9 WHIRLPOOL 2fedcab66a859eb77746be124d4b7befbdb832365aa852850e00e313d2501f2cdf4203ba3eed46c7145dfd178ef20b3f7331c7f41a5573496448b71d265eaa13
+EBUILD scribus-1.4.6.ebuild 4038 SHA256 076954fbda52552cac19213d78ba50174ba996f6f9004c5237ce0e01c2e60667 SHA512 f260d782b5d189775b4568208f76dad5ef2e5f1ecf43aaae831da378f8bf2ba7f763c5ba62dfbceba088f337b627c7876e32cdd576295c520c30a79711cd31f7 WHIRLPOOL be3575ece159b5b3d8c25cf81ae505a53065fd521193677bedf3ce5f125085ec38e88311b13ab6fbbff74f00eaed9581a48184cd5dce4fc6aaeb0a048459c58c
 EBUILD scribus-1.5.0-r1.ebuild 5769 SHA256 2c434d2a44b3cb6498515f3d099138da575f85a1d31093be7c87b47820ac1fb9 SHA512 37647cea2d2bd4651c3ad6c1c58e1c85b695070516c916f2309120292f4b91a7d1156252c0126d0431868a69aa6b9edafa5e26b4a06584840e891e281974c303 WHIRLPOOL 77a41b82ba5d2bb054e7c39fe484e96c70af7e7e3c93a8ecdc19394a573dce973918973c0d3915ab6f2c084648748201639823208e965b187d6b4b607311f338
 EBUILD scribus-1.5.1.ebuild 5761 SHA256 c4f47ba5b11d25b76cf74857a90cf10605edffac6a9c860c4c016589f067d532 SHA512 982f6afc72ee43c7223a0ae981435ef328ddb7bd05adc5820240f35839adf816687207ef77121609cde4116a630b19acea48471fdab06fa34f8d0903f138d2af WHIRLPOOL 4fadc862b617ddde7fba82b5e73acad469a2d60747df0dbddc29e2c264ca86f555565426d96314691c6cd86b6e7d1f9bcb480ca2808f5f4e0228d90ce46c2d85
 EBUILD scribus-1.5.2.ebuild 5720 SHA256 5adcad98f019c5c89cb2719bdbc021c8dfe9880a45a0590064523439e98289b7 SHA512 e82b45d8d825bb7f38a5115ecf1f464054ca85c04ff422e381e3d4e4ee5693dd1488e75b5fa90c586058317e50dadcaed6904d3cd1c37d9dc2430397536c2fae WHIRLPOOL ba2bd675a9c43aaa487ff443a1a2a4bd4421ffc11c8d39ba1e02c030164990f0a9d7995a431c82080ffc1a59706ab91bff01219dc6ac7da65f28b63f8ec2a985
 EBUILD scribus-9999.ebuild 5721 SHA256 8d33f07cc07be85cc1e143c71bfca0cd7fd25a44e35cd2118dc5e4facfea02f9 SHA512 eed7ddc07f0a334c51ad0dacfe60fa5ba7eab9def0c18a988c71a08ce93fdbc60bd194981bdfddf2f0116d7e5a9daa04f0b582571a2d9624650051d54bab57fb WHIRLPOOL ad0405b00b4da87fb929822877f59f755b27483a181625637ef2ac4e18ab3e424da190c38f029bffed9a748a6899483760b96f28b5956b1feb670823774d1b5d
-MISC ChangeLog 7083 SHA256 ec194b3e996a3684a6f8d7572ac14eeb4278fd7bd17006c5f3e34e6c74b82f67 SHA512 724d69ed3c33027e8c0a2020aa3e5046df8f2d9d491db01e7efbbbb3e6e2ef24e52bcb57bede323368ea30e79dac359e3d3803c545c6b40eebbc8e97acebabf4 WHIRLPOOL 6394c760e30c95e02bff53b35a1981b4f07cda5190942d54b39c5c2c68471c59fa89bc6ea0698969aaacdfe52a205f39e49e80e4be44f64743c443d1b82268fd
+MISC ChangeLog 7261 SHA256 63ef667cd680e37d17493b35a77764211216429ff72a444279b2de8cb2662912 SHA512 0f4ffc6c755068fb12c2911d86d0708479a42ba36f240fff196a50a0117ea8ddf556ac1a86089e60cec5cb0dd810bf761e27cb0b63a2aa4d5984b2c37fd3abce WHIRLPOOL 425caf05264b89e5b5d0f145ddaf07fa58bdc780ae7661d66990e479771cf640ffb7081799df2c57c5ede44768540c6faf79a073edbb0835496c16d4fdbe551c
 MISC ChangeLog-2015 29142 SHA256 ae387a21c374d46fb2a44a47eb4b8684d7d29eace0aa6cd5ef16ba4ed86fa952 SHA512 7467b987b0683335df402c697fe15657006a24313784049a04f313a684d7b1708d18a14b9c6a3942c6405ecb57f4c731cd53dbca12160c8fecc9c278efb8c945 WHIRLPOOL f768c5d6c111dfda47c4052e0c97abc98a58129a55040553923603468788400894daf37177bffe2e0f8cdd60157933bfb9e5469ca8b2390c09a65642cfffc0ab
 MISC metadata.xml 885 SHA256 693ff19d4ee7c9abdda3d52f0450154dd0452092d7a57e9f64f5736742f39e5e SHA512 1e2d219d1b16c5a6a1f82c0f2d7191d6bf290b50df8bf7c53db4a1c1e4296e39fa2539787e2d76f0187108ae9e0431c3c98d7e872849735ab0181ce0f739b54b WHIRLPOOL 246702496fcc884f23255c40cfe01ffe957ccb21734ad7443728815fb76da7644486f835dfb8e46bb6a18ad16881e25c9294bc9afb8e760ac26cf19865aebc08
diff --git a/app-office/scribus/scribus-1.4.6.ebuild b/app-office/scribus/scribus-1.4.6.ebuild
index ec00eac..5d2dad6 100644
--- a/app-office/scribus/scribus-1.4.6.ebuild
+++ b/app-office/scribus/scribus-1.4.6.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 hppa ppc ppc64 ~sparc x86"
 IUSE="cairo debug examples hunspell +minimal +pdf scripts templates tk"
 
 # a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a}
diff --git a/app-portage/euscan/ChangeLog b/app-portage/euscan/ChangeLog
index 862f254..430faaa 100644
--- a/app-portage/euscan/ChangeLog
+++ b/app-portage/euscan/ChangeLog
@@ -78,3 +78,8 @@
 
   Package-Manager: portage-2.3.0
 
+  24 Sep 2016; Alice Ferrazzi <alicef@gentoo.org> metadata.xml:
+  add Maintainer
+
+  Package-Manager: portage-2.2.28
+
diff --git a/app-portage/euscan/Manifest b/app-portage/euscan/Manifest
index 561b523..972bad5 100644
--- a/app-portage/euscan/Manifest
+++ b/app-portage/euscan/Manifest
@@ -1,6 +1,6 @@
 DIST euscan-0.1.1.tar.gz 441780 SHA256 cbf89803c0c8d6025239f0abd1ac17179c8ff81b1b059be7fc9415a8cfe6dd7e SHA512 2f55f8f4b0fd46b13c981ba94be29a62f16fe2890ce03f99ac14b1488c2ebb59abdaee12f671d679b934b4fd875ee27e751d2c305420f7cfb08e69ec899a75ab WHIRLPOOL 602bc0e3ee60ee6acc6c39bd477957a544fecfd81b38bbd06e46adab246f16889700b38bf6dde306b9978357e521ebf4d185364fd37f765696cde53836a8e127
 EBUILD euscan-0.1.1-r1.ebuild 812 SHA256 b1caeab486da321dcad35452304a79603d0b0bb7cdb5f569f85591f0cc5887f1 SHA512 173a8a3b278399465a437902f01f3c06768f37f2851691b59a22c72208636fa2f4095efac303e4997369eaf198f51985d490d48a6faed9af6787d242ddbea968 WHIRLPOOL b358ae503133eb45b7400d8dfa7a14b3e1ac0b67283322170305a679a966b6346b83e99fe45f4966a1eefe162844c3b62dea209f4c062cd464b2f01ed83695cd
 EBUILD euscan-9999.ebuild 773 SHA256 f046e8e569330f91c9b459f37dea1a33c231f742fcf1e92c08c21f2a935418c3 SHA512 7436063a78d1f2d6a064d7e0f8d6b0a3e75b685fa40acbcc9040655669935d31abd1472bcd3131a6d293d67e10a2f523cb7a57e0ab8a4658ce01443cbdb8b3c9 WHIRLPOOL af4047dec08356fb867bd798e5e9c3a35fa29af8aaf5692e911b2b8f9e3f21aaca2fffab2c6ca238f7af91f6330f98b32d6c626c5121e3ca77f20161ef545d0b
-MISC ChangeLog 2843 SHA256 a9de135fdf4ca116f4a361a30812354fd80e4c98114b51361d981b0665e4a11e SHA512 4d38e6b63d536623e8de9333f5f02527f2cc2ae8c20a8d5761fccbb22c4b088d3eb6112fc8deafa6250782ba199a41a4fd5db835e6c6a4ad5ff6ac5e4d52286a WHIRLPOOL b4615fc55fd9fccb2755042263161d5faee47a215e89c29e952f366bde4ea441d1f1313ca45ed1c5e13883e68a675d5493adbf669394778029f92b191fb9468f
+MISC ChangeLog 2960 SHA256 da048d650c207ccbf68859ecd74a3c6a874f15d4bc547b9620ce32440db286f9 SHA512 05ba143dc0429955d27faf2161e6b2b5f86224c6e6a8ab7ea292fd3a12e2021f7f37753db891e204a767ecaad20001248413fe7dbb021567448ff431feaea744 WHIRLPOOL bde612341077fc1910b920d82026e4d5b5d43fd6c788b91c34609600c59853db1b5f609db974f90207b70ef8a9daefdc1b562ed64b328dd9e0d48d0607bbae1b
 MISC ChangeLog-2015 2321 SHA256 f0abfc40e11007abba0c2108a35cb6e1fdfca516960aa42cc230684cf026f960 SHA512 073ba7e4af1c089289e77c704431550a89a2eff312640e0533e55275936345e4d46f065065656345a472de8451ff8966bf4ae8143da4a9c38151e466a6c6e85a WHIRLPOOL 64cb242409b8fbe00f252238d09cb43ecc97252ffade6b5d7be77707e3017453016f35d1d302f74907a3c83a6fb89e8ce77eea1a778895150118b727e7f47deb
-MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630
+MISC metadata.xml 340 SHA256 46663e868baa69c44ad2584d0551db271f913196e7fb4da8848883d3928914c1 SHA512 de74198fe372171f19b6486164e81b3f256ae6a04451ce5c3c789909a0a3bff6ec15a42a3cf3387f227cef33f8dbb32eb9872af95d6f962f61ecd2fa64ad0b5d WHIRLPOOL e56f2f3c5e6fcf295ed5540608d7e5dcfb283c653ba1c4e8dc5cc0a5225fd66fa72f7fc7223530603b7042652148bb31864a7ac0faf16173156976d001ad1d87
diff --git a/app-portage/euscan/metadata.xml b/app-portage/euscan/metadata.xml
index 097975e..2c94ca1 100644
--- a/app-portage/euscan/metadata.xml
+++ b/app-portage/euscan/metadata.xml
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<maintainer type="person">
+        <email>patrick@gentoo.org</email>
+</maintainer>
+<maintainer type="person">
+        <email>alicef@gentoo.org</email>
+        <name>Alice Ferrazzi</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-text/languagetool/ChangeLog b/app-text/languagetool/ChangeLog
new file mode 100644
index 0000000..6aa3191
--- /dev/null
+++ b/app-text/languagetool/ChangeLog
@@ -0,0 +1,13 @@
+# ChangeLog for app-text/languagetool
+# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
+# (auto-generated from git log)
+
+*languagetool-3.4 (24 Sep 2016)
+
+  24 Sep 2016; Tim Harder <radhermit@gentoo.org> +languagetool-3.4.ebuild,
+  +metadata.xml:
+  initial import
+
+  24 Sep 2016; Tim Harder <radhermit@gentoo.org> languagetool-3.4.ebuild:
+  update worthless header
+
diff --git a/app-text/languagetool/Manifest b/app-text/languagetool/Manifest
new file mode 100644
index 0000000..356ad7f
--- /dev/null
+++ b/app-text/languagetool/Manifest
@@ -0,0 +1,4 @@
+DIST LanguageTool-3.4.zip 95764120 SHA256 ff36380c5807c5bdc67d222c5f2adeeb0a047a02661885c29cd8297443846c9c SHA512 450c5faa98b61cd2ed132f1e3ff592914e0abd58ed02d9c372fb9ef57d566d32d7bbb3a3ecf6a3d26248379bbecd35934e4ae0e33bb5ae821eaa0eb17d6e07e2 WHIRLPOOL 9f44486917581ed723f61d5d8af7100c4ab679a7ca36362b2426f04575bf90966e2a5b6de15b28cbec517bae5f1d6ae1ec18c6c9b0643880130da03e838dc09d
+EBUILD languagetool-3.4.ebuild 1643 SHA256 87a886d370e51b292fc2ef8e35a2599fa539bb193eb39583a1ad862cc367008f SHA512 626e94dee55dac45f3bb02646850524e314b0c4bf122b3c318c80c634668313f7f333f62e4a8af1bd330bf213dd1d2ba12c0b803460dc1141c9d07000b27f4fb WHIRLPOOL 4811a8f76b7c3ade510c4aba03bc44590f77db79269f39b21313a36b53a45effff8b10a66ded7d717fea295e7a2dd2b718a73e05d1fec068090c985bcfca4414
+MISC ChangeLog 385 SHA256 96bd6eb28a01f5351fe41a7eb6516169ecc6a85d2349f0a828dac5d180a2165f SHA512 6a2e81e6ae0a3f971755e8edde4a4af333ca2dbbdb4b8f81a3a5cb8219cb4593ea91fc92aa8f891f7814115366afbd8155ab4042668a60c12b9fc4d2eacaeea6 WHIRLPOOL e9636d7e95386f8925fc502a39fa2983eb328570d1b6fa4e6494fa6774a5b6ea47e28b0e89c25c1209283c0a3cdf6b784d1f9a19a96e191b73537e97888d24cd
+MISC metadata.xml 255 SHA256 fa2495381a46939e915222bc4f5e8c1e704f336ca63c064a2a63090c79b0e5ff SHA512 305ae93d2bb3da79ee181cf36bb0ca2bbac016c20555967d7281cd5c0edfc26c1450dacd7a7de57078650dab0e815be9169c0b25a24d71488185f71ae8834167 WHIRLPOOL 0e543ebc68a9501374d42528b31fc9d94ab416939eefc6cc37dcf033d0ecd85397ec58ab67e02d6a08b2f4c0048891d441a2b217075e4596ffc25d5b12cc8ec8
diff --git a/app-text/languagetool/languagetool-3.4.ebuild b/app-text/languagetool/languagetool-3.4.ebuild
new file mode 100644
index 0000000..662dda5
--- /dev/null
+++ b/app-text/languagetool/languagetool-3.4.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit java-pkg-2
+
+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"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8
+	dev-java/commons-cli:1
+	dev-java/commons-lang:2.1
+	dev-java/commons-logging:0
+	dev-java/guava:18
+	dev-java/hamcrest-core:1.3
+	dev-java/jna:0
+	dev-java/slf4j-api:0
+	dev-java/slf4j-nop:0
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	default
+}
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins *.jar
+	doins -r org META-INF
+
+	cat >>"${T}/${PN}" <<-EOF
+		#!/bin/sh
+		cd "${EROOT}usr/share/${PN}"
+		java -jar ${PN}-commandline.jar \$@
+	EOF
+
+	cat >>"${T}/${PN}-gui" <<-EOF
+		#!/bin/sh
+		cd "${EROOT}usr/share/${PN}"
+		java -jar ${PN}.jar \$@
+	EOF
+	exeinto /usr/bin
+	doexe "${T}"/${PN} "${T}"/${PN}-gui
+
+	dodoc CHANGES.md README.md
+
+	pushd libs >/dev/null || die
+	rm {commons-lang,commons-logging,jna,junit}.jar || die
+	java-pkg_jarinto /usr/share/${PN}/libs
+	java-pkg_jar-from commons-lang-2.1
+	java-pkg_jar-from commons-logging commons-logging.jar
+	java-pkg_jar-from commons-cli-1 commons-cli.jar
+	java-pkg_jar-from guava-18 guava.jar
+	java-pkg_jar-from hamcrest-core-1.3 hamcrest-core.jar
+	java-pkg_jar-from jna jna.jar
+	java-pkg_jar-from slf4j-api slf4j-api.jar
+	java-pkg_jar-from slf4j-nop slf4j-nop.jar
+	java-pkg_dojar *.jar
+	popd >/dev/null || die
+}
diff --git a/app-text/languagetool/metadata.xml b/app-text/languagetool/metadata.xml
new file mode 100644
index 0000000..84f8f1c
--- /dev/null
+++ b/app-text/languagetool/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-text/lcdf-typetools/ChangeLog b/app-text/lcdf-typetools/ChangeLog
index c29452705..2c19cb3 100644
--- a/app-text/lcdf-typetools/ChangeLog
+++ b/app-text/lcdf-typetools/ChangeLog
@@ -94,3 +94,10 @@
 
   Package-Manager: portage-2.3.1
 
+  24 Sep 2016; Agostino Sarubbo <ago@gentoo.org> lcdf-typetools-2.106.ebuild:
+  amd64 stable wrt bug #594726
+
+  Package-Manager: portage-2.2.28
+  RepoMan-Options: --include-arches="amd64"
+  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
+
diff --git a/app-text/lcdf-typetools/Manifest b/app-text/lcdf-typetools/Manifest
index cb17377..55b8103 100644
--- a/app-text/lcdf-typetools/Manifest
+++ b/app-text/lcdf-typetools/Manifest
@@ -1,7 +1,7 @@
 DIST lcdf-typetools-2.106.tar.gz 643503 SHA256 503c3869f73a392ae0ba41e0fc4f7672e70e2d66e8a81f3bb183f495183fa967 SHA512 039215132585214e6518864161885f7a06f08f8b36b002a961b1d83182e388b31eb034eaa4466ba56a2af52e1cfb202e88f004be17c22df1343f94481e3114cf WHIRLPOOL 6ec074348f3a1f17d06b7f70f5b170d70b63055d81556ba8c2c14c50e7be4f0070f3ad685a1624a8e10a78db931cd798f7656a08b7fa0c324d663f4d0fcfad51
 DIST lcdf-typetools-2.97.tar.gz 616431 SHA256 761746041c669fa3673a3e90ec7a247abd0e2782bdddf0fc5d7ab70b33b6f975 SHA512 8812436843721b7134ec796549092854050d1e9017fef048a62e7aa0e866d20e9757b246dbad738cdf8d8583afada3a2db9c6c7dc2546154cafd4dcd0f27f7f2 WHIRLPOOL 767a2a74a9f9b7a0c29407178b96a1455da39239b835f59def2ae77db068655a8953362c6f8d48a8a31fb6fc40dea405c0e6eb276fe60750e9dfbb11954bd972
-EBUILD lcdf-typetools-2.106.ebuild 925 SHA256 1e0bae35f6cb9f5737e41af53f974506425c9189342b110e4482ebea3b204e97 SHA512 37fb590a66d8303965f7975e6bdd2093f0c6def3f9b614a69f945204e143f41b0c1e9c77cefcf5da7a10af233ea4b208b4819183f7dc503a502d49e03de7c77c WHIRLPOOL 8d149b8a51d732332e152b9bfaab6b40eceb39c9a1142541951f7923799384fdab665c4a8d78f1543b5978607d33a508f7fba6c8b5395d84fa6766fd164868c1
+EBUILD lcdf-typetools-2.106.ebuild 924 SHA256 fecf0c8c980c71f6673098f6ff687f2f3b97bf6ded57814248caf120d33f3aae SHA512 42fc37bb03e62d81a0e24d8d5f39eaad0847faac775177f1f288e7a47f097112c3e3774878ea93ea7cdcf27e5e6527ea2d9355482e0cbd346e3b4b8d6155550e WHIRLPOOL f0ec7161051a9c6c20d1a9f55a235c3e198c84844ea19d4e3bfcf73433769cc4fde9e523f86050a5b76f4160e99ce49223f99c1b1bcb64b97aca3f2c57197147
 EBUILD lcdf-typetools-2.97.ebuild 743 SHA256 77ca1bf1b571448c1f3ee953a0d0b79440023b789f2e8ba834d809c11112a7ff SHA512 9a96197561e401f53430429d96089f9c0a4afe1ab91908bc5e188f328900562e28210e128633db1f8fb7c5fb2d0139118cfe6a7362a26ffa8b458054be22e138 WHIRLPOOL 1013eb7fb36916c3e656a8a2adcc21ccbb8b7d52113f191abbd7affbaeb9b67fa9a4f450119f003fea357bf907ac41ca5de73b8f6b1f850e3d556d8519c64e86
-MISC ChangeLog 3434 SHA256 b76ec973f98aa12b6173830af2c0b460c2abb3a993a277aaa4504262975005d1 SHA512 69c7e46ed813deec8477adc2668a20c728eb57a05c0f12ee12f0a76b0699380f66e3945b7fbac4fa52c7ad5c8e077a27475ad2c53b7171c0cf8a3206235cbbf5 WHIRLPOOL 450c1186aefa5ea277ebfc2fb97a22ac2bf0e362a869dda9e2babf0149b93877e7dcfebb961296ee970de95d06e18a32b40a6239615c90c3d25480c255559cc3
+MISC ChangeLog 3674 SHA256 f2fb8285144c65482b3d681d1a1490327b9188a6770519d53e3427502a30aa32 SHA512 5892dd3c0f59d162b642d0f5fd951ea2c48102b643c28f8248a1832cf715ae3c451d97e7abac7876f7626c404fd7e7a596ef4ab4e49622c2840950c9a5a91f9a WHIRLPOOL b5630b0e5815af5b76b0694a23a432248ddf3b1f5b227542cdc9d347e9890d0b280cbdfa4d76e155dbe149c72fd6ad623ee9d71da91d9b9b40a831aaf340d889
 MISC ChangeLog-2015 13461 SHA256 e7812f14ec13e571fb977343ade6d1c2b5409f00776f0d38ad70835a5ff1ebbb SHA512 e11173f902c7eee7e8d5c929dd527e70860a8c875e26690b520df753f6278e598bd78fe8bf13240c143ce85c1099eab68c7a7c842b64cef799993bca7f6de87f WHIRLPOOL 7c9f44d7f663c01e69d1ce1e7be844b96df8af13c47d73326be9d25a2c7157a13a3302dafe613928405cc33063bf68514d2e014e23794b37097e75613cc960ab
 MISC metadata.xml 794 SHA256 9518aea3f3c6b016f19854f7b1b9a478443b2b5157ac1b657d6d97c227dc703a SHA512 9ae4e29814e34012d731aacc0a8b4a38649c95a988049f3fc10c7f260cb6ebcc57caa0a93d21eb8e66e64207673842ab7ab2fb71792ed3d537b7eca891609cba WHIRLPOOL d98330ba84752f17aa838470d66edc634cf8f89e4594d65dedd2b9eda84be7c40a6441c04d269c3f688ffc4fdfcf713b6e699b7ab3d46a81858cebcaae6a8628
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild
index 6366adc..0422b75 100644
--- a/app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Font utilities for eg manipulating OTF"
 SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
 HOMEPAGE="http://www.lcdf.org/type/#typetools"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="+kpathsea"
diff --git a/app-text/linuxdoc-tools/ChangeLog b/app-text/linuxdoc-tools/ChangeLog
index d200796..c3c0869 100644
--- a/app-text/linuxdoc-tools/ChangeLog
+++ b/app-text/linuxdoc-tools/ChangeLog
@@ -239,3 +239,10 @@
 
   Signed-off-by: Ian Delaney <idella4@gentoo.org>
 
+  24 Sep 2016; Agostino Sarubbo <ago@gentoo.org> linuxdoc-tools-0.9.72.ebuild:
+  amd64 stable wrt bug #585532
+
+  Package-Manager: portage-2.2.28
+  RepoMan-Options: --include-arches="amd64"
+  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
+
diff --git a/app-text/linuxdoc-tools/Manifest b/app-text/linuxdoc-tools/Manifest
index 34248a6..5237eda 100644
--- a/app-text/linuxdoc-tools/Manifest
+++ b/app-text/linuxdoc-tools/Manifest
@@ -2,7 +2,7 @@
 DIST linuxdoc-tools-0.9.71.tar.gz 613357 SHA256 1710b03d0e7151892c417363dd26c15d7f45d36411b6a341b0a4d3753519f476 SHA512 8383e5f08d58ca6395db1832c02e1af7b348c276187e8271564b229d811f5141128976924f110d6575fa94bb45d547a2f4c90acee523e78c849659cad592b7ae WHIRLPOOL d40660d2b3373e853adb3055d8053507c786e278906eedf1d9b9afb74a032bc464587fbd6e9320b7fa8aab3de334c12a899a2e8bf9f5addf0c13988bbdc0ced1
 DIST linuxdoc-tools-0.9.72.tar.gz 614429 SHA256 664bfc4e580a5e7b8917104aa93b7f5021367e24ee22d67411a5f3f27fa81ba4 SHA512 2d522a99212dab2535786b64e0b404a9bb023d1612d8e57a628de21b5e77b104285713a98591c61a2fb2196e687b34180198ab0dfeda2b44fbbce051e9919408 WHIRLPOOL a9185f1666675d1ed398b9b96e798c7788e52d1ad57e39692fd9d06174f111b559c9e4f62a5762b0d0af3a7fc3d7d943b9e788d2d9df031f3d0cf4e2595587ee
 EBUILD linuxdoc-tools-0.9.71-r1.ebuild 1964 SHA256 e4f9a7b69374f820b5289088d54c4ebf962e130703b5b5f33b424b13887b6db3 SHA512 4a2c3d18877e4d89c952cb9cf62e7308af0ba2d5f9b0eb5e26fa37b32b134703d7db3c658d47d2710b7e8122d02fb6c59952a02aebfb2204974dbf076eb0b96c WHIRLPOOL 2367670e4e7f455718cc4ffcda7440bf488426e01e4a1d72aebdb04d6df3dbb3109fcccbf3676c76a941cd5616da6d99c0743b7e31d6d0d0c2d37dc82d5c600c
-EBUILD linuxdoc-tools-0.9.72.ebuild 1721 SHA256 0467e282f7ba02c07f07e77bbc8faf180f09be0f978886b700c7e2e41c55aea5 SHA512 3585c2bc073041ffec8fd80a5e18ac71bad50d5f540adcd2ac35506b96a584866a37551c41b3fc7add1feae906a7bb71f9f886c37795cba000a9f851857f1174 WHIRLPOOL cd0202a0c1d4f0780d45b6986942132c5db30fd3e919a9d961b09430f78cc2d3e8ec61c9506b6cbfccc7c45eb9d91436e62b30459d81f371df1c984745c2eae1
-MISC ChangeLog 8511 SHA256 3a3cff39c38cb360e5dbea134fa701e2994683e30b5817e16e59880d4f03d6f9 SHA512 052238bb71301306f4c02d0766549fb54335da95d73e4da8aa1bf56eb30ffb3067f94fd0b5f95832bc39ad8b67d5d132c88d1b70a1b37918cacea322491952dc WHIRLPOOL d9240a33f9405b08628d776f8d1c4dea7ac7fbfe808bc9fe2c83d099404963af9c0b6f43e35bb0f5cfb5f507d0fdd90e748cf30970fa59e78be2457a8bfea43d
+EBUILD linuxdoc-tools-0.9.72.ebuild 1720 SHA256 08d9b04ba502e7379b8ab3c910ff199f64aa4252f61bcd61ab9ac2aa9053731d SHA512 a2d6f6865e684269043499db788b41b8f6c6c768f78d87e607769bf80118947471e956b052b18e9646974ae993c125dd16d004a5ca1a604d39c3d5220c475b83 WHIRLPOOL 5a8674b542ab591336f1112191931f071f73feba665a3f77506cf065add5a2143e4ebc89b8b1d5616b82c662e5139e72e40d1698f37b40f99f37accb54375c73
+MISC ChangeLog 8752 SHA256 5c5021af2cff651421511fd761707d96e0cb6a43d0ffa059ac95bc7d7f451b75 SHA512 f5aa770304557466d3c39d19033421600a7536cda91b3f21238c5d6d94c01a33aa889f48eb546e1e91769dba4cf6bbd492436cfd80e5fda7a6ab89e6c4ec2160 WHIRLPOOL a5ef95a2d4513611edb4f93743f561897fbd8aa63b704a288fa4fd44f26559455fa9c209564d7e304339f6395d2756693c7e2d8a3a0c291be304916b157c83bf
 MISC ChangeLog-2015 4827 SHA256 643c8a92ed36c263bb293fe99c224210f435d51a3f135f6f8926274ffb4f81c7 SHA512 9d12067c92d7e7f9ed31597439726462abe50518c485b895d3e23e0de4b0bc13d45c3fb58d5d57324c2c2035a5b1ea4e4a1ac596bc2b778664e05c361b89e0c7 WHIRLPOOL 083853bce70d9403faf09e7fc0e3881613dbec47f859f5d5bea6d3560c6a9bc595880fa76fa681b9f379ddfc5c4572a7d118ba5b403ea763ec2323c4e912f0b9
 MISC metadata.xml 911 SHA256 dcd2d0223d26c84f80a30953da23929e601960896f3f5a850319b2411c18a67c SHA512 6afd802552b700006b38a5eee516e5e1f59d0af0dff294bc2807804f8a85823ca2c5a928c0cfe2d5ef74d8c34521ecdd2a54d4ff5a1d322f17d42a6e5e6ad0f4 WHIRLPOOL 10b9193efe3623d0295897dfe43c37673d3aa816620b28fdbb6b6bb44c8cda8af06fc4645ba1f850f51c479f282073bf9350e6e6a1b8e7f97659ca761a0b30d2
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.72.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.72.ebuild
index 9119802..9d45560 100644
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.72.ebuild
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.72.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-3+ MIT SGMLUG"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
 IUSE="doc"
 
 RDEPEND="
diff --git a/app-text/pdfgrep/ChangeLog b/app-text/pdfgrep/ChangeLog
index ac5b8b3..edc5dd9 100644
--- a/app-text/pdfgrep/ChangeLog
+++ b/app-text/pdfgrep/ChangeLog
@@ -101,3 +101,10 @@
   24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
   Set appropriate maintainer types in metadata.xml (GLEP 67)
 
+  24 Sep 2016; Agostino Sarubbo <ago@gentoo.org> pdfgrep-1.4.1-r1.ebuild:
+  amd64 stable wrt bug #591844
+
+  Package-Manager: portage-2.2.28
+  RepoMan-Options: --include-arches="amd64"
+  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
+
diff --git a/app-text/pdfgrep/Manifest b/app-text/pdfgrep/Manifest
index 9ef6952..f6a4d6d 100644
--- a/app-text/pdfgrep/Manifest
+++ b/app-text/pdfgrep/Manifest
@@ -1,7 +1,7 @@
 DIST pdfgrep-1.3.2.tar.gz 114754 SHA256 386b167434443dd299d389a0ef292d708123255cbab0e179e11b65ba51d9b386 SHA512 dd5d26999405e1e84f5639ea48e15d2aab951a766f828e8e7b45409a7e027a5312757ac64952da56b8a37cf0cd0bc6f43cd16d78600dcc6c8fcb4deabecf0a5b WHIRLPOOL d2ca79e647a21767e0296d72dcdb511157352adf1f1d60beec9d15eb46554f3ec6d9c11f1dfda8988d4f6dcf4a814c52a8ffc28f72c2f227e01430354a8b99f9
 DIST pdfgrep-1.4.1.tar.gz 151926 SHA256 db04a210e6bb7b77cd6c54b17f0f6fed0d123a85f97a541b270736a5d3840f2c SHA512 27ce23c25a5f284b3eba92a0f8dbf02600248548967c1e71dfb41e43528824d9add587ea0ac23899ff07d2ffc6c74c2e6e4c2e7240e69494b8d31b7a4afc3735 WHIRLPOOL f08308a13b0b577215521b116db7b4c787b34993665031a690308e45333f35e86419928310b303060cda40aaf4ed5d474400bcee0e29106c9f8c8935d779687e
 EBUILD pdfgrep-1.3.2.ebuild 485 SHA256 56a93edd5977abf9f532efb8477aaf09f3d0d48c7e0e1ae1af4e5e26ae5ace62 SHA512 8be7951e016d773b5444a9d7420985c9d96e5128f345d9c6d579e88337f27e280df61714e91aa28ac4ff2e43b91b894cf681115cb2d7560e5ecf816236fc9666 WHIRLPOOL 28dc52533dd27025e2a1c1680b02387a98a086f71d0a8a6d04a188fd57ad2ee1a4de838fe9855292c7a680abe0656c7c8e4c3b6bd9fbee427bc409a95dd46a30
-EBUILD pdfgrep-1.4.1-r1.ebuild 616 SHA256 18dbeda5d374f7592c11bd96c6f1c38130888ec89b3818ee1ba028e4e8a5101b SHA512 daf6635e154344bf5a02599384fb2aa6d64b9734e1c3e95c0fb774f6f14ba4790d11e9be77c2bf5a8f04a7bba5dbc8f1a2f7363e211f4330d491733ac971db36 WHIRLPOOL 1f7e30bdfd39edb0117bbbe2af96ccafd3dc0ec116804a5928c4f5b64ec02b79f12216985315d212c1ac3a8a1f6b8b9f08ef4bbb186f0ba304542280aa0fd756
-MISC ChangeLog 3471 SHA256 68105ff90f023a69dea7f9c655865f830c341a49f0f61956bc37e272622736e0 SHA512 6ca602d973e60b675ecf33d1f8772cf7d18fee4adfd7d03fdedb9e47cb3e477dbd77c1e56318466258f29abec29da61f529dd210593adae622ca493f3d64cf41 WHIRLPOOL 83ff77cf99d2e0e025cd411cf74fcb92a149ea69ffb941aa5a3fcfd2ab404672c480142bc85a2ff0654f7cd7bb83fead6d7ff53d94e4041c3fdf2609e77d37c1
+EBUILD pdfgrep-1.4.1-r1.ebuild 615 SHA256 6b0ca6d057853eec1483de47902d13cb51d6293058ffba0d4567060b0657c397 SHA512 30b105cb92cd21801f4c8f7d5df78641593eab108ee8547fa872464f52b23fa29128d2b2172b73d9b69a85bd1f3a8bd6196dd579f305b9ca2806ca5e0abfb574 WHIRLPOOL 6c7806592dee2a33efca477b9da1a4dbc50914f11985919581312a64d9ab3cd0f277cca34546a5d64794250776f6071d54028eb2766da46f17bf394a6ad9d0a1
+MISC ChangeLog 3707 SHA256 c3171928a259f0ffb7f1dbd65bd1b87a1ed0992296db4cb3fb0ce8d3af66fa5b SHA512 df7219ab3624c930eaf9b4ed6fa5061ea6440414111e01d99cce5f2b84b312077084606f7a5d9be812cba368a6068e766ff803a58ea3639f81f7cf927f2ee865 WHIRLPOOL 110633012b8e11111c7020030282978e22c76b46ceeeabac60daf09ad3eec46ff74cd97fcf8d7ebd15618710a5ffb2413d0b84636e00a56e680c5a961da8a35b
 MISC ChangeLog-2015 1984 SHA256 77160a1cb1b7ee740400743fb1b8159e0ff9174f35597407055544438fcf644a SHA512 d628737d18fb7d731a654f189a0e3d88088e312ad5f911402bc966795b86113893fa87bba001db474e0681c8194c3001c735a6866d2763461977d139ed710d5c WHIRLPOOL b06e7aa450fe591031f1f36cd8af3cbad62c5d1dc15deb3b9d2fef6fc4659018c773e69db62d7c63948b4f17079c14d468d40d97217f6fa230e30c825c1bed9d
 MISC metadata.xml 669 SHA256 08d923af306270248119004fb3b52e244e13e73740fc8ab8bacc27ac51d31227 SHA512 22f8e105bdd34a2e5d0b9b96ddad8f163787b933128924341c511e6902610b5956edba7ae213d5112038943268fa0d4c99c1deea25d629e2038f01585fb35472 WHIRLPOOL beb96f744d63a94ad15cad6509574158a4a3fdc2800c8d890cd18680f969e5fa5da3b36a0dd87bf8e9f99c959ae423879d2c969539265675cb68a9d90afc716f
diff --git a/app-text/pdfgrep/pdfgrep-1.4.1-r1.ebuild b/app-text/pdfgrep/pdfgrep-1.4.1-r1.ebuild
index 7ad1d96..42f6eec 100644
--- a/app-text/pdfgrep/pdfgrep-1.4.1-r1.ebuild
+++ b/app-text/pdfgrep/pdfgrep-1.4.1-r1.ebuild
@@ -10,7 +10,7 @@
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+pcre test unac"
 
 RDEPEND="
diff --git a/app-text/wgetpaste/ChangeLog b/app-text/wgetpaste/ChangeLog
index a308a3c..608707e 100644
--- a/app-text/wgetpaste/ChangeLog
+++ b/app-text/wgetpaste/ChangeLog
@@ -101,3 +101,10 @@
 
   Gentoo-Bug: 591544
 
+  24 Sep 2016; Agostino Sarubbo <ago@gentoo.org> wgetpaste-2.28.ebuild:
+  amd64 stable wrt bug #591544
+
+  Package-Manager: portage-2.2.28
+  RepoMan-Options: --include-arches="amd64"
+  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
+
diff --git a/app-text/wgetpaste/Manifest b/app-text/wgetpaste/Manifest
index 40f78a5..cc7a76e 100644
--- a/app-text/wgetpaste/Manifest
+++ b/app-text/wgetpaste/Manifest
@@ -5,7 +5,7 @@
 DIST wgetpaste-2.25.tar.bz2 11107 SHA256 6a7e078e6607f4fe819fc52857a601630ec0f7d2ee855d3b1cd7e75a904c40f4 SHA512 c3cd56f32311c77ce5ac970f0cd6b2e8285cac3caaf61669237ac707ed3b9aab285fbe9dee6260ea13b8df41a22acfaa3b8439298560ab68c3a568d60557d82e WHIRLPOOL ad64e1d45cb49dd70a2b33e49e81f255b304def9e4b8d8c29ac4b4161fb7cc290574686a0488a731cd36f339fde0f78da90ad439f1b771b8d5bd2f2df9cd67c3
 DIST wgetpaste-2.28.tar.bz2 12448 SHA256 538d38bab491544bdf6f05f7a38f83d4c3dfee77de7759cb6b9be1ebfdd609c2 SHA512 b3b9ee4bfbc52da6762b06c2640385eeedab7910ad1bc4e92ff9304371ec2442e2d30b69ebc0f1407a00a9c8afde398e00dc3d3c048452d730517227a68e6b97 WHIRLPOOL 31564962f633fd9d63aa77569646777932a563a3d6593ef6f4a83d639b437b85904f8b7386de961952e8328fcc1c9255c25528c55f4d04d1393e074b595586b2
 EBUILD wgetpaste-2.25-r3.ebuild 952 SHA256 fe4a27d56508ed33d38a84248f18274c8ce013a83a0166c67318a9b95ab5f031 SHA512 d1ce9bcba0377714a1cc5e7fda5711883644dcbf40e6fe723d5f20621461b7b48bc91e2bd7c7f5e68f1983e16e5e784ab3ca794fcb407cdf9e5d3cf49cb883d1 WHIRLPOOL 13d6d4f12e010c025180284bafac80c7c785a51fecdc3cd6aea40dfda3622b0d630c02db01aa44e4f148d26272d1e92ed3a1f633de121da5c1fae3985f3c40c7
-EBUILD wgetpaste-2.28.ebuild 747 SHA256 25475a5be3efd1ead104cfb6eb92013c380592406c124fc061eb2d8d9b284293 SHA512 062ee55af9fbcb7a966c521b7a651be4525cd2419bdbb2c8ffe922064760fd77598baf7741f5b8e5e74c24ed1f8ba47307ef80bd3810df15dfb6b69db5adfb77 WHIRLPOOL 8b316e6216f7d744c736978fe8582db02e0f461a0bb85c5b8f9550625cadfb71abc54268b25c1c0391385733550a02dad1463da0f2ea7aa0c4f123438a3fb7dc
-MISC ChangeLog 3404 SHA256 366a2b2b30c416a8a03bd77cba0700482977427d6d1a78b84d166b6b64d2cb91 SHA512 be45e6abf5c429992fdf27435a0b31fa5fa26496d8af745ca72c48530648768dfd6717cfd1725b2ac677821e0e5d97b957c4b863bd5acf832149abf874705348 WHIRLPOOL 9fa6b7b93f56a8a149455b10d2922f68055da6fef865ec89f8acbf220404c1d6e06bb3826cbafb7953c160b6c80241a62dcaf5e2ff5ffa1a6ac3dd27b8e8a96a
+EBUILD wgetpaste-2.28.ebuild 746 SHA256 0518a52e4e11c29c25f071ca3f7b7bac6a1966f72ed94efe241bbd6ded4faf04 SHA512 0629757ea56ccd1f51e1fbc5b05fa60f48ed9dad4e39321b752208f5c64b9f4c87ae71ccdabe79f7d9c562377149a2a0f3540d4db0c645cae08beccdffcdf8a4 WHIRLPOOL 999a4e3eae8e2980289259db707b1b37eb2700059013f12866f3ca88914fe4b21bf3e365c71c0ca3fca8920af8b9a97989f9ce8f5414b0b4a53d7e2ad8d6eea0
+MISC ChangeLog 3638 SHA256 4ead68ac6c149b8dafc34aaca2b30a4fa38e78c3e6843e0505f91ea195ff56e3 SHA512 f1229cd6e72d3cfc764e7b5c6458481ff99cac80bcf3a7cf72aed5d469dab2806b27e4a65c70b5685bf7e5002142410c75a3853b584a21b57b37346480c9b206 WHIRLPOOL fa1ae9ade590276f00c72617901c225f26a4ebfa404362bd32d80fddc7c59428cf7cef459c79fb21c902cdde2ae8fe42df88963f3201e8075c1797164c22bf0d
 MISC ChangeLog-2015 19159 SHA256 94577d675df0cfc0fa981e1f87eab558e5255863293b22cf93159811aca0b190 SHA512 b77c44a91af92c90af2bbd9ae92bc243dd4055884bd0e4f3538fd82a8ccd8c0ae9ac544ee07dde3bdb5d111a8f7d8bbb7a42614d6fb2fb9301dda8217828ee45 WHIRLPOOL b886d74788ebd0b6b665dc3c409ef499272967c36148dbcb049fa878bea906f8fed54f1a5a15d2277e4c1c1a2d20f06a54cbb7236a3016c8b44d73b49780f1ac
 MISC metadata.xml 478 SHA256 20bae017e67c47a54fc6b21777e277c0fa7771af5249fd4074d83b128744f499 SHA512 0abed227215e198357b7c3e4fba660d650b5377364729b20a30ecf78f43089e0c797e5d82652fc978fedd53e3d2afe89ea831b11492782b4d30922ef5e3b9676 WHIRLPOOL 0fd4fde59dae90e4a49c0d2b0f1c285570d3e6277f852430660bba0e941f9e3a09942fe3cf850c6031890065eccac3645c2fa2b622d2d111981fd7c465a2a4ea
diff --git a/app-text/wgetpaste/wgetpaste-2.28.ebuild b/app-text/wgetpaste/wgetpaste-2.28.ebuild
index fbaf55d..10f12d3 100644
--- a/app-text/wgetpaste/wgetpaste-2.28.ebuild
+++ b/app-text/wgetpaste/wgetpaste-2.28.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/app-vim/languagetool/ChangeLog b/app-vim/languagetool/ChangeLog
new file mode 100644
index 0000000..0d01bca
--- /dev/null
+++ b/app-vim/languagetool/ChangeLog
@@ -0,0 +1,14 @@
+# ChangeLog for app-vim/languagetool
+# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
+# (auto-generated from git log)
+
+*languagetool-1.29 (24 Sep 2016)
+
+  24 Sep 2016; Tim Harder <radhermit@gentoo.org>
+  +files/languagetool-1.29-script.patch, +languagetool-1.29.ebuild,
+  +metadata.xml:
+  initial import
+
+  24 Sep 2016; Tim Harder <radhermit@gentoo.org> languagetool-1.29.ebuild:
+  drop unused eutils eclass
+
diff --git a/app-vim/languagetool/Manifest b/app-vim/languagetool/Manifest
new file mode 100644
index 0000000..dd3b920
--- /dev/null
+++ b/app-vim/languagetool/Manifest
@@ -0,0 +1,5 @@
+AUX languagetool-1.29-script.patch 1413 SHA256 0893cc1c3362376db4c7c09e2263682a87bd02361407a17629dbd720558dd2cb SHA512 b4e25e527a8af3ea5fe649bd31aa0ecf0f073a0852f1f155ecf2cbdc58d105ce114db8a12dc56ee086a9076cb15e5bde61e7340e570fff59093ed2f266247564 WHIRLPOOL 6cf5e1f99903a8f5fe0dea7d3d6b0dc02270b036aa3a62b0000993d6531a5f2ac316af3b508b542d5741dea028addcce5a95f6d108a3085c25ccfd37d0cf6535
+DIST languagetool-1.29.tar.bz2 8059 SHA256 92fd4bf94c65828f1c309da5257336a2287c07cae7ab6a4709ae1b79dcbbbcca SHA512 09b5bdc1d3590afe26578f687064a7a62493a11fafca903759dc1e9048cb22a04c6352127b13e4a63acb867d73d943b56fcae7f733350626f05b66a6d1f1626d WHIRLPOOL d5c8d411b465fdad629493e834d154e7e3a25898b20bc009c4ff9977593ab46ca6e0f6f57ae7933da08b9f7283ebc793106a4eb31a17d670050a94f27a2f2af5
+EBUILD languagetool-1.29.ebuild 425 SHA256 9acf94be8085a61fc2901ef1d3c822692e743d356d42a40da50982edadd1471c SHA512 7ff58b2bd77793a087089503bddcfdc45e6f1ee14e7568778acc1bac1f94365e26bf8a606c0c7ab66c2234e074ecaf1f718ae537baaf46db8780a817043ce4c9 WHIRLPOOL 37ec5d65c9cb750c0f96851aae2b01833a8c41410e569ee20dd9ef599d919846ea4694e5c3107ff58ea6e661af1a13f44319244da50d74f067466724004e3fd5
+MISC ChangeLog 430 SHA256 dc26d53f4539fee9db8dd3951de886ced07a1cff099e3df5b5c840477590a122 SHA512 979ddfe69dfbcdb1158049ed2b83e4bfaf0c76cb9d8397844ef0b3e57de7847221a464343d8db0ef49905c3211ce2af94478b413c3ed336ec29302afff09250b WHIRLPOOL 43d2cc5780e54e5604da92e224b8c10da5d90ba88543b6051c2771bb8d4782e6ef305952e270eee1cd99e40a1d52a84fe7e49b7f05f9bdade5660988d1714d36
+MISC metadata.xml 255 SHA256 fa2495381a46939e915222bc4f5e8c1e704f336ca63c064a2a63090c79b0e5ff SHA512 305ae93d2bb3da79ee181cf36bb0ca2bbac016c20555967d7281cd5c0edfc26c1450dacd7a7de57078650dab0e815be9169c0b25a24d71488185f71ae8834167 WHIRLPOOL 0e543ebc68a9501374d42528b31fc9d94ab416939eefc6cc37dcf033d0ecd85397ec58ab67e02d6a08b2f4c0048891d441a2b217075e4596ffc25d5b12cc8ec8
diff --git a/app-vim/languagetool/files/languagetool-1.29-script.patch b/app-vim/languagetool/files/languagetool-1.29-script.patch
new file mode 100644
index 0000000..f2737fe
--- /dev/null
+++ b/app-vim/languagetool/files/languagetool-1.29-script.patch
@@ -0,0 +1,38 @@
+Use launcher script instead of directly running from the jar file.
+
+--- languagetool-1.29/plugin/LanguageTool.vim
++++ languagetool-1.29/plugin/LanguageTool.vim
+@@ -162,23 +162,6 @@
+       endif
+     endif
+   endif
+-
+-  let s:languagetool_jar = exists("g:languagetool_jar")
+-  \ ? g:languagetool_jar
+-  \ : $HOME . '/languagetool/languagetool-commandline.jar'
+-
+-  if !filereadable(s:languagetool_jar)
+-    " Hmmm, can't find the jar file.  Try again with expand() in case user
+-    " set it up as: let g:languagetool_jar = '$HOME/languagetool-commandline.jar'
+-    let l:languagetool_jar = expand(s:languagetool_jar)
+-    if !filereadable(expand(l:languagetool_jar))
+-      echomsg "LanguageTool cannot be found at: " . s:languagetool_jar
+-      echomsg "You need to install LanguageTool and/or set up g:languagetool_jar"
+-      echomsg "to indicate the location of the languagetool-commandline.jar file."
+-      return -1
+-    endif
+-    let s:languagetool_jar = l:languagetool_jar
+-  endif
+   return 0
+ endfunction
+ 
+@@ -242,8 +225,7 @@
+   let l:range = a:line1 . ',' . a:line2
+   silent exe l:range . 'w!' . l:tmpfilename
+ 
+-  let l:languagetool_cmd = 'java'
+-  \ . ' -jar '  . s:languagetool_jar
++  let l:languagetool_cmd = 'languagetool'
+   \ . ' -c '    . s:languagetool_encoding
+   \ . (empty(s:languagetool_disable_rules) ? '' : ' -d '.s:languagetool_disable_rules)
+   \ . ' -l '    . s:languagetool_lang
diff --git a/app-vim/languagetool/languagetool-1.29.ebuild b/app-vim/languagetool/languagetool-1.29.ebuild
new file mode 100644
index 0000000..1bd4528
--- /dev/null
+++ b/app-vim/languagetool/languagetool-1.29.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit vim-plugin
+
+MY_PN=LanguageTool
+DESCRIPTION="grammar checker for various languages"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3223"
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${MY_PN}"
+
+RDEPEND="app-text/languagetool"
+
+PATCHES=( "${FILESDIR}"/${P}-script.patch )
diff --git a/app-vim/languagetool/metadata.xml b/app-vim/languagetool/metadata.xml
new file mode 100644
index 0000000..84f8f1c
--- /dev/null
+++ b/app-vim/languagetool/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-vim/perlomni/ChangeLog b/app-vim/perlomni/ChangeLog
new file mode 100644
index 0000000..cb75e77
--- /dev/null
+++ b/app-vim/perlomni/ChangeLog
@@ -0,0 +1,14 @@
+# ChangeLog for app-vim/perlomni
+# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
+# (auto-generated from git log)
+
+*perlomni-2.5 (23 Sep 2016)
+
+  23 Sep 2016; Patrice Clement <monsieurp@gentoo.org> +metadata.xml,
+  +perlomni-2.5.ebuild:
+  add perlomni to the tree.
+
+  perl-completion is a plugin which supports basic Perl completion for vim.
+
+  Package-Manager: portage-2.2.28
+
diff --git a/app-vim/perlomni/Manifest b/app-vim/perlomni/Manifest
index 7c5f318..ee484e7 100644
--- a/app-vim/perlomni/Manifest
+++ b/app-vim/perlomni/Manifest
@@ -1,3 +1,4 @@
 DIST perlomni-2.5.zip 26871 SHA256 b13f8ed41ecdfa779875c48ac2df1241272ac03cef53271054dc6e9c0b011288 SHA512 aeb4bb6efef859145a942271ac4e08c99af3aed45024ca2d5affe2e72c356fa4e8f9cef78ff8a1796426ec9d2339ea2b83f07b224a1b4b98598aec5f6f45b0d7 WHIRLPOOL a8f62ff6c7a0535d0177bea205206505ad3d578c50a2ce8880fa2cfb32ba3e8fa6f750908ec846ac0a7b2af546c34043676c8747b11504487e178f93ecbc4089
 EBUILD perlomni-2.5.ebuild 571 SHA256 aa47ba735f7ff35011e0b668f084fb6c3156709501f79264502d0d5a5baf07e8 SHA512 fe1e28140dbc1bc8d393a31e2054a4bc7f3e4b1ba4eb96f36785b24918da16630aa2e0b28df5df57e211335f59f261824a90812b479fe93eae32aa927bf8095e WHIRLPOOL 6d90b6aa4f7d436dee88b5e564913e7aa89e631651d3e5d5193c633c8cc7433e3c360b48a4883dc944f23e1067488e147a49ddbeabd8d0be62a1973ba371ee76
+MISC ChangeLog 399 SHA256 9b5fb44ef5efaf4d64a2dd7ec344c79062a37eef469d0fbc8b63dc3106207650 SHA512 25d2b8345a56a6ec3af29763b08ce2c64a1864afedd4c63391dabf90877c5b6f6f83f6944c2537c0e1763b19a5fad025ec2b97e56f4ec731c99ea56877f73c15 WHIRLPOOL bde8e69f8fae74f3a7ee5a63990016a6edf8d448b425d8060c50033c959f616f5badba0a9b73e5394ebafb9af238fad3c61e5e52b52291c62b1b619cbb35131a
 MISC metadata.xml 340 SHA256 b5f94f381f43622fe0bdd5583e273d70cf00bed9c1e54cf07b1441804f206e87 SHA512 5b3eb98fdc674b48cdf126bc027b5c9c09145e9020fb2b54788452e1329e64890fe78628dcf7098266b1ea72db038520959233e1ef89ce479eeab259ac31650c WHIRLPOOL b1e003b8e2358b4b83544ed9a533e72336f7f24523bb0643c8a870de2de2cfe1047e0d1355db9aad9d04da2bca13bcd4972c12da6a77ff13987216d85b511b9e
diff --git a/dev-db/couchdb/ChangeLog b/dev-db/couchdb/ChangeLog
index a0fbb22..5619130 100644
--- a/dev-db/couchdb/ChangeLog
+++ b/dev-db/couchdb/ChangeLog
@@ -99,3 +99,10 @@
 
   Package-Manager: portage-2.2.28
 
+  24 Sep 2016; Agostino Sarubbo <ago@gentoo.org> couchdb-1.6.1-r2.ebuild:
+  amd64 stable wrt bug #586638
+
+  Package-Manager: portage-2.2.28
+  RepoMan-Options: --include-arches="amd64"
+  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
+
diff --git a/dev-db/couchdb/Manifest b/dev-db/couchdb/Manifest
index e6da9b4..349b4de 100644
--- a/dev-db/couchdb/Manifest
+++ b/dev-db/couchdb/Manifest
@@ -2,8 +2,8 @@
 AUX couchdb.conf-2 234 SHA256 056042951c9314feab924d707bf347b2ef265f10e90bec847315d9c0156f700a SHA512 5c40927957362a7431be6980be3a239e4ee0ca47d28f1b4d4fb3014b307e459eb429f5b50e0c8aa58b3e9f2285371616a58f06207e272feae1bed33f8c32d836 WHIRLPOOL 694a6ad4d948a56903ea8c628506325bcac181b827c8000aad1032014668da19d571ecee6f37bc1ecaec06c7783ea2918685aa107ff3786f5909cfbf3356fd5c
 AUX couchdb.init-4 439 SHA256 ae1b5551ce432ca85a99e3a93355204936b4dff99dc0cdba5e19d44b87946f76 SHA512 a1e0a9403082e1c336454584d78d15e5d76861b3b3d0e56fcfb25ab50c0dbbdcf658e251e25f22e2a58dc72f38ec16ce82759bf9c7b5330a569ffb5fab912999 WHIRLPOOL 8ebe4af5892ea2b8ef4e00d273ce3a0612de281907327a2b3191a30822077fb0470b6a0af39cea6806d59da25d19b517db678aaead514ad9b46a22c8d2110922
 DIST apache-couchdb-1.6.1.tar.gz 12085350 SHA256 5a601b173733ce3ed31b654805c793aa907131cd70b06d03825f169aa48c8627 SHA512 70630a27dec7281fa5bdca0601796baa28fba1d7c9975d8f38b9623bbeedd62b26081118357886c7be00b7769360238b2c99695234e13cecb15a210eb986eadc WHIRLPOOL 5776fe139db54e5ec285ef9882f5164a42a499bab312d66c0edd5314dd1915827a7cf7df02cd5df85c437bf3f70096cb101748956d639e8e80ffd0bb0b79197a
-EBUILD couchdb-1.6.1-r2.ebuild 1886 SHA256 b3d198863d1aad2c8af72c13feed6e98349bb21d1fbba758a5a60219aac69b8e SHA512 df021edc101efd5eb44ed7b5a9d207f1a46486d6f73845c9e2bea70baafb88f471eca9cf8154046b295b3262294ddd7d5b1747bf3ded127c44290e4087366234 WHIRLPOOL 9c4b6b5c391e4c00a1e8c513077ded9e396c0855d5251d49effc14da73563dc9340269b2770eb954702bd6db8ee2ca1516f7504b3caa56e1339f160ee4131d73
+EBUILD couchdb-1.6.1-r2.ebuild 1885 SHA256 228b10ec39a858006778c7b4b216048176c0a86aac84c933a17e5b2574b9c4d4 SHA512 ba15ea54b58eb0ff19727d2ce37c140bc831be9aa009461b3ac09b50057d4ca4c2fbbe07f3fb79cf82e5f1136d8bc91897af3cae36fdf994e324e922e7715d9f WHIRLPOOL f436bfa4b115a6abc0a3213064467b6a22654ead083b488c421183540018e757ce4247afda214a34769e378e0d35b45922b477f458962cf55f7ab8b3898c9d30
 EBUILD couchdb-1.6.1.ebuild 1750 SHA256 76d0e2c988a3b974fc24dee03b87b8025d6feef7d7e9fbe981f70f50076374e3 SHA512 146ebe1e2a02eab086a13b669539c32bf0aa9a09c8c3b6242cf903e46fe433de6b4d0d019421067ce6f2f2af5456a9e46ee65dae0be4cab50b937e900ed5dd46 WHIRLPOOL 7dce0ed756478fd6d956d237940f3bfce97a6603e4d9df63b32b08925dc61614d1070a3cd6774c78bf1f60ec4abe589e57314a524de21a0900646b914ca62d66
-MISC ChangeLog 3453 SHA256 79a89aa161e677acdcd864955abd6b71104d090b0e6537c8ea83caa803de7dc3 SHA512 34cca4bd9edc3a71c34e3796e63f95397b6be2c02f68aff3b06bd1ef3dede6eb7e865c475ffda609cf78b4476f745d201e8e58e1fdea63efceb52ed011ab24b3 WHIRLPOOL 8b776b150fd6b989842428490a97c6529388d1124320e4ffc81e72947de8f4774e694baf8e9f311cc1b07ebc717b50682ac8c0152f81979620807cc11ce3162c
+MISC ChangeLog 3689 SHA256 9695fbf0257c000cfb6b875048d6b5f7b61cd2a1d15da22017114675b293a5f3 SHA512 25cd2bbf8512952af2ffa3f6fd8fd14ec09497088eaea9b660f54e1c10752118b387e10b113218b1a36fdbedc9b7d03d18fb79814cc297484dfafad7234c6e51 WHIRLPOOL 3efe4e412eef4ca434bdf53ac0b81e8f882a7db4285b291730e4669d9bd68e267a6957ba783dc656774faa9c014e355593d0efc00554a978359ca0ddfa71028f
 MISC ChangeLog-2015 14103 SHA256 3a06cdf5f2fb5900395c9ceb77aa1e355811eb9412e6126f48dab7c07de136e3 SHA512 a90e09a5a6e33ec0f1eddec1a2b651a201b90dc797525616034330006e263f12cf1e338d456269a48a406557d649c6cc1bf3ced63545cda5055961f35adf088a WHIRLPOOL 1585d163b62ca0835f429d6d81b8d8572bc9dff8d477315649cb48aebf7364c81bec11dc4835b694d5c790e4fc50f54b39c8313c31d7f9fc7ab9bd2d69a953ac
 MISC metadata.xml 212 SHA256 061538b4837ab7b95b652299476a75942b769652dbd569225713fdf1166b1d37 SHA512 e4f4b6dbbf6bf039ff5c19bb6a209ad4e0b1286f8cf7cc0cbafcc04fcf93fb92766c8cae06ff19f980a069c7fe9a1686437ab215f84ce10e301275ae107d00bd WHIRLPOOL bb35c86572b2ad56bf93b52f6eca6bea0f5591c1a9ebd608833dea63c89d4bd36cd402a8ffc2d5fdc1d7e1d5466782d1e37dfcac14fae0bbb181029799728fa5
diff --git a/dev-db/couchdb/couchdb-1.6.1-r2.ebuild b/dev-db/couchdb/couchdb-1.6.1-r2.ebuild
index a00bbb1..74a91a0 100644
--- a/dev-db/couchdb/couchdb-1.6.1-r2.ebuild
+++ b/dev-db/couchdb/couchdb-1.6.1-r2.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="libressl selinux test"
 
 RDEPEND=">=dev-libs/icu-4.3.1:=
diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index 55cc0e1..68fd137 100644
--- a/dev-db/mongodb/ChangeLog
+++ b/dev-db/mongodb/ChangeLog
@@ -308,3 +308,10 @@
 
   Package-Manager: portage-2.2.27
 
+  24 Sep 2016; Agostino Sarubbo <ago@gentoo.org> mongodb-2.6.12.ebuild:
+  amd64 stable wrt bug #591186
+
+  Package-Manager: portage-2.2.28
+  RepoMan-Options: --include-arches="amd64"
+  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
+
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 71ae43d..6c8ee5a 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -20,11 +20,11 @@
 DIST mongodb-src-r3.0.12.tar.gz 29353503 SHA256 b9bea5e3d59b93775d5d55fb1dd161272aeefa193c2311a8f6722ad46d7a21ab SHA512 52bceadeeeaaa1880df22dc541bd4190c81e0d37cc93b24629f581028978a868de120e9e3430295a7b8c0a793b465efba1d52616cb121d1b97c622e55ae46255 WHIRLPOOL 11c8d23d1f2d7254927dcfa5ded413d1d049dbb3d68f140a4a1ca361679213caf8c44712780d40b59fd98f0df1bcdc6cef68a180115b2800a828c72c86c99df3
 DIST mongodb-src-r3.2.8.tar.gz 28504785 SHA256 5501e0e90c9358358e9ee20d4814643e910b847827627ed7ca1a9d90d220c0a7 SHA512 264161b98e243ed2058487b765d1b06c6aacaabd058f36fff9f4d72b451dd2f811c56b528ad1d26da118844e8020453598727a0367249b959af3c9b39048fd1c WHIRLPOOL 2c18bd9e56cb9168e4d883e0ea51c3185f175d52c834a8c9a6cecba2987b90ad1b8103ee92fc69e97b3d1d2336e036ee0a44270db029f48ae78f0aee759b4822
 DIST mongodb-src-r3.2.9.tar.gz 28950352 SHA256 25f8817762b784ce870edbeaef14141c7561eb6d7c14cd3197370c2f9790061b SHA512 83187167c9775065ac24da180c6483bfc1580e085cfb7ff27572c812b9eee9ec7e9800d5da2238c333f03c641cc0e41b067341f28578ffc4513369a3f99dc002 WHIRLPOOL e661cb05f5ad6649a424ce80d4db9ee1979d127a947869d85adcd6be7ab4cb6d1d694d19675d43840ed910455bd873af15871f0addd41bc2db122ff7d4281a1d
-EBUILD mongodb-2.6.12.ebuild 4692 SHA256 70ea75b0aacf49d1bbc8798e4eadf3fa13f207de03c9f090937763f3e4e20350 SHA512 7156b4c9771b21032f83ee527084ce11a9cbc7c2ca79fc6446129691bfc87cb146192b0c4d97d3d576581259ee3baf23149626584171b15d931456f22caff69e WHIRLPOOL a0265d8a059fa8cf91bf54dc9c88197a63b02548db843217c6317311f5142c604916fb3946a64923ef4217906bcad0ef268e10d45f73a91d9a1014f0cfea3982
+EBUILD mongodb-2.6.12.ebuild 4691 SHA256 481d9c3bed3218395c4fd64b91da63671b76b1df48c36e0c27486b3d6b34ddfe SHA512 f90359d426bb66727cab78338e914dad05b9d9b1245d7c92a86f8938ebcf7493625a2fed67365cad9ce07e73f97421f41ad90531701e475d2edefbb3ee24532f WHIRLPOOL 54223f811884912ac68d8227066f76323c9b9fd5bfbf1b453de9474395b9ee0c6f7c128c152552e4587fd814a9c4d5e1d07bd850ddbd036c0fa29eef70cc7c62
 EBUILD mongodb-2.6.8.ebuild 4690 SHA256 a5b5c2659400dcbbeb7e11accedea2aa5ad696497abbbe694077eee50ba127a4 SHA512 e0a370c50b146888be715c80d5ebe55fbd32a7d3d04e7272ca5471d94ece2cb8f9171890326c5849070c9dbcc092e2550939b66ff5468adb29bed4f79a04e169 WHIRLPOOL 1457d68d8d352d3dd9a9c5b78affd50ce96afef5f6df048476120591bd56878e429a3e4fa180eba7d3cc714ed9519733a577cf39e902bcd12425379077e2e0cb
 EBUILD mongodb-3.0.12.ebuild 4396 SHA256 5e892f29fe417f1ae89471bf124201e9c47d25dc195663c4f037b991a388ce2a SHA512 e510c42533dfdb836dbf6f68c8cf7d63e25277e29b432848f3dc723a599649378aa3018baa9e0cc37c78073398c2cab5534d06f296ce752c936aed246520a06f WHIRLPOOL 23206189583e96f5a39c52c170d92fa7631ae16e174c42dccd85dcd0736de3bb5aba2fb801d5c4986c71797ba6e33ebece9c0d66c096faa951e32a83d67638c8
 EBUILD mongodb-3.2.8.ebuild 5059 SHA256 98955242f41302d2a5d47a251f239f839637f10ed84f2bba0f81ccd4e0a77237 SHA512 5194f2bfdc763ccc678d6968a2130c6a53d90e2780758589945f7f3e326db1bc60eee289b36c58cd84f8c2b49527ebd50bbea0fa9ad4d4f96cce7e9a46743908 WHIRLPOOL 11b7d685d51e42abf480d66dcf57c0826d249c4c302bf577beb60600bbdca18b5a941d48b403f2046434c606d3c5a8624b64a6c96804059141a43a4553d87a4e
 EBUILD mongodb-3.2.9.ebuild 5059 SHA256 98955242f41302d2a5d47a251f239f839637f10ed84f2bba0f81ccd4e0a77237 SHA512 5194f2bfdc763ccc678d6968a2130c6a53d90e2780758589945f7f3e326db1bc60eee289b36c58cd84f8c2b49527ebd50bbea0fa9ad4d4f96cce7e9a46743908 WHIRLPOOL 11b7d685d51e42abf480d66dcf57c0826d249c4c302bf577beb60600bbdca18b5a941d48b403f2046434c606d3c5a8624b64a6c96804059141a43a4553d87a4e
-MISC ChangeLog 10360 SHA256 e84d06370d1fd4134437fbf287f8dff9d728df0ab584ed84542f220310386751 SHA512 df1f6aca620f9a392694cfafeb622c9e1948232c269ff1d187f4b35b492c965d5158b51f82b2c5559064834dbd3a4682d309bf6ab2c2898f9dcac307c5448265 WHIRLPOOL b047231bb9ac693e2568b9bbbe85311043c05d511836800e5ca5a0215d87f6e3c83dc65c1d2cb2d13b035771723e8ffbe9d0959d23c507c8c8a5f624ce7fe80b
+MISC ChangeLog 10594 SHA256 ed8a85cac39cd77f5b6a64b6b2ee7ff36da57e4abece3d07ed45c89b40ade42b SHA512 db0ee000f74da9581a800cab351d134b62ed566fb93b1b2a18c1a43783a4e45e72b54596c3de702b261dc75bcff07800db26b1896ec0e127c3fd6a9fde799487 WHIRLPOOL e3a83834d18d5978f688481983ff01ac90f782bbf388fd72a7249bb2115d00fe792a76440a5408a9a548014d881e30ece2f5542f5e9c9dcf6f85a9f33cc798c4
 MISC ChangeLog-2015 25355 SHA256 a3aed548a6ffb7287da4945eb5bd03d1fa13d900600ba8b9349065276684e916 SHA512 efaeaa046614ab70a6e790cd9af861ec98a6472f62f3362cc1a935e12eceae8e00bbe210abec070eae6bba6cf791b69b937744acf2053ef2eda7458eb6b62efd WHIRLPOOL 22ad53f03a3f038d53fc8143b2a8a729c0157efe458a7aabd48ea753bc37b90c7424dc5103dafac750db40a47296a8624e566789fa49c71f54d479af860550f5
 MISC metadata.xml 1155 SHA256 2ed67d1bdeb810dcadcb72c2c21b3640c2b045e7ff339e834dc843dc3926f43f SHA512 6c858e9e63a821d3fc96aed9c960fab171defd4cd45e24bc11b796e2f36ffc39462f4525b533106c51a07ed3d94610230e26de1a4ae22d6e0658faee16856671 WHIRLPOOL 89411d2986e81b3017e6efe2c9de7201dc995d9c8644e45bc886efc275310cacae20d24074915e1e5584eda4c32ad380b36d3c76739fdcecc81d17411081c947
diff --git a/dev-db/mongodb/mongodb-2.6.12.ebuild b/dev-db/mongodb/mongodb-2.6.12.ebuild
index 3f63202..f6d1b3c 100644
--- a/dev-db/mongodb/mongodb-2.6.12.ebuild
+++ b/dev-db/mongodb/mongodb-2.6.12.ebuild
@@ -19,7 +19,7 @@
 
 LICENSE="AGPL-3 Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug kerberos mms-agent ssl static-libs"
 
 PDEPEND="mms-agent? ( dev-python/pymongo app-arch/unzip )"
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index d41abe8..4e116f4 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -483,3 +483,15 @@
 
   Gentoo-Bug: 593614
 
+  24 Sep 2016; Jeroen Roovers <jer@gentoo.org> mysql-5.6.33.ebuild:
+  Stable for HPPA PPC64 (bug #593614).
+
+  Package-Manager: portage-2.3.1
+  RepoMan-Options: --ignore-arches
+
+  24 Sep 2016; Markus Meier <maekke@gentoo.org> mysql-5.6.33.ebuild:
+  arm stable, bug #593614
+
+  Package-Manager: portage-2.3.0
+  RepoMan-Options: --include-arches="arm"
+
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 7c0744d..9fed423 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -12,8 +12,8 @@
 EBUILD mysql-5.6.30.ebuild 5545 SHA256 2b3a1cf9c941ba4561ff31b5c18d5d7a7a3848c28e9e4347fe978f7d605c30c3 SHA512 a186834a9b60bbe48896d41435914385fa90b946f49b0a78acc8ecf70ade19b52f90eb84bb9b54364780b6721966021ed534136c61721c9b23dfda2a77cf700d WHIRLPOOL fdd378d82198340ae011fa6b42bbae39a740ab6367b0216d1e5a3ea33ff407684ed2b4b94e527f90f8882b4ab00820c7feab7176fa53ada4416e36e2e8cb2ac4
 EBUILD mysql-5.6.31.ebuild 5548 SHA256 37dddd977dd0025994c2627d9be11656040c914df90e8a63a64710b848b9a54e SHA512 100ba9625ba14c9e0a4c4377dd7f43d61705dd92f8b93670fd4475b6cea84cb9103d27e738df5e460cbc0292e4e4ca6494dd089df70d43aac1b68f7d11252e47 WHIRLPOOL d6c3e689117f76ff029ab1e84b529042e2d734c9f02275f350a993275b612aa09a6dc3f1f813e88026593f795175dceeb4a9f190985c9bec0277fdeeebc13bc4
 EBUILD mysql-5.6.32.ebuild 5554 SHA256 1a90a9c5ca87502e738c62f70589b340c647de30744f8055a533322a2d2463f5 SHA512 feb6226f00d9c2d28278958c1155c55ff6c1a4bba8fcf113aa64524ac93130e8e73a0676e6c87fb04a18659c66e2a3952895429aaffbfdd8449c7b3be0e9e061 WHIRLPOOL 7ee5b3eb79cf2337cf8b7d71ad8da0a9604e04fc8aea3bbadd88ec2cf366a26f2e93320d6c9152c9b46f71d25d3bbee9d07c59f32aa5a9df0ed6593851b2bb11
-EBUILD mysql-5.6.33.ebuild 5450 SHA256 47331b42956293057f691643ca578901042078b0e8c5a1572d642f0f5cd4ddc9 SHA512 9dca44f504c05b56eb868a81e83a980b0354e4714fac16787320f17bbabe4b79acda2bb72798e48e36356b9c2a9fa00e28a6d230870d25d82a164b9998b6912c WHIRLPOOL 38d9d98ea7738c25681e7730ffc6d36a66a8ad3673eb90d809278d662f5b2abcaad6ae00dc535afb3aa81aad18312ef9ae075152ccb1306bde3c001acbc61c1f
-MISC ChangeLog 14846 SHA256 93db5465e95c245657e503122b41e00243cd1d680181b25a56614c47c9cd6ef3 SHA512 9dd63d89b000cd4fb31037b2bba2a10577d4c562d6faa4c6e4d768409c8a88907c177fa2bc1076bb9746551c7bc7f960113bf3eb20615756f97795c7dc4ba21e WHIRLPOOL 5f8aeca59c7439b22562901b3aa27c49ef5b9845aa09c2e7e5d3b92a1e289a184b1364f64bc8f978cf2a3fc8262116193560268f6db421bda0955d1cb855d07b
+EBUILD mysql-5.6.33.ebuild 5447 SHA256 d97cccb8dccfacb7887b654f57125bc16ae8d89519f6c7ac3851744a26cdce8e SHA512 c287973a2baf943e571f52a8bdc6f34293ea96a0d8c2ef3c7271abbb9088e09d2350f78962c4fa39af2cf99870a94a18d8139ebbc558161daf78649a221e75e0 WHIRLPOOL b79a2c9c489356b773d2c36c3c3b18c398652797eb27a96c190aa0d996d7da746f283254ac85707048b61a49a3181f52f6ea905e6c6ba78d6426a1985560f3ac
+MISC ChangeLog 15195 SHA256 260f18c01d67208c764c89a864e464f80cff1c191edb50812f9fe297923ceba7 SHA512 15191b58380d6fc101e3b7249ee84af0898c7e6b50bf3c3d0e4dbd474755318a399e66844d49650d438e76157cc7b5e3d0a6193dc1031f86db2a633ea1f57f1c WHIRLPOOL c1b3adb3ce6e4c344374d2ec7f89c36f1bd8191e51160ea53b281376f7f48dd7530f5db9b18b199f1ec4a947770765f78ac3f885774999b13986174f21b3601f
 MISC ChangeLog-2010 108404 SHA256 93dda53b8871d9040e6aebb59f095a8debd5c0a9437e78e5e949989e209ba5cd SHA512 5f54b7c2e25d27680a9313da2450851118e34a57202d9f36f59da52834ca3b587701d93868d71bf684ddc253d49f87837c8d7e2d442f2955dfde8a701150fbe5 WHIRLPOOL 55f758942e3012aa0ae7d529c2f8b6e0d8f4d7cbde09039f16cd05f0a58fc4e3e09ccd50e366effdcaab4641300eb0f494ddbe3a35a645ced8a9d747d80e9821
 MISC ChangeLog-2015 27542 SHA256 997fb94e9984a271cfd68316c0012c16f78234b1aad328c2c5e97e2940f7dcfa SHA512 f07244cfb59f613fcaed97ad0ed135857ba995b616962b145548ecf84176666986fc9fb5e55ec543110755e73d316ee5a733cfc1ce14eb1ca2a1449adfa50859 WHIRLPOOL aed27d4cb6a7cf33d354fb559268baac8c7977dd9cdc821b12af8008c94dc22d0dedace9e33caae6bd676405a3a02628e1a8ae8d3baac46af33b95251a94c70f
 MISC metadata.xml 1654 SHA256 16592a197951904e3eb76dd8c1d3aab1017ad91bc7f00075eee29739987ba324 SHA512 18a59971c3eb563ca835c61719b67a4466abbacbbf13139acda8fd3a3197eb40d15d1b230b0514472a53c7870a3dbdc1b875c83842737fc4e91a077b2507704b WHIRLPOOL e2aa493c466978bba4b1ff6b9ecdf9d7595f2930995e1da5c535d3a863881e174524138665762213ebe4794bc057082ee88344c5b96c460c59167bd2d4e14ead
diff --git a/dev-db/mysql/mysql-5.6.33.ebuild b/dev-db/mysql/mysql-5.6.33.ebuild
index 1f86f06..f66fa53 100644
--- a/dev-db/mysql/mysql-5.6.33.ebuild
+++ b/dev-db/mysql/mysql-5.6.33.ebuild
@@ -15,7 +15,7 @@
 IUSE="$IUSE"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~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=''
diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 9f7368a..1fa071d 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -532,3 +532,21 @@
 
   Gentoo-Bug: 593582
 
+  24 Sep 2016; Jeroen Roovers <jer@gentoo.org> phpmyadmin-4.4.15.8.ebuild:
+  Stable for HPPA (bug #593582).
+
+  Package-Manager: portage-2.3.1
+  RepoMan-Options: --ignore-arches
+
+  24 Sep 2016; Jeroen Roovers <jer@gentoo.org> phpmyadmin-4.4.15.8.ebuild:
+  Stable for PPC64 (bug #593582).
+
+  Package-Manager: portage-2.3.1
+  RepoMan-Options: --ignore-arches
+
+  24 Sep 2016; Jeroen Roovers <jer@gentoo.org> phpmyadmin-4.0.10.17.ebuild:
+  Stable for HPPA PPC64 (bug #593582).
+
+  Package-Manager: portage-2.3.1
+  RepoMan-Options: --ignore-arches
+
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index bf91df6..5adb351 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -5,10 +5,10 @@
 DIST phpMyAdmin-4.4.15.8-all-languages.tar.xz 5772212 SHA256 aaabba81185da6496eef10eb2ee3fcb47138494bb50ca57a4050ca5a732a67a1 SHA512 4f417d8d371975133b76a9b4c4a4e6d31089281e68c9e0df33107c0d343b8d25ebb03f13ed6327a6024283b3de01dc623e080277acbffa41b46a87d00476c23c WHIRLPOOL 3046b629ecaacd843b130871af38561ac9b0aecbf4a80ceb3ee6b7f5491abf3ae39755ce038b6dcbb53ac0e8145ca3d01bda3b9fd001d5fe46990d805c16ed4e
 DIST phpMyAdmin-4.6.4-all-languages.tar.xz 6137016 SHA256 f2ea32a2971efcab073ad41b6512475af1b6da70cf800a5586a12cf49797d319 SHA512 80ee0180c283c6ea139410289f9aa6535077f68812014dd8c7e334bdae0f49171a47b50274172a153d81e5f3145f906fdcda52751ba703fed8158482a924c6b2 WHIRLPOOL 45672ffbead30a885d4852de3d497001c73820c5777ff2ea397db69240d561b7903397876aa1ce5b3ca519d84abb3bdebeb815052f18a9f3eaab3580b8eafef2
 EBUILD phpmyadmin-4.0.10.15.ebuild 1569 SHA256 f38166d876e80e501e949535affcf11ab19702e613f42df3397fd370fe927a9b SHA512 d9f4795f7ff65c2f589f16756d7f702253df921146e1de18fb231ee53bb398faf04227ddef2a1d7b14b028206fee214cd6b04f5b0c435b2604384c7c3cde2776 WHIRLPOOL b15e03ae3d03380627f5a50264bd19d40403f0168780afb5d260c7bb214e9b48e0f06da5884d2cb2ae0506569c7246f3f71b3b0afdfda124670572f5112a877c
-EBUILD phpmyadmin-4.0.10.17.ebuild 1574 SHA256 28bd232bb08ddc08e31c4fc38fbe491095b4d62e3bd87e19bf96a96d10988b5f SHA512 e28401ae6380cdde51db390e0a325ffe952b9bdc491c14997fbda372d74dde8289209a811dea67d46456e0b0ab85c3cce857306e5e9a9891c4834c69a2da2874 WHIRLPOOL 3c4fd5522826cdd210fc63683262203b27edc6fdfc9c3f68985cebfa98dbdb9802b4896c2fd3ac1c938b2e3712cb592c4aad387e5f226d56e1f1d5b8c997514f
+EBUILD phpmyadmin-4.0.10.17.ebuild 1572 SHA256 061876c4834344ea48fd5f5da49053cb726af3ba56a3a031b4a2f192c75749e1 SHA512 ef4db704b0a73b5e117343242a75bedbedcd116db5a963a5e3c6691aa8a6a7ec3475462ef0d189780b656dd2e33c31a5edbf5721f3aec99795bd5a00d4f14ebb WHIRLPOOL eb03bbb042350c094c09395495390122c5e4d8fc3b33b36ad3a2cf6c9c8d2d714969c6328a64796540df6f883a58717276bba761f3851e3454cfd417043a06ae
 EBUILD phpmyadmin-4.4.15.5.ebuild 1570 SHA256 bc36f6fc1cda205a942cbf38dceed62673ce5dcfc5bb46a8c8c8cefd16f5911f SHA512 0d817e0769053a599f2d43513d70d6662cc32bc5cf391d7ec12b8b60d9c4a409cef34c46d897941e832d76b4a63227793a3d378114ad28cab11c10e4b653b58e WHIRLPOOL a92646acb5bdf197a8c213a1a92241394f6c85d885015d1c25af4a5c83a41e4781a420c243e6a5c07b5397525e0a8fd79a364302783d15cbb6abe1e406ed2c26
-EBUILD phpmyadmin-4.4.15.8.ebuild 1575 SHA256 4a7b86deedf92e237685d8d53a5b64a365ce1abc798f25d2a54b872ab8232202 SHA512 4db0c8a50bfd14fc1c6ec42091de89964ea61c3a93ba29f2ff4d72e8022fc5ecd228c681297df56aa162e3ed2126ed05473a02a2cb9926abaa88dab80a518656 WHIRLPOOL b6cc06380c451f1dc284337351d14a5691af98626e603e639b136d8899167074e3be194192548127d4d2c6759df616748e56c7fc8f9f539013aed192d5090b93
+EBUILD phpmyadmin-4.4.15.8.ebuild 1573 SHA256 d204dc5717432e7703607289cb4fae6851dbb90eab570e3b82515aa38c124975 SHA512 8ad5e05adc058d1fe0aaa918e64c199c4fa8d8483daafc0971221e3f05b5f0038df4000075dbc4a1e799ce2b842b1b82202a2367845d1a4103731c819efac44d WHIRLPOOL ff22db770c0a523f0aa16967db6baa4f60d45d451398b1d0734eab7774a0a089884ce137ce3bf7a1fadc187616ff05fd01d3727bb4a79d273adb7beade302e5c
 EBUILD phpmyadmin-4.6.4.ebuild 1582 SHA256 4fe1d5fe30699e7479322b32b937f2d9e9ab68379a4e58ea1b8b8becee950503 SHA512 c82822d72e4144d902b88a4edddf2bd599a653eeb1095b74c0f010173f4aa493590d4abedfc8bc50328c7b7c198998c6e57ed53f92e339ac9af9c0abe7f79b2d WHIRLPOOL 7076a9cc2280822ed49a67e4b1b0ca4f7e28e9e2bcf37b6771d31cfa9d4b8535e0af4aec650077ce8a74d7b738a5f6df6dabba31addb6efc2cd85ff441076537
-MISC ChangeLog 18245 SHA256 79154aebb30fcb257c314237bf1c78e36e10c761a82b680bc5b6f4f254db2408 SHA512 49867602eb7753fc63b52ac382664d5511359830d44de3890dfcf0b7c2f219b528d8f34baa60eb59b860575b300e45712e476b89aaec85520678278ef2b59716 WHIRLPOOL 7a67327fafa2cdc8a074953aa711bfab7a30a12e3064f7b54c17def88a190f5d05d556c2db91f1b47f8b3b4d4af7435a86d22afd992cf668f77a48db9f04c178
+MISC ChangeLog 18787 SHA256 d54c21aba043b587429c766b62346231b32d466d608bcf0776581119075eb351 SHA512 9bb3c636e466a1c36e793ccb39dfdc5d7d96c9648d47b2d6c9ffec8db70241f53eb2f60782bc85ce01b506c86a0a5507e1146cb9bdd8e867f81f4486604f6ce6 WHIRLPOOL 51df85ec7392d05a4b46570c3b410bce84ecb99019b46dca73cf84168ce349bbbcb0df68b628d2c056d1e2f506cda123761bfddd3c91f0aeecf9c4a0d9bc9e51
 MISC ChangeLog-2015 80911 SHA256 8c20627f5c843b8aa8999b982f5618a109becf30bc848bcb7ea1392847f7b72a SHA512 75a3ae700448f65c6da1b2e85f20d7e961f4b15a7c06809a312563536a7e0288aad25b05c88879240cab27e3584cd9fde12b29adc883e9ccc359dbbc5480c08a WHIRLPOOL 2173a3da61d49ce67021c840a6e65582abc5902a3d5c10486bbc74a1f45fe17f9b0fe57f752de9596a25a198c793c807295e2546e98cbde2be297fac45b0272b
 MISC metadata.xml 701 SHA256 47c56f4cc1682d217f2d69bbec1a98ad736a24ac224bcb1b789ec477ca754f75 SHA512 6dcb099779cd0db4928ee812c81fee762612846044e6ee3df3b661a2dce6aed01420d0bc1301c8ff9d763fb8aeaeef3290a7889b32705fc48e8c392aa8b8ca82 WHIRLPOOL 7381974d488b5ee5ce23888fe2eeff5fd7136be63579b0e01206a2fef6c1f82d6127ee0db88018bbbcdc0263a4c5ec78db6135b8975a51a33135eb05fc6dd9f6
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.0.10.17.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.0.10.17.ebuild
index 0318452..4fbdc9f 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.0.10.17.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.0.10.17.ebuild
@@ -15,7 +15,7 @@
 SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"
 
 RDEPEND="
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.4.15.8.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.4.15.8.ebuild
index 6a759fa..353c148 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.4.15.8.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.4.15.8.ebuild
@@ -15,7 +15,7 @@
 SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"
 
 RDEPEND="
diff --git a/dev-db/postgis/ChangeLog b/dev-db/postgis/ChangeLog
index fdea02c..6eb4d97 100644
--- a/dev-db/postgis/ChangeLog
+++ b/dev-db/postgis/ChangeLog
@@ -158,3 +158,10 @@
   Closes: https://github.com/gentoo/gentoo/pull/1936
   Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
 
+  24 Sep 2016; Agostino Sarubbo <ago@gentoo.org> postgis-2.1.8.ebuild:
+  amd64 stable wrt bug #588434
+
+  Package-Manager: portage-2.2.28
+  RepoMan-Options: --include-arches="amd64"
+  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
+
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 6da4bfe..b95573a6 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -10,11 +10,11 @@
 DIST postgis-2.2.1.tar.gz 10069889 SHA256 0fe500b0250203aac656bfa8f42f8458b63f33258404844e066e0e535988fa09 SHA512 e580fc6556e1d8e2ba36d62795650852d303ce4c935c8e538d14f0bf0f00c3c27dcb034c42dfafa0c8995eb0f28f71119c8ada4ceecaa8ca9897d0653552bb2f WHIRLPOOL a91f5e44de49b1b41d90188a4f7842c23d41b8c589416014273f4a1e655e0f3013176f7341bac0ea7004c3f7af86634981f3c0695d3e848e45798eeb5f7bfdeb
 DIST postgis-2.2.2.tar.gz 10071528 SHA256 40232391f8f66a6dc740ebb26088e568c8ccb663666998616c71c3bdaeed4163 SHA512 c5ad97abe52b7ec67e52a06e05e694099eaf2daacb7dc73c85dce71a61c269c755ec401f1077a1760cfb930ccd42fb1d34ebfb79990f52f5bc3aafa9db2e9ce4 WHIRLPOOL 265630298436c79023a4a1263ca0f4208ba7ece62d5a992fac9914ee6489926d94d23ea6d0f4c0557caa47a1032f4ef0b5d71b22f95ed0e11c5f265aafa3c48a
 EBUILD postgis-2.1.1.ebuild 7843 SHA256 651940a55077ad5b9766a27abc16ae2b9bcfcaf51b4b0af49b794c365b8ab4f6 SHA512 db6571b7e9703874009e68769d406c29e71b79b6ae0762e30553b691d6eefc1cad5f595283d7acb45b536e1f39a284ffc52be11af356a0bd1a2d06167cece46f WHIRLPOOL 797e09a77953320f8ba904dd043db511371275db82a4049ad0d186b9da97128ac9d793674f29001090d0ac8709faf9b0677a5bba5a97af55d4f68d2de99258ea
-EBUILD postgis-2.1.8.ebuild 7498 SHA256 30bf54ce9dd4145ca5b0c73efe373f8ac8f5e9b4d27739ba0e10772f7d999b88 SHA512 b04f311a1eacfd78eed5ffd495d89d702dd6f603dcf96c31fbca27b5e9d4e872c8d6a2821855ae2d5c8aeccaa5f3ed8abe66d1954c688159cad7deeefacf71d3 WHIRLPOOL 4c9cc9b7b8e25c4e10a8b44d88f92cf6962feb7c7745fd98ba87dcc0a6d495eae111d25653ce92ebfcc0be8f2006b7fdfefe95455039d478e81692ef63dd6816
+EBUILD postgis-2.1.8.ebuild 7497 SHA256 803acafa1d4892d740847c2f947b34cb3d0b17090ec5dfb233d12d8d97adefaa SHA512 747a1137b3f61608eb718082f6650a2900661315e3acc6c5cdc00e7f26ad76a5b31dec201281291f6896e94e3c2e30811610ae4c90c101c0e31e56916235821d WHIRLPOOL 60f282d4321944723bed1ac67e572bd48a781aba247ae250540278eb39b16e32c324efe1e83d78c7f99ab4ca8fad1a84d957499137824dfca8791f0863172fc1
 EBUILD postgis-2.2.0.ebuild 3165 SHA256 79bd064826e477f5878185fd834d51a39816354d8fc3d20ac9f988a42673c961 SHA512 f7562306e560a3784becb94e17520f9b13dfa30ae941f0702270ac1504c9d6efd25653a00ebc4168728ee7a638fe7a8c3d75befdf14497ee87640ca219773714 WHIRLPOOL 657d9be1aa389d5c880d30d3d259d0533d61ffe6d7a6b8f34d3f5c5bf411caa165a669d4f5e3142e61717987f46b1b2dbd9cb4c0f89f26f446591204013cebf3
 EBUILD postgis-2.2.1.ebuild 3165 SHA256 79bd064826e477f5878185fd834d51a39816354d8fc3d20ac9f988a42673c961 SHA512 f7562306e560a3784becb94e17520f9b13dfa30ae941f0702270ac1504c9d6efd25653a00ebc4168728ee7a638fe7a8c3d75befdf14497ee87640ca219773714 WHIRLPOOL 657d9be1aa389d5c880d30d3d259d0533d61ffe6d7a6b8f34d3f5c5bf411caa165a669d4f5e3142e61717987f46b1b2dbd9cb4c0f89f26f446591204013cebf3
 EBUILD postgis-2.2.2.ebuild 3177 SHA256 63f9ae228ecb383daf0e010008405ffea6eea213f566cb9bb2ead50de87d9cd3 SHA512 1abc889bf9cca921670edb8fa13d18755eda4524b827afee5b02de8020b5861d82e6fae9f0f1ce4e2e0de814d60ebf449f063d8e0fe5e25de52796a8a9d78938 WHIRLPOOL a423246daddeb57ec8c063ca906c6dc919f2d2df38c251c994f8b142f6c8691d0382bdec8861205aee10e3815adb14645478157f27321720d2c62fa601eb84dc
 EBUILD postgis-9999.ebuild 7520 SHA256 e1cc19f6603919b58f2095ccf5bc41ad9ce71ae8eafad1e4c063f5e8fbabf146 SHA512 969e783da89e93b86e3cfb73fb38bf88adb8730792fc40eb361c60a03a98f9aeea258dd3118e4a699d5e13e8374b3ea4bce22bfd71d7cee6fb5352e80b75c5ca WHIRLPOOL 3c3d2d0ba81067bb4ab572c66a7fa949ba4c6e86c5452f040b412a13dbcc43329ea08ace99db7b1e53cbfb64bace6c4f51eec2ef28b3438cf687ac072179b79b
-MISC ChangeLog 5308 SHA256 e6d601f7c9675821d315d26fde38930d7b72a7aa213733b3bd57d0798ce9b77d SHA512 b422e85e54d8483bcfe92cc278e7dfb97c4876b774ef8d7f18eb64ab46f806e6d8bb312f0eb823d8d3d6495eee953c77bf44475cf7b5ed311e2d716730d2c978 WHIRLPOOL 3151dcb567ad855e23d29198d4e64981d38bfa95f9a50a19d5d801cb3e55768b9dc49b0f7ad060177a648d9e364bbe0ff050374959664714b9d8f00d860f077b
+MISC ChangeLog 5541 SHA256 2d9cfbbca0a79e1b88ec6f57b0a8e0db63251b4f1cab00e0485b5f8e27c35cc8 SHA512 03878bb7cb5fb855479f4cf0f1aa0fc34b35ec29f51aeee74d663c01634a28657405d1f80bd776f7ce91506dfdb51c7c11f8d3589285475ecd1039b5b8d77650 WHIRLPOOL 954df86820d42b6b111614762101109007f980c2044b512a60f35de8ee7d7e25f7515f961af6b95dba7ceece61c2b874b61a0e0dd4d7c0f2063fec69746bd558
 MISC ChangeLog-2015 15421 SHA256 0f3e682af97970b63f483d38082d202cad0ce391e805f545590a37fc9fc2c3b3 SHA512 71d3a8f9f00ecdb484fead44508a1f15674b546d60533addf7f91c94d028800b098f52b1172ec028b6c85470154a4b364f10c9e1c8e0e6d0d8139d1aac8b9c6a WHIRLPOOL 651c4e132f36162267fe3473136aecfb8f6266a22d2715989697ff8319c933b058fb3a9fdbcefc6abc9451e5b3da72d94c05c51e31dc90bf6a09dd9e166330d6
 MISC metadata.xml 506 SHA256 ef5bf9003c7834db20fcd1278ec11d36d5e7230c09f25cac7ae4e9b59f70ae74 SHA512 5cbe7ca8eb33c99d029f9491189b1cbe76506b7ff375eba688e9975edc89c2f0518eb65e703c4fcc48600949718b932408fb87217cc3eda2074d9da1577c2803 WHIRLPOOL 255644f4eb56f3964a15388fcdef709483a1e44d1332b9980f58b8cfe9d973a5782363da188fae64811fa0efbb2294d2b232b16c394b304ed1cb66ed3086188c
diff --git a/dev-db/postgis/postgis-2.1.8.ebuild b/dev-db/postgis/postgis-2.1.8.ebuild
index e8fbf93..627e487 100644
--- a/dev-db/postgis/postgis-2.1.8.ebuild
+++ b/dev-db/postgis/postgis-2.1.8.ebuild
@@ -16,7 +16,7 @@
 SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc gtk static-libs test"
 
 RDEPEND="
diff --git a/dev-db/tokyocabinet/ChangeLog b/dev-db/tokyocabinet/ChangeLog
index 52c4df9..407f107 100644
--- a/dev-db/tokyocabinet/ChangeLog
+++ b/dev-db/tokyocabinet/ChangeLog
@@ -87,3 +87,11 @@
 
   Gentoo-Bug: 592032
 
+  24 Sep 2016; Agostino Sarubbo <ago@gentoo.org>
+  tokyocabinet-1.4.48-r1.ebuild:
+  amd64 stable wrt bug #592032
+
+  Package-Manager: portage-2.2.28
+  RepoMan-Options: --include-arches="amd64"
+  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
+
diff --git a/dev-db/tokyocabinet/Manifest b/dev-db/tokyocabinet/Manifest
index d42a7e9..a4e65a8 100644
--- a/dev-db/tokyocabinet/Manifest
+++ b/dev-db/tokyocabinet/Manifest
@@ -1,7 +1,7 @@
 AUX fix_rpath.patch 2111 SHA256 cba364650da90d9fcae3424a1e6ce400769db193c863e5cdbf29a4ced0292ce6 SHA512 c0ee076d048d8ec4a77b036d0503776c4e3ca7a97c30cd8ba41cb0d99707ad5021613e1d308f6e73cc3432e0f71f7b38429ca0edcbc4edfe0d96955fc56b3504 WHIRLPOOL 9fc3b76b68a58e08cb1674f2a13a2b3de80a3b67874ccdab0bf789e85330dfcb3950ab6f0ebbfc11fa105fe0cfbc169a07c91dcfcfbdaed52354e8e14fc5b2ed
 DIST tokyocabinet-1.4.48.tar.gz 1000485 SHA256 a003f47c39a91e22d76bc4fe68b9b3de0f38851b160bbb1ca07a4f6441de1f90 SHA512 b9995c838e713c13f781ab41062caefeb5c613f696dab08039f992f6860413d60a513114b83468cafdf7fc5b5e51ab880226972465d532f873f2a55f615e1440 WHIRLPOOL 90d47ac8858e5f4c198418c48118c0142e5bd04156088075eb0450cbc1aa7c70dde3206624c52710c46bb1a307675d536ba0d15e5ac8f4680aaf56691dd8a58e
-EBUILD tokyocabinet-1.4.48-r1.ebuild 1580 SHA256 fa7b7422576b5efb9fa1cf88aa60d8f61af17eda69d3b3bf6ea3b63be27922b0 SHA512 610307736fc57d451d54a0b85eeaa1c67048d1bbfea984524d982e95aee9cbc499f39cdb80e0e660213780ae1861a24da4de1e5aa721ec47cbaacce7e8954b94 WHIRLPOOL d1f09f9bae8d7e90bcd5d528e00b16fdca829b4b928db13ff48b34a8eb733e6d928d987bdb82d67ccc35b9c06c5340eebead9d4f86531fcf2c4ea3d6dd2a0b83
+EBUILD tokyocabinet-1.4.48-r1.ebuild 1579 SHA256 5d2cb264f86be88fdf0348c809f0bd71dcd11f257f287124eef9caffa2107898 SHA512 40f1fec2255567b1d1f313213f07b839aadeba01194c58d6a157d1d3ef708ff5c0bab7874504f54ca8fc642a5b8e646f50a417a26c005455e0bbb4c7a60cb612 WHIRLPOOL 4f279a75285899e8d44ff3fee1f5ec879be291766672921a7a72d76da6fcdd7aca3fa0e86ad366b6f70fcb2135e2bf0ea38a3f792015ef817fbd74d3c45545e7
 EBUILD tokyocabinet-1.4.48.ebuild 1441 SHA256 1a6502680403b5694dd01f39a42e95661d405add46b0e8fa132788ca1dcfa69a SHA512 6903bc9e86eb5db488fe8ca8a919cbf6433b239cfbaeec2e3e597a36720863aae452cf6475df7619b29cad3585a38bdd7e527623696d2603ba881796cc00dcab WHIRLPOOL cf44f559598d89288a01587d3cf1b60799c81ecf5a449867f10184c8c49076e272419fa92a07c8a9e032e64e5b1e4709e27a58f8197d95e613d5c0cdd2a7e235
-MISC ChangeLog 3119 SHA256 4899ce966acb83ea48171f4530738e4672eb2a5f522b43a88a06624997b4e83c SHA512 7c65976abd122c12a14e596f515aecd9bc8448d49bf37b79099149cad0f8d906410636e9d6720b6bfa3e37adda5c84bf943ba70c792ea00c786c62188963cd9e WHIRLPOOL 0aa83ef6328a723503e5171c9eba9d831943b2d6437e4bbd7cb7275fa29e6a5b6d0914f28a13a897c1f2a64efeb0b3d60dcc9befa8a77cfd82053436557f8084
+MISC ChangeLog 3363 SHA256 05a0327df1da60effbe1ebd0872cb9d53a8b1ddd12e0b16008bfd7f7f78d56ac SHA512 0ba149f37f2ad663c8ae44d649cfe50809586db13c27704e7850e3fb6d3918d91f8de93d1cb3b518dc02b3090468b2697331c75bd7fa50f8c8b18376a434162a WHIRLPOOL 34f76134c9de62d9108ce6468d5491e6e512f32015e131376d695f1d68a22950d2ac1c9f17237df93c4d3b15b584daf72622f5a1bdfe43b0c0aac5f336751a55
 MISC ChangeLog-2015 7087 SHA256 e9fc61799c2985bb4d76c0dec6a5a21b0edf2127971085387c7e3b5907511842 SHA512 c3a0403af4cdcfc746d04be888fa965c41904b393916055707dc48046edf96e4a75333e6b45b2dbefb008203eba3dac56d9e1f9fa46b5e30dddf1faf2ed84793 WHIRLPOOL d53b775ba78ab3ebb16cb614ae2648a690da6b23d9ac74604aaf66f696aeb4bbad61e97b837396750a4490a2b31b6d1b8237c452390b9398eb4adfe8cdd3c019
 MISC metadata.xml 247 SHA256 0deec0776f26fb762fdf7711f4589b14f52a2456436ef557eec62a2cf2fb2bb7 SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7 WHIRLPOOL a135fa622e99d3dcdb432bc6b3c366076b3d86b4bfd9a76c852d781b8e9152541c7e7a2c7c6d6a3c4d2200dce792847a08166aaf7c17c22b6299dfe868234dec
diff --git a/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild b/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild
index bc6df13..69e95b4 100644
--- a/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild
+++ b/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="bzip2 debug doc examples threads zlib"
 
 DEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index 9ef794a..bf45ad1 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -207,3 +207,13 @@
   Acked-By: Dirkjan Ochtman <djc@gentoo.org>
   Closes: https://github.com/gentoo/gentoo/pull/2161
 
+*erlang-19.1 (24 Sep 2016)
+
+  24 Sep 2016; Dirkjan Ochtman <djc@gentoo.org> +erlang-19.1.ebuild,
+  metadata.xml:
+  version bump to 19.1 (fixes bug 591970)
+
+  Thanks to Kenneth Lakin <kennethlakin@gmail.com> for doing the work.
+
+  Package-Manager: portage-2.2.28
+
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 431bae1..a76cbed 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -6,15 +6,19 @@
 DIST otp_doc_html_17.5.tar.gz 33510258 SHA256 baba1d373c1faacf4a1a6ec1220d57d0cb2b977edb74f32cd58dc786361c6cf5 SHA512 d3e455452e6d6e241c40de6e41a7b1069f8daa45c8d2340adb62f8867948261692c8465db7e288378942ebe86fd938847756992600da93aa99cb294fadcb5211 WHIRLPOOL 9657c1fd133fa713d0f30bae0394f47f43b090149ec3457a177bd9f129c052b73f1e757762ced02c1c8bcbaec294e845859b18b0e2004429e04df8e04e36cade
 DIST otp_doc_html_18.3.tar.gz 34285271 SHA256 8fd6980fd05367735779a487df107ace7c53733f52fbe56de7ca7844a355676f SHA512 0ac429f67ca9ae7f235cda72eb0f4e5b0b43ae90b70c706aeea08be0ad88968677ccc80eb1ba006e90c9f024de586ffd91741d4cef4d614d1dfac51b407d2659 WHIRLPOOL 7d64c2ec433b4bc2da4c56290ad6d21b85d15f72fe9b78654955d27e65b26e1b929d0c9b7d5f60c25c1f16db8d22e36c2ad6ca2a75044707ccd1eea1197fa15d
 DIST otp_doc_html_19.0.tar.gz 34550919 SHA256 b6f7c4e964673333f6c3eea8530dd988b41339b8912ae293f6f1b429489159ff SHA512 51d6da443d028fe533f12e2f2b8e12cb301977bc91cdf08530d1db53b707d60bf8ef8319b23d85ad1efbd5aaf08910b2f2a99e961b772a47e9647a03166f7d9f WHIRLPOOL 22ccd960ca4258a8afed3e68d6d3f7ef37842fd92c224f2cf6d942fcafee2539e7f91984286988b2f2bca63cb71cc8f8100e3d7f3df497f8d1d3bbeff5f6ffdd
+DIST otp_doc_html_19.1.tar.gz 34624316 SHA256 76c89aee1ac69b5107114b0065189101e3f42d53e929d8ef8f08b5c586f15930 SHA512 2c6448af0be4bf35427950aca82eac3aac7554575ba07a8ba8942c27e1eb668461fde00604c3be28fbaca8a1e28ee4861608e33a9c79bc951bb695f99b1c1ac8 WHIRLPOOL 5c344246b32f21abc5ad8403c136263a6f9f5f2664b8027ad7f574e1b7cfa9b127f7863547550114b889daba363c19936cf7a0199a0bf5b4da8ac23c02dd24d0
 DIST otp_doc_man_17.5.tar.gz 1363320 SHA256 85b1b2a1011fc01af550f1fe9e5a599a4c5f2a35d264d2804af1d05590a857c3 SHA512 98d241aa127cfe377e5efc52284cd324713cacefc96db5992275c4f8712a9e35e43f0dbc0d2a8d58a1127fbfa3f762eb001aea1bb1c9fa82205a3d83659ad548 WHIRLPOOL b790046a449824aa02e11bef6b84a7027351edba0fffd241221e690739df30c9c692074b7354612970d8d02b3c1bccfdbd81bb988af9874d181f177ffed49e2c
 DIST otp_doc_man_18.3.tar.gz 1395166 SHA256 978be100e9016874921b3ad1a65ee46b7b6a1e597b8db2ec4b5ef436d4c9ecc2 SHA512 d45d72d7ee7492e081dd5fac1a4d1cea93fe5f5287900be13c92e1c1802f7ec77573eeb4d271497154b9e0723c393700f35982ceedbe29be6cb759a0ebe83325 WHIRLPOOL 03b57a87573630a2826dd5e9a597ab0bb67daa73e4b2b733982b6ce4a3cf6a32c5ad17cb3ba3fc0a29248c867b1ba303098c7f61c0cfe42636621aa8a370790f
 DIST otp_doc_man_19.0.tar.gz 1405918 SHA256 c7a3d6d85a5a2b96d844297a3fa1bee448c3dd86237734688466249fd5a1401e SHA512 bb31563542c51eaf94e8780717f57718ab49592f7718e0dee855f3dfeae809d67cc3ed750d28c0fa53e3bae29dd27c9511d9228bde21bf010cd1d8588d4b1b7b WHIRLPOOL 53889e4dd5140bdcb1e3311edbabebd80a13c032581d67987e705989022c0b4459742b6fbb7b9ba062a212ea2c3460579c59f8dd02636172e663390935f097db
+DIST otp_doc_man_19.1.tar.gz 1405580 SHA256 7200e9e5b3a229a6b3838046e1b3e64afc869265539d49d0e4853212f19c0c79 SHA512 4ee35feeff70419ff5500e00dc17e34fdea8be21342d41cf1e255b84a1826b51057046be543ee1052153ae8c8cd215f4720cecae7d9fe1576cbd681dcf4b2334 WHIRLPOOL e94333be9d1d9239d1dc6e9bbcc6930b148eda8d8a73e3d21896e498c331c062ea1541d8fa03a2d0dd6f21510874f5aa6062b22a3738c85d1b18a30b09fb5482
 DIST otp_src_17.5.tar.gz 67242289 SHA256 3c28820c981b30c50df8ac2a4a238e5813454fa3ed2ad530bc7948a282846474 SHA512 cfd082c8baee7ded370a34f15a1ba3b846b7d81e06edc36c62308c9220697925f1feda91eeecb70fc658f8987087256f51a2ebd0c526d16eeb09c72889d2390d WHIRLPOOL 3c3d987981383bf148b9788fae0574da398ff63d81eea13da0463bed303922d06fe54354de1cd3d37091eb23438939c645176ab565877f06cc1f11235c4d8d3d
 DIST otp_src_18.3.tar.gz 68292101 SHA256 fdab8129a1cb935db09f1832e3a7d511a4aeb2b9bb3602ca6a7ccb9730d5c9c3 SHA512 f4a69bb14743d9f913d7060cfb6426f7c54693d07ed439506ede5160a0ba5a79a81cf08a56aaa02c68b3377cd22fed66a0fbeb216378330d7ad5c6348ed82014 WHIRLPOOL 493fe8f803194647ab0c113d8f67f5f97636321618296969d9da0396cc9b083b6deffd42638fe3e3eb0b63c4ff996fb4b2c4559c6039add94f7dad62205b815b
 DIST otp_src_19.0.tar.gz 68022550 SHA256 3fdc27a2a826e7f3d9cda43302d27d98704d6b41ce29a8a5df747a161da53bb1 SHA512 fdab82883f7be04cca91041819d15e0b065bdd049b134d056fe4ea12657f1c6f77aeebd778c09b4064e6d974734fe087592739181e14fe60597dbe37f492684f WHIRLPOOL b3b70b04b7189606dc89a3acaebc2fc0b8f8c2bbca20ab4556641bc51d3fcf784155a3ad406d6e0b1c2be12a243ff51a019038b3ab103c91c5b9af2e13a1a09f
+DIST otp_src_19.1.tar.gz 68103074 SHA256 fed4cbbc1ee5cc8efc2b8f14c3db97bfde1de967703f5f9a95f8ab6852737e23 SHA512 bd1c243393c867c91768367613aedb40d56889add149390c81f22e022e76b716d6e9a4d5db7e6477ceb1216c26c18c962abdfd8215a87420758f5ef2063b9714 WHIRLPOOL 3422ad4ab48916f79bcfd2b4550059f88e4e55340a9eb298a9039f07f899e6430eb2fd346bf52931acc2a03e86f3fc5571e9e577fce83bd2040c6cb37fb5348f
 EBUILD erlang-17.5.ebuild 4646 SHA256 5ad4f27d2f71c014e2c4dc5d02367b6fbb2843d4028eefcebac5cc1fca9a44ab SHA512 f73f7716e58e333c12fb512004314dd3838ca6bd0f0f23202b974debc972b9730aaffe3c7c25b9ce1130178f06c70b7204d1832294f63519ae676e6b0546c938 WHIRLPOOL 5347073e088852372b337568712bf0006353cf6e9c10ee4d993a87bbf3473f0eb5c1950e853d791445fadee6d7541a18c2392b65c9c302dcb2707bc4f51fa4fd
 EBUILD erlang-18.3.ebuild 4571 SHA256 5ffa0538a3b31394ed390372a26d431179c3857a96996aa5da0e814b3c7ef043 SHA512 c007a1246f75ae2c81603ebd8b67fefc92a1920b9ac78419fcea71fd3877472b239629729d2005dec09d751a0ce0422fb21e5a18fa17dcb72e54b5c71e622139 WHIRLPOOL 3a39dfee6e449e9885b68091ca63e8b9239122206053dada8f288bc26fbbd82f3e20a9b431fad12eaf9b6974db7794c10fa45998a1948e313c57762271e18bbb
 EBUILD erlang-19.0.ebuild 4419 SHA256 5ed00ea75fbac10efc658876e8e7a7e3a61863ddf1ac03ea85ae502bfa69df17 SHA512 0ad5d3543d6d5ce16626fbce10af5ebd3e6c98f549f36223fae7089f299c518283bb7d9d8f98092036abda5fa9fc9121e86fcbb86ce4eb9a466cb37ae7ca9832 WHIRLPOOL 33ffcf7d3d198b54121a0c6f9b344ac7a97ae9b1b4e05a65e92cf4ed056f781794c42462d35c3153bb4b391710713e35c2d67797991f9a8fcb155d76d38a28bd
-MISC ChangeLog 6676 SHA256 76d1dac076b590093a5178c3cc7688a260f53030760d21e1ba6e3e6aaaa3c493 SHA512 4e62181a9bdf45ed52c96d10ae982d97003e0b9b425412b6bb512c9e4ba2c0d257236d899eb70f4d2242bacf9c19cf99b8ed2b1959953a4c623867acfe0dcd54 WHIRLPOOL 5c2ee07b9523e16b1bdc07ccccd417c4734acaf122ea5a436610a38a12e5575cbe986f0883035a33d97b69093fbf0e24c7754f1267b6ca3e7a2840873df4ae72
+EBUILD erlang-19.1.ebuild 4471 SHA256 eb080f2abb757b4ff61a487ff106febfbeadbb238f38283329d9f5112a8d3ed2 SHA512 d3ff9a50e2c8a8c33ebeac25154e1988c5194eff7b94eb0c9d925e0cb334fa64be47bd5448a8a725e1f135b154e708fe2b7392fff9179ae48982a6205f275a80 WHIRLPOOL 6981094944dc2155b9a24ec39536ffd3d432bb36e851c7f8d18447f3d0c230404f8b79a2f5c8fdf7c4bd564bbcf41737c28311248d0fb029bbb8fbdb8d23f3f8
+MISC ChangeLog 6939 SHA256 b53b63e91b559d7d54089facf45163140f393c1eec45f68e49ea2c425dd3e392 SHA512 dcf45a4d02ef5a9705ea67ce7c843adeb5dbef927cb5a03f4143e45ec49f6f302a65ec6050a8bd4ff9850841e1984b47d082f280b06264531058f2abd20481e5 WHIRLPOOL 0106b9728d365040debe47f0237b279492ef606bcfc28aca8795c4a92a15412beacb65c31c23ebae1e307387191ccf89390b6dcc3eef8cd6656879637506554c
 MISC ChangeLog-2015 42199 SHA256 a9beab51a32c9af7307a3954d3ff27d3716ec4809ed8944df3f696110474994f SHA512 bd29ac327f61d9c50230bd83c54c38e3dbe5c520af3a4a21315459927281e99e637cdb6e9e59e167e0da6745917d93320f4e831e893c99d562773225f8ebe8db WHIRLPOOL 5a5861a5200a9c521b6feca878f760d95f12af1d49f1e4ba8a9f331e0fb308ede81f58bd0b01802abef5b697a4e42216ee0fb4aa2e6093a375a3d2df476e6b96
-MISC metadata.xml 765 SHA256 8c94e02fc567b68f8bf0e3618a424204fc56081d617dd3978c3e338dea8dd0b1 SHA512 42a33d32a5387e9a40f2a33213d4fc813590a8794b0bd9981e5217041596f27e7c704a1e09e9d2d77328ad96d72b449c25ae747f10bfb3425f6395f6bcc6b258 WHIRLPOOL beb880228e526c150069ecab2d79e75d3e74fb15e759036f1065979c594a3c52f7fa47db15d3aec091c64e42d4a0074f2f66d716f583caace58650ad46c8ee2e
+MISC metadata.xml 830 SHA256 ac935af6fe91d7bb96698b73f751972748848274c9d5e6b1c75d02dea85a709f SHA512 d506b53454c5d83cac6a575ec356922e60c0c0472b712a9513c35c254a22936ce8ef3731fc3991d19284e67124307851d8740cedaa43d4087de6e3faeb77ff42 WHIRLPOOL 7abda69b567ce599c7b29a71d473eb1880b12d0e3ab3a5aa9db8b5c5cb85cbb6f82896ca7be7fbe8f17bfbeb9e9805369d0429bf166eb307c498a01ed4281977
diff --git a/dev-lang/erlang/erlang-19.1.ebuild b/dev-lang/erlang/erlang-19.1.ebuild
new file mode 100644
index 0000000..a7999bd
--- /dev/null
+++ b/dev-lang/erlang/erlang-19.1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WX_GTK_VER="3.0"
+
+inherit autotools elisp-common eutils java-pkg-opt-2 multilib systemd versionator wxwidgets
+
+# NOTE: If you need symlinks for binaries please tell maintainers or
+# open up a bug to let it be created.
+
+DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
+HOMEPAGE="http://www.erlang.org/"
+SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
+	http://erlang.org/download/otp_doc_man_${PV}.tar.gz
+	doc? ( http://erlang.org/download/otp_doc_html_${PV}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="compat-ethread dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
+
+RDEPEND="
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.7d:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	emacs? ( virtual/emacs )
+	java? ( >=virtual/jdk-1.2:* )
+	odbc? ( dev-db/unixODBC )"
+DEPEND="${RDEPEND}
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] virtual/glu )
+	sctp? ( net-misc/lksctp-tools )
+	tk? ( dev-lang/tk )"
+
+S="${WORKDIR}/otp_src_${PV}"
+
+SITEFILE=50${PN}-gentoo.el
+
+src_prepare() {
+	epatch "${FILESDIR}"/18.2.1-wx3.0.patch
+
+	use odbc || sed -i 's: odbc : :' lib/Makefile
+
+	# bug 263129, don't ignore LDFLAGS, reported upstream
+	sed -e 's:LDFLAGS = \$(DED_LDFLAGS):LDFLAGS += \$(DED_LDFLAGS):' -i "${S}"/lib/megaco/src/flex/Makefile.in
+
+	# don't ignore LDFLAGS, reported upstream
+	sed -e 's:LDFLAGS =  \$(ODBC_LIB) \$(EI_LDFLAGS):LDFLAGS += \$(ODBC_LIB) \$(EI_LDFLAGS):' -i "${S}"/lib/odbc/c_src/Makefile.in
+
+	if ! use wxwidgets; then
+		sed -i 's: wx : :' lib/Makefile
+		rm -rf lib/wx
+	fi
+
+	# Nasty workaround, reported upstream
+	cp "${S}"/lib/configure.in.src "${S}"/lib/configure.in
+
+	# bug 383697
+	sed -i '1i#define OF(x) x' erts/emulator/drivers/common/gzio.c
+
+	cd erts && mv configure.in configure.ac && eautoreconf
+}
+
+src_configure() {
+	use wxwidgets && need-wxwidgets unicode
+	use java || export JAVAC=false
+
+	econf \
+		--enable-threads \
+		$(use_enable sctp) \
+		$(use_enable systemd) \
+		$(use_enable hipe) \
+		$(use_with ssl ssl "${EPREFIX}"/usr) \
+		$(use_enable ssl dynamic-ssl-lib) \
+		$(use_enable kpoll kernel-poll) \
+		$(use_enable smp smp-support) \
+		$(use compat-ethread && echo "--enable-ethread-pre-pentium4-compatibility") \
+		$(use x64-macos && echo "--enable-darwin-64bit") \
+		$(use_enable dirty-schedulers)
+}
+
+src_compile() {
+	use java || export JAVAC=false
+	emake
+
+	if use emacs ; then
+		pushd lib/tools/emacs
+		elisp-compile *.el
+		popd
+	fi
+}
+
+extract_version() {
+	sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk"
+}
+
+src_install() {
+	local ERL_LIBDIR=/usr/$(get_libdir)/erlang
+	local ERL_INTERFACE_VER=$(extract_version lib/erl_interface EI_VSN)
+	local ERL_ERTS_VER=$(extract_version erts VSN)
+
+	emake INSTALL_PREFIX="${D}" install
+	dodoc AUTHORS README.md
+
+	dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl
+	dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc
+	dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript
+	dosym \
+		"${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \
+		/usr/bin/erl_call
+	dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam
+	use smp && dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp
+
+	## Clean up the no longer needed files
+	rm "${ED}/${ERL_LIBDIR}/Install"
+
+	for i in "${WORKDIR}"/man/man* ; do
+		dodir "${ERL_LIBDIR}/${i##${WORKDIR}}"
+	done
+	for file in "${WORKDIR}"/man/man*/*.[1-9]; do
+		# doman sucks so we can't use it
+		cp ${file} "${ED}/${ERL_LIBDIR}"/man/man${file##*.}/
+	done
+	# extend MANPATH, so the normal man command can find it
+	# see bug 189639
+	dodir /etc/env.d/
+	echo "MANPATH=\"${EPREFIX}${ERL_LIBDIR}/man\"" > "${ED}/etc/env.d/90erlang"
+
+	if use doc ; then
+		dohtml -A README,erl,hrl,c,h,kwc,info -r \
+			"${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-*
+	fi
+
+	if use emacs ; then
+		pushd "${S}"
+		elisp-install erlang lib/tools/emacs/*.{el,elc}
+		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
+			"${FILESDIR}"/${SITEFILE} > "${T}"/${SITEFILE}
+		elisp-site-file-install "${T}"/${SITEFILE}
+		popd
+	fi
+
+	newinitd "${FILESDIR}"/epmd.init epmd
+	systemd_dounit "${FILESDIR}"/epmd.service
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-lang/erlang/metadata.xml b/dev-lang/erlang/metadata.xml
index d5ac5d5..d84f7d8 100644
--- a/dev-lang/erlang/metadata.xml
+++ b/dev-lang/erlang/metadata.xml
@@ -10,6 +10,7 @@
     <flag name="halfword">Enable halfword emulator</flag>
     <flag name="kpoll">Enable kernel polling support</flag>
     <flag name="compat-ethread">Enable compatibility with pre-pentium 4 CPUs in the ethread library.</flag>
+    <flag name="dirty-schedulers">Enable dirty schedulers</flag>
   </use>
 <longdescription>
 Erlang is a programming language designed at the Ericsson 
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index abce127..5a041e5 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -1,16 +1,10 @@
 AUX 63julia-gentoo.el 94 SHA256 20445070d924ecc8adbd242c032bcb7ef080898f8bca5533356be459d8f151f8 SHA512 03bcee53dc4064e9bee51ffeffd5de78cb6ae6acdbfb145933ee687a31684ced2ca39cb8d6c4543c638c18b1da52accfcca8b05bde71847dddfdb8923ceef99c WHIRLPOOL 57fe5f96d8b45f343b0245cca9623415eddbb61961ba495336cb209d3d8184169e0e4c424954633fb8b0a330107b449b47bcce0949a3b186b79c3cf5e6187349
-AUX julia-0.4.3-fix_build_system.patch 5821 SHA256 62c397715119ef714474f0ddb212a8b1fd8a8efd5849d7eb2fe702db34bd885d SHA512 0c027addfd1a2948190084cf393313c57d2694d046bd6253a9c6518d099e49a0355f53507991d8500c83370be45182e62c006f5f123b17ae83cf2790ac957a72 WHIRLPOOL c34ffa75b3ddd2df59a6d7ec507b5ea330ea844c2d883fcad31956ab2dea4ab253f73c9a2d96c57229b2abdbd388b675304d29ab0d467c422d204b03095ea227
-AUX julia-0.4.6-llvm-3.8.patch 1702 SHA256 2fa4fd8aef4a8805919cf66442f8b76f6a47886c1f6d31e7be525aad33c358c0 SHA512 8546ff6c762b2a3a9f15a898e8b95b6cb0dd50a014de8349ee8d94d9663ca5031f775ec4f00e136ae2aef4778a8bdb1074930d10e2e1c40a8ec8db55fb7dc4d8 WHIRLPOOL 2cf2bd56e7681c5d0d3ca0ba4c970a80dd218703e733c65ccde187ab36aa760314a80a0ee0e1dbac1999fe15950c2b0f651b2b1e2b934d30e28d744cbbe32922
 AUX julia-0.5.0-fix_build_system.patch 3154 SHA256 b5a763bf923f0d3e721f890324b1356009da329594e2cfd2b24ac683640c36df SHA512 3a01a6f5a29215c5f67bf8cf73856a8b2a7e82c0a0fb969beb82c73f4600bccdca25b885efaab0f72d5aaf4758fed1931d8ba99d6513c8ea8b48fd8101a641b4 WHIRLPOOL 034e7006dd5c0bb5789f9435a576fb4332437cd45715cc5a3c5e5f3ffe20319db328f359cf017b9802a7c8e11603c8066f634f343d63d066240dd143a390acc6
-DIST julia-0.4.3-bundled.tar.gz 2678787 SHA256 9451160add4c1fa537762627abcd3dd5fecca9ce44f71c4140d89a4bb6b23392 SHA512 919ca7b99a6eb17a651ce24fe07e5c12bfcee54ce86fac8f744765195002e8f3330df9059fadd5af3408c1f7e067e247ad4bb135879ae4ae43e1457245f90db9 WHIRLPOOL 94bb022d4f1586dfdc2f52286db423cb09898a3a5dff2f2086ca111b9117dca808758351dada23cea1056a8e5c3b33f6919410c34af96a92a4a9f8b0e0758783
-DIST julia-0.4.3.tar.gz 5563437 SHA256 b2c12b267c0d8eb380f6628e7be48c7ec46d2cfb5c585ecb3ca4cc442650e4e0 SHA512 7d5180c69573452c00563c7b98514fc9e4f0f70762912cf4f90cbf632e4b23ec149295ff1955164833ab94efd1feab992067996e3d60f795850542cf2f18f67f WHIRLPOOL 75c3ebf8cb1af67158896872e098bf66a8073eba3daf6cf5903471d34201e1605458e59f14c19ff5177413daee5aac102ec69a0afe9a93a219698a4640acaf33
-DIST julia-0.4.6-bundled.tar.gz 2678787 SHA256 9451160add4c1fa537762627abcd3dd5fecca9ce44f71c4140d89a4bb6b23392 SHA512 919ca7b99a6eb17a651ce24fe07e5c12bfcee54ce86fac8f744765195002e8f3330df9059fadd5af3408c1f7e067e247ad4bb135879ae4ae43e1457245f90db9 WHIRLPOOL 94bb022d4f1586dfdc2f52286db423cb09898a3a5dff2f2086ca111b9117dca808758351dada23cea1056a8e5c3b33f6919410c34af96a92a4a9f8b0e0758783
-DIST julia-0.4.6.tar.gz 5548248 SHA256 e5d12b5a8ddff0131e460612ecf222ddf16014fc64c4fc3d8b021da7ebbd9a9f SHA512 744fbae14f7b38d5f7ef1c39d05c66f42833ee0e07b3f4be2ae377f2c997872777c6f7e9e667f52e5a33879032b2d02d76b00fab59f81ba6552f1fd4165953da WHIRLPOOL 3403364fc13bd8012da1ee333cc51fd0a957e94920bbd3f951fad4a689469f514e19a661bf2bdfdd29afbcadac1c9d6948638fd9d4201780a1aa7c0fd2995dee
+AUX julia-9999-fix_build_system.patch 2802 SHA256 1c0a9f77248393a82934b92a5e8d510c9d3588399cd914624cf9f79e3657f63e SHA512 3e8532d7b26ee1246e08c100332d7c9acd229610d0c098038d6e5354f4f6761b5a43b8dd0fad3f6a3205eadfb592583fa1e1f8591257bd01acb2ef22f23cb650 WHIRLPOOL 270313e969bd0c0e40b98640c43a8356360a4f963cb7551571b1dc72677b4c6d4307e07f599384b1d53cb4a64c95f541ff7f5b24cdb361ad8dc54cb46db80ea0
 DIST julia-0.5.0-bundled.tar.gz 3461547 SHA256 3f4887fc2c0112666eb28b99f86bd8f7bd50615325e03135c546127885d46fbf SHA512 f8df589edf7d6b0e1e6553583c81d26fd256a79cacd79fbdd0ea1a9eea46b2466e3cbf055b5b7aa2d5c08318a5c35b9c09a30ac46a48689cc5c7245954b615c8 WHIRLPOOL b0137b2ed55aef7dc2c1a8693043ce63305bd2bbb5c2f959b2752fdb68189a506b027b467bfc0bb443fa4202f3735dd9410a257adec08302dfcaa0c9e4bfed98
 DIST julia-0.5.0.tar.gz 6326490 SHA256 bb62a14806e58f079ecd4941d4a18d1f1c1d89ab33c826d3a58a2244e364112e SHA512 6d76c5050da5050cd541c8407c35c8ecd60ad2ba61c4defcc5c084aaeb09e82ffed09be79a3453000bdf88efe56039948335bab21c8389389ffb8b29806568de WHIRLPOOL 7f0066cc7fa912fe7ce5b6bf43449d828b0b9dcf2ab57df6c13a0df17ee53351c6deb30e7b998dc00ff53c548074d79ed6288bc79507afebc4fd827b3e3c032f
-EBUILD julia-0.4.3.ebuild 4758 SHA256 4d5cd88ac8093b11df1d4d01ac846c972bf86493cb0ca47129578aac92131a3e SHA512 3281846dca1d07f459fb30a2ae29dbd47ce9a65576f11f1a8b158ded27b7aa606d5bf03a4f99552837a485e19283f361ee775f36bf59e27e4829a7139010525b WHIRLPOOL 7c0fa492eaa37103c7828eb30243e96f4670ad0421604455b287569c0d56cc38cce7b49bd2cc6ae687ca0c874ea6a0e774b53f939738a15ad5d76c5c7ab01561
-EBUILD julia-0.4.6.ebuild 4800 SHA256 e6bb9028b1c3cb8a1551bc1cbd52c7436dc277cfb13018daf531041a74de2706 SHA512 f5d3831e379b7bba0e56ef09c9ff75ad0e8fa54dc4424d17fb993d4abf05a272e73cdc39b60ac022de14207977a9438e0fd5f488a1355f433bca500226c960d5 WHIRLPOOL 8e9731ca7111158da4897c4862565c7792297dd51cf656f59dd48ecc69ca01cf3db0c069263fd0b61cb17168aab1bbfa3bc74041373e7818851c63f407b2404d
-EBUILD julia-0.5.0.ebuild 4563 SHA256 8f01ca540a0c3da067a1401b1cd320119996ca1aae52558fe83011a0c45a4b35 SHA512 2611e26adfc7daf6e52337f966db10b6869586018e8d078c0de7b1e1ac9cd7e835a758f531c8b519037ae04fd92a1b0936f2efc4565887a2fc8e367804187852 WHIRLPOOL 4438a0ab8e5bcdca4c94b4c245e9bffe9e69a43112e5e98ac77f626c7af9303d21e2ea9c8df06a2787342269cf0658f1ba153aad33c706557f8fbd920f35aa0a
+EBUILD julia-0.5.0-r1.ebuild 4570 SHA256 3e65fdcadcd5d8f3f49caad6549aec24e1e2c67c7e521e0110d24e928cba6486 SHA512 44079ea4a390c2f5a0d673553c14fdefac7a097148423b6d8b25cefb01f74a0329b7be87683296dad0eb62fa756729ac5c99fadaaa29901a00d07f82310bd1a7 WHIRLPOOL 23e0635c01b852b51f9e2107ddea4c50faaf7375686d3fce4decc3e71868905c389ab119f3b530e09f6bdc193bcd5eef81e1a1da461ea09ed19724e8dd096c68
+EBUILD julia-9999.ebuild 4277 SHA256 624d220afa47daa5804450dcd34dedc8c733a185b40334a57136df1ec6bdb81c SHA512 6c29855a0f08fd93c56d20c835850e108c96d94980358f5da95ebc1ad4e9ef640bbfee479a439641160bd283fec558694ff5df3133f9d2b4945145416a0c1d15 WHIRLPOOL bb8dea412c4347ff8d4ed6fbf97f8fd41eb43019a4cd4539e4fd378763b40c6ec95e5efe0527cce5f27fe3450ee986fe2e6aa5b478be182b7e6d5ae708cbb8b2
 MISC ChangeLog 4333 SHA256 e32bdde72369e4d40aa0ff22cd72589fbc01735b6d75aba6874b85392e3e50c7 SHA512 5ad0119454eccae31d5c4fcabdb76abbc013a0ae4d339332393ac43e9c97dc7f39fe43ef28509d69ed508ba4f0370e02fb6b5eabfef36ccd7ee9e57980ac588c WHIRLPOOL 16dac680812c6a7ec1f8a770e1a82613396e96f59f07a06c49922e454ce52db165aecab3b5ad51548fb9c4e6e432f27f36905686a2aca0a40f415e40d632be7b
 MISC ChangeLog-2015 2685 SHA256 0affb3e0cc478072c2b9c94aa1f02be5ce786fa165adc7be104cc2729e1910c3 SHA512 5c1c815a4a97101b85f2e17e6a6a3175c469216afd00906b01e0161893d710cf249ef5685b3abc8dede1003a39e5da348a62b61bcfa2710641532b17fb741973 WHIRLPOOL a1aba60d257e1bd160fc75ef7b0c5a9c4d1b1bc8efe4838ae7c78ca1ec4c42d69c86a11afed280cee13c163844fa609e28da38136a3104b03d1413cb3c202166
 MISC metadata.xml 1177 SHA256 cf9abf0eae417f8fd199260af3fd5ec01f47e210237ad2fbbdfb867813485c3f SHA512 1ed4c6477da40c7a79ee1f9efe1a33eb0ea61ee150a5a50b0c0e0241b0177541d7953d4043d159036f68d116aa41fa9413caa01b36c688fcdfb874e6627f234d WHIRLPOOL 7e418748fbc3a89670725bc9c716e9151870da4debb2b89e8d53e18a360ca4cf0522ba74cf348c343364a9c1a059ea0efd46d07b7d0d5c149731d9dd22423cde
diff --git a/dev-lang/julia/files/julia-0.4.3-fix_build_system.patch b/dev-lang/julia/files/julia-0.4.3-fix_build_system.patch
deleted file mode 100644
index c83f043..0000000
--- a/dev-lang/julia/files/julia-0.4.3-fix_build_system.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-diff --git a/Make.inc b/Make.inc
-index da01e38..c751607 100644
---- a/Make.inc
-+++ b/Make.inc
-@@ -297,7 +297,7 @@ JCFLAGS = -std=gnu99 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
- JCPPFLAGS =
- JCXXFLAGS = -pipe $(fPIC) -fno-rtti
- DEBUGFLAGS = -O0 -ggdb3 -DJL_DEBUG_BUILD -fstack-protector-all
--SHIPFLAGS = -O3 -ggdb3 -falign-functions
-+SHIPFLAGS = GENTOOCFLAGS
- endif
- 
- ifeq ($(USECLANG),1)
-@@ -307,7 +307,7 @@ JCFLAGS = -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
- JCPPFLAGS =
- JCXXFLAGS = -pipe $(fPIC) -fno-rtti
- DEBUGFLAGS = -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
--SHIPFLAGS = -O3 -g
-+SHIPFLAGS =  GENTOOCFLAGS
- ifeq ($(OS), Darwin)
- ifeq ($(USE_LIBCPP), 1)
- CC += -stdlib=libc++ -mmacosx-version-min=10.7
-@@ -334,7 +334,7 @@ JCFLAGS = -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 -
- JCPPFLAGS =
- JCXXFLAGS = -pipe $(fPIC) -fno-rtti
- DEBUGFLAGS = -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
--SHIPFLAGS = -O3 -g -falign-functions
-+SHIPFLAGS = GENTOOCFLAGS
- endif
- 
- ifeq ($(USECCACHE), 1)
-diff --git a/deps/Makefile b/deps/Makefile
-index 051b23d..881ba68 100644
---- a/deps/Makefile
-+++ b/deps/Makefile
-@@ -862,7 +862,7 @@ OPENSPECFUN_TAR_URL = https://api.github.com/repos/JuliaLang/openspecfun/tarball
- $(eval $(call git-external,openspecfun,OPENSPECFUN,Makefile,libopenspecfun.$(SHLIB_EXT)))
- 
- # issue 8799
--OPENSPECFUN_CFLAGS = -O3 -std=c99
-+OPENSPECFUN_CFLAGS = GENTOOCFLAGS -std=c99
- ifeq ($(USEICC),1)
-   OPENSPECFUN_CFLAGS += -fp-model precise
- endif
-@@ -902,7 +902,7 @@ DSFMT_OBJ_SOURCE = dsfmt-$(DSFMT_VER)/libdSFMT.$(SHLIB_EXT)
- 
- DSFMT_CFLAGS = $(CFLAGS) -DNDEBUG -DDSFMT_MEXP=19937 $(fPIC) -DDSFMT_DO_NOT_USE_OLD_NAMES
- ifneq ($(USEMSVC), 1)
--DSFMT_CFLAGS += -O3 -finline-functions -fomit-frame-pointer -fno-strict-aliasing \
-+DSFMT_CFLAGS += GENTOOCFLAGS -finline-functions -fno-strict-aliasing \
- 		--param max-inline-insns-single=1800 -Wmissing-prototypes -Wall  -std=c99 -shared
- else
- DSFMT_CFLAGS += -Wl,-dll,-def:../libdSFMT.def
-@@ -1181,7 +1181,7 @@ endif
- endif
- 
- libgfortblas.$(SHLIB_EXT): gfortblas.c gfortblas.alias
--	$(CC) -Wall -O3 $(CPPFLAGS) $(CFLAGS) $(fPIC) -shared $< -o $@ -pipe \
-+	$(CC) -Wall GENTOOCFLAGS $(CPPFLAGS) $(CFLAGS) $(fPIC) -shared $< -o $@ -pipe \
- 				-Wl,-reexport_framework,Accelerate -Wl,-alias_list,gfortblas.alias
- $(build_shlibdir)/libgfortblas.$(SHLIB_EXT): libgfortblas.$(SHLIB_EXT)
- 	cp -f $< $@
-@@ -1607,10 +1607,10 @@ install-suitesparse: $(SUITESPARSE_OBJ_TARGET) install-suitesparse-wrapper
- # SUITESPARSE WRAPPER
- 
- ifeq ($(USE_SYSTEM_SUITESPARSE), 1)
--SUITESPARSE_INC = -I /usr/include/suitesparse
-+
- SUITESPARSE_LIB = -lumfpack -lcholmod -lamd -lcamd -lcolamd -lspqr
- else
--SUITESPARSE_INC = -I SuiteSparse-$(SUITESPARSE_VER)/CHOLMOD/Include -I SuiteSparse-$(SUITESPARSE_VER)/SuiteSparse_config -I SuiteSparse-$(SUITESPARSE_VER)/SPQR/Include
-+
- SUITESPARSE_LIB = -L$(build_shlibdir) -lcholmod -lumfpack -lspqr $(RPATH_ORIGIN)
- $(build_shlibdir)/libsuitesparse_wrapper.$(SHLIB_EXT):  $(SUITESPARSE_OBJ_TARGET)
- endif
-diff --git a/deps/checksums/Rmath-julia-0.1.tar.gz/sha512 b/deps/checksums/Rmath-julia-0.1.tar.gz/sha512
-index 6a64d44..6bbeb34 100644
---- a/deps/checksums/Rmath-julia-0.1.tar.gz/sha512
-+++ b/deps/checksums/Rmath-julia-0.1.tar.gz/sha512
-@@ -1 +1 @@
--1dd94eca05bc06c3f33e8be5087d3b1742d01c8b38588e0fa79b8f6b9998760bca21bee1b65873825c4dde2d994a8271166bc21f670a34810fa9db598473a887
-+15da0b3ff16113d5ad44c7ec42a1c8e260973883dd85ee174b3526f01137a94136cb03d4bbecb9267b7ca20d5ffc10670496d589cf60b86930f869a9fe219794
-diff --git a/doc/Makefile b/doc/Makefile
-index 08ba8dd..078d725 100644
---- a/doc/Makefile
-+++ b/doc/Makefile
-@@ -56,7 +56,7 @@ help:
- 	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
- 
- clean:
--	-rm -rf _build/*
-+	@echo "Do not clean doc/_build/html. Just use it..."
- 
- cleanall: clean
- 
-diff --git a/src/Makefile b/src/Makefile
-index 98fa704..b566791 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -26,15 +26,8 @@ endif
- 
- # In LLVM < 3.4, --ldflags includes both options and libraries, so use it both before and after --libs
- # In LLVM >= 3.4, --ldflags has only options, and --system-libs has the libraries.
--LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs 2> /dev/null)
--ifeq ($(USE_LLVM_SHLIB),1)
--ifeq ($(LLVM_USE_CMAKE),1)
--LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) -lLLVM
--else
--LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) -lLLVM-$(call exec,$(LLVM_CONFIG) --version)
--endif
-+LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs)
- FLAGS += -DLLVM_SHLIB
--endif
- 
- COMMON_LIBS = -L$(build_shlibdir) -L$(build_libdir) $(LIBUV) $(LIBUTF8PROC) $(NO_WHOLE_ARCHIVE) $(LLVMLINK) $(OSLIBS)
- DEBUG_LIBS = $(WHOLE_ARCHIVE) $(BUILDDIR)/flisp/libflisp-debug.a $(WHOLE_ARCHIVE) $(BUILDDIR)/support/libsupport-debug.a $(COMMON_LIBS)
-diff --git a/ui/Makefile b/ui/Makefile
-index c9b5d0e..557a38c 100644
---- a/ui/Makefile
-+++ b/ui/Makefile
-@@ -20,15 +20,10 @@ OBJS = $(SRCS:%=%.o)
- DOBJS = $(SRCS:%=%.dbg.obj)
- DEBUGFLAGS += $(FLAGS)
- SHIPFLAGS += $(FLAGS)
--ifeq ($(USE_LLVM_SHLIB),1)
--ifeq ($(LLVM_USE_CMAKE),1)
--LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) -lLLVM
--else
--LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) -lLLVM-$(call exec,$(LLVM_CONFIG) --version)
--endif
--else
--LLVMLINK =
--endif
-+
-+LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs)
-+FLAGS += -DLLVM_SHLIB
-+
- JLDFLAGS += $(LDFLAGS) $(NO_WHOLE_ARCHIVE) $(OSLIBS) $(LLVMLINK) $(RPATH)
- 
- ifeq ($(USE_SYSTEM_LIBM),0)
diff --git a/dev-lang/julia/files/julia-0.4.6-llvm-3.8.patch b/dev-lang/julia/files/julia-0.4.6-llvm-3.8.patch
deleted file mode 100644
index c301f96..0000000
--- a/dev-lang/julia/files/julia-0.4.6-llvm-3.8.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Description: LLVM 3.8 compatibility
- These fixes come straight from upstream's git.
-Origin: Upstream, https://github.com/JuliaLang/julia/commit/b67609b988febe062e6709d8972c4f869c82cfc0
-Origin: Upstream, https://github.com/JuliaLang/julia/commit/3f6abadc9d12bb9d59ec775db4277b3841395d0b
-Origin: Upstream, https://github.com/JuliaLang/julia/commit/caf3c74426696d43101d9607b1a2cd3a5e05bc0f
-Author: Graham Inggs <ginggs@debian.org>
-Last-Update: 2016-02-03
---- a/src/cgutils.cpp
-+++ b/src/cgutils.cpp
-@@ -219,7 +219,11 @@
-         }
-     }
- 
-+#ifdef LLVM38
-+    virtual Value *materializeDeclFor(Value *V)
-+#else
-     virtual Value *materializeValueFor (Value *V)
-+#endif
-     {
-         Function *F = dyn_cast<Function>(V);
-         if (F) {
-@@ -492,7 +496,11 @@
- 
-     // now copy the module, since PM.run may modify it
-     ValueToValueMapTy VMap;
-+#ifdef LLVM38
-+    Module *clone = CloneModule(shadow_module, VMap).release();
-+#else
-     Module *clone = CloneModule(shadow_module, VMap);
-+#endif
- #ifdef LLVM37
-     // Reset the target triple to make sure it matches the new target machine
-     clone->setTargetTriple(TM->getTargetTriple().str());
---- a/src/intrinsics.cpp
-+++ b/src/intrinsics.cpp
-@@ -780,12 +780,20 @@
-              jl_options.fast_math == JL_OPTIONS_FAST_MATH_ON)) {
-             FastMathFlags fmf;
-             fmf.setUnsafeAlgebra();
-+#ifdef LLVM38
-+            builder.setFastMathFlags(fmf);
-+#else
-             builder.SetFastMathFlags(fmf);
-+#endif
-         }
-     }
-     IRBuilder<>& operator()() const { return builder; }
-     ~math_builder() {
-+#ifdef LLVM38
-+        builder.setFastMathFlags(old_fmf);
-+#else
-         builder.SetFastMathFlags(old_fmf);
-+#endif
-     }
- };
- 
diff --git a/dev-lang/julia/files/julia-9999-fix_build_system.patch b/dev-lang/julia/files/julia-9999-fix_build_system.patch
new file mode 100644
index 0000000..4ed2822
--- /dev/null
+++ b/dev-lang/julia/files/julia-9999-fix_build_system.patch
@@ -0,0 +1,70 @@
+diff --git a/Make.inc b/Make.inc
+index 651c9df..ff01872 100644
+--- a/Make.inc
++++ b/Make.inc
+@@ -389,7 +389,7 @@ ifneq ($(OS), WINNT)
+ JCXXFLAGS += -pedantic
+ endif
+ DEBUGFLAGS := -O0 -ggdb2 -DJL_DEBUG_BUILD -fstack-protector-all
+-SHIPFLAGS := -O3 -ggdb2 -falign-functions
++SHIPFLAGS := GENTOOCFLAGS
+ endif
+ 
+ ifeq ($(USECLANG),1)
+@@ -400,7 +400,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
+ JCPPFLAGS := -fasynchronous-unwind-tables
+ JCXXFLAGS := -pipe $(fPIC) -fno-rtti -pedantic
+ DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
+-SHIPFLAGS := -O3 -g
++SHIPFLAGS := GENTOOCFLAGS
+ ifeq ($(OS), Darwin)
+ ifeq ($(USE_LIBCPP), 1)
+ CC += -stdlib=libc++ -mmacosx-version-min=10.7
+@@ -427,7 +427,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
+ JCPPFLAGS :=
+ JCXXFLAGS := -pipe $(fPIC) -fno-rtti
+ DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
+-SHIPFLAGS := -O3 -g -falign-functions
++SHIPFLAGS := GENTOOCFLAGS
+ endif
+ 
+ ifeq ($(USECCACHE), 1)
+diff --git a/doc/Makefile b/doc/Makefile
+index 0749d73..f4d49ec 100644
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -62,7 +62,7 @@ help:
+ 	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+ 
+ clean:
+-	-rm -rf _build/*
++	@echo "Do not clean doc/_build/html. Just use it..."
+ 
+ cleanall: clean
+ 
+diff --git a/src/Makefile b/src/Makefile
+index d7ec864..61d2470 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -66,20 +66,8 @@ HEADERS := $(addprefix $(SRCDIR)/,julia.h julia_threads.h julia_internal.h optio
+ 
+ # In LLVM < 3.4, --ldflags includes both options and libraries, so use it both before and after --libs
+ # In LLVM >= 3.4, --ldflags has only options, and --system-libs has the libraries.
+-ifneq ($(USE_LLVM_SHLIB),1)
+-LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) $(shell $(LLVM_CONFIG_HOST) --libs $(LLVM_LIBS)) $(shell $(LLVM_CONFIG_HOST) --ldflags) $(shell $(LLVM_CONFIG_HOST) --system-libs 2> /dev/null)
+-else
+-ifeq ($(LLVM_USE_CMAKE),1)
+-LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM
+-else
+-ifeq ($(OS),WINNT)
+-LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(LLVM_VER_SHORT)
+-else
+-LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(shell $(LLVM_CONFIG_HOST) --version)
+-endif # OS == WINNT
+-endif # LLVM_USE_CMAKE == 1
++LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs)
+ FLAGS += -DLLVM_SHLIB
+-endif # USE_LLVM_SHLIB == 1
+ 
+ COMMON_LIBS := -L$(build_shlibdir) -L$(build_libdir) $(LIBUV) $(LIBUTF8PROC) $(NO_WHOLE_ARCHIVE) $(LLVMLINK) $(OSLIBS)
+ DEBUG_LIBS := $(WHOLE_ARCHIVE) $(BUILDDIR)/flisp/libflisp-debug.a $(WHOLE_ARCHIVE) $(BUILDDIR)/support/libsupport-debug.a $(COMMON_LIBS)
diff --git a/dev-lang/julia/julia-0.4.3.ebuild b/dev-lang/julia/julia-0.4.3.ebuild
deleted file mode 100644
index 8d648df..0000000
--- a/dev-lang/julia/julia-0.4.3.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-RESTRICT="test"
-
-inherit elisp-common eutils multilib pax-utils toolchain-funcs
-
-DESCRIPTION="High-performance programming language for technical computing"
-HOMEPAGE="http://julialang.org/"
-SRC_URI="
-	https://github.com/JuliaLang/${PN}/releases/download/v${PV}/${P}.tar.gz
-	https://dev.gentoo.org/~tamiko/distfiles/${P}-bundled.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="emacs"
-
-RDEPEND="
-	dev-lang/R:0=
-	dev-libs/double-conversion:0=
-	dev-libs/gmp:0=
-	dev-libs/libgit2:0=
-	dev-libs/mpfr:0=
-	dev-libs/openspecfun
-	sci-libs/arpack:0=
-	sci-libs/camd:0=
-	sci-libs/cholmod:0=
-	sci-libs/fftw:3.0=[threads]
-	sci-libs/openlibm:0=
-	sci-libs/spqr:0=
-	sci-libs/umfpack:0=
-	sci-mathematics/glpk:0=
-	>=sys-devel/llvm-3.5:0=
-	>=sys-libs/libunwind-1.1:7=
-	sys-libs/readline:0=
-	sys-libs/zlib:0=
-	virtual/blas
-	virtual/lapack
-	emacs? ( app-emacs/ess )"
-
-DEPEND="${RDEPEND}
-	dev-util/patchelf
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix_build_system.patch
-)
-
-src_prepare() {
-	mv "${WORKDIR}"/bundled/dsfmt-2.2.3.tar.gz deps/ || die
-	mv "${WORKDIR}"/bundled/libuv-efb40768b7c7bd9f173a7868f74b92b1c5a61a0e.tar.gz deps/ || die
-	mv "${WORKDIR}"/bundled/pcre2-10.20.tar.bz2 deps/ || die
-	mv "${WORKDIR}"/bundled/Rmath-julia-0.1.tar.gz deps/ || die
-	mv "${WORKDIR}"/bundled/utf8proc-85789180158ac7fff85b9f008828d6ac44f072ea.tar.gz deps/ || die
-	rmdir "${WORKDIR}"/bundled || die
-
-	epatch "${PATCHES[@]}"
-
-	# Sledgehammer:
-	# - prevent fetching of bundled stuff in compile and install phase
-	# - respect CFLAGS
-	# - respect EPREFIX and Gentoo specific paths
-	# - fix BLAS and LAPACK link interface
-
-	sed -i \
-		-e 's|$(JLDOWNLOAD)|${EPREFIX}/bin/true|' \
-		-e 's|git submodule|${EPREFIX}/bin/true|g' \
-		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
-		-e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
-		deps/Makefile || die
-
-	local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)"
-	libblas="${libblas%% *}"
-	libblas="lib${libblas#-l}"
-	local liblapack="$($(tc-getPKG_CONFIG) --libs-only-l lapack)"
-	liblapack="${liblapack%% *}"
-	liblapack="lib${liblapack#-l}"
-
-	sed -i \
-		-e "s|\(JULIA_EXECUTABLE = \)\(\$(JULIAHOME)/julia\)|\1 LD_LIBRARY_PATH=\$(BUILD)/$(get_libdir) \2|" \
-		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
-		-e "s|LIBDIR = lib|LIBDIR = $(get_libdir)|" \
-		-e "s|/usr/lib|${EPREFIX}/usr/$(get_libdir)|" \
-		-e "s|/usr/include|${EPREFIX}/usr/include|" \
-		-e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|" \
-		-e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \
-		-e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \
-		-e "s|= libblas|= ${libblas}|" \
-		-e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \
-		-e "s|= liblapack|= ${liblapack}|" \
-		Make.inc || die
-
-	sed -i \
-		-e "s|,lib)|,$(get_libdir))|g" \
-		-e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \
-		Makefile || die
-
-	sed -i \
-		-e "s|ar -rcs|$(tc-getAR) -rcs|g" \
-		src/Makefile || die
-}
-
-src_configure() {
-	# julia does not play well with the system versions of
-	# dsfmt, libuv, pcre2 and utf8proc
-	cat <<-EOF > Make.user
-		USE_SYSTEM_DSFMT=0
-		USE_SYSTEM_LIBUV=0
-		USE_SYSTEM_PCRE=0
-		USE_SYSTEM_RMATH=0
-		USE_SYSTEM_UTF8PROC=0
-		USE_LLVM_SHLIB=1
-		USE_SYSTEM_ARPACK=1
-		USE_SYSTEM_BLAS=1
-		USE_SYSTEM_FFTW=1
-		USE_SYSTEM_GMP=1
-		USE_SYSTEM_GRISU=1
-		USE_SYSTEM_LAPACK=1
-		USE_SYSTEM_LIBGIT2=1
-		USE_SYSTEM_LIBM=1
-		USE_SYSTEM_LIBUNWIND=1
-		USE_SYSTEM_LLVM=1
-		USE_SYSTEM_MPFR=1
-		USE_SYSTEM_OPENLIBM=1
-		USE_SYSTEM_OPENSPECFUN=1
-		USE_SYSTEM_PATCHELF=1
-		USE_SYSTEM_READLINE=1
-		USE_SYSTEM_SUITESPARSE=1
-		USE_SYSTEM_ZLIB=1
-		VERBOSE=1
-	EOF
-
-}
-
-src_compile() {
-	emake cleanall
-	emake julia-release \
-		prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-	pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
-	emake
-	use emacs && elisp-compile contrib/julia-mode.el
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	emake install \
-		prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-	cat > 99julia <<-EOF
-		LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
-	EOF
-	doenvd 99julia
-
-	if use emacs; then
-		elisp-install "${PN}" contrib/julia-mode.el
-		elisp-site-file-install "${FILESDIR}"/63julia-gentoo.el
-	fi
-	dodoc README.md
-
-	mv "${ED}"/usr/etc/julia "${ED}"/etc || die
-	rmdir "${ED}"/usr/etc || die
-	rmdir "${ED}"/usr/libexec || die
-	mv "${ED}"/usr/share/doc/julia/{examples,html} \
-		"${ED}"/usr/share/doc/${P} || die
-	rmdir "${ED}"/usr/share/doc/julia || die
-	if [[ $(get_libdir) != lib ]]; then
-		mkdir -p "${ED}"/usr/$(get_libdir) || die
-		mv "${ED}"/usr/lib/julia "${ED}"/usr/$(get_libdir)/julia || die
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/julia/julia-0.4.6.ebuild b/dev-lang/julia/julia-0.4.6.ebuild
deleted file mode 100644
index 6f10200..0000000
--- a/dev-lang/julia/julia-0.4.6.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-RESTRICT="test"
-
-inherit elisp-common eutils multilib pax-utils toolchain-funcs
-
-DESCRIPTION="High-performance programming language for technical computing"
-HOMEPAGE="http://julialang.org/"
-SRC_URI="
-	https://github.com/JuliaLang/${PN}/releases/download/v${PV}/${P}.tar.gz
-	https://dev.gentoo.org/~tamiko/distfiles/${P}-bundled.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="emacs"
-
-RDEPEND="
-	dev-lang/R:0=
-	dev-libs/double-conversion:0=
-	dev-libs/gmp:0=
-	dev-libs/libgit2:0=
-	dev-libs/mpfr:0=
-	dev-libs/openspecfun
-	sci-libs/arpack:0=
-	sci-libs/camd:0=
-	sci-libs/cholmod:0=
-	sci-libs/fftw:3.0=[threads]
-	sci-libs/openlibm:0=
-	sci-libs/spqr:0=
-	sci-libs/umfpack:0=
-	sci-mathematics/glpk:0=
-	>=sys-devel/llvm-3.5:0=
-	>=sys-libs/libunwind-1.1:7=
-	sys-libs/readline:0=
-	sys-libs/zlib:0=
-	virtual/blas
-	virtual/lapack
-	emacs? ( app-emacs/ess )"
-
-DEPEND="${RDEPEND}
-	dev-util/patchelf
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.3-fix_build_system.patch
-	"${FILESDIR}"/${P}-llvm-3.8.patch
-)
-
-src_prepare() {
-	mv "${WORKDIR}"/bundled/dsfmt-2.2.3.tar.gz deps/ || die
-	mv "${WORKDIR}"/bundled/libuv-efb40768b7c7bd9f173a7868f74b92b1c5a61a0e.tar.gz deps/ || die
-	mv "${WORKDIR}"/bundled/pcre2-10.20.tar.bz2 deps/ || die
-	mv "${WORKDIR}"/bundled/Rmath-julia-0.1.tar.gz deps/ || die
-	mv "${WORKDIR}"/bundled/utf8proc-85789180158ac7fff85b9f008828d6ac44f072ea.tar.gz deps/ || die
-	rmdir "${WORKDIR}"/bundled || die
-
-	epatch "${PATCHES[@]}"
-
-	# Sledgehammer:
-	# - prevent fetching of bundled stuff in compile and install phase
-	# - respect CFLAGS
-	# - respect EPREFIX and Gentoo specific paths
-	# - fix BLAS and LAPACK link interface
-
-	sed -i \
-		-e 's|$(JLDOWNLOAD)|${EPREFIX}/bin/true|' \
-		-e 's|git submodule|${EPREFIX}/bin/true|g' \
-		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
-		-e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
-		deps/Makefile || die
-
-	local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)"
-	libblas="${libblas%% *}"
-	libblas="lib${libblas#-l}"
-	local liblapack="$($(tc-getPKG_CONFIG) --libs-only-l lapack)"
-	liblapack="${liblapack%% *}"
-	liblapack="lib${liblapack#-l}"
-
-	sed -i \
-		-e "s|\(JULIA_EXECUTABLE = \)\(\$(JULIAHOME)/julia\)|\1 LD_LIBRARY_PATH=\$(BUILD)/$(get_libdir) \2|" \
-		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
-		-e "s|LIBDIR = lib|LIBDIR = $(get_libdir)|" \
-		-e "s|/usr/lib|${EPREFIX}/usr/$(get_libdir)|" \
-		-e "s|/usr/include|${EPREFIX}/usr/include|" \
-		-e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|" \
-		-e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \
-		-e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \
-		-e "s|= libblas|= ${libblas}|" \
-		-e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \
-		-e "s|= liblapack|= ${liblapack}|" \
-		Make.inc || die
-
-	sed -i \
-		-e "s|,lib)|,$(get_libdir))|g" \
-		-e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \
-		Makefile || die
-
-	sed -i \
-		-e "s|ar -rcs|$(tc-getAR) -rcs|g" \
-		src/Makefile || die
-}
-
-src_configure() {
-	# julia does not play well with the system versions of
-	# dsfmt, libuv, pcre2 and utf8proc
-	cat <<-EOF > Make.user
-		USE_SYSTEM_DSFMT=0
-		USE_SYSTEM_LIBUV=0
-		USE_SYSTEM_PCRE=0
-		USE_SYSTEM_RMATH=0
-		USE_SYSTEM_UTF8PROC=0
-		USE_LLVM_SHLIB=1
-		USE_SYSTEM_ARPACK=1
-		USE_SYSTEM_BLAS=1
-		USE_SYSTEM_FFTW=1
-		USE_SYSTEM_GMP=1
-		USE_SYSTEM_GRISU=1
-		USE_SYSTEM_LAPACK=1
-		USE_SYSTEM_LIBGIT2=1
-		USE_SYSTEM_LIBM=1
-		USE_SYSTEM_LIBUNWIND=1
-		USE_SYSTEM_LLVM=1
-		USE_SYSTEM_MPFR=1
-		USE_SYSTEM_OPENLIBM=1
-		USE_SYSTEM_OPENSPECFUN=1
-		USE_SYSTEM_PATCHELF=1
-		USE_SYSTEM_READLINE=1
-		USE_SYSTEM_SUITESPARSE=1
-		USE_SYSTEM_ZLIB=1
-		VERBOSE=1
-	EOF
-
-}
-
-src_compile() {
-	emake cleanall
-	emake julia-release \
-		prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-	pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
-	emake
-	use emacs && elisp-compile contrib/julia-mode.el
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	emake install \
-		prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-	cat > 99julia <<-EOF
-		LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
-	EOF
-	doenvd 99julia
-
-	if use emacs; then
-		elisp-install "${PN}" contrib/julia-mode.el
-		elisp-site-file-install "${FILESDIR}"/63julia-gentoo.el
-	fi
-	dodoc README.md
-
-	mv "${ED}"/usr/etc/julia "${ED}"/etc || die
-	rmdir "${ED}"/usr/etc || die
-	rmdir "${ED}"/usr/libexec || die
-	mv "${ED}"/usr/share/doc/julia/{examples,html} \
-		"${ED}"/usr/share/doc/${P} || die
-	rmdir "${ED}"/usr/share/doc/julia || die
-	if [[ $(get_libdir) != lib ]]; then
-		mkdir -p "${ED}"/usr/$(get_libdir) || die
-		mv "${ED}"/usr/lib/julia "${ED}"/usr/$(get_libdir)/julia || die
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/julia/julia-0.5.0.ebuild b/dev-lang/julia/julia-0.5.0-r1.ebuild
similarity index 98%
rename from dev-lang/julia/julia-0.5.0.ebuild
rename to dev-lang/julia/julia-0.5.0-r1.ebuild
index 10bce00..5ef16ca 100644
--- a/dev-lang/julia/julia-0.5.0.ebuild
+++ b/dev-lang/julia/julia-0.5.0-r1.ebuild
@@ -39,7 +39,7 @@
 	>=sys-libs/libunwind-1.1:7=
 	sys-libs/readline:0=
 	sys-libs/zlib:0=
-	virtual/blas
+	>=virtual/blas-3.6
 	virtual/lapack
 	emacs? ( app-emacs/ess )"
 
@@ -171,7 +171,7 @@
 	rmdir "${ED}"/usr/etc || die
 	rmdir "${ED}"/usr/libexec || die
 	mv "${ED}"/usr/share/doc/julia/{examples,html} \
-		"${ED}"/usr/share/doc/${P} || die
+		"${ED}"/usr/share/doc/${PF} || die
 	rmdir "${ED}"/usr/share/doc/julia || die
 	if [[ $(get_libdir) != lib ]]; then
 		mkdir -p "${ED}"/usr/$(get_libdir) || die
diff --git a/dev-lang/julia/julia-0.5.0.ebuild b/dev-lang/julia/julia-9999.ebuild
similarity index 88%
copy from dev-lang/julia/julia-0.5.0.ebuild
copy to dev-lang/julia/julia-9999.ebuild
index 10bce00..80df05f 100644
--- a/dev-lang/julia/julia-0.5.0.ebuild
+++ b/dev-lang/julia/julia-9999.ebuild
@@ -6,18 +6,16 @@
 
 RESTRICT="test"
 
-inherit elisp-common eutils multilib pax-utils toolchain-funcs
+inherit git-r3 elisp-common eutils multilib pax-utils toolchain-funcs
 
 DESCRIPTION="High-performance programming language for technical computing"
 HOMEPAGE="http://julialang.org/"
-SRC_URI="
-	https://github.com/JuliaLang/${PN}/releases/download/v${PV}/${P}.tar.gz
-	https://dev.gentoo.org/~tamiko/distfiles/${P}-bundled.tar.gz
-"
+SRC_URI=""
+EGIT_REPO_URI="git://github.com/JuliaLang/julia.git"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS=""
 IUSE="emacs"
 
 RDEPEND="
@@ -39,7 +37,7 @@
 	>=sys-libs/libunwind-1.1:7=
 	sys-libs/readline:0=
 	sys-libs/zlib:0=
-	virtual/blas
+	>=virtual/blas-1.1
 	virtual/lapack
 	emacs? ( app-emacs/ess )"
 
@@ -48,20 +46,15 @@
 	virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.5.0-fix_build_system.patch
+	"${FILESDIR}"/${PN}-9999-fix_build_system.patch
 )
 
 src_prepare() {
-	mkdir deps/srccache || die
-	mv "${WORKDIR}"/bundled/* deps/srccache || die
-	rmdir "${WORKDIR}"/bundled || die
-
 	epatch "${PATCHES[@]}"
 
 	eapply_user
 
 	# Sledgehammer:
-	# - prevent fetching of bundled stuff in compile and install phase
 	# - respect CFLAGS
 	# - respect EPREFIX and Gentoo specific paths
 	# - fix BLAS and LAPACK link interface
diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index bddb8af..9c54358 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1783,3 +1783,9 @@
   Package-Manager: portage-2.3.1
   RepoMan-Options: --ignore-arches
 
+  24 Sep 2016; Jeroen Roovers <jer@gentoo.org> php-5.6.26.ebuild:
+  Stable for PPC64 (bug #594498).
+
+  Package-Manager: portage-2.3.1
+  RepoMan-Options: --ignore-arches
+
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index cd2e1a6..0b5f915 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -15,9 +15,9 @@
 EBUILD php-5.6.23.ebuild 23014 SHA256 18e75cbcb987c197ab489441b47c58a703eb974b9d4997e49d528b0d6c194b55 SHA512 3a1865a0194e3d09a4406715c7b7f348eba73b65bc4aa6dd56eba141ebed4cef9abd4c1538ccfc0b5009dbebb05e9b5db1e2c1de7982f4f449ab93d81beab5cb WHIRLPOOL 73b701e7e919d4ade5f5c32609747b07fb356fad948d0ac52c267969dd72b48ad228f37ebd9a28f04b927c79138f2c66459c1562a98e549379ac1340faf797db
 EBUILD php-5.6.24.ebuild 23333 SHA256 43d66add8f717e33ab9c52726e0d131897a08df6eaa14854e2c1ba9025e97251 SHA512 9186ddae30b4a52daeaae41e73313dcae046819161113087a1271f466e781047484f0e3dd8f3025087f97f7800196a77ff5a5c646b9146b6b1f5594a87ac00bb WHIRLPOOL cad3b9d9beda370132d33e0b8ff9073ab0bd0da5ad13538c5cf2f2854b40365d6fea82c448eb7e3ea27e709927ca233174915bcd923e3143fe8fee9f3e58c365
 EBUILD php-5.6.25.ebuild 22444 SHA256 99e150367b4ac338ad19c704375f5d489e6f93abd7bde3958bb4b330bd9597c6 SHA512 71b721efba858781051699c329af1e7e730ac41f82cdb32c127dcbd910e3180dbc526459ecc4077e09107cb8ff64dfd265afc8c3c764cd778d796a726e691245 WHIRLPOOL 80fbb05514a152e8549b7bf4478ce4894979474108338721b040ac2528bd536c04448dfb3f7d2edad801c2c6b9dce0acc5798c9841a5fe52f5a192efecc00838
-EBUILD php-5.6.26.ebuild 22463 SHA256 1e3aee56957276e8a66b938c60f6e0ac47cbc65e16a17ab67899230e6184c9bb SHA512 f9dbac677cf6711c51f3912cc4870018216fcb18bf1d60e55241976b378f7515a8f949a83d420626d49b9a056b8e48fd42b3207d72bd055612d620dc78e7c3d0 WHIRLPOOL 0477edf5fbffa68635c63e05b138d7cd97fa76dd803709bdd5d34758ae89e9238f8238181ba3097885f865e441a0a1050a3243bae4b7cecf443798356901fa68
+EBUILD php-5.6.26.ebuild 22462 SHA256 e240b3a4ea51b1658469a5e86fb201f099e27e01c90cc822496cc1b9f7ff1c87 SHA512 87966e6b643cc0966536e4003acc94fd6cd304cba8d72c69006390f4a62a11dd74b9f902db21be7ccbe46e2e6732d0ccb32eea471eed069701fcdedb7b023d10 WHIRLPOOL f8064f04d3fe347adfcb89d59479f110a8e03fcfe0e7a6b96077b54f0264f3644fda653df972ccc561e3bc716f7045caa8db1101850cb931ac30a8b581dbb788
 EBUILD php-7.0.11.ebuild 22445 SHA256 2b440b1324bfdda4688ae79e881ad3c2f4eaa82bcd644e274d4d201df592c52b SHA512 31c04dbb8c30e8a957101e70559690216eee93488363aa51b4ffc5ca8e4ba996994a640ee481d0ccc101f343729a77777b9ffca40de5358b202d9f661cb6fe4d WHIRLPOOL c1fca2df7649f6a330b78cd933c488cac1fe93edbe834a5d744489e850d4180e6dea0e5c9ad8146e8bb29a7f0e2d621fac2de7d54f39e530f205f6f3b9072f60
-MISC ChangeLog 55750 SHA256 174b12013043ad34d2f1951cfa2878c78ea60b634c35e89f064fac1447aa7a87 SHA512 1fa66f8397b3f620377209acb01757f126149542be9335f0c3e87f8a797cee3e8464cfb1fed68dec03c38e81ec7d01cca82f3e16e068baf59fac90d7bc6b436c WHIRLPOOL 050b77b8f9d910744b40edf0b6228a554ac99830693d7d52b5a165d3c6c66bf1d127639e24c2f503db7b855a0bf5a86f28a13b1021351071311be071f5b6e803
+MISC ChangeLog 55920 SHA256 d17eb1a97a725c64d716d5e099408b351ab627ab125c5c4e08f3fb7ab7bac72d SHA512 b838f0f7d98ecc0674561d76d73ac8ab2500b3384bd4c748c5a69f1c4c02e2d704a00f2b41d1480ea89deb2c00f620ad35f8ba95633f48aa1e2766ea4fbf4cc4 WHIRLPOOL 15e7920a5d43113f5dc7c3aebcf32805b004bf18ef26391edc5ba21128c2c14ea6833988d41bcd22a0deb6ba827e78a041ad3c89b95d11df0b1c63e0ca280d3b
 MISC ChangeLog-2012 108488 SHA256 c2eea36502d34eadc7995d546f78aaa553ba07beeb51ea738715ad7f2e51b08d SHA512 eb25224993eff1ea42ea133302991a3ffad3adda0bc524cfa4fae49574230a8e65b35b08750d780c11cc9c152435fadbf2c416241fac28dcbb025e060e96cd7a WHIRLPOOL 82f627853fa961f3f3707fb2c8757acbc8fc644e89121d78703b40ff0f668aa7d0f1aa26c77f8f503e4f6da22ed865e4cb7c02d5d112c89488b12aa6b0d80568
 MISC ChangeLog-2015 48694 SHA256 0dc57defe0e591303069f037d3dfb54d74cec2d2ab35504b8d43200910dfa056 SHA512 2e71df8e73b0db5c70c817e235f2b7998d07dc73c64affddc7d21e062a3bce0de8e5537239536619be8f8bf6163065a06082a26d34e90d22fe2bd5de1cdd5e3e WHIRLPOOL 5e90f2584f49e8a0be2fe0f611ee2d451d755f0c75aaab8bbed2083d9b5d42074685d0f8d6c4bf3a2ff098f0a845d89b9435ab8cab0cfc56aecb44ddf9e92d14
 MISC metadata.xml 1701 SHA256 b256e66817074908a15246d5d9b0ef832f01e8e13e6c124b365938eb26fd027c SHA512 0c347d97dd5ad17813340a2c478bf57df1f5a47a8868f41ff855e7f8fe80f6f658040a0400ec1b60a94db2527d42a074d9fde75449ca82b0b74a33608b5848eb WHIRLPOOL 228d3832a9ec011c3dd5d75395814895ffa09a9a8ac07ecd570b293d8be4a8253f8c50be82757c5207fdb3aadeb9936828bfffc028ff9135930ce14dcf1c788d
diff --git a/dev-lang/php/php-5.6.26.ebuild b/dev-lang/php/php-5.6.26.ebuild
index 2f6bab5..31a0ea5 100644
--- a/dev-lang/php/php-5.6.26.ebuild
+++ b/dev-lang/php/php-5.6.26.ebuild
@@ -11,7 +11,7 @@
 SRC_URI="http://php.net/distributions/${P}.tar.xz"
 LICENSE="PHP-3"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2"
diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index ec33003..da0d6a0 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -676,3 +676,10 @@
 
   Package-Manager: portage-2.3.0_p43
 
+  24 Sep 2016; Mike Gilbert <floppym@gentoo.org> python-2.7.10-r1.ebuild,
+  python-2.7.12.ebuild, python-3.4.3-r1.ebuild, python-3.4.5.ebuild,
+  python-3.5.2.ebuild:
+  set LC_ALL=C in src_compile
+
+  Package-Manager: portage-2.3.0_p43
+
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 2af3e0a..0e4cedb 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -25,14 +25,14 @@
 DIST python-gentoo-patches-3.4.3-0.tar.xz 11736 SHA256 917a9d98d40a91379c81ea57922a8632ba3c6f6db6f304ed6262bc88c5044946 SHA512 7ad1b30cf8bb7900fe518ed71e4ee55dd92ce7e23ae583a1f2f851b26cfa8c4f4271d28f418e780f3725a48d4ca8eeb8fd083f850810c66c29fb08c430828d72 WHIRLPOOL 074e8c0055b49a028eebda21d1acfb8a25ec968eb8b350c2bed37e042f9f354871e413db13e0ef2fe41d7e56d647178a7b3622019f36c4819c2c68f088366eb1
 DIST python-gentoo-patches-3.4.5-0.tar.xz 12044 SHA256 84ee7630670a1dac4bbbc55fabf5f99b5b29007de4f140ad956e93d2e7aba8fa SHA512 108a4845667ecdf4001fcbeffab0cfbbac87439a449a7351428b0f3e2f159e3848ee0c0dfa45c9fba893b9f9584b33722fc8bb0bd7485a1d0909c3a35ede6ed8 WHIRLPOOL f0248faa0b4ce5679e37381bba90f8a4d361a49db792787bffc06a54a4bc82fea4d53255120f10e6dbf51b99e12417fc1b469be9624e73508fa3a212a38e7352
 DIST python-gentoo-patches-3.5.2-0.tar.xz 12008 SHA256 eb898fb448bd40f086ae2910e94c608faa932eb377fe40bd34f4390b4c37aac1 SHA512 e2ef1b8f10f9ea849bf52a0be65d48f7cfecf07bdf151cbbd7e3a1c9428a8d96e901650496c4ae7fd0093af8cc90de8df674dc1a4c66ad21916a4ee45a81efc8 WHIRLPOOL 66b99c7c50e3eaca783f773349b3e8a357f706a7da6a66bd2e0a53946bc81d965ac99d8fd4c50ba7e42052aa84508c8aede5eacedbb95f040a48cf1a5de6b6b0
-EBUILD python-2.7.10-r1.ebuild 10174 SHA256 98105ad874cc19f5343b2f9a3b0cfc17622acca576e261f6d48a04fd85bd293c SHA512 4436de8a170ec419da561dbe4390db2148ade02c1208a2aeea8764ab5926960de32b482fe2bfac3dff7ebf20f80cda1733bf1c9d2bc7f9197658121dc3b44783 WHIRLPOOL 96e2af03c5c39b95cd37056ef1d00057044b18017550c328f217a489a5ce2601079e95c1e3930236cf172a736046fceb9b69a8931474eaad983934175252ea70
-EBUILD python-2.7.12.ebuild 10559 SHA256 3d3fba686609a93e367697acf2edcd6798f32e147c14c4a5cd4050eda9c96163 SHA512 2b3bc262e78cdec3a50cb6c270638b4a2a7a47a85ea56503290c24f6988309393cf43886ac334af5b534708345ef11c9fd518cb2df0c2b5a318e398b0f56e663 WHIRLPOOL ee5ae1bb8854c3b6c1f126c67ce0be27a96a81e3a424f17ce4e7d6652a40da07758d3cb35769be2d40df0bd4a6139513d386038045d21671df3962e9c9fc43a3
+EBUILD python-2.7.10-r1.ebuild 10086 SHA256 a16f6ed9ad0819ea463c3200e856742be420858ba49e2d5c3fd924fa66136503 SHA512 ba5c633bcee4e9fa033cc5802b00f8516054778a93b57e2f12b70b0abff8dfa2f3273c6603c54a37fdbd3b1e9fbf2cf0e3290dc96321e094ff1928c7f0646ca1 WHIRLPOOL e1fa2532846ada26f15e65c3b7898dd164a128bc93d13abf1585a6eb8d60c166a919fa711d2b60f7b8feea1f6139bad5b261f23e95b1e91684dcc1cd88ff37bb
+EBUILD python-2.7.12.ebuild 10471 SHA256 531ec8e7c17c6d0f469dad50564621e1b29f065d3a2a5d89b260b808c756af38 SHA512 918b38c70720a96d4e1e4ca3a95f801aa48b8431a729806dcbe4abf808eb58dd1653a384fa9d733f7e18f93edf07463b6efd672986b841fa0e96e292c5ee9a7c WHIRLPOOL 2d053a265aa5ba034bf9e71163f8b339878bc827b2264496800af5ce33cc686730f41392a00741ce6f30330706ddef7cb62b62030bccbe0880c8ad246cb12eb9
 EBUILD python-3.3.5-r3.ebuild 9431 SHA256 dacdd361abf8601fabadf87ef87f6980a52fda1607db4fb85e2566a4303964a6 SHA512 3274bd9c42821ad39aea1554947369d5ced8e5139251892e4c23015fa3e128a7e56d6f46b992ee4974b8a7e87244dd4bdcdb44fb846375a4ecf63fa74accccdc WHIRLPOOL d4acd03a6fac849fb492b59ca08d6b19fd07c76b17121cf5fdcfcc7d015b9d4c2fd5f8e0233ca027b1c4e57c4329ee6ac96fcd7422b68e9553605801202493b9
 EBUILD python-3.3.5-r8.ebuild 11078 SHA256 c9566543c4f3d958510a30c49f419afb66b8a34cbddfe70c201d5dff6cfcb006 SHA512 196bd4b6d0da5693e59cfb3f15c532474d9b296f4cc4372483013440baafd2ff1fd7a79aa07c5104821c5c543d63ec933b3f98db15d0ce991ef53363e1f7d52d WHIRLPOOL 14bbaa5ab851783963f68b52bb4d9c5d5be2f09dff5e5bb989c1e69cf9f4dd53c01af95467118de1d4137063b1ba4bc847515adfd17a01577ac29098f7cbc30a
-EBUILD python-3.4.3-r1.ebuild 9271 SHA256 d2a75ac1067b78f4f8bbaaa3bcf6698f51bce97f056a385b18eece5a1532fdea SHA512 8dbdcfaeb21dfbb7db8cc4d99883f5df2b381c6c70a533e68abe48d58334243f51b9fc587d0693b69c4d0511674b5e7d54fe161ac036906c2d873c929327551e WHIRLPOOL dd958a401f909bd4b8814efae15f842ff11fa10faa2aee9dd408349197066df9e85579ad9ee1ba3e20ea220f5e74dc95c8b307d7502005d195e9c51d7ce91422
-EBUILD python-3.4.5.ebuild 10513 SHA256 e4704ef398bfb6e400c6f13d2a344bcce26b17fc1162c77fe68b6342d6b65faa SHA512 dc0cbbbb7218c37b98de31f6d77adecb3b8dad180bbab8a0b4d9ba49d5874fa7fd5a6f70e413d8612c1583839b5966dde6ad51c3b2d1d744418bdd6c70dad9d1 WHIRLPOOL a756f798b7258b6c62eecf2e4b1a47459d2bb4e3dfbdfff1ffe3d818c0e9c00dfa04699d0880212646a1c5dbde27c994103d410c36733d6cd4b12a7ee7eaa969
-EBUILD python-3.5.2.ebuild 10623 SHA256 88e2f76594b62d1b7744999a488ad0759d6b68acad8b7be67d48cd3e01dbd8eb SHA512 8a782befac495b2a0cbbb5c4fb9bb339c42912e80c8e2fe3444ac2f8c11ce63d8b7f960beefe4bb2bb45450b82bda0ce3776d77771991582361ff1f52f48242d WHIRLPOOL d3661416e9ea3acba86417f7e0f6c43bf18b9eaa31af9e06a0c1982404760778179c73890ddc943e39b879c68f968547af94e177d45ebf87f1f7e81687a2297c
-MISC ChangeLog 24376 SHA256 6a25c676bd3e565bb188d34461037c5d123b682a818f9516aaa9c71660cf4f65 SHA512 d8f1733121e35b3abc8de656551569b0310e117ba551eac277c548f3da706e368d770f1d7ac096bbdfc177fa9b66aa3e37f669671a1e17c19a7e2f86396f2d57 WHIRLPOOL 8be86ff4a35e01d6092cba0b731afb1d4eb9663815cace961b6eca5eb283989abd0275080f72b34e8db1f8e918a4faffd847a1684d490efe7c33e51a168b00ed
+EBUILD python-3.4.3-r1.ebuild 9269 SHA256 181b73d6fbab56ca77dca8f1f966cf70bfc04c645f783b0913d7974caffd5758 SHA512 91a43c9c11039f6bc7d916d1e38ed953843c70bc5180da4fc173ea454a4d962c784a412b2a6f91ffdb6c3814460740143483e411bf46333bd1e53d61eec48783 WHIRLPOOL a36af886f8800ae231364d5283fb8533b74f454f406cd22e54e5c154f4675c896acdb5cab53ec57aa6798e668e7d47372f705ef18291b029c15a9e6726dedfe0
+EBUILD python-3.4.5.ebuild 10511 SHA256 e3a57da4dbd493c5c02ced83894e42e987a3c9694fbdd3a191fcabdab8be6179 SHA512 5f99fba32f14eb248c1c3fdb5501e17fbde22907048393786740a48c8712a65d34edfb50d6bf16d86e265514879755298edd5f20d54565a5b5cce00b1913b520 WHIRLPOOL b65b779b5fbddbf68c92d4e7991d4269084baa5929b7ba68621f04a36bb00d394ea825d0b60418e2d916a5ecba35aa230e870bf097e8a35a0e09fd10a13b08b6
+EBUILD python-3.5.2.ebuild 10621 SHA256 aa9cfc02188bc3505cab1bc48fbeb1775f12002431cac70b60f7df4e8999bb0b SHA512 2d55613564238b30da7b25cba3fab72eeb548726f7b9e691eea7c19c1636990a2bec20ce1b7202dcd072fc4dac3f68c4995c681d8e0ee83b8baa9eb3a8a057e4 WHIRLPOOL 95983e4a2aae4cf1377329bebcf27f851abcb651993ea91bb4e9e2658bc447e27b1f2bac3b4680b478edc8459c806f40db3396e6a563fda0c4a5bf961f37b4ca
+MISC ChangeLog 24611 SHA256 cb071f5a42b7f06642304099875f28bfbc189ea6d795fae102d3174f0d554077 SHA512 354cf01090cddefe449ad80555e5bbefae8bae49eeeb1887f7ffa325477b45071df54251c9eeaaa7d8f2e3b3b92311c360547ad98a748497c8f25366759e3031 WHIRLPOOL 5e3e057492cbac3768c1b8ad9f80aa3decabf53d6bd9df989d20b25672d38797bd93cdda91fd0cb5562cc404008721cc52a1877b8aa7f5f689833e72afa190bc
 MISC ChangeLog-2011 100599 SHA256 23129cb47321b2a6b1cb9323f1815d0cd11d6f30c3893908ed51575c270a0cc8 SHA512 4181ba9d965139ba58218da5b960c87b7a611b27606a1ab1ce1b4c3c9255b4e0e2947307cbfffc531f0f8b6b545ee11e083fcb29dc7b2b7ba31c6bb40b8ab128 WHIRLPOOL 4ceebb6a6ed58b906d3a7331795748ac6e4fe2e1401bcccae9024a8e81e2c444aebc5fec610398cfe6002354ad3b10487484598da5091867874727f07e239c56
 MISC ChangeLog-2015 40926 SHA256 f5d1dfa6038a588334062ea3e00e9ef9647ef13c7d667a0288a0cec4958aaa85 SHA512 36477f494cfe71e85401b97f1bf5035ebe255e4995886b74a2d535c9d77ca287d324adf239a3213e3be010793835d88f3f513b869bbeee57feb3cb2737549530 WHIRLPOOL b80dc69c8fa4666dbeb71e13c801ed332fbb80141076dc31e1e5b91f34531727f9b2004bee04b2415ad709c77e0be23318e96f4a7219c05dec79f99c22ffc853
 MISC metadata.xml 738 SHA256 beed28468aa4bb66e15e519f9816d94ee0f6a2e9a9e058cda3e6b7f2574b8465 SHA512 f938683740658db5d8eb363bf0eb88a81aab75b7a9e4c5e33bca73722c3b1a8b879151bda58099d67c5596a7dd5d487f15b0f7327918e35ac997e15feaf89847 WHIRLPOOL 0dbb9ae204b4bf8451b35ab170cd9d339a4fcc29f36000220fb148dddcf7c2c1515d41cccd4b759bda3dc8b88545ce1e99f3abff77564905e7dc50131b987dcf
diff --git a/dev-lang/python/python-2.7.10-r1.ebuild b/dev-lang/python/python-2.7.10-r1.ebuild
index 180d7be..de85de7 100644
--- a/dev-lang/python/python-2.7.10-r1.ebuild
+++ b/dev-lang/python/python-2.7.10-r1.ebuild
@@ -146,10 +146,6 @@
 		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
 	fi
 
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	export LC_COLLATE=C
-
 	if [[ "$(gcc-major-version)" -ge 4 ]]; then
 		append-flags -fwrapv
 	fi
diff --git a/dev-lang/python/python-2.7.12.ebuild b/dev-lang/python/python-2.7.12.ebuild
index 1066b16..0856ef2 100644
--- a/dev-lang/python/python-2.7.12.ebuild
+++ b/dev-lang/python/python-2.7.12.ebuild
@@ -144,10 +144,6 @@
 		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
 	fi
 
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	export LC_COLLATE=C
-
 	if [[ "$(gcc-major-version)" -ge 4 ]]; then
 		append-flags -fwrapv
 	fi
diff --git a/dev-lang/python/python-3.4.3-r1.ebuild b/dev-lang/python/python-3.4.3-r1.ebuild
index 67492b3..43e1369 100644
--- a/dev-lang/python/python-3.4.3-r1.ebuild
+++ b/dev-lang/python/python-3.4.3-r1.ebuild
@@ -115,10 +115,6 @@
 		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
 	fi
 
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	export LC_COLLATE=C
-
 	if [[ "$(gcc-major-version)" -ge 4 ]]; then
 		append-flags -fwrapv
 	fi
@@ -177,6 +173,10 @@
 }
 
 src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+
 	# Avoid invoking pgen for cross-compiles.
 	touch Include/graminit.h Python/graminit.c || die
 
diff --git a/dev-lang/python/python-3.4.5.ebuild b/dev-lang/python/python-3.4.5.ebuild
index 860da67..f5c7f7d 100644
--- a/dev-lang/python/python-3.4.5.ebuild
+++ b/dev-lang/python/python-3.4.5.ebuild
@@ -112,10 +112,6 @@
 		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
 	fi
 
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	export LC_COLLATE=C
-
 	if [[ "$(gcc-major-version)" -ge 4 ]]; then
 		append-flags -fwrapv
 	fi
@@ -173,6 +169,10 @@
 }
 
 src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+
 	# Avoid invoking pgen for cross-compiles.
 	touch Include/graminit.h Python/graminit.c || die
 
diff --git a/dev-lang/python/python-3.5.2.ebuild b/dev-lang/python/python-3.5.2.ebuild
index 4875c2d..0dfc350 100644
--- a/dev-lang/python/python-3.5.2.ebuild
+++ b/dev-lang/python/python-3.5.2.ebuild
@@ -111,10 +111,6 @@
 		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
 	fi
 
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	export LC_COLLATE=C
-
 	if [[ "$(gcc-major-version)" -ge 4 ]]; then
 		append-flags -fwrapv
 	fi
@@ -174,6 +170,10 @@
 }
 
 src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+
 	cd "${BUILD_DIR}" || die
 
 	emake CPPFLAGS= CFLAGS= LDFLAGS=
diff --git a/dev-libs/confuse/ChangeLog b/dev-libs/confuse/ChangeLog
index e42398b..a862be2 100644
--- a/dev-libs/confuse/ChangeLog
+++ b/dev-libs/confuse/ChangeLog
@@ -80,3 +80,10 @@
 
   Gentoo-Bug: 593804
 
+  24 Sep 2016; Agostino Sarubbo <ago@gentoo.org> confuse-3.0.ebuild:
+  amd64 stable wrt bug #593804
+
+  Package-Manager: portage-2.2.28
+  RepoMan-Options: --include-arches="amd64"
+  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
+
diff --git a/dev-libs/confuse/Manifest b/dev-libs/confuse/Manifest
index fcafb68..2937df8 100644
--- a/dev-libs/confuse/Manifest
+++ b/dev-libs/confuse/Manifest
@@ -3,7 +3,7 @@
 DIST confuse-3.0.tar.xz 449144 SHA256 bb75174e02aa8b44fa1a872a47beeea1f5fe715ab669694c97803eb6127cc861 SHA512 12279045b772e94d2e29201ab1d7aef1ef8e698780a22d6a282d12f51ccd9a437e7817a4dd5e39bdfc8dae79700b72aa0783b4b983a935d751403d2cffd1161e WHIRLPOOL fe9f792b9f0858029393a811da93746fb91dc6cc3c99bfcc3a183d7bc0f3600818b96df8d169c63e64a59cb0f3857a86298f0bfd4053c8360bcd2b6bd1e71156
 EBUILD confuse-2.7.ebuild 1017 SHA256 7475094853b50b9328dccb80a257c3d27dcb5b1c8962213aa982d3eadf125eb3 SHA512 820e4a1530e886dc529f52f9f6ec34609219b57f5b8f94f9dcfbc1d5404909913c7662c6d1421d3893ea45b014281fd6b5ced0475808228de25de94bf790e162 WHIRLPOOL 93127a7d20b302b1d2afd75887a85e13101f70f77da04b269a769ee01f9cb4eea50306c9a178fd80437d84d8c9350a8c9b443cbcc24fba80b78bd8dd01d42887
 EBUILD confuse-2.8.ebuild 1204 SHA256 0c81478f20769aa58e1ba1cf3e2905e6faa95b608fa4013d084d44214246adc6 SHA512 a4a3cf8b8dbd45a12e4922dfee9d82d3dd5bc686fcd1e86ce6364006b975b50fe0dd52d3b9225cdf7a7d6cc504cda279ad604433b3fd152a1253510643adc2e7 WHIRLPOOL b2defa774d6011ac88bb90263cfdb256fe06b3238c53c31e0ed090e9d2cba6f96e25865f305c714646c2f4abd638a2ac02d1a178eeb4c5ccc86dfb85e3f4d146
-EBUILD confuse-3.0.ebuild 1181 SHA256 73b9ec815a8528225d6ed4ddfe3ee1edebe2c611340d51f180b8782a193cd3a0 SHA512 1fa94af533bb828fce040a799b4e397889bd375c187ccdc6cfa62d291fe173b45bf607d67b6d36dd096b7259e98c3dd9f3451c4bef159d6ca38713a5ce7207c5 WHIRLPOOL 3899030a7fe5cee3c1d5ccbcb1546cf2fd9f35ee125a061fd364c01a41ad1bc5c6ff69c2cc82cba59ffff13b3a42f35cf1fd5a30d16f23cbca99274dc8f296f4
-MISC ChangeLog 2660 SHA256 b383056ef6236a010c41e0af1f656c860d2cc4f0f0b459a40c61e1f0c023c685 SHA512 321a642bb6520cdcd72e7eb3e2ac19213ec487f019e47b817873650ab45906670f6f2f4c1a4c113c6c299fc5e27fdd2098c970c418f4aaca013718757e2c2dad WHIRLPOOL 6dae615f6f0c437500c0e0b642dc9148802e1e010e8be4be15148ee67eb28f78b3e4215301a327fb46856d17662c9cd04c2b3bf739437601826147baee2dfab6
+EBUILD confuse-3.0.ebuild 1180 SHA256 3cad2d71b05f8355cb4e8c5e433660ad8ed00fc92b646ef1f005c3cf54ac5c59 SHA512 91d13d7b0cef4b1b30c7f2ee7e0fb7d3d7685992d904893e7731e600b0404f11995260c2f953acbb2b6d10aa02307fe1da158568b9ac0212bd82f88bfe892b42 WHIRLPOOL 490c16903a21f182819acd8e15332f2cc93d64abf820d9c154c19a0298b338c6ad8637a25d0687a7f1dcc64e923fcdf3499026303e71d5557ad23732f7abafa5
+MISC ChangeLog 2891 SHA256 1ee66efdad2a0a1ae08cc535c31f3ac40c2ff313f3224cd4d8d3988f6597acf0 SHA512 ac26a0ecb12a7f63e903d385727cd410348d56fb354b99fed1e361e5c6ebd43104ffd3f0573e50c6487244e29443434cf54c6845a8aff7a11ce5eeff948efc1e WHIRLPOOL 4ed694db7243b8fca5d2903c428fa0e210028a3ac2c3ef3f49678fa991b19fea2eead94556a4ad3c0deca9eeb50e710557849266af1071fc95d38a8988993e48
 MISC ChangeLog-2015 6775 SHA256 941579df4145ee3db54980905eba6087cb6f34b929c37f36e91fdf498a92e445 SHA512 c8936a44771fbd0a425257a4bc0b579b630fa870cbd4633dc74d5f532e6ad20b56a7dc94f49810407df14ae0ac26f6c92debce0be02adab75a76416ae733b45a WHIRLPOOL 1675feddf111bef96a1c4abd35e4c570fe14fbf1341f1f00db5cf0cc0eaaa80b15e75df6a00702420918b6f2bf7921b2976c6b4931f77d2c35bbf2d075754e63
 MISC metadata.xml 247 SHA256 fb925313d1ae70feaa6db91150f34a2157b48e884e8f47d773640af149e3744b SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a WHIRLPOOL 142b4295733faec48b0ca9eb6d3561799ff743481aabf2b74ecf6d717d972b4961979c7b6bf32b9840cb34e47d22fe2befb9b0ef8ec0d3f28f6416069128d3c7
diff --git a/dev-libs/confuse/confuse-3.0.ebuild b/dev-libs/confuse/confuse-3.0.ebuild
index 6eb3afe..8c54e9f 100644
--- a/dev-libs/confuse/confuse-3.0.ebuild
+++ b/dev-libs/confuse/confuse-3.0.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="ISC"
 SLOT="0/1.0.0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="nls static-libs"
 
diff --git a/dev-libs/libksba/ChangeLog b/dev-libs/libksba/ChangeLog
index 208a16a..425fff7 100644
--- a/dev-libs/libksba/ChangeLog
+++ b/dev-libs/libksba/ChangeLog
@@ -161,3 +161,9 @@
   Bug: 593748
   Package-Manager: portage-2.2.28
 
+  24 Sep 2016; Markus Meier <maekke@gentoo.org> libksba-1.3.5.ebuild:
+  arm stable, bug #592078
+
+  Package-Manager: portage-2.3.0
+  RepoMan-Options: --include-arches="arm"
+
diff --git a/dev-libs/libksba/Manifest b/dev-libs/libksba/Manifest
index 0a3850b..2d1593f 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -4,7 +4,7 @@
 EBUILD libksba-1.3.3.ebuild 765 SHA256 1c92d175ac939adbd62b629548721b8565d4ad9bf2ac5429570c7d8e1b78b592 SHA512 63e5fe361df113ee8d671a062b94221d5c904d110db366dbe11c81e79c0f344a8189d7d9950ab24bce0246af63010ebb43d1930c1e368721387a5f5df75e5f92 WHIRLPOOL d1cafbf6037208de458041fbf07fc68cf3777502fade0f58f8de161785f7835ce4e6ceadbafdd2d1063ffac196240d320191d20bc9bb8721178d60d0aa82a3ab
 EBUILD libksba-1.3.4.ebuild 656 SHA256 d652c5ca77c49e353a69b3483dcebd851ad426f67747327a8679933948c7b8a9 SHA512 8fc655ba0b031b85144690a3d5a002be2fc085293e1ef0ee57ef565aa476b16aacb320c02311f4739db22387a064c1d93c13e86e86b46c4bc47b0ff48873417e WHIRLPOOL 939d4025f45a44e0b965c7022a1225e012c01132ee992c1f005a9f906e47a1683550b1d5a8539f58d95f068d3182c5fadf25826ee282a44288d9dadd3821c46e
 EBUILD libksba-1.3.5-r1.ebuild 845 SHA256 e589026ad84d22a27fde743f27e9d3e6ee55a68df8da215b73e36b881b70093b SHA512 ba60d6bff7b95e3c2940e089837c02ac6e2468b5b8d43ef8fba65cb079501948d21c99782785a4fa1afea32299f6100a815a0afbb05f50351a1fe80b26aabad7 WHIRLPOOL b89f8aff4dc8c113df152893ae83326730adaff6258265ab10d8a379b9cb6ef1a70b0e8d3a7190d37cc6e85408ba50d7bb5e65248cf65f182e7585452678b175
-EBUILD libksba-1.3.5.ebuild 660 SHA256 7b267fb802e8b5e0234f800f9a19df468009dedd2a24129a9d5acda8924d0405 SHA512 7abd18b770756b3890b8687ad062f9d635b16d2d2f860ac4c0b5c47e5664e85d12713e92f5651dccbe6e58184f1294e572b3a40970b0e24308dab08a293e8a0f WHIRLPOOL 06063e2d2472e491566876e8012ea3f01f7517bda538b21cd17c82a58be31bdea70b49fff2d6209bd73c838de2edbc3e8e259f9ff63944f88939f530a6575d95
-MISC ChangeLog 5201 SHA256 785ba09f65f73d18f99140b83f5cefd5ba6e830b54b9055a4964b354ec2f167b SHA512 b016765d8ab9793f96c260744d67b8a1b4aeb69d85e6fba1b47e3cf281bfb7d95a57c3067e2546f01c4b486d449d20605521744018929e53782235f081b67d19 WHIRLPOOL 70887e7cb250567121da9160bb23000ad90087af183c8a854c2ddbede41079043b9e5d743c41375db4145c1dbc96f8aa449a9983470b923eab4c7928ef426705
+EBUILD libksba-1.3.5.ebuild 659 SHA256 bd5746dd20e9864485e0b7a045af9612354061508ed11983e715699bebc2221f SHA512 148b4fa9b46b95590e6811e878d8dd4bbc8f823df3281c588c9fcc076d137fc17ce55dd1981bc90fd2d0593f69593b4c26ff78f688a7d4be9e61988e19a46611 WHIRLPOOL 3da26922804d9c70dd6061ce8b57ab3c22231265b2a5ac8bcc657d73ec3492ca6bd004d81e1cd29ecfe9a95aa2083e81b942176d961406b211f87595db201813
+MISC ChangeLog 5374 SHA256 e45264bcc097453277ba71b607dfdea23a44ae9a993edda7624f8da23288d3e7 SHA512 0e149d7df0a2f6f282ea64d7cf759fe4e99df4a4bb7d430d6e4c7a1391689e1fc09e31b51469d2c02ff8676733ce98ec6b2cb73b7c21b1e758fc82c61d848e7e WHIRLPOOL 3b71f57d21b84fd16defa99e81047393d26110d15f180356da2aa101624e63681c2ca0d65293bf03a9e25f2716d50204fa0a5cadd732cb5dcf1b0a839cf2e036
 MISC ChangeLog-2015 20384 SHA256 58b60c0d0199c25bd54e9a5c912ece368d6d2eafe713b8d6b067746013a8f239 SHA512 61e2a951a0cbe6d6084df7face8ff7378ac712c078557183feb94ee75ba6e573973f7aac398212a27dad28cc3bca1b55b96e313b75b2b9b4f381812adcd088a7 WHIRLPOOL 44fad28a6c657f145a1411431a0d4da0db43a9bf068d37554e9f5b995f916a9486db6d06a86da8772f7e7c637a570fb06132272a7c9b66e11479e4193d988e42
 MISC metadata.xml 236 SHA256 dd25b46c95b0c63da84b7ff5778479e31449a385df066e9ee14bf0d7d176f42f SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08 WHIRLPOOL b15a2dfb001c41c8de2895842148b2531b74949e89e93ff8c366519c35792996e344918eaf9144fb081fc240796e47890be356d2339bea60b1e1d41830447d31
diff --git a/dev-libs/libksba/libksba-1.3.5.ebuild b/dev-libs/libksba/libksba-1.3.5.ebuild
index ae18c24..b7774d6 100644
--- a/dev-libs/libksba/libksba-1.3.5.ebuild
+++ b/dev-libs/libksba/libksba-1.3.5.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="LGPL-3+ GPL-2+ GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libtasn1/Manifest b/dev-libs/libtasn1/Manifest
index 1e743ea..9e13411 100644
--- a/dev-libs/libtasn1/Manifest
+++ b/dev-libs/libtasn1/Manifest
@@ -4,7 +4,7 @@
 DIST libtasn1-4.9.tar.gz 1864709 SHA256 4f6f7a8fd691ac2b8307c8ca365bad711db607d4ad5966f6938a9d2ecd65c920 SHA512 1fb2c5eb89f3e9abd8f7433342619e3d89576ed15a783b8152ed9da0383342f80e750c570733ac266bc8a3c4b23e5e2a57e3735b2341d507e7d88ac366a8d6e7 WHIRLPOOL 509afea66788b5f0d2aa944cbf07b48f122c1f2f1e6bd9278fce2a0e195397453e5203b2b4ab519520ea0e3614664f2af0cc2f046f2b91252d156e8058e1952c
 EBUILD libtasn1-4.5.ebuild 1089 SHA256 5e2646f5b9da432e4387d5a90f7cea594962eed9e51d70a569c2229e0e24d31d SHA512 976a133615f666e93d83ca02f7707140c5ae479536cc620195161833e72d9f80609da5f634315b52e925409d5bea041689ed77ace48323abedb588e54bcb710c WHIRLPOOL dc4b1d737f66ecb21edcc55c7e8a9eb8a9f64177d6ac5fef428e3f67b0c6f9c0ccb8351fc909fa79c4646363e9023ee666645bf04ff64fb5f15fb6114a1290b2
 EBUILD libtasn1-4.8.ebuild 1104 SHA256 659f5be57d899e6a7ec9c79e8f9709a4375a5d1fc70e43b093f8f64c5f55e0c3 SHA512 b7696447bf90abae699639620d43c3fb33e689e233c3e23cd0f287fa7bc7339e5722d1669659453e4af9ac2d0b4a8a52c48af9fb249f41f1b2426da8882efb08 WHIRLPOOL 5de5ffb5a2a79e2babeda962be9c1cf34a5f0037be8feb142911956a3b39617d79f2d35e7a0dfe39fd4128350b7721cac6a8585d03bedbb971711338c5191a4c
-EBUILD libtasn1-4.9.ebuild 1156 SHA256 966e0af177056b49a22797bee2b1e10545a2212ebff98ee09af00426352cef56 SHA512 e3b0a01ace014f95d71ca681a4e544d3789c8f092c6a7d50dd4fc13f0684e5fccf880f50810674f587c77d730e4d399a53bde2f371b290af59cf629111dd2964 WHIRLPOOL cc61730199ca5f716ed593c0046fa21d46403d8c3cacc01d41adfb9a9c3181bf1f97c7f615bdaf7612739d5bdc8ec243e31ffa1bb189e350b1eca13f83bedc24
+EBUILD libtasn1-4.9-r1.ebuild 1188 SHA256 40fd67df453762c5c7e3a930b01088ae217032000633507885778d0760fb836e SHA512 e10fdc36b0166b4354aca13084f9fb6f70cfbdf012a1c0f0048051d745dcf66d36fca6a969f8d1016310bbad26701146f85693141bb20b5f0c2699da05b8dd00 WHIRLPOOL 68f30d80c599ea6953e277b81e5c2294d3ee3b3bf868702f28d364bf59142278edd2dca9c99ebe3d56b86140078c77cbf16246ef428ccf02a41783d27584d95d
 MISC ChangeLog 4863 SHA256 03159ef748c55c1546f971d13b59913d8762bdebf5acb2910671de7136ea7340 SHA512 176e023acfa209061578c89adf11371d942ac354ebb33499280a334834cafde55b17211e2329f30c8e2674ade9ade0396c5b96c9fe8b79e6d25c4b2a4a52498c WHIRLPOOL 7e24da934142b719884d24ba48c92d95a0a4f94baa471f22999608e9ac2160e6cbe33415a19815e4b59287a3f8b38c80d0ce731b10dd3d3ee7ebd1c20f4ab106
 MISC ChangeLog-2015 29688 SHA256 8f9a731b7eda2c9321d3934d944889d3c08fa2afe2bc0735c76fa894fb24d04e SHA512 d891912b5eabdc1ada0db858b0f6e5daa3c3d90b95bf9cbe3abf36931484f0305abb81d2c3c5448b82a57d6625cfec1eb874a2992f9a5fdf3ddcbe561ad4ed0e WHIRLPOOL bb760059ca2af1f3e11e5025023c3d0a64b8c2f6655060cf4ab38299235610910ffafbf03a536432abdf0df9e449aaeab971494738e353d9a6f6a9b7c24b0664
 MISC metadata.xml 240 SHA256 d1d2aa7abc46b180b2494a0cbb393768f12073097a3ddf9d118cb9e2cead8317 SHA512 e94cdc08f1a8aafc0ec72615a476ed63dbacd22b48413a938f5bfbe9c2bda2cab2347465df3035b53031e0a4f935b47d22fad8c89a67e5780a5370ec9564d99d WHIRLPOOL aad153df696809789d129412e71fd5eca91f7b230c22a10c70baa6f79e3ab57cf8890540fead3d9587f76b4396a7089921b207165fe0505917ad76b5cf86af90
diff --git a/dev-libs/libtasn1/libtasn1-4.9.ebuild b/dev-libs/libtasn1/libtasn1-4.9-r1.ebuild
similarity index 85%
rename from dev-libs/libtasn1/libtasn1-4.9.ebuild
rename to dev-libs/libtasn1/libtasn1-4.9-r1.ebuild
index e227f89..eb4054f 100644
--- a/dev-libs/libtasn1/libtasn1-4.9.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.9-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-inherit multilib-minimal
+inherit autotools multilib-minimal
 
 DESCRIPTION="ASN.1 library"
 HOMEPAGE="https://www.gnu.org/software/libtasn1/"
@@ -29,16 +29,20 @@
 )
 DOCS=( AUTHORS ChangeLog NEWS README THANKS )
 
+pkg_setup() {
+	if use doc; then
+		DOCS+=( doc/libtasn1.pdf )
+		HTML_DOCS=( doc/reference/html/. )
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
 multilib_src_configure() {
 	local myeconfargs
 	[[ "${VALGRIND_TESTS}" == "0" ]] && myeconfargs+=( --disable-valgrind-tests )
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
-
-multilib_src_install_all() {
-	einstalldocs
-	if use doc ; then
-		dodoc doc/libtasn1.pdf
-		dohtml doc/reference/html/*
-	fi
-}
diff --git a/dev-perl/Lab-Measurement/ChangeLog b/dev-perl/Lab-Measurement/ChangeLog
index fb02e67..b96640d 100644
--- a/dev-perl/Lab-Measurement/ChangeLog
+++ b/dev-perl/Lab-Measurement/ChangeLog
@@ -104,3 +104,17 @@
 
   Package-Manager: portage-2.3.0
 
+*Lab-Measurement-3.520.0 (24 Sep 2016)
+
+  24 Sep 2016; Andreas K. Hüttel <dilfridge@gentoo.org>
+  +Lab-Measurement-3.520.0.ebuild, Lab-Measurement-9999.ebuild:
+  Version bump
+
+  Package-Manager: portage-2.3.0
+
+  24 Sep 2016; Andreas K. Hüttel <dilfridge@gentoo.org>
+  Lab-Measurement-9999.ebuild:
+  Update dependencies in live ebuild
+
+  Package-Manager: portage-2.3.0
+
diff --git a/dev-perl/Lab-Measurement/Lab-Measurement-3.520.0.ebuild b/dev-perl/Lab-Measurement/Lab-Measurement-3.520.0.ebuild
new file mode 100644
index 0000000..dcd0868
--- /dev/null
+++ b/dev-perl/Lab-Measurement/Lab-Measurement-3.520.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+if [[ "${PV}" != "9999" ]]; then
+	DIST_VERSION=3.520
+	DIST_AUTHOR="AKHUETTEL"
+	KEYWORDS="~amd64 ~x86"
+	inherit perl-module
+else
+	EGIT_REPO_URI="https://github.com/lab-measurement/lab-measurement.git"
+	EGIT_BRANCH="master"
+	S=${WORKDIR}/${P}/Measurement
+	inherit perl-module git-r3
+fi
+
+DESCRIPTION="Measurement control and automation with Perl"
+HOMEPAGE="http://www.labmeasurement.de/"
+
+SLOT="0"
+IUSE="+xpression"
+
+RDEPEND="
+	dev-perl/Class-ISA
+	>=dev-perl/Class-Method-Modifiers-2.110.0
+	>=dev-perl/Clone-0.310.0
+	virtual/perl-Data-Dumper
+	virtual/perl-Encode
+	>=dev-perl/Exception-Class-1
+	dev-perl/Hook-LexWrap
+	dev-perl/List-MoreUtils
+	>=dev-perl/Role-Tiny-1.3.4
+	dev-perl/Term-ANSIScreen
+	>=dev-perl/TermReadKey-2.320.0
+	dev-perl/TeX-Encode
+	virtual/perl-Time-HiRes
+	>=dev-perl/Try-Tiny-0.220.0
+	dev-perl/XML-DOM
+	dev-perl/XML-Generator
+	dev-perl/XML-Twig
+	dev-perl/YAML
+	>=dev-perl/YAML-LibYAML-0.410.0
+	sci-visualization/gnuplot
+	!dev-perl/Lab-Instrument
+	!dev-perl/Lab-Tools
+	xpression? (
+		dev-perl/Wx
+	)
+"
+DEPEND="
+	${RDEPEND}
+	dev-perl/Module-Build
+"
+
+pkg_postinst() {
+	if ( ! has_version sci-libs/linuxgpib ) && ( ! has_version dev-perl/Lab-VISA ) ; then
+		elog "You may want to install one or more backend driver modules. Supported are"
+		elog "    sci-libs/linuxgpib    Open-source GPIB hardware driver"
+		elog "    dev-perl/Lab-VISA     Bindings for the NI proprietary VISA driver"
+		elog "                          stack (dilfridge overlay)"
+	fi
+}
diff --git a/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild b/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild
index d3cc7b0..ac910c1 100644
--- a/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild
+++ b/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild
@@ -12,32 +12,39 @@
 else
 	EGIT_REPO_URI="https://github.com/lab-measurement/lab-measurement.git"
 	EGIT_BRANCH="master"
-	S=${WORKDIR}/${P}/Measurement
 	inherit perl-module git-r3
+	S=${WORKDIR}/${P}/Measurement
 fi
 
 DESCRIPTION="Measurement control and automation with Perl"
 HOMEPAGE="http://www.labmeasurement.de/"
 
 SLOT="0"
-IUSE="+xpression"
+IUSE="test +xpression"
 
 RDEPEND="
 	dev-perl/Class-ISA
+	>=dev-perl/Class-Method-Modifiers-2.110.0
 	>=dev-perl/Clone-0.310.0
 	virtual/perl-Data-Dumper
 	virtual/perl-Encode
 	>=dev-perl/Exception-Class-1
 	dev-perl/Hook-LexWrap
 	dev-perl/List-MoreUtils
+	>=dev-perl/Moose-2.121.300
+	>=dev-perl/MooseX-Params-Validate-0.180.0
+	>=dev-perl/namespace-autoclean-0.200.0
+	>=dev-perl/Role-Tiny-1.3.4
 	dev-perl/Term-ANSIScreen
-	dev-perl/TermReadKey
+	>=dev-perl/TermReadKey-2.320.0
 	dev-perl/TeX-Encode
 	virtual/perl-Time-HiRes
+	>=dev-perl/Try-Tiny-0.220.0
 	dev-perl/XML-DOM
 	dev-perl/XML-Generator
 	dev-perl/XML-Twig
 	dev-perl/YAML
+	>=dev-perl/YAML-LibYAML-0.410.0
 	sci-visualization/gnuplot
 	!dev-perl/Lab-Instrument
 	!dev-perl/Lab-Tools
@@ -48,6 +55,7 @@
 DEPEND="
 	${RDEPEND}
 	dev-perl/Module-Build
+	test? ( dev-perl/Test-Files )
 "
 
 pkg_postinst() {
diff --git a/dev-perl/Lab-Measurement/Manifest b/dev-perl/Lab-Measurement/Manifest
index d61f357..7d6b340 100644
--- a/dev-perl/Lab-Measurement/Manifest
+++ b/dev-perl/Lab-Measurement/Manifest
@@ -1,10 +1,12 @@
 DIST Lab-Measurement-3.41.tar.gz 381680 SHA256 38044abae96872bd1717cd9ad38dbb5075dbe458c72349ebfbeae1380d0f1c7f SHA512 21de97972cdc463762d6da83ba15b9407621c3416c19e86ca25ddd05592133811e81950350ecfd0e571dc1e6c8ba3df1ff4daf88d6537af69e5ab5e611820171 WHIRLPOOL bea1c57b5968397b1325068577d12c148933007a434272571e5bfd5ec14ebc6f7cccad78f06db261dc0bebfd41c8a74271a27d6bfa639891809e7225ffdb48c6
 DIST Lab-Measurement-3.500.tar.gz 415063 SHA256 415041099b8d846c2366d9f86fa23ea5f3231b0595e1fd89fb9e8ff24c133909 SHA512 c75bfd3dd5b3105603777005846b34cfab5fea9a1ecd88f54704c3b5e89011c145dbab8eb7778494884d687a8c1d56c8c09add5af9c7a39e499b33646dc7e5c6 WHIRLPOOL 1cf460ebe9d1d7c2918fa469af5269a63f3c3e01be641e7bf6f9b184b4ee933c63b04934ffbbacc9e2f047793bd392265fa7227f18a2b945b8522194e5601510
 DIST Lab-Measurement-3.514.tar.gz 385535 SHA256 26458d4f05dbde7cc8cecf3f3472ec1fc31255c4ef47119d99ae97ee0c93f8fd SHA512 2eb48a2938958ed86b8c86b0bc6b510a1e84844d46195b7e86d2ff25ca297da3539a3bb5eef6440bc7ce059c9c633bb015a9cad04170d01f93bc01f6977ec257 WHIRLPOOL aad358dfd2df637679a98c1edf19dea5131764c643f0eaccc6f285dac9fb3fbf45cfd5011f0de2d70108338eee70aa8771defd110207c061b147341161b31f22
+DIST Lab-Measurement-3.520.tar.gz 449506 SHA256 3fca8c0cd7cdfb57bd390e06603e493d4ec86a35d2388448ecc17aa1c2c43c7b SHA512 9c439842ac958d62214e4116b285a02f879519ef543429a06453d309f895e75c869acc8d31ce10697e4077af1c25adf8b6cbba7849f03b2523d4e77733591e9f WHIRLPOOL 81f5cd59a649adc5521afea35522cdd97ca40b6927b95d8a96140dcc88ec0ad5f731bc71d35b0de91d3b0075ce5b67020af69ce7902beb5186bca3beb5f811e4
 EBUILD Lab-Measurement-3.410.0.ebuild 1650 SHA256 464821b269a7197eb2e3ef18bf3a15f782ca8cfee20421c122f6878704b52222 SHA512 a16fee6c65d2689ae7043d081f47467aee1c0d1d21cc9378c778b30ff65544708f21102dc4807b2a29db8b87fa4c1299f60bf8ffe4de9336d41eaac1ba672406 WHIRLPOOL 60b3246886b1d2f68ebf3edb240ec5c2302dc41155b0859f81f23632008a61d390733a3786b6bb85c72d6f2e21518b9cc5ed789ca065fbf4c4965ae2acdfc322
 EBUILD Lab-Measurement-3.500.0.ebuild 1533 SHA256 befa4df8baaed87c64d93a573e59d2d004bfea33793b063aa61cc55bd2c8eac5 SHA512 c12e1be2141b7b2b14062d8e0903f67c08cd734226d0c93a727c1fcefbadb1c18272d2d6c517ce13558d0142b9d12263f1d058c7863b67852e4806838f39bebc WHIRLPOOL cac6a115a4d2845f46f27a308195aa77da4e18e673fba2d4c069ca847ca152d7471977024e03234461af2e06239948bd9678c086fe59b3baed72d184dea44590
 EBUILD Lab-Measurement-3.514.0.ebuild 1443 SHA256 fb56086e5bef884420a0f512a27475d0ceb47934cd938e4e293c715c9fb25e64 SHA512 8931dad0b768d1701668a5c8e2929fc44d40a467b66d2cc8f548aad0927b07b94e03bc34bf5162b5c9378520f2f6dcc595be39504a55fbda917e2faf46c8e254 WHIRLPOOL 5de44f8907dd9e8cecb3357c59471e442c81e0cc504e0f36f3a5bae032d4240dbe2a6bbf18ac8666880a105c3967a347d5ba23710f4d2c4e3d12c76089f92a7d
-EBUILD Lab-Measurement-9999.ebuild 1459 SHA256 99036636b56757ae3888f7b000d226be08885b6b2622c0d5c239fac63477783b SHA512 9af23118eda8b0d40c82c24ef9f77874ab69298a81b8114b2917c9f573a36cf867c2c3fc42a7854d2fbee5690962bce268cdd6e18bcf94102f76347a3977fe2f WHIRLPOOL b132b8da57fc17117880ea0db97996fac2399c8bd7f50a025670ce7ac023fb64e3cbc2b8eaba99dc579fe46a32778fc46330576e7b8c2fcb1800a0e4907acabc
-MISC ChangeLog 3758 SHA256 036fdd40ee9d491ab6c555448ecadcf4428bf33b2d82ce2064b33ebe2dad5abb SHA512 d3d0b47965989efec3bccd39b432f9cb46f6ec460c66546f244512395135a78776c464fc0d9f116f0279b044a71fa733da3fed682d3a462fa93820899e1c76b7 WHIRLPOOL 37c3621a7690451f6671d890ac7a435f62962e83b21dd48db63e90db8d4c1afa71c95ad4af820555b7aebfe8f6de91112bd1933defc1d6393f582a44df20dd4a
+EBUILD Lab-Measurement-3.520.0.ebuild 1586 SHA256 5ae00c786cf642be0fa82bfd66263bf9ee040889752c5cefeb0b9dd4cf7e0482 SHA512 450d0d156569c2a35db8120fae7b8e260a78bdd4c614693eb2e6bf801b70579a6d65514c58685999f4e86e58d8a5d2f6162b9cd6a2d8c9f7076af7de61dba1ae WHIRLPOOL b76ecb1b1d5653c701933c6b6812ab6df8fa76c192238365a808084b1b012748e04ce67f405e78c27d5a7cf5042bf274ed92457d277151fe3132a5ca886013ff
+EBUILD Lab-Measurement-9999.ebuild 1749 SHA256 b30cb529f046f46826fc539c905311144e82db073e078b5b4bd3872cea83009a SHA512 2e38fe21ca8156a30960a24cbad5d964084b8d40b336106aedc86765317aa3ddf644c842bca119371d6f642a268af3a27799926988bda9655bdfbb5a9df405d4 WHIRLPOOL eee3db5d3a460fcd99150aba5cfd153bd8aaa630c2dedec550733adc942ec16a3a2fe9d501407bd003e06af09679245052b412c3e2f4c96f6140206b75d1c99f
+MISC ChangeLog 4129 SHA256 23a9b4e66a954dce38a1a6693481aa39f3879658a6a004d6ea3591f54a370cc6 SHA512 a48c3b99568e52ba5c8ae10662a2994d202b06cbf8c1beff229367fa786a8412f1f5d475e80c8d45a3b4bef8a92ebf4bd0d36fca215aa000cc874ae8df9379ff WHIRLPOOL 4f88c63088b7f0cff1551b00778af217b6232ccf5f7349956bb7e68bb013be0e0cda3f6d541856e37e2c484ccd910f59fb9243fed51ece811c30dadf003417ee
 MISC ChangeLog-2015 4747 SHA256 0929c319a2f8cfb21df21c4aa441e14bc6cce077204c75cf78dc087c4c2054fe SHA512 bdf08c7ee2e64fc9f75db62f0b0384c44a4d3a82f657fd07cd18ab82ffcfd3c5cbbbe9a94492dabd524ff5e92be317ce023f047c02e7a12175b3da8ebda41891 WHIRLPOOL 20e4d7c346b070730a007c7bc4cf1772180adbe62b75cd17eadcae279164e4fda81ef2c507ee8517635d1646a268ce4a4f0cd5f4aa6a8c3368906cd9e80ba93d
 MISC metadata.xml 3263 SHA256 2829dbd04b1e52b9587556af015769e6e20463fd45772564dedce6ef661b31e6 SHA512 9445d7ca0493e192d8d6ea6de3614609e7a69e93de8cbe6090a5e390d665eb00de44b92f7a4bbe8fd57cad9f47de2ecc0ead7b81811230f25223465604312bf5 WHIRLPOOL 04551d7f422e7e9718c156eab5e60c9a5f610d0de276b8e793723571fe5f9fd15bd93bc8e6dc99b551835d4150c1a68de11982be86fd9fde01b3d59398be833c
diff --git a/dev-perl/MooseX-Params-Validate/ChangeLog b/dev-perl/MooseX-Params-Validate/ChangeLog
new file mode 100644
index 0000000..ef2ace2
--- /dev/null
+++ b/dev-perl/MooseX-Params-Validate/ChangeLog
@@ -0,0 +1,12 @@
+# ChangeLog for dev-perl/MooseX-Params-Validate
+# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
+# (auto-generated from git log)
+
+*MooseX-Params-Validate-0.210.0 (24 Sep 2016)
+
+  24 Sep 2016; Andreas K. Hüttel <dilfridge@gentoo.org>
+  +MooseX-Params-Validate-0.210.0.ebuild, +metadata.xml:
+  New package, needed for dev-perl/Lab-Measurement
+
+  Package-Manager: portage-2.3.0
+
diff --git a/dev-perl/MooseX-Params-Validate/Manifest b/dev-perl/MooseX-Params-Validate/Manifest
new file mode 100644
index 0000000..ac5e61a
--- /dev/null
+++ b/dev-perl/MooseX-Params-Validate/Manifest
@@ -0,0 +1,4 @@
+DIST MooseX-Params-Validate-0.21.tar.gz 34300 SHA256 88295446aba999cbb8f998d7fb9a2701d6617394a51d6d724c774e6d9ff139d9 SHA512 73bca04f5368de3d5ac947b6002f8c0801c150fdf24f1d792772ffd36c85fe1095d694725de310cc465ab6e0794643ba372bbfd53595cc2a7f6f91d5df06377b WHIRLPOOL 15472c65eda004afba9d80b5cad177659c7f26cb791a5cc59a0f744a2138ad51acdd038cc2b1bed6441b035c655e67cd00f15926f208b480b615c7d9584b051a
+EBUILD MooseX-Params-Validate-0.210.0.ebuild 614 SHA256 6787cc0abbdba166301216596e281c8f3e629a5f346868b2b4b074abed053941 SHA512 448833ef223a723cb94ffe4ff3ff23f33741f22f0552b0aa807cd0e5d56a3c99d7d38a1df7c27ba82ef5c1dc10fe64d9ff4bca4e16fd13fac1643f8a5b46194c WHIRLPOOL 2d5a8f0cbcfcf551a80c4094d9a1b9cdd4ad2b6054e89ea637f9a265bd8924ebdbb2c766ad9a8e84c726178dbc51c2eee0256d5b1ab96ba13b6b0e1730084e51
+MISC ChangeLog 398 SHA256 44f5be7e83222200613e2f5c84c05ef36504e1405b95da1da6e01946f16ae366 SHA512 575130d0cec55921ed8b2d96f8d698c6b286a9446c064f837c6da2aeb5a03de0f14733a29ac8b2ee607c5037c99b5245ff5e379282ab13b2db7cd65ace370589 WHIRLPOOL ec949ad41de5d55e755d313149172b1ef7d744d7a367630f70a3a4991a0a8c60ade77107bb1dbb9bbbcac21cacece0daf873782e8ad75beb7894fef90d114014
+MISC metadata.xml 293 SHA256 c7c4c21f3407547fdcba65d60cc98280b07d2665c94eabc0b71b72cdce3e44d7 SHA512 8fc4213021fd9558e5c2b69cc38f21df7abd313ed31c216a0b718d61004b45165e7898aa43b07c6243407dfc9e5c43d8110557b5fa2516b571d943ddb7d0b007 WHIRLPOOL 12a91c833ec2b5314baab88db19aafaa2d9f257b885c2e395e5c00facc58733869d220a49fe19a533c90a9276a237135dbe467e9c782ff03a0fb914d7224f979
diff --git a/dev-perl/MooseX-Params-Validate/MooseX-Params-Validate-0.210.0.ebuild b/dev-perl/MooseX-Params-Validate/MooseX-Params-Validate-0.210.0.ebuild
new file mode 100644
index 0000000..7448672
--- /dev/null
+++ b/dev-perl/MooseX-Params-Validate/MooseX-Params-Validate-0.210.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=DROLSKY
+DIST_VERSION=0.21
+inherit perl-module
+
+DESCRIPTION="An extension of Params::Validate using Moose types"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	dev-perl/Devel-Caller
+	>=dev-perl/Moose-2.120.0
+	>=dev-perl/Params-Validate-1.150.0
+	virtual/perl-Scalar-List-Utils
+	dev-perl/Sub-Exporter
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		dev-perl/Test-Fatal
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
diff --git a/dev-perl/MooseX-Params-Validate/metadata.xml b/dev-perl/MooseX-Params-Validate/metadata.xml
new file mode 100644
index 0000000..8ad3d95
--- /dev/null
+++ b/dev-perl/MooseX-Params-Validate/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+        <maintainer type="project">
+                <email>perl@gentoo.org</email>
+                <name>Gentoo Perl Project</name>
+        </maintainer>
+</pkgmetadata>
diff --git a/dev-perl/Test-Files/ChangeLog b/dev-perl/Test-Files/ChangeLog
new file mode 100644
index 0000000..6f8019f
--- /dev/null
+++ b/dev-perl/Test-Files/ChangeLog
@@ -0,0 +1,12 @@
+# ChangeLog for dev-perl/Test-Files
+# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
+# (auto-generated from git log)
+
+*Test-Files-0.140.0 (24 Sep 2016)
+
+  24 Sep 2016; Andreas K. Hüttel <dilfridge@gentoo.org>
+  +Test-Files-0.140.0.ebuild, +metadata.xml:
+  New package, needed for dev-perl/Lab-Measurement
+
+  Package-Manager: portage-2.3.0
+
diff --git a/dev-perl/Test-Files/Manifest b/dev-perl/Test-Files/Manifest
new file mode 100644
index 0000000..3b6476e
--- /dev/null
+++ b/dev-perl/Test-Files/Manifest
@@ -0,0 +1,4 @@
+DIST Test-Files-0.14.tar.gz 11520 SHA256 96ceabf035243048f591bfe135ed3f7619b63b25597a92658807dbffa21fc3fe SHA512 fe456e5e99f734ca356e0595f79e66e899e0a92e14ccf32a7deb04537789546e3b9f1fd091e2e50dffdee51d01ee9096ffc36f3a6792eaa8be85e6ec8ab25782 WHIRLPOOL 00a20b9449012c23599685386ca0ae5856155ef5d4c4ec82d013975e006a67d727db70d6a3814d4bd406c8f8312a297ab57532241958d22a309b77cf614009fb
+EBUILD Test-Files-0.140.0.ebuild 441 SHA256 19e5d5ff0a95fcf83186b8be13ceaac2c15df225b59e09b5b747f0c3b3107ef6 SHA512 788b18d0f56f13389511e6afca6483b4f80157f047ad7bd3514e959040f6daa05b8787d4f9c734f289fab24e14375623f8edbea77e04d34b29dde5f82a8e1d7e WHIRLPOOL 3c479f626dd2cbe8970b9f729394734bf1645b2aba0dfb51baed297e594b9bd67a7ce2cccea46773e67ccc879ea84b58c1b76fea6eb94af411172b267f97c501
+MISC ChangeLog 362 SHA256 eddf3511f013b4ead4a05e2a0ff432173994f19825434b505d87081794682cc3 SHA512 4c6216168c4964085145a70b3984c3d99174d3997a24567221bdab87d09fd6634fbc42719834664f740318027787295b66eecfc609a432da3b7bd1900287ab1b WHIRLPOOL 1180a30269b6d4fae8760a8c590f9b521905e0b37780dd696bdd0c2a80e21b0845609ce94d5d2a7f5ec27929932e344e9012dbad21711e79d017e0e37703ece8
+MISC metadata.xml 257 SHA256 4d43e70b770d0898a99af64a8454a6116e4a86500c23290655c8371265010427 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e WHIRLPOOL 87039765046556cdc2f7d76ce4192945117bfd5bb684220ea8fb72be310673a5b729ea428666ff1ceb1e6c21fb585a3a7dd72bd94dab89cf076a895e6a7677f0
diff --git a/dev-perl/Test-Files/Test-Files-0.140.0.ebuild b/dev-perl/Test-Files/Test-Files-0.140.0.ebuild
new file mode 100644
index 0000000..a77198d
--- /dev/null
+++ b/dev-perl/Test-Files/Test-Files-0.140.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=PHILCROW
+DIST_VERSION=0.14
+inherit perl-module
+
+DESCRIPTION="A Test::Builder based module to ease testing with files and dirs"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-perl/Algorithm-Diff
+	virtual/perl-Test-Simple
+	dev-perl/Text-Diff
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Test-Files/metadata.xml b/dev-perl/Test-Files/metadata.xml
new file mode 100644
index 0000000..2b9a936
--- /dev/null
+++ b/dev-perl/Test-Files/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-perl/XML-DOM/ChangeLog b/dev-perl/XML-DOM/ChangeLog
index e8dd0eb..aab1e96 100644
--- a/dev-perl/XML-DOM/ChangeLog
+++ b/dev-perl/XML-DOM/ChangeLog
@@ -78,3 +78,11 @@
   RepoMan-Options: --include-arches="alpha amd64 amd64-fbsd arm arm64 hppa
   ia64 m68k mips nios2 ppc ppc64 riscv s390 sh sparc sparc-fbsd x86 x86-fbsd"
 
+*XML-DOM-1.460.0 (24 Sep 2016)
+
+  24 Sep 2016; Andreas K. Hüttel <dilfridge@gentoo.org>
+  +XML-DOM-1.460.0.ebuild:
+  Version bump
+
+  Package-Manager: portage-2.3.0
+
diff --git a/dev-perl/XML-DOM/Manifest b/dev-perl/XML-DOM/Manifest
index 0f1289a..0a657b9 100644
--- a/dev-perl/XML-DOM/Manifest
+++ b/dev-perl/XML-DOM/Manifest
@@ -4,6 +4,6 @@
 EBUILD XML-DOM-1.440.0-r1.ebuild 555 SHA256 df395684776e8e775319729921516d353e3c695f3d99216bddc71eda15e8b68a SHA512 724147f819c734bf5e4672564ff05610af3018fd40afcf2453d671f8646cdf4bba845dd4898350762f9b6f89183bb4953e8d431177e8ca51a11c0efc07ed0991 WHIRLPOOL 6092195c222087720c7cf525f48ab4ef1d42c06b4b0f94c43cc5c50447dd45f47d282a0f723cfc97ed6a045a6adc6facdc4934400c725e98c83ba362415daccb
 EBUILD XML-DOM-1.450.0.ebuild 613 SHA256 c3ce1b3a9ef0dfd6bf280a8788d8d8d97df5dfefb7fab7af42fba0c41737b0dc SHA512 5eee02971d246665c1ebb1b05ce9b61bf45ccf82b348345bedf55efbcc334be22aff3b0d088d51e4f9a7686087cfd1435363bbe866980bd30264edee6b88e6eb WHIRLPOOL 1b84974e5b83af3b10d5b1469a585323d5bfa9df0a1097b32f9a2cf7cb3b6890c4ae177c8bf649d937c65a51719cbc9241984e4ab715d383fd1be472c3681268
 EBUILD XML-DOM-1.460.0.ebuild 619 SHA256 bbe6d1890dcc9d8ee3e03bc54d1c734230f21f142ad4acd0a5bc7e8e0240af70 SHA512 de5356227af66fad74c585c2a8da932071fe7a34a5bda2e37fc463df7d9ef3930ae91ca830348864f7d271beac81d129af2d3f694bbce65f8938d46072658fed WHIRLPOOL 42c82df86c8b510704e7a084140cfc3b309d1138c15b58753f131ab5a23ea4f9b7558cd7577dc29e6193a9a46dfa30903ccec8f47315096d89668ae141d7c5e2
-MISC ChangeLog 2846 SHA256 acca6e893d6975c9ea8abd7d88409329aa6eaf0d86b590defc8c5d199f83b849 SHA512 f050020028f14a817c5ba2fa64c8327d8da27fe33e374e8806965c4ac2d91eea8ce583fbbe02ecb66c6d3f8eabee3737eddc7657c3b14e2e8154f11d4fd70040 WHIRLPOOL 0f26d7d20824fd2431141775844303e4d6bf1b93fdeee1a172f21f88f68133615a418097076c229a54f8b170ba270bfed5d79f11f85214496925bad0dfbbcac2
+MISC ChangeLog 3012 SHA256 790918e180259c3c8a5cae29294383248488b0d0a1a769c5e4cac82d3a77264e SHA512 5054690e2d8ad19bf50ed9305286fee0a13b07a222bb953aa4620510c7db4028212dc444f8412e913a357934c15fe65857de1469cb379fd7e5673618a83121ac WHIRLPOOL 9af243437174ad7ea66622f4ebf9e2e1c076c418dbbbd74c56fc52341a43a8e768076a024fe7f2677666ded14156aed9575036182e0eb63158297b969f7b4841
 MISC ChangeLog-2015 6261 SHA256 2ec8bfde7450beb2070cb752731c61226ae857618c87a4241e682b41044fe5d9 SHA512 c3678ee29a2fea7340823516a37f6cb05df2b135a665c83260cb4967f907b66973fdf964b9d9e649a3929150a6b8b362860aa44caa95b364ca17d9261e3df4cf WHIRLPOOL f3da1b5bd442808bdd7ae576bec093da1d93e4ab306f97291d3a836ac02897c588266b1916d9c5eb727502e44364c9f44306654e4a57e28c4f67e719000c8dfb
 MISC metadata.xml 2325 SHA256 757b03767fe8455a473dd5f5e7b3500ebbc9cc3a2c992fd55769d996571de967 SHA512 80b933f9a5569530b77d63f9e710e6fd5011dc0c9227fa574e2a41c0880c65f8a1f030efe6684a6f6b2f8b7586ab864d3311aa71724ac4fea15876a2fd3905d3 WHIRLPOOL 249cf4c8ba149eb3af575a6eb2b4ebcb987bb21ca1e456d635521a3c83321b8db7c9f8e506e81a5ec4499531e436dd377c114f513d2fa95be36aa1f8bbb58fd6
diff --git a/dev-perl/XML-DT/ChangeLog b/dev-perl/XML-DT/ChangeLog
index d2a81d6d..e2bd42d 100644
--- a/dev-perl/XML-DT/ChangeLog
+++ b/dev-perl/XML-DT/ChangeLog
@@ -82,3 +82,9 @@
   RepoMan-Options: --include-arches="alpha amd64 amd64-fbsd arm arm64 hppa
   ia64 m68k mips nios2 ppc ppc64 riscv s390 sh sparc sparc-fbsd x86 x86-fbsd"
 
+  24 Sep 2016; Andreas K. Hüttel <dilfridge@gentoo.org>
+  -XML-DT-0.670.0.ebuild:
+  Remove old
+
+  Package-Manager: portage-2.3.0
+
diff --git a/dev-perl/XML-DT/Manifest b/dev-perl/XML-DT/Manifest
index e0ca9f3..9ff8417 100644
--- a/dev-perl/XML-DT/Manifest
+++ b/dev-perl/XML-DT/Manifest
@@ -2,6 +2,6 @@
 DIST XML-DT-0.68.tar.gz 31150 SHA256 fd44da80de086ddba5d5efd1407c2ad4fd76c4fcfcceafa3101b60df37c09bd6 SHA512 37108b13a98e23145b87693e8df20b5b6f7fc2aea13c9b19201e78d86d5de36c693d3deeb37769ec87bc78789811aefe146000bf4e836fba6664ceffddf6b326 WHIRLPOOL 3a5df14dd64fd5782ce4bf1a88d7ac5e4710267e451464cc92d80960050d209fefb566a0e8f72e7e27a287a31bfbbb57836b941ab3032cbeaba44681d529489b
 EBUILD XML-DT-0.660.0.ebuild 502 SHA256 32c01e9c4b4064d9cb646bc1638cbf9bbe246739c407ea1265c6ccab590d08fa SHA512 46cb333fb3247a5cf6473e6ca855f60d277aefad91e1781e04af07ddd03cdb6e9303bb92230753440657a97e0d35350d8d88b9888eae03aa142a3758419d2ac6 WHIRLPOOL b886263bd4a4cbf57f9dadd9ec2d8882cd3c5a796d38bed557c3dbb1c0dfd4a653649139641f36f98710fd28793fc2c0f14aeb85094e1886871b0792fe023a47
 EBUILD XML-DT-0.680.0.ebuild 632 SHA256 ea0fd6552003b5b4fbe3040312e79bb898b60ac97db873801138903f39d4dc48 SHA512 4fb20e7616da840adc1e50da0755d23b4779110cc128d186249f5969423b9ac4f85f87c30a1ab85a78d28f19022ef4e5ad8059b1b6af7a8b14937cad81cdb742 WHIRLPOOL cdfaa6907ee83f1e1f3af31c581d0254344392fa284941bda8eff43ec6b976afddc54c9a25332b1f1326bc1d36fe4c0a594454d31ba925bd021ba141f01f8e3f
-MISC ChangeLog 2948 SHA256 1e8c9a2fe5ff8d47b274919a79c5a2571007bcf542ed7bc28dc81564ad129bdf SHA512 a28fe724d5d936b87de0451f6142076be0e04ab19ab434ebb4b1c2bfb40c2dd0c435eb6bc1a89406268f2641aad4905e118e249fe00545468f23a4556e1d0fd5 WHIRLPOOL e9e9dcc0dfe6bd1399cdcaad9d0c10e48cdc52c9d68c370b3ed534fe3794d58c3964339c8babd11f62ff7326ec595dda88b30e89cad5e1f478dcc25cce9e18dd
+MISC ChangeLog 3079 SHA256 824cb5e1bbc362b89c369bc441abd4e24b739e2e517666136d7b18eb048efc32 SHA512 663b3929381e67543a5a5978b5f5500d5b56f33d069348e7acbe12f9cca8bd120f6356308259507e8273dce76d7bcb2e44963807abefcff1c1179fa2f54b22a7 WHIRLPOOL 587af1fff77eb42bb513d76cb5763f34de4e80a740a030297a2065b20d2419edafc17028ca7b184b244484ea3dcf92c8e016e2dd3c2f9947498db7c37134eb98
 MISC ChangeLog-2015 12372 SHA256 e0957b8f4759ad353d9f94b9f2ef45006959533307e19e9ee5386caf86b3e1d8 SHA512 7d52efaae9a197d774810778a807372327127bd2456bf3013792243bd44e44627498569c87d7b009a864ad25e682eab9f88c98d182f52873051e6db8413f3a1f WHIRLPOOL ecb09cf30fc60a76dcf7ddf310b0cc8da8fc48cac408b3a89fad220e5f7723258e1d1029a62b1ee4f4c0224332e5dc03c09e86fe04fff393a4576c5451b7cc83
 MISC metadata.xml 384 SHA256 1bbdbcef0a6e908895411e306686bcf5daaf26766db79acd490241565f80d7a6 SHA512 25e694d873ecf5ed8a1856cd1ec7e92fb389c484488cb3270def31b795590dd6bdd617fc87a69eeb2580e24bdea7dfaf90020c2b792ef1dcc2f61c88f0de51cc WHIRLPOOL 9b32c7282f22c6ea5dc6bf0a4d78d2856a73d80f3f78b436bd1b3fd72fafd9e48ebbabb3fbfd283c489cd0641a14fd83b6f92db7a2aa8caece4754e778285db7
diff --git a/dev-perl/XML-Entities/ChangeLog b/dev-perl/XML-Entities/ChangeLog
index a2edd5a2..0970d97 100644
--- a/dev-perl/XML-Entities/ChangeLog
+++ b/dev-perl/XML-Entities/ChangeLog
@@ -79,3 +79,9 @@
   RepoMan-Options: --include-arches="alpha amd64 amd64-fbsd arm arm64 hppa
   ia64 m68k mips nios2 ppc ppc64 riscv s390 sh sparc sparc-fbsd x86 x86-fbsd"
 
+  24 Sep 2016; Andreas K. Hüttel <dilfridge@gentoo.org>
+  -XML-Entities-1.0.100.ebuild:
+  Remove old
+
+  Package-Manager: portage-2.3.0
+
diff --git a/dev-perl/XML-Entities/Manifest b/dev-perl/XML-Entities/Manifest
index e377647..09392ad 100644
--- a/dev-perl/XML-Entities/Manifest
+++ b/dev-perl/XML-Entities/Manifest
@@ -1,5 +1,5 @@
 DIST XML-Entities-1.0002.tar.gz 20640 SHA256 c32aa4f309573d7648ab2e416f62b6b20652f2ad9cfd3eec82fd51101fe7310d SHA512 e25c45ca23fdc7d6038a4350985ee73a460370f62717197700842364a9c93ddba30dbb0d16ba2f5db10e99ad81311f4aaed20bb1a3811bba121f6ccf36137108 WHIRLPOOL d4aac8d4406e78ca2a58d8e277e01ad89accf219c0d432a7eff0b7ebef117915fb941ec00cefabfa2b1d3c39da8c145c8f3d40b6b3354f1d4a3e411e96e46089
 EBUILD XML-Entities-1.0.200.ebuild 566 SHA256 2836226cc5e13d01a5cbb75121abbba32fa05c2aa861362c7b8a32a56d2e4d18 SHA512 4b8622b45822adf088c2f1d59f0e5d63d4494e1003553f290d5fc2e5a9d8710553cc72be605600ed60490462074230788281dbbc8f263600f66af1d8775be5eb WHIRLPOOL 5bc41e91fe7dfdce73c3ad8df730f4b8346a763dcbedc0b1b76c6f68807f0f6507616626ee57da649510595179b3ba963bcd2cd1bf4389ce723c3808e90bc24f
-MISC ChangeLog 2883 SHA256 902d0d264204fd63097c5759a19fb7fb1575c6766c20717fc15d36d25c840374 SHA512 6c8beb84f4c33549cb3df00b453bccb34838f7c203b7d052adf246a94373e5226702e73128406eb685289570fe32b7d180334b4bd33a5a91d76582178bd19a6b WHIRLPOOL d92d09a29c0cfe50da7ce8316ce29ec9b22ab78fd4da82618e602aefdafaa83f9d7d65695f79d97d004c2f61214798c8f9dfad8b29e8c53e973125bc32595bb3
+MISC ChangeLog 3020 SHA256 408e003629a72c663d001612ab4753b2714abfe9e05953d4883ce6333a1bfde5 SHA512 a0a32aafac3308ac1740937116bbeff60582799bbb7f42ebecb26268b52633169d245cf1e68a2ad8f8d1d0751337b946610dd4e9191be626bc225f8c9ae45f00 WHIRLPOOL 65f1f0c02962082c25cd7af990e6c0705c8e32a0c8e1e70c4616fb0df14090ddffcbfa045d4f878d2d42e45c8fc57f94f67554a9cf4771ab2244a9de7eaaa36e
 MISC ChangeLog-2015 693 SHA256 b1f3e0ef965ced44d58365efc8b29181fa31ee9358d5fe49e34b8486f877764c SHA512 4d4bef6844cc3892bd1a457832c5e8de5747fd1d6120c04dec596e7e884237c3aa3abf20e32ecd7e107e71f57b63bcf08793febab0ed153f474c18ae9ccdc567 WHIRLPOOL 5a340f946da7d841b555353a08f89b2ff73bd559e30729d80c992e409f7ed487ec60b31531dbc6c81149a488354087e6e42548207ca867c32b3ff2c179af782a
 MISC metadata.xml 462 SHA256 59d0686f270bac55bcc63299a98bec207b96ae6c14e3ecd6541d11eef5fb93e7 SHA512 72e012b98b96e2939183bdf8c8883b39366edbc66ec0f8b42ccecb7bd24ed48e2532a435e7972eb9089efb72b1005aacbd0a62802661e5022496b04c829a9f97 WHIRLPOOL 3b08af4e5797d148128360afe0cfae7397ebba04b36922146f983b4c09c4ca6f5687b0c93d1953ff1d9a9a8cf796b0a06b8be1a4050d1da51de1c2c1959cee20
diff --git a/dev-perl/XML-Feed/ChangeLog b/dev-perl/XML-Feed/ChangeLog
index 3fdeaac7..871f48c 100644
--- a/dev-perl/XML-Feed/ChangeLog
+++ b/dev-perl/XML-Feed/ChangeLog
@@ -96,3 +96,9 @@
   RepoMan-Options: --include-arches="alpha amd64 amd64-fbsd arm arm64 hppa
   ia64 m68k mips nios2 ppc ppc64 riscv s390 sh sparc sparc-fbsd x86 x86-fbsd"
 
+  24 Sep 2016; Andreas K. Hüttel <dilfridge@gentoo.org>
+  -XML-Feed-0.520.0.ebuild:
+  Remove old
+
+  Package-Manager: portage-2.3.0
+
diff --git a/dev-perl/XML-Feed/Manifest b/dev-perl/XML-Feed/Manifest
index 2a256fe..ed416b6 100644
--- a/dev-perl/XML-Feed/Manifest
+++ b/dev-perl/XML-Feed/Manifest
@@ -1,5 +1,5 @@
 DIST XML-Feed-0.53.tar.gz 54588 SHA256 ece0396db666758f1104908deb67b6e29aa726b02327422fc7134d6e5e31611d SHA512 6a68939d8ff02124b86f38a2c82344e616e40732bd1e564a1bb8e15c8b406b8548d0630cf7c1a52744706c07d383b494b4876683c1ae3d43493bcf5138c582df WHIRLPOOL 9b620f8ced930119642c0843ec8456a1372ab034c6d7232f9dbc184d49251bb05b1733694f23d446a9f13523133950b606c478e64b945093b2e37a5e8ecae235
 EBUILD XML-Feed-0.530.0.ebuild 870 SHA256 0529916efade803a2d2162c58dea4c7077757fa41a418e489ff670fe372b469a SHA512 511e7742c4c6e73cb20d3e063be1e4532afcacc9726b8d48665b9b21bd6da4873ad0dc15efd920f3e90569ab7cd8939e4ad979835ecc517f3ba44efc2697e4a5 WHIRLPOOL b00eebf0fd53977aa36da138734ca377c892c3f8a1f11a3c0a02e76192256daa32beef424ad9b33475107352c202786291d0b6d2eaf915a47f891c52ff2b28e9
-MISC ChangeLog 3382 SHA256 afba3a85adb5b1a90f64ba09d014e38b7c282a1ab729e43db61412d7a88d4b04 SHA512 90f05ffc35382d684af9ffbd09c38c46b7995cf28474147cb15305f715ea1007daf00d2ac1ecba5c3d968794d15224aec996789e17bdf490e44eeed757594881 WHIRLPOOL ddfcac70c116f70847447971bee197031d4bf5150b9f551915fc02d0a5603a8ddafa6861dc8fcb8628a66afc6f8cdaee0115a1430d139b36881352379c92eb33
+MISC ChangeLog 3515 SHA256 393626c50968fc00f271ee40eda2046e2cb2732230818e18244389a3b922b257 SHA512 e3d6198218af9e4cf8526bd6517d58e20a0f554b679fdca3013886fdc235e22effe1559c35be4ecc226303fde80366e4f818b7ba1399fe392392a8255ed1676a WHIRLPOOL eea57f776f5b81d8f6a975be49a74899f72ccdf3454739d44d55e772cbd5a3333d51030861f55c6cdaeebf8aaff6e450c03f2a39b59f5c82a6cfc588f6924017
 MISC ChangeLog-2015 3882 SHA256 abaa3624059e9316aa2e17c9b3c5f7b2d86ebdd9a8ca2e2e4fdf39a3a34c4fb9 SHA512 ffc831aa01427a1f2e8f8f697bd737dc125d6954b36b7859ddc3752db9550d198e90127a4cd1b0afd353610d5057ea878b8309a73739e17a9db226779110ac0e WHIRLPOOL 787a04d0b14ef3b4085badaf35d37a7656a84e62fb9d7d604a96e732e89c57c1bffe202749997e4014e45b9de4a46219436d61cc8d8be97806b37cf650a2aa19
 MISC metadata.xml 875 SHA256 8cdd29e96348cc371fcbe54dc56a7b9f5f71f89ddd8a36e0c0748c60ab01cf34 SHA512 7c124726fb0b1a8a694c7cbb9e44b9a33c08cbebb202bf9cb2ab4f9c44b1175942df974317442c016aacf12691a3f2d45ef2ad3e65a0550d23a5452056c7c6a1 WHIRLPOOL d51c9e7816aeeda539b41604e4b421f720b7f2745276e92253641e383486fe8e8f3c85ae4e13bb096cf5c0cdb52339ada53ce80dd227b923d90067cd12fb27f0
diff --git a/dev-perl/XML-LibXML-Simple/ChangeLog b/dev-perl/XML-LibXML-Simple/ChangeLog
index 9216c9b5..4691d1a 100644
--- a/dev-perl/XML-LibXML-Simple/ChangeLog
+++ b/dev-perl/XML-LibXML-Simple/ChangeLog
@@ -87,3 +87,9 @@
 
   Package-Manager: portage-2.2.28
 
+  24 Sep 2016; Andreas K. Hüttel <dilfridge@gentoo.org>
+  -XML-LibXML-Simple-0.950.0.ebuild:
+  Remove old
+
+  Package-Manager: portage-2.3.0
+
diff --git a/dev-perl/XML-LibXML-Simple/Manifest b/dev-perl/XML-LibXML-Simple/Manifest
index 17ce6e0..5c73a60 100644
--- a/dev-perl/XML-LibXML-Simple/Manifest
+++ b/dev-perl/XML-LibXML-Simple/Manifest
@@ -1,7 +1,5 @@
-DIST XML-LibXML-Simple-0.95.tar.gz 21968 SHA256 b1272256cee7b4341368819f25dc66555b00dea0bca11d890cb0e2b78ac40e63 SHA512 45352738649d48e374d337ee9cec93a0d8ddffa47aa7d098d67a23f479a4d3d6d40a33dfec223651fcd89ed2c8b22caf881c7472ad52d6a2cb8b54605769a670 WHIRLPOOL 5f7bcdd00105688ee8c09fbda6b263a6387de9a2fb665200ba0af35f8d037de068ebaa5092eed22a21fe596075be5681433bab404e97b472f74d560da6911a7d
 DIST XML-LibXML-Simple-0.97.tar.gz 22927 SHA256 1ccc5fb166586232c939b27244abf1bb7627c7d2fbabe33a654cfcf6c7a416bd SHA512 5607218a0ee7cd08f6e166af30f38ac7942e36e32469836f9b09d3802f32d8c5ca965fe6870823679523721241530eab9a5235dc376b2ce362d70a78b9c2d8f7 WHIRLPOOL 51c1c0ef466ac62041a9b11716cbeb4f9a190dc61621b96be1207b35f9fc4fc07828e4b9e4f6ccd10c11d87d4c3b53296401a3c26c1871e8d55b2d3292a2482f
-EBUILD XML-LibXML-Simple-0.950.0.ebuild 380 SHA256 fe06b0251644e9a372eab9144f700e66c9f576e2ce5b088df94a454beec8a227 SHA512 c08ac0ad4508b071e402b718defb626bf7974d88545db1387bd7e0507b73ab16a42c3799cb4c819a41d5e5954f3e3ee7a15eaf464f80cd592ad2ab3f7c1d2b03 WHIRLPOOL f21c75adae7a1d33795bff7362d7fd4dcd24c1c233527c9888d4139ea6a3bd97654b3c5c0edfc176eb7087944ec1851536571dab22e301b7b8be9dda2da6ad20
 EBUILD XML-LibXML-Simple-0.970.0.ebuild 481 SHA256 745578c8536bd6d714cd53799ce74656e54b49229895fe22f180dda68ec040f9 SHA512 0e5c0bfd90f34a1b336b529815aee48bf6021121320e171a80f855573254d907ab300ff383ed9898773c0e61680ef02cf38fcc091720e01c04e248bcdbd3dc2d WHIRLPOOL 098ef0e7e82f91ca77cafc870f3ca50357ed77e8a15e3ed74bcd9e40e64092d6a6dce28e4a6cdee3bc5b6372855814d00b935047285b57908b9c675c02043984
-MISC ChangeLog 3158 SHA256 9d238bcbd538ed7ea0bb87851706a1e35af2c5eef26c868a8deff533f2db2d98 SHA512 346c4ababbc48f464e25e81104aaeb4887fde78d5fe53e85d2d009e2edf5090eb175804430cf4c4a09a6b042d7e161a70d1e6946b24031a28e34f4e7ab62c0b5 WHIRLPOOL 45ba17cf100880c1d4f57a25d5e64706eac27844b004abaf137fe06570422cc586371f41a3d7dd87af4363da3c0182424c46699c5b9c1cdced035cda0e1b473f
+MISC ChangeLog 3300 SHA256 530b4562ae954019a4db9e87e77ff22bf9e5f13e22cb6da7887277bb2157c592 SHA512 71a699c3484ac48bac02ccfa4544922af4fe30bf5169e6d7613bc62e6745d475742388d56b75c59ff05d110bc21ee6771cf0d1c599f0427ab34b394b8a17837c WHIRLPOOL 739b85ee7565ebefb383b10eb75383abdf3facccaad61469679a848fd00078273286d53f6b4ef24c05a7ffde828fce717b6a83743e48efed48831f1e1a03739d
 MISC ChangeLog-2015 1413 SHA256 18fddbf462be2d79b8b59e1ca6aeeaee799a658303009447ffc4c5d2e8ce986f SHA512 f0f0745853b6c22320769dd21624d450b1e51141eee436de4e188d9b9db339754256c15fb5c800b2b4836bdf6d3c016eb1c27abfd3a4369d1ce6606d5db4f4a9 WHIRLPOOL 8b7dddb7c6ea465efdb81aaac598ff431194d5e0be293cf24eaf6c39acefccd581429bd322dc5c90933ae1493fcc550ff92074e6263fa133a182e48d1264bcb7
 MISC metadata.xml 407 SHA256 a0d5abe45b48714f250c01b01e04ca748c93d918feb046889eb9a3021d98d5b2 SHA512 b8d18c3aaa601fd1e0138def54383730da3f6a13bedae16c738b394e357b3454805adf71f43ed7ed97650ce50bfa2b4e7de5973baff7780b3015153c5ca07e05 WHIRLPOOL 8c4b8455fcd8b592cff100ecfb30879ea0077e2accd5b394c3086d80320f9e8f6572352422b71224537677e04a7c80001033a706e357ce083277fd761ebb2385
diff --git a/dev-perl/XML-LibXML-Simple/XML-LibXML-Simple-0.950.0.ebuild b/dev-perl/XML-LibXML-Simple/XML-LibXML-Simple-0.950.0.ebuild
deleted file mode 100644
index 0212805..0000000
--- a/dev-perl/XML-LibXML-Simple/XML-LibXML-Simple-0.950.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=MARKOV
-MODULE_VERSION=0.95
-inherit perl-module
-
-DESCRIPTION="XML::LibXML based XML::Simple clone"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-perl/File-Slurp-Tiny
-	>=dev-perl/XML-LibXML-1.640.0
-"
-DEPEND="${RDEPEND}
-"
-
-SRC_TEST=do
diff --git a/dev-perl/XML-LibXML/ChangeLog b/dev-perl/XML-LibXML/ChangeLog
index 888578a..1013921 100644
--- a/dev-perl/XML-LibXML/ChangeLog
+++ b/dev-perl/XML-LibXML/ChangeLog
@@ -113,3 +113,17 @@
   RepoMan-Options: --include-arches="alpha amd64 arm hppa ia64 m68k mips nios2
   ppc ppc64 riscv sparc sparc-fbsd x86 x86-fbsd"
 
+  24 Sep 2016; Andreas K. Hüttel <dilfridge@gentoo.org>
+  -XML-LibXML-2.12.400.ebuild:
+  Remove old
+
+  Package-Manager: portage-2.3.0
+
+*XML-LibXML-2.12.800 (24 Sep 2016)
+
+  24 Sep 2016; Andreas K. Hüttel <dilfridge@gentoo.org>
+  +XML-LibXML-2.12.800.ebuild:
+  Version bump
+
+  Package-Manager: portage-2.3.0
+
diff --git a/dev-perl/XML-LibXML/Manifest b/dev-perl/XML-LibXML/Manifest
index 378d1a5..8f10620 100644
--- a/dev-perl/XML-LibXML/Manifest
+++ b/dev-perl/XML-LibXML/Manifest
@@ -1,9 +1,9 @@
 DIST XML-LibXML-2.0121.tar.gz 464562 SHA256 ec431011cb37a04640fd2316f64d0405a274eece2c6f3847f7fbd336eb1c0dc9 SHA512 1833d1e14d8a3b361bcacde910807a56e21cd08204f3fa58888a8c9219bd9228bfdc211af8f74b91ceda3135b4e72cbc60ef1d783afbe0febd100117904f29f1 WHIRLPOOL 8168fcb40e9cfd7d9802f443124a1a38419b5e74b5560b95cfb66f4bc37110a2ac11515b365c4c90bd6007cb5a98c0045bc460566e7f52f758958019953411fe
-DIST XML-LibXML-2.0124.tar.gz 465948 SHA256 f053434d68d94586ba062c8ded33a448b2943f9ae9e46db4293a97673e755240 SHA512 aa4b72ddf10ca1dab917b7988f8c715659d7659ccf6150eb88d9f6c64823daa2e5500f9b7031ec3abe88de647c7e2bc87da79d37086a1cf3d0b94de082981f71 WHIRLPOOL 545d9d494b43e4aff2951a9598194c116c25adeef58d9003b0e56cf8b179347fc10d09061a03119ca3c306b638444c75bb0f44fdc2a90cc3e667e89404c09076
 DIST XML-LibXML-2.0126.tar.gz 465800 SHA256 0e735ab72e2ba77070a58a737fd6c61fa6aa198527abc59a5d5627f0650a60af SHA512 b7e5cfdf299c6eabbecacf3a8b5192439b251aa15304a08296481daae2ff01f4d2fab74c38b42c2c63a2fa9f485d287a72ea06ebc58e679ac39cf6544f3cf60c WHIRLPOOL 341b49339342abdf93df0d7dd322b0209bd9a3fca2ffdfdb8e51055d1adab5093f221deaf43330668d17b4795a6c65e029e6bc51bda34184dd91f28e723d7de9
+DIST XML-LibXML-2.0128.tar.gz 466334 SHA256 26e7ba451f3bade4d29ff00653a2ee01d13fe38b9a2ebcd0b0f3f82f9f688f2b SHA512 c388570d0a140f3b92ab9922d9c917fba791e804b160822eeff91923891059ba189ad3743f2ffd13f7f4c92a3e8db1ee5fae588007d3fcf50251d9803e8e261b WHIRLPOOL d5aa29ca1254e6c94b8b765c2d0f05ebfaef30c3f67c7d5f4ee0f6c08619627cb98590f915ec115e28898bc44f7cd675a3c5a3f7abe827ec2d57baa5c76734d2
 EBUILD XML-LibXML-2.12.100.ebuild 1482 SHA256 7349937da1509bffe6abbf6a2168b7c71b820cbafcb91b6ae55935ba40cc930f SHA512 0ad7404d29ed2cd57b8dcb56a9397108dcf77cf6ad91ef87800d9721fceeb6acfcd6753c6fb682eacfabbc4342596657a6367198b3ce193738ca48ed4588193a WHIRLPOOL e07e6edc71d6f9a0014f716711260fdcd6df51e46ed915011c289cbde4113f49b425f691a72f83dc2a31d345cbdb41b50da370896e8d40e1825099fdaa2f5061
-EBUILD XML-LibXML-2.12.400.ebuild 1534 SHA256 72cea0ee5068fc6d3b4ac6263d56ea918fc1101e88649cf690d929cd72f82d23 SHA512 1bae8fbd2802cda398bcedf88105cead5c963375c230f9378ee57fdfbca3c7fd3e4af481a95081092ab8e12535f03e14b43e684dd8aa033ba0e33afdd34212f3 WHIRLPOOL 5bb9fd01d2c67f9179d00e1f10d88c611e5c1b77e675d5e2d2af4ed5381e93babcbb5429fd77a7aeeffb00d504806fbee8ef14dfca05cb33ca18bb3a575bd69c
 EBUILD XML-LibXML-2.12.600.ebuild 1578 SHA256 feaee50864c5190f8d5edd9fa7a6d3608df5c9fbdf409938b608d8645e61665d SHA512 f7aba5813ee9731a78d3ceeee777915026408089808707a8f8af9b894e2cb2877c1827d147a5f9cc5ebbf272278f279913597dffe395ffd5a31e869c20ec5f23 WHIRLPOOL d26b2df642a7832b91c8f00a54932f1d8cf0c50b193cf73a97e43d1efd4506f9be47264b6d32b01963f2b69b7ff713fc5d2948e9429d27a6d3cfe0ca30fea348
-MISC ChangeLog 3976 SHA256 fd4a8b3ebc47865c9c0ce15a66ae25101ca51445239feb3b86670b2d91a16954 SHA512 9f7fd29a0cc5b724682dfa84ff4213f2841759778b9b0e45d8dcc0e077264aa47a2097976fadf02ecb831cdfb7776f18c8acc2ad7e26eb86a3bd49ddba6e4524 WHIRLPOOL e0d530113feff872d97d348f2084e73a3e9e88660fe75c34941bdbdd92d0ffe9d9722227912e11db7ceb2c8e98658b95f885e020f4bcfb745732bf0bbecc40a4
+EBUILD XML-LibXML-2.12.800.ebuild 1557 SHA256 0f661aa2acd721469aa196fb87de9e6c8ca67d30c93d5878cc7b547cbb0c3bc6 SHA512 25d3e75c9d72836dd76e33dca7337cf88d97e5bb66002181422a118e2bb2b9d4a3b43f786708d5f86e111ae84dac5b50e6138c2e3ff26f90bcbee4a4cbd4a831 WHIRLPOOL 9002eb0bd2a8f1a43a5e70a68bc56bb2a2010f7a56a60d412a2b6591b34f27833a2849dd33076ea112a616bcc67583042b01b866bfe8318cad02f32f8ae08f9c
+MISC ChangeLog 4286 SHA256 2406373040b254eda3b489ea75cb5228b4b2de694ba1dc43a429b1ce4cfa552c SHA512 65db95132e8f06732de0708d33f3bdd20089ce64eb39faebe56aa9f5056d3c6466a29945bae0e71cb900fcc521b048dd4b0397231c25841ec17ff924fbad3280 WHIRLPOOL 93fdcd8a6ebe172af041511be5b119955b0e37787268c16426370f3f71f7d34d7cc6821c68c69666be486d605287f7c793a439692c2583b9d8b14e285b973c3d
 MISC ChangeLog-2015 20395 SHA256 29516f8fb39da48978c2634cc56646d2195c0416e4b91091d78b1b18846f99a9 SHA512 20bcbbe09f16f0a38bbbb9f493ce9cadd6c5b231976a2d97e550e835e4b30b3e520dfcdb32db75efb3b0c5d78de691c4fba79ee7f28b949bc23a8ef7edf409f6 WHIRLPOOL fdfa819713de65093711c9529c6e62e576b9097cd1b39221a8e10058d1782917668b4c741ae63b2a3b5ca6b82b6e13c322b4cdb5d9fb4364379eb763d074636c
 MISC metadata.xml 2782 SHA256 5ad527a0f733d03b65a825e64e29d2bc50efb58252317fa1b61ade04720a5bc9 SHA512 6353b4890d24a2ab018caa0994913a4dd6b7dd753e089f9fb0570762f75517bc8ae4e8ed3a8990ae2c75957aec0791561f00a991f1e3976c225781317fdd82dc WHIRLPOOL 0bfca38d74a897c18b6a19eaacc5e66b5e2c5025e3593ec1b7683c72cd42407885046274cb631f19ba663b6eadd21af552fcb5095311880423526561108499d5
diff --git a/dev-perl/XML-LibXML/XML-LibXML-2.12.400.ebuild b/dev-perl/XML-LibXML/XML-LibXML-2.12.800.ebuild
similarity index 96%
rename from dev-perl/XML-LibXML/XML-LibXML-2.12.400.ebuild
rename to dev-perl/XML-LibXML/XML-LibXML-2.12.800.ebuild
index 3eb0e68..8299b27 100644
--- a/dev-perl/XML-LibXML/XML-LibXML-2.12.400.ebuild
+++ b/dev-perl/XML-LibXML/XML-LibXML-2.12.800.ebuild
@@ -5,7 +5,7 @@
 EAPI=6
 
 DIST_AUTHOR=SHLOMIF
-DIST_VERSION=2.0124
+DIST_VERSION=2.0128
 DIST_EXAMPLES=("example/*")
 inherit perl-module
 
@@ -18,6 +18,7 @@
 RDEPEND="
 	>=dev-perl/XML-SAX-0.120.0
 	>=dev-libs/libxml2-2.6.21
+	dev-perl/XML-SAX-Base
 	>=dev-perl/XML-NamespaceSupport-1.70.0
 "
 DEPEND="${RDEPEND}
diff --git a/dev-perl/XML-LibXSLT/ChangeLog b/dev-perl/XML-LibXSLT/ChangeLog
index 77156a3..05467fe 100644
--- a/dev-perl/XML-LibXSLT/ChangeLog
+++ b/dev-perl/XML-LibXSLT/ChangeLog
@@ -67,3 +67,17 @@
   24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
   Set appropriate maintainer types in metadata.xml (GLEP 67)
 
+  24 Sep 2016; Andreas K. Hüttel <dilfridge@gentoo.org>
+  -XML-LibXSLT-1.810.0-r1.ebuild, -XML-LibXSLT-1.920.0.ebuild:
+  Remove old
+
+  Package-Manager: portage-2.3.0
+
+*XML-LibXSLT-1.950.0 (24 Sep 2016)
+
+  24 Sep 2016; Andreas K. Hüttel <dilfridge@gentoo.org>
+  +XML-LibXSLT-1.950.0.ebuild:
+  Version bump
+
+  Package-Manager: portage-2.3.0
+
diff --git a/dev-perl/XML-LibXSLT/Manifest b/dev-perl/XML-LibXSLT/Manifest
index 866774b..b47c750 100644
--- a/dev-perl/XML-LibXSLT/Manifest
+++ b/dev-perl/XML-LibXSLT/Manifest
@@ -1,11 +1,9 @@
-DIST XML-LibXSLT-1.81.tar.gz 86611 SHA256 2859425bb9a81ef4e958352655d0a5d5abb26a30d88b3cf23ae93d7e14775c96 SHA512 a68df91b542e002656e19f2d45a19266fe62ad2fdbc9784782f1f332852cf8a7a44da618f6a4ef1defae6496d08f8df4834c25e2f6127ed24eccdfa0b5375f03 WHIRLPOOL 03eecf5accc4ec88e11c3bf9b3d735b5b5a9924840171a28cfec89b90649c8aca51fbf9320a6aad2f4c650d1d612efc11cd07d55c7276fcfe34af4654b3ed114
 DIST XML-LibXSLT-1.87.tar.gz 112288 SHA256 e1f7c8a04f0ee857fb949a08853fd754bdf690e2071f0e7a43395fa042517da2 SHA512 8d14621487802230b2040bb13077e88dead0a8ca0c79b86f62e24283fd5544200ad3851524fcdf2b4d0ccf562876d9ce1c0fc00080e7f881cdb3924265465322 WHIRLPOOL 9333d4f26d4f46f7aac3487654d2052aafdf013563754b0f81ddcd350fd5f0678b2655e5b7ef91cfc7037492e201690dd612d409e89f3428af56c3905ed03e99
-DIST XML-LibXSLT-1.92.tar.gz 113741 SHA256 46993c2751007f660e60e09441d57343b81b49a903281e33105824c2058d91bb SHA512 c2935790590cf29b4f7bb01994f785c64a3bbe0189050ac66c63be21914ae2501232e3d4591a9ba2f28c0765da45a7b9a0c64eb7c30bdade3aad290ad52740a0 WHIRLPOOL b727c27ca3cc41039530a5aa4d07df2e0a32d410dac8958d045497c19d49f10aa8c5ecd821b5298efc2cb4962ebd8007d91ee7606089afa6ec68b524e37a3bcf
 DIST XML-LibXSLT-1.94.tar.gz 114015 SHA256 b9c0d4de0697284c3f4687283f2ed6b28139b088e2dc2c73be37b0f7b5e94ae5 SHA512 52b3ec6ef0556d9dde8320acbea01fe36e219bc62ed2d9e0cbe2f8f402bfc3f42ca1e28a6e047e69f501982fe4ba40d23fcfbce9399388c9f28a0d8804fc5f73 WHIRLPOOL be0c6051ae7f7e92d6818838f0f4023959cb326cfee3bab08e2af77dc2d763fba811f0cee4d2414e286503878c69c899e511a01ce3f81dfec18cc6d2b5fe3dfd
-EBUILD XML-LibXSLT-1.810.0-r1.ebuild 500 SHA256 9c21a9547f4fa6aa2f4717149626900786f8255e0d2fdfbcf196806936ecab00 SHA512 50d32175815c20fe78912b6a551d20d21cb9fe0bc967e1862f4bbc46987eea2de56035f437a6c219f4753c3f00a5615f2462ae65af5d22151ba6241c18da5342 WHIRLPOOL 0ed2836bf05e3f2055099f93044c02a38333d7b4de0ba02a5604adc2d1923192d6df8698ceabafffc3889903d389c29ee2ba00a545a957dd483498da05d8a543
+DIST XML-LibXSLT-1.95.tar.gz 114231 SHA256 f1ca21135acc53af9f175958ef5fceb453fd0ef383cfb0e6ef6ea24031f3ef35 SHA512 06a1c9896a391be2588995f25520da05f086b3fa79109884131525a0d76a7b375e0c5a2febf8a79a888f3a9bd25b5eb39064de1baeffafcfe18f5576c9c54e19 WHIRLPOOL 897dcd0d91af457c01863a1a283a6d05219d47564800d93a29434ee30199b5781a874f9162a8775e40e05a6208d67ae8411f551a8932a9b2dbe37b309b9701bb
 EBUILD XML-LibXSLT-1.870.0.ebuild 500 SHA256 525760610431ae8c6a54c98e279b79dcc0a30f0bfb05d38c30acb1996dd64f42 SHA512 724243cf7b7e0130e893d0cdfbd3db1e94ff4434b49c291596c0d35f4bd01077cd35b21df685aa5f2d5ade45766e9a20e37e0f132d8320c7a35861f06144e7e6 WHIRLPOOL 1a16cc5c8bc455c28802595b42a527c9b99bbf30888d48cc9768d69a03365664f3214b96751e82ac5ce57d5bfba2ca308ade42c5874e5428f191b6b59136998c
-EBUILD XML-LibXSLT-1.920.0.ebuild 504 SHA256 0d80b1abbe6d8b7f98d28d549c89a7d11d878ac235df65680fe9a65a2c733b37 SHA512 111f42b55655cc414fa2cb5c45a58034e401a9e6fe3ee589249785902580ad1c8c71390ab9041bf4f29a845d9ec9c13f56ee2f983c497d93af31d2a133164b67 WHIRLPOOL cac9833d894505a2fb8640c1daa4706e6104d9f611752a0cfd75925c9e190a79be037e0df2eb4adf672367d4ab49697e9cf067b106419893425d6aa848f578d5
 EBUILD XML-LibXSLT-1.940.0.ebuild 504 SHA256 368db8814c1bbcb1a26a191893ca6328d910e87b900e361450e655f265e51c60 SHA512 fab7600e3385dbc8a8cc1bbd746629601829a6429a3fcdafeec0526fddf6f030d8cc1e2e99396cbf22ba33102c5a3d7140db345b8eb705c763a332c3c2d5e3c6 WHIRLPOOL 7acb26fbde3c95ada3d5ab43c7d33134999b5dda226b9177a372707b3212b2ccf7f4a5fb3bfa392646e2090044b83ad9ecf29cec5cdbaff12e56350b89f1b84a
-MISC ChangeLog 2643 SHA256 3ce704eef9ab52f82f02181c38bb6b62e5cc11587ec4883a83920cf2b58886cd SHA512 180f291d307a7488ddfdf4e012f6c7695f7f8a2b5ffaf10ccdf0973127694491dfadb8a5258544c717390552e3eec33d16f8be666cdf0980b90bb64f9b379638 WHIRLPOOL b5c9aa60deec8df908a99899ad85a93e85593a1ff14bc0846f595cd8f7f34e08903157488d2e2228402d306687fd034d4690cd4e2635495881f978022661d3d3
+EBUILD XML-LibXSLT-1.950.0.ebuild 539 SHA256 aa91c66cabd6fb720bb5c823b6b681cff50c9412d266596c6fce60bcca84f989 SHA512 a9b9469dea51ac2c8be1a3349cb20af1b84c61d8cdbe9f47756aa888998f65b008b3a6d3138364528115198b0c770a29971f8af4e3d11a9e9453b4d6ce470649 WHIRLPOOL a4dcc0fffa45e446567d2c2e2c0ee4a899864e2bc24099b48f14e6958d452adce3a9010fa86f35c3f4fd37a8b90f40ea7c6a177e7badfc50b96bcc06c9c2405e
+MISC ChangeLog 2985 SHA256 bd4445d548e41cb31d67026ed985b801cae28d1014eea35b2b0f63010a2debd2 SHA512 1339537087445bf0a55d09453f5f89219096193df0e68375e781a62290b0e50d526ef72c58b6741a6df6999bf91a9b6a938f390bec478441779996e7b00f6dc2 WHIRLPOOL 76baa3022f96da27c37f041678e429a8a16246d55816e815960ffa4bf927ac2230f4822ef1f49f61de3535bcd0c14c7ebd5970c48a219f97c599c31d35d350cd
 MISC ChangeLog-2015 13204 SHA256 ef335e2a732166c28656d3806b6058fd3b2e953acef647508c74b7123107d927 SHA512 e0d077857a52c0ea61daddf278f5be3fba4301c0cbfb61886eab78ef576662fc7a74ad66d47c193a289deb9bb115bcfde01a225f6411720d9f387c4eda1e7062 WHIRLPOOL 6a054f431bf3f9cba042bdfbcadd5ea9d84f8cde18fba36d523f64a269e874e9fa406c94206d27ecee83f61fa723b9a03593533438b36d39f861f0b80264e5ff
 MISC metadata.xml 804 SHA256 cd09dcf781e07e0fbccbcd2871338d1cd671844e5de618db3a78a50d7fe1107a SHA512 8baa00642249d81519d3d21ff2375ac5adbc79db18a225f4bb1f9e7145b8a98b9d258248cbcae9d50cfb5440185e06942e1551ad1d28db8bb7705525d962a6d0 WHIRLPOOL cfa7b0091ec492bdeb915c0286f3297a9ceed11fd8bcf51a44a618df35ce0fbfa6fe944ffff0b4ee35e73aa16d038f9be03eb820383e1f9801e450260518c13c
diff --git a/dev-perl/XML-LibXSLT/XML-LibXSLT-1.810.0-r1.ebuild b/dev-perl/XML-LibXSLT/XML-LibXSLT-1.810.0-r1.ebuild
deleted file mode 100644
index aa73666..0000000
--- a/dev-perl/XML-LibXSLT/XML-LibXSLT-1.810.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=SHLOMIF
-MODULE_VERSION=1.81
-inherit perl-module
-
-DESCRIPTION="A Perl module to parse XSL Transformational sheets using gnome's libXSLT"
-
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/libxslt-1.1.28
-	>=dev-perl/XML-LibXML-1.700.0
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-SRC_TEST="do"
diff --git a/dev-perl/XML-LibXSLT/XML-LibXSLT-1.920.0.ebuild b/dev-perl/XML-LibXSLT/XML-LibXSLT-1.950.0.ebuild
similarity index 74%
rename from dev-perl/XML-LibXSLT/XML-LibXSLT-1.920.0.ebuild
rename to dev-perl/XML-LibXSLT/XML-LibXSLT-1.950.0.ebuild
index 98abcdd..c5b2c30 100644
--- a/dev-perl/XML-LibXSLT/XML-LibXSLT-1.920.0.ebuild
+++ b/dev-perl/XML-LibXSLT/XML-LibXSLT-1.950.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-MODULE_AUTHOR=SHLOMIF
-MODULE_VERSION=1.92
+DIST_AUTHOR=SHLOMIF
+DIST_VERSION=1.95
 inherit perl-module
 
 DESCRIPTION="A Perl module to parse XSL Transformational sheets using gnome's libXSLT"
@@ -15,11 +15,11 @@
 IUSE=""
 
 RDEPEND="
-	>=dev-libs/libxslt-1.1.28
+	virtual/perl-Encode
 	>=dev-perl/XML-LibXML-1.700.0
+	>=dev-libs/libxslt-1.1.28
 "
 DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
 	virtual/pkgconfig
 "
-
-SRC_TEST="do"
diff --git a/dev-perl/XML-Parser-Lite/ChangeLog b/dev-perl/XML-Parser-Lite/ChangeLog
index 504994d..ba76946 100644
--- a/dev-perl/XML-Parser-Lite/ChangeLog
+++ b/dev-perl/XML-Parser-Lite/ChangeLog
@@ -87,3 +87,9 @@
   RepoMan-Options: --include-arches="alpha amd64 amd64-fbsd arm arm64 hppa
   ia64 m68k mips nios2 ppc ppc64 riscv s390 sh sparc sparc-fbsd x86 x86-fbsd"
 
+  24 Sep 2016; Andreas K. Hüttel <dilfridge@gentoo.org>
+  -XML-Parser-Lite-0.720.0.ebuild:
+  Remove old
+
+  Package-Manager: portage-2.3.0
+
diff --git a/dev-perl/XML-Parser-Lite/Manifest b/dev-perl/XML-Parser-Lite/Manifest
index b21f335..1b68e96 100644
--- a/dev-perl/XML-Parser-Lite/Manifest
+++ b/dev-perl/XML-Parser-Lite/Manifest
@@ -1,7 +1,5 @@
-DIST XML-Parser-Lite-0.72.tar.gz 9382 SHA256 38c7110d9fc23042284e8584777a18f3e1c5c1974ab3df598df120c0922811bb SHA512 5d7d91e0ab19373845c0b1dfed8dfdce8326d84e55cbe5996dceebcc897dd741b0ef65ecefb7e05105caa7be8d74f4d6e9dce5ffa32f8745a8a19a1c3a6e4870 WHIRLPOOL a7d37912b24f99898a938d4f84391b40e466be456645b35620c6f92e115c3d388377f4f511a4b20d39bf9b9800a63b3871202cc6564f94d51e144c1290fd7ddf
 DIST XML-Parser-Lite-0.721.tar.gz 10303 SHA256 5862a36ecab9db9aad021839c847e8d2f4ab5a7796c61d0fb069bb69cf7908ba SHA512 23c0aa9363e87afc885e40bc92643c355a5e7be85a61b8f1d1e829a970538b2f0a9de6dd652387d4612528274da64e8812faa6328be2283a28675a6da09c707f WHIRLPOOL d6666b542b96bf749c36b0f7b724ab56a0c508b0ce3d19895236b3cb2ab8ff504f4bd30146270853a761cc3bdc1d188f717c294cf4c3f720350d7a6ed083d8d5
-EBUILD XML-Parser-Lite-0.720.0.ebuild 390 SHA256 4f3d81e4f5cd7b2c873526ca3d97739a9c364c58210ea9082351092f4bd4ffa0 SHA512 444b64e48da91420bf0c5e8b75637dfba70ae7b0c843064a6b277646ab36fc747623c4c2f474d03dde6109d84e7a93839fc400c86bc47611dc30987f02f81522 WHIRLPOOL 485311570869f3275afa8afddfeca9e46a7b4b3c3f549ca5fd4699f6371979280c445807c1aff3da9bfa4396a04f001727c67381fe06b2a6cf31733aa268bf83
 EBUILD XML-Parser-Lite-0.721.0.ebuild 875 SHA256 b4fb7bbc990136e26878c0fce2dfd427421c7688579c843f22a86801546ed71b SHA512 3ed73fd68ecbb6ec65c1adb3b959cd7df357ca0e1543221b7ffd42fb51ce2d9e87caae046cceb7ac004287ed4816a480ffb549d7d23637b49707381f6eb34d04 WHIRLPOOL e9c193c7835caa9db8ad08c5e0b36ff4acbab98bbb0684b80f6a019cebd753a51d2132392414fcf8ac22b4a400dbb8cfc0f4844ab18dd09dd8b266c621bcfc48
-MISC ChangeLog 3363 SHA256 e620eb2de8a006a60fb6cf9760503b552cb3597cc15d00b50da57cc1b7f68aa4 SHA512 db51777d2ccba1d1c9ac851a6344dd198f713a9286a417e6cb81c3f89bd7112d6ae038c5f1e30a4a3b720892227e6b161aa45396a3a5a46d9c011ca9f9ef8c02 WHIRLPOOL 0abbe899e061162d32ff83e723ecf1b84e53beaf4dfeb659a0a26cf2b6e1ae03ed06930b788ab271944696fe38d42e0cfcbda8b664d4c215679d722682b6db5c
+MISC ChangeLog 3503 SHA256 699ab48d1c034b92dc159be1647c0a80dcf992f5cc86bfc9e87bde5000851b67 SHA512 4930806673a13a913e9751fbbed2a283a1bd42bb2d153aab7c37c02d72ce140d68e962bd044441d49067fb708e197a895291747c11a70ec68adfacb8a1ffb9e7 WHIRLPOOL d6972106592b0ec3094e66047d784cd928fadb866120b1495b8f89e50fcefe014c5681f4a96239ac9256a24a1571defaf010b84dd7d28f941f1bb5b7f2a93c73
 MISC ChangeLog-2015 535 SHA256 297e21b71df09eb2903d2dcea1a23aa25dd4eb38a98ce578d9bc8cd1e692a6ee SHA512 a49dcd0b904f4bcf3ea9fbf313bf11a05e1b082944ac1d14689b626213ef725348efa751aef3bfbcb497285a240d970fb04d6b3529c3d58c80abdded340125aa WHIRLPOOL e3f4109dcc2277097f7092eb2aaf997a3dabc5c5c9e43755c01a5aee769161d72b79289aafd79874228d2034b48cedbe45d441096b089b702f538831e6c7e491
 MISC metadata.xml 391 SHA256 2f60fc0e6cec1c303b77caa276d26b249932db0d79ae2ecf06c3c57a24208f12 SHA512 e5e6d6e1af6047f9b00216cfe035bd7145d7b14bdc11154b9267ad90298a67056272870e68dd572da92bb67015c9b035bf63647b56e880f7bd30f51cfb4be1bc WHIRLPOOL 60958f34d740feb6da5a71234f30edd699d204dccbba0e514addae2b5bc4b0615f105d587fd66996776e1954ba4d894cc16204f33f734c6c98687dca1afa7ec3
diff --git a/dev-perl/XML-Parser-Lite/XML-Parser-Lite-0.720.0.ebuild b/dev-perl/XML-Parser-Lite/XML-Parser-Lite-0.720.0.ebuild
deleted file mode 100644
index 9d52c47..0000000
--- a/dev-perl/XML-Parser-Lite/XML-Parser-Lite-0.720.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=PHRED
-MODULE_VERSION=0.72
-inherit perl-module
-
-DESCRIPTION="Lightweight regexp-based XML parser"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-
-SRC_TEST=do
diff --git a/dev-perl/XML-RSS/ChangeLog b/dev-perl/XML-RSS/ChangeLog
index 4e1ca234..36a9610 100644
--- a/dev-perl/XML-RSS/ChangeLog
+++ b/dev-perl/XML-RSS/ChangeLog
@@ -122,3 +122,9 @@
   RepoMan-Options: --include-arches="alpha amd64 amd64-fbsd arm arm64 hppa
   ia64 m68k mips nios2 ppc ppc64 riscv s390 sh sparc sparc-fbsd x86 x86-fbsd"
 
+  24 Sep 2016; Andreas K. Hüttel <dilfridge@gentoo.org>
+  -XML-RSS-1.560.0.ebuild:
+  Remove old
+
+  Package-Manager: portage-2.3.0
+
diff --git a/dev-perl/XML-RSS/Manifest b/dev-perl/XML-RSS/Manifest
index 784e82a..afea35d 100644
--- a/dev-perl/XML-RSS/Manifest
+++ b/dev-perl/XML-RSS/Manifest
@@ -1,10 +1,8 @@
 AUX nomanifest.patch 617 SHA256 038fd99816a4a867e797ef0e9f8a7b91e3f42cce4776425339bb0fb9f753312c SHA512 29babed1ec19818e3debecbf67398503085cfcea5a1637b32a0127ce34308950b1d6982d236e717255e74c52dfd5061b8bb6a11bd60383a459e9935d5c32120e WHIRLPOOL 819895db817f2c6ee0b69141d9c7d917fbe689a929387f6373cd0fe8a012328f68013e849d46302488efb4660762c2efddac54b2615549024df1b975d7049e3e
 DIST XML-RSS-1.54.tar.gz 127636 SHA256 5351152a804733b96026c51d42c2ba8c393a2ed51f0ed6e2d0321ad18a62859b SHA512 3260ea46445687479a2d82eca93aa2bf4ef02bcaf1ad487a9a501f42619e7639342020be06ea63e2f8e4be20e5584e094e012786c5b3c34485cee0e22ef81d38 WHIRLPOOL 00b23e5bf77703838f6d2e3c994b740ecdf628273b6edaefa85cd6475da24693c944dc44b440b8a5ebabe439033d90bdbfcc67f01e33300274d9520cee602cf3
-DIST XML-RSS-1.56.tar.gz 128117 SHA256 6f61a26f814217181ea7b792abf869336213157d016bdb10ee0ba505d488f5e3 SHA512 502518e17aa85ea032ee94e62da358e54c6708f2675baa1546c103ef0c454e2c1545014cc08662c067bce4bdc94315adcc5d6eb6e8478de7d249064059ba38a3 WHIRLPOOL 26fadb10487b77d8f648906fb41c94e0142612fc9387fa1b8d5c5720917dc6418a40e666af3e7487378eb9114d3f311b831a5e12583dcc0be006ef62575553ee
 DIST XML-RSS-1.59.tar.gz 129141 SHA256 a26b4a11c1149afc4795a6f0b18c1ec78f3fb63b779e02b6325e5f617f74db6c SHA512 ab35d7897b286a154158696084749593e4b4cde280ea91d38d10222bc4c41838bae4e6063dde763ca58b1098c41db66680763135622deb4d2747ee10155a0e70 WHIRLPOOL ffda28243d5e5ac3a7c07674b8ab87217e03ca02e206936ba955caeff91685cfaadcc4b8774723fe249d791384dc537e5d6b6f14b976d139a796808dd8c3ea0b
 EBUILD XML-RSS-1.540.0-r1.ebuild 794 SHA256 4e53ad17a4e66fcc18f6173505b11cf8dd4978e604d6dfac3df1864e8f1c25e4 SHA512 9cc8581a8f8322011cdf3ba8f7caaff780b0b73d76f2e15dc4ebe3fb6d6e56afa2c551cfe3a214c38062737034b7a6c4a011bf48ea5c81dcbc194e35565af80e WHIRLPOOL 192f6ac4e8fb98f1fb847469da59677a0ac5ba81d6ad1943c0850de506a86e2f554b49838419aa53c83a74378431330f63d0e937316e7ce5f833999531d611de
-EBUILD XML-RSS-1.560.0.ebuild 800 SHA256 47ffe3cea961a373a7cdbdbd6987510540e576b4af6bb2fe8dba7ccaa3dfd109 SHA512 621a04d9162d667e757b1ea4ecfdcb87c9c7cdd85641201c9274862b29e7e80dd129185b69f19f0ab0df637cde5d7c21b51b579e7bc269c98ce17eb165d46386 WHIRLPOOL caf17c01cc32772072ea807d897172d0c6e3769934b575613715bf6cb7034cf5b0f475eb513c5cedd7adeb443772b676528db21f4fd110df5c6e99766422bd4d
 EBUILD XML-RSS-1.590.0.ebuild 817 SHA256 2b9cdd9c54e7dfe061d0608980058d2d87c14baa03a919c9369797abcfb7e772 SHA512 a7dffbc2af6069456d23117de10b76248b7eb3d1f0145bd2cc2820e4d502cbbe2556b7908d012c635c882a269393bf570f1b5cdc7ee9d16e0588baee83026785 WHIRLPOOL d0461cbd9042ab35acbe76690469ae8a0712a5c360ed0d64372e9d4826fa6a2796694690a5486fadb947959360f687726a2f1b1cf6370b4d575f4aa60b297e08
-MISC ChangeLog 4603 SHA256 19aa60c540d338e1f664832ed0a29b644e1677171eb48682f36c475ecf1a4c09 SHA512 c67b272d518b37f9d2c8c4feeb108a5eb6322da789f34897c5406e9125f84fd4eec564722e8fa1d786d876b4ac6619c647ed2bfee182e7811d8e9afcdcded897 WHIRLPOOL fd0312b8100c95dd39a03ca3a0a21c655862ec43f8d2d45ada55c11cdf4b6ec6f9188624c573d540e946ab78404b19a70132343943e4a4213260c8111064e607
+MISC ChangeLog 4735 SHA256 16225379bd1044f170816b0f403d73070e1959d40fac555b05df0ca6fa12edd9 SHA512 ed29df520e40278d261b7227db0a7229d11b7af70b26d91e5ebb24cebfd53af04da993788ae940b9d31de39e755bdbc6eaa5779498392bde1a857a3e4529ea8d WHIRLPOOL 8dc65c40483b5aa34e8f925cf301f9b48283498d7ec1a51d6a9d6cb516cb1bd8dd613e3a0930f2d7f3f606d301559207f2934a02e881a4551e518e74d4b6733b
 MISC ChangeLog-2015 12075 SHA256 d3a98797e225f983ccde0c66a6fca66c7ddf767ac7535a3aae730c59ee91bda9 SHA512 01b9a3fcaead7006345fbf2b6510ef387b8800290af7a81c7ae1ca20eec41924d103bb8a0362670daad8f9a8784d9299b58826ee0cb3a866b975b335f3c4b87c WHIRLPOOL 868d26eb60591a5616487697ac88882af7b992f19cc8218b905ea2a1d96255b103778807f1ebee821f2184c3e63a0a15b8515fec4eb429f8b86ef4922c6e8781
 MISC metadata.xml 1015 SHA256 33de74b1897cb14ee10c79be651143a038b0e742ea2fb95e00ea8b6c1f71c0c9 SHA512 e3de6576d44c2fc21379d99bd626f8bfcc991f80e281a4c9052bd2e2860bc55258e35a4a0ab26560decfda1421e41fb79ba6c3d2f765da46bf407f730556024d WHIRLPOOL 57fa8ceec03811dd7a1a5361e268605e10abb10b9e43d7a45f3bac4afaff4e7dcc452ba4297da1019288422ae23d9f7e4ee1ed3da00c6f936076c40de0b401c3
diff --git a/dev-perl/XML-RSS/XML-RSS-1.560.0.ebuild b/dev-perl/XML-RSS/XML-RSS-1.560.0.ebuild
deleted file mode 100644
index 20a82e8..0000000
--- a/dev-perl/XML-RSS/XML-RSS-1.560.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=SHLOMIF
-MODULE_VERSION=1.56
-inherit perl-module
-
-DESCRIPTION="a basic framework for creating and maintaining RSS files"
-HOMEPAGE="http://perl-rss.sourceforge.net/"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-solaris"
-IUSE="test"
-
-SRC_TEST="do"
-
-RDEPEND="dev-perl/HTML-Parser
-	dev-perl/DateTime-Format-Mail
-	dev-perl/DateTime-Format-W3CDTF
-	>=dev-perl/XML-Parser-2.30"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	test? ( virtual/perl-Test-Simple )"
-		#dev-perl/Test-Differences
-
-PATCHES=(
-	"${FILESDIR}/nomanifest.patch"
-)
-
-src_test() {
-	perl_rm_files t/pod{,-coverage}.t t/cpan-changes.t t/style-trailing-space.t
-	perl-module_src_test
-}
diff --git a/dev-perl/XML-SAX-Expat/ChangeLog b/dev-perl/XML-SAX-Expat/ChangeLog
index 8f3c4bd..a00628e 100644
--- a/dev-perl/XML-SAX-Expat/ChangeLog
+++ b/dev-perl/XML-SAX-Expat/ChangeLog
@@ -66,3 +66,9 @@
   24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
   Set appropriate maintainer types in metadata.xml (GLEP 67)
 
+  24 Sep 2016; Andreas K. Hüttel <dilfridge@gentoo.org>
+  -XML-SAX-Expat-0.400.0.ebuild, -XML-SAX-Expat-0.500.0.ebuild:
+  Remove old
+
+  Package-Manager: portage-2.3.0
+
diff --git a/dev-perl/XML-SAX-Expat/Manifest b/dev-perl/XML-SAX-Expat/Manifest
index c0d33b9..361c826 100644
--- a/dev-perl/XML-SAX-Expat/Manifest
+++ b/dev-perl/XML-SAX-Expat/Manifest
@@ -1,9 +1,5 @@
-DIST XML-SAX-Expat-0.40.tar.gz 6510 SHA256 4b477dd7afba6e8d3f6117a28a2012381f8635e5cfb996d3cd4d0ee624c39930 SHA512 71f5419ae677e36f3c4471052944af8dc73fa599538afe077502c1c00a6c39e8c1a387da4d69d36ccaa90235e5ba5adee57c1aea18d0b0c789aa81f82347a0be WHIRLPOOL 3e5a463415da14bf195edeecbc0cda924140b13d449be42613cb345302bdb84359b1c85f5efe23604367991e01064a1aa3d8d7a57f45007b732484739024cc4a
-DIST XML-SAX-Expat-0.50.tar.gz 7090 SHA256 a506e64cf3b6f3828e95085148226be1f3487b46e317c4d362dfdb755e954a12 SHA512 be015e608a923c8d8632c8dd44b6f7780fa3daa7075b1cdb961e45af5da3516826cdbfa198aa6ec52a31c27860830227e6bb6b22344780cbb630aa7ca6f0663f WHIRLPOOL e50438ea881cf435be5f1d73b1f78b07f5c3a45a070e5a2436c780dba864f06bd399130e1b8d731fb4352366018014ffc6d2407df4efc6ffeaffd28ead51442a
 DIST XML-SAX-Expat-0.51.tar.gz 7134 SHA256 4c016213d0ce7db2c494e30086b59917b302db8c292dcd21f39deebd9780c83f SHA512 9cd3c7a1cdf0b0a49ea9f871095984fb67ff54c9e5ed49884c591a450c2662acbd6d0f5232a5720663bcab09ff4f41093d414daa0b72457dc98eea5001270478 WHIRLPOOL bfac47b4e8b3af2b06f49cff868938c97af5a935ebb74bca81e6d0974393dddd02728b7257d11f243967bebd9d2b73e6cea042c0656279ca1ae9a268c5ecd450
-EBUILD XML-SAX-Expat-0.400.0.ebuild 1111 SHA256 f77a6e0af5b9e0ae23e1fb534d451a2d5b6a5642f52445805c07e34c7fdf9663 SHA512 e09e192f5e7af733029d4942e390ab85e0be9a690c16814478fc4df4eab52621e4252b0bde98385bf16a2ec117ee8cc19fdadf8de37821e1b770aded75367d08 WHIRLPOOL 7114a0df76dbc9dbfd3cff9de7653d9a3de4d9dd911c862aad5715422a7b689b77f48895ae377d8cfdc7d18a2186d80f8ca37f8a89fea8bc48196c576ed99d7e
-EBUILD XML-SAX-Expat-0.500.0.ebuild 1111 SHA256 e71a978b23f1cba8b7690bdbb29ebcd63537b29325173e01375e40bc97ddf537 SHA512 85847ecc137597664340cb88100d837f5b819b31ae5fb6e20409d01f18ac32bf4d37ae04db4674e7ee779e279a2c3e0a406a8a02d21dc874f31afb49ba6a9673 WHIRLPOOL 22c46f20ac959368a8b2a648cb37e7a079d7e635000b4ce2abd0340a212d3efe75c9f4d934e89a367c98c3718e2aeb3b32f7e715df57817b40b13ae8fa65b55c
 EBUILD XML-SAX-Expat-0.510.0.ebuild 1114 SHA256 d69b867f140858f6d113495991c5c4b3f291f127c8b5b8f4e8ce003bbd2ceefa SHA512 d5f36f99fd06734ea6ec4365fdd4998b7c35cb783299638bb5c2b2435394d17fbf806ca25a20724a4de992e2d9e2b8643a2ddc199c2f7fac48c86c1a30cc50cc WHIRLPOOL 3e9fe9216ba572a81a03cffeee44a7f6b5bc7160bb51ec515503a6011130c3362d99b15740ea92e21e70580fca74ddfd19512748d8eced02bdf4150f1597f26d
-MISC ChangeLog 2587 SHA256 fff83c6b9c8da2ba114c30f985fe73e2a45900a5476ab4d53a163211f3983e5b SHA512 746bce971551e0772fa27bb5701f47f69c2c9c597d0ec2b0b2b3e655835ae07ddf5663727989f506a91a10dd583298a87e3f30850abcbf2e5506dceaf2363f2b WHIRLPOOL 755de737b342b40d22b421c0921edd4f163d1e09909d8f2c08bfd4cff0c4364163a4caa45f9dbe734a6429a4ccf00800e06cf1600e19e6fd6d47140171b2a2a3
+MISC ChangeLog 2756 SHA256 d49d223a75665d4aba22536103df0aa35699c5fca5537d95a6432271f839f6b8 SHA512 9ee04df5b7668e8fa0505ef64b68d4b6aea40c217e6b1e39c1eecf41e7c4e9dc9cdda3bb696fcc88a03448df905a2eea8b4f823b27893c12a896592485e2e7bd WHIRLPOOL f2e265bdfa2a389ed813d654fb1edcea1a86130cf32a4c8baed823de961255ce2fe4b0ab89656dff1911a9786fd24b37dd898f0b944c9d7859fb6d3c565e96e6
 MISC ChangeLog-2015 1880 SHA256 1dc5bd3d99749411c9c8113e790a11db65cdcb33e7bf5dda7e811e43f3506802 SHA512 5434e718289bbf68e5ee77dbb7997925cfec11a9727fbec16919ac7152ec11d659c59bd618c7951030c0dca2951a641f0760b2cb3743a676b71876bb8634ae85 WHIRLPOOL 15c15af9d0d3dfc740f8bf340a7fcf4a7d1991a4f890587f147eb154a85fc7fd658d192fdf8a1d7ea2429b2054d4cf55c05546587153a24867384b93f3cdecd4
 MISC metadata.xml 399 SHA256 1feeb74f77a91be5c85f33d0776da29cc5eada61558dcc373d0ca37fc118e1cb SHA512 658b27f117623f86efb9a39b76857410146d8bd412d0861f2dc1197af32d2e4d6f9f84a7d71bb2d0960cb0ca1e264e0e18d499718326c1aabce51427b5272d09 WHIRLPOOL 7787f32ea428488e6e084eb16ec440891ff3dbb3237d46bc125a01c6ed6e32c8bf31f280af77343a85479c1b7e07ff67bcb7548cdbaa94e10260e39c868f16ae
diff --git a/dev-perl/XML-SAX-Expat/XML-SAX-Expat-0.400.0.ebuild b/dev-perl/XML-SAX-Expat/XML-SAX-Expat-0.400.0.ebuild
deleted file mode 100644
index 0b4e086..0000000
--- a/dev-perl/XML-SAX-Expat/XML-SAX-Expat-0.400.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=BJOERN
-MODULE_VERSION=0.40
-inherit perl-module
-
-DESCRIPTION="SAX2 Driver for Expat"
-LICENSE="|| ( Artistic GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-perl/XML-SAX-0.15-r1
-	>=dev-perl/XML-NamespaceSupport-1.09
-	dev-perl/XML-Parser"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage )"
-
-SRC_TEST=do
-
-src_compile() {
-	export SKIP_SAX_INSTALL=1
-	perl-module_src_compile
-}
-
-pkg_postinst() {
-	pkg_update_parser add XML::SAX::Expat
-}
-
-pkg_postrm() {
-	pkg_update_parser remove XML::SAX::Expat
-}
-
-pkg_update_parser() {
-	# pkg_update_parser [add|remove] $parser_module
-	local action=$1
-	local parser_module=$2
-
-	if [[ "$ROOT" = "/" ]] ; then
-		einfo "Update Parser: $1 $2"
-		perl -MXML::SAX -e "XML::SAX->${action}_parser(q(${parser_module}))->save_parsers()" \
-			|| ewarn "Update Parser: $1 $2 failed"
-	else
-		elog "To $1 $2 run:"
-		elog "perl -MXML::SAX -e 'XML::SAX->${action}_parser(q(${parser_module}))->save_parsers()'"
-	fi
-}
diff --git a/dev-perl/XML-SAX-Expat/XML-SAX-Expat-0.500.0.ebuild b/dev-perl/XML-SAX-Expat/XML-SAX-Expat-0.500.0.ebuild
deleted file mode 100644
index cb04a08..0000000
--- a/dev-perl/XML-SAX-Expat/XML-SAX-Expat-0.500.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=BJOERN
-MODULE_VERSION=0.50
-inherit perl-module
-
-DESCRIPTION="SAX2 Driver for Expat"
-LICENSE="|| ( Artistic GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-perl/XML-SAX-0.15-r1
-	>=dev-perl/XML-NamespaceSupport-1.09
-	dev-perl/XML-Parser"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage )"
-
-SRC_TEST=do
-
-src_compile() {
-	export SKIP_SAX_INSTALL=1
-	perl-module_src_compile
-}
-
-pkg_postinst() {
-	pkg_update_parser add XML::SAX::Expat
-}
-
-pkg_postrm() {
-	pkg_update_parser remove XML::SAX::Expat
-}
-
-pkg_update_parser() {
-	# pkg_update_parser [add|remove] $parser_module
-	local action=$1
-	local parser_module=$2
-
-	if [[ "$ROOT" = "/" ]] ; then
-		einfo "Update Parser: $1 $2"
-		perl -MXML::SAX -e "XML::SAX->${action}_parser(q(${parser_module}))->save_parsers()" \
-			|| ewarn "Update Parser: $1 $2 failed"
-	else
-		elog "To $1 $2 run:"
-		elog "perl -MXML::SAX -e 'XML::SAX->${action}_parser(q(${parser_module}))->save_parsers()'"
-	fi
-}
diff --git a/dev-perl/XML-SAX-Writer/ChangeLog b/dev-perl/XML-SAX-Writer/ChangeLog
index a5cceb6..0156a05 100644
--- a/dev-perl/XML-SAX-Writer/ChangeLog
+++ b/dev-perl/XML-SAX-Writer/ChangeLog
@@ -74,3 +74,9 @@
   RepoMan-Options: --include-arches="alpha amd64 amd64-fbsd arm arm64 hppa
   ia64 m68k mips nios2 ppc ppc64 riscv s390 sh sparc sparc-fbsd x86 x86-fbsd"
 
+  24 Sep 2016; Andreas K. Hüttel <dilfridge@gentoo.org>
+  -XML-SAX-Writer-0.530.0-r1.ebuild:
+  Remove old
+
+  Package-Manager: portage-2.3.0
+
diff --git a/dev-perl/XML-SAX-Writer/Manifest b/dev-perl/XML-SAX-Writer/Manifest
index f835434..eb1b603 100644
--- a/dev-perl/XML-SAX-Writer/Manifest
+++ b/dev-perl/XML-SAX-Writer/Manifest
@@ -1,9 +1,7 @@
-DIST XML-SAX-Writer-0.53.tar.gz 30754 SHA256 8250e36a061e2ed05a9935c556bb0874a7de5b6d61a94d43407ae78bde2c89ac SHA512 157e67821dbf37f7bc956308b51104079b7ac6b08623a115c40d61c6352767e542c04d316e82a9e245f22d289d1c3151cd54670574ca62465322da9edd8ae68e WHIRLPOOL fe900d86424e6d91bce130abb6da5cc1a4ac0d64ff96bccdaf214ac71387d330dc6706d24ec4cedb6da20dadf318f1d362508189af0b06e5d0c4f3d57866bcf3
 DIST XML-SAX-Writer-0.54.tar.gz 21399 SHA256 a1b4d959aed8f8337523c4cef4b431e56e619c795dc6f99a868548952101cf3d SHA512 c7c7dcf157b872b2f4c4dbe4119945e31fe4ffc1eaf7df68e19b0e892cba5ff1ea0b4213199fdeca2747ca75169d14a3811a90c16915c40454b3ef22b754cf27 WHIRLPOOL 853411b4a32f7f973e46542b6aa4e52de926e0947f65e6884617739156fe81a13fe87ae7571dc44b13e93335c0c2a9e09c7efb8990580b3f63e18ac59d04b7c7
 DIST XML-SAX-Writer-0.56.tar.gz 21484 SHA256 d073f7a25072c8150317b86b99d07031316a15bffab99e63e5afe591c8217d03 SHA512 af792d43394133adef608a80fcbaa0e24098e9b0408daac91aefb43735d20a27fcb003c90c95d1e472d2b951b64d5ce81ca9e1da956973eed1856f8b111cc866 WHIRLPOOL 9bb10032f899b5a6286990046591d44be4a820ad32a650c51bf4191b8628cabe5d555ffef54824f641f86b1c8291a25186b0d33c3f2c8b241ed4b80e798a6692
-EBUILD XML-SAX-Writer-0.530.0-r1.ebuild 532 SHA256 7c359118c14322ca2ff51ef7e55443947b96fed8e12649f093159e95928ed46e SHA512 cb670b539743d62b92c32f0f9c8129ba65db9f9f149de4c727a235b67b1907b30322b7d6511747eb8fcc4a85781aa4b50b79e0da23c8d5a8f6bef476b9151a44 WHIRLPOOL 02e4e275ad20315c342a68ccd5ddec3f5069d645b09fc846a7c45560fe6bdc763818b545f57625d9dc2f5c2aaac3fbfc9f33bd78cec6d71acfd1c1fa0c262514
 EBUILD XML-SAX-Writer-0.540.0.ebuild 539 SHA256 a4d7a01b5cd8cf5f1e7afbaef2d586f39bbf608f29bf04094cb0f417b205126a SHA512 2d138d7b5532946cbb1ba5d23885f414bc7adff8c49d2773568c1e91be1f4aaa49f94d77e3ac5a2119dd1903e5674f29a1df935f07698c1a863406f2c206faab WHIRLPOOL a5ba90f401cab5557e2c62fc38c7425472df5bdfdc8750f7747c9597498af7a122536df60861ecce019e03a01707a792ec5d48fde114f1ec079b2bab78786535
 EBUILD XML-SAX-Writer-0.560.0.ebuild 548 SHA256 ee7586589199c0939ed82d940ed0f8f120e292fa2d66340b3ee9089249469f18 SHA512 bf5b07eb554527696e7f775710e0ba5bfa5bdc37e2e75f044d2e43796ad636a04843c3916c015308b7c34055b0d679aae2b49366da070456ad9f05cc860c9113 WHIRLPOOL c50b0e0f340dea146eff28293c3bfc207ee5e5cb4d453ddb246108368ee817f168f5b571df7351140ef432fb175f9749db787ef636ee3cdf32811d126aebdf6d
-MISC ChangeLog 2916 SHA256 d3984a7f608163e03260e54b05c4e6db68fab6583de8c4cc4f0ad4f30cc971e8 SHA512 11bd432646bbb6990117a9075d243fc581cea4fbaa0b8dfbd712428ba20e0c741a010ee5eadad63ede782ce03b86f4e8d42aad2440025b21149129a052459238 WHIRLPOOL e3e27cc44d5d89d417d1f45c2cc56f14096d789bed06f2c134d5d2552fe076462194ef585ca6422e08893e4535ba9e902dec353614c7eb1b0fb6651b881fba73
+MISC ChangeLog 3058 SHA256 6a5e9e64a0f61e20e6513c95b9a7e416e26c52da6e56639910ecc44263c84c4e SHA512 14d327098ce418a4e7ed530bf1ed3d54f8daa0fe5b3b6dca7e90f0e396cf2fb1664a7c1184696d0aebe43d1cf60cfa8b9a28a8f0515e4cac0b0c9c8ab5a90d2c WHIRLPOOL f94781c3f56f81a0981757998e669af6d148f25285bdd50a7f002f7dedd8ab92a6b33cea5c055c7184d021550972d95bcba465c561530bf3b6e53a5316d59e4d
 MISC ChangeLog-2015 7111 SHA256 74a6ec9bf0970ecd6ddf81d28f3bc1255dce534338529a2fcdd48d65efdcf694 SHA512 e7a0ff15adecedc880031dbacbbbdba559e64c59976c3a9daf4b7ca19fad08cdf4085fcac44029cc0ca92b0681df889c22bf67e897d921e2524edec8fe986294 WHIRLPOOL e1bd361cecf099d09ab132d96160995cde9bba024de1c13cbadb3b7c88b52b431ee0a84868c9b1476f1f38660f2c9f0fc81b14f143b32d24a290b4da29fc7465
 MISC metadata.xml 1090 SHA256 3ca784566621a098678755f0002fc8878ced47ce3d724ec839e7e1a33604ff1b SHA512 015b74cb17c2f62ede3c2ecfd414982a14b574aca86544ed59654f1a47b0af649e6f7522dfae6176ad0943d97fc47606e235e9f626ff5001df9350af537d7c33 WHIRLPOOL 6301b9d502f0f07d36e335a29b96e5b010e0345a7a61c3a829f9d2d6027fc8ff454de22402deb4c8aa48da2f6a19129b1ef8abae3adc4cdc036ae0979376f06c
diff --git a/dev-perl/XML-SAX-Writer/XML-SAX-Writer-0.530.0-r1.ebuild b/dev-perl/XML-SAX-Writer/XML-SAX-Writer-0.530.0-r1.ebuild
deleted file mode 100644
index 1449b42..0000000
--- a/dev-perl/XML-SAX-Writer/XML-SAX-Writer-0.530.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=PERIGRIN
-MODULE_VERSION=0.53
-inherit perl-module
-
-DESCRIPTION="SAX2 Writer"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="dev-perl/XML-Filter-BufferText
-	dev-perl/XML-SAX
-	>=dev-perl/XML-NamespaceSupport-1.04
-	>=dev-libs/libxml2-2.4.1"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-python/botocore/ChangeLog b/dev-python/botocore/ChangeLog
index 1ae2a02..fd66d40 100644
--- a/dev-python/botocore/ChangeLog
+++ b/dev-python/botocore/ChangeLog
@@ -498,3 +498,15 @@
 
   Package-Manager: portage-2.3.0
 
+*botocore-1.4.55 (24 Sep 2016)
+
+  24 Sep 2016; Alex Brandt <alunduil@gentoo.org> +botocore-1.4.55.ebuild:
+  add version 1.4.55
+
+  Package-Manager: portage-2.3.1
+
+  24 Sep 2016; Alex Brandt <alunduil@gentoo.org> -botocore-1.4.49.ebuild:
+  remove version 1.4.49
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 5537f12..6eb373c 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,9 +1,9 @@
-DIST botocore-1.4.49.tar.gz 2720919 SHA256 c7804efb622f340593ae49cc552481f2820de2088199a0010d469cf0dfb94731 SHA512 677d79bcd3cc13aba62693294952542588e016682a0e682cbf6b4035ea202abaf0b805664ae8c6b599df2f29f180ce48631286c9a8745ae7003b1858eda84259 WHIRLPOOL 3e5890f8ac15ae4db3e48d5f4c049eccf4de45e0a805988f5492a6b103faa64d636ec9113f4949523dc7706ed45ab0004481111b63821985da946b5eadc0e1cc
 DIST botocore-1.4.51.tar.gz 2753035 SHA256 e6216bf77f23c49eaae9fff4ad3903af2fbff0de92d2d730d8ca83447be33ad9 SHA512 80849c9eae2d700751258cc8dcf099a8bb8210c0f8f92f2daf53125879b91b7934f56fe98afdac38a92997fb9cb1584d3e188866508514758d4b587d9c1913cb WHIRLPOOL d0014eb9c10215dd4fbaab220a7a9db308dbb6c19857738c650a479591d5d63da4abed95d2c2708f8a92cd7f438c0518ed5216dcfa3332b94abe3fd3050d59df
 DIST botocore-1.4.53.tar.gz 2772347 SHA256 7d6c96999e57145fb0b0c9534c3c7bfa9dfd30a58a4d9ccaa89f734211d987ad SHA512 28a6b2dbea3ee5394df15fb2c99a9d353fb75785b8e87e309c7c77dc61fe3fc508d76bbcd3e6cf928851be4cb236c4a375e8307a1b97db0f224b7057007cdcd7 WHIRLPOOL c14095f6f3e7aa616ebb258634323b266e8668eef89839250760ad09e23b9686ec421a6388036b1457295248b019484beca597e92d0efc90eb4dfff0e9cbce22
-EBUILD botocore-1.4.49.ebuild 1314 SHA256 223912df657473514b7ca2755fe040222861b6fecdf5ecb9d99c33e6d4f74a77 SHA512 94783565baba10a0d9e0d9ff7ca4a47642b7a355df129231a49958b9a5cb3d23801f8afbd4736381c86143b8359ca1d8742747162d0b258474f082045b5708f9 WHIRLPOOL abe73057513dff80e56d26215931686a3085d63ea586088e7f84d5f41198b8c9cd40305b530b1caaed75a20e1e60c1c1e8fca736f09b1222a6feb13faac45e44
+DIST botocore-1.4.55.tar.gz 2774299 SHA256 0c0a2ffa545cb4209cac4f8caad4463d12e17c052a2a643814109782a68540b8 SHA512 5d5311112e56329afa37f7930102e60d6372790c9c45f76f483936fb53eb97608f6a2b7d3c39c5c03e576a25e1b8944586761b11465409cd57bbed2af590a5d7 WHIRLPOOL 1ebe49e320cb894281a3e7b35779baa99d7d7f1a59aa469cc0ef8e67880cc6eb070ba43cd4040f5fa57b739be4f3aac8c83a6d1d797f3fac942109ef40c9fa60
 EBUILD botocore-1.4.51.ebuild 1314 SHA256 223912df657473514b7ca2755fe040222861b6fecdf5ecb9d99c33e6d4f74a77 SHA512 94783565baba10a0d9e0d9ff7ca4a47642b7a355df129231a49958b9a5cb3d23801f8afbd4736381c86143b8359ca1d8742747162d0b258474f082045b5708f9 WHIRLPOOL abe73057513dff80e56d26215931686a3085d63ea586088e7f84d5f41198b8c9cd40305b530b1caaed75a20e1e60c1c1e8fca736f09b1222a6feb13faac45e44
 EBUILD botocore-1.4.53.ebuild 1314 SHA256 223912df657473514b7ca2755fe040222861b6fecdf5ecb9d99c33e6d4f74a77 SHA512 94783565baba10a0d9e0d9ff7ca4a47642b7a355df129231a49958b9a5cb3d23801f8afbd4736381c86143b8359ca1d8742747162d0b258474f082045b5708f9 WHIRLPOOL abe73057513dff80e56d26215931686a3085d63ea586088e7f84d5f41198b8c9cd40305b530b1caaed75a20e1e60c1c1e8fca736f09b1222a6feb13faac45e44
-MISC ChangeLog 13279 SHA256 5e8ee6cf5de0ec4b8cc5360719990668d12731aca0c34ebf29fb4cd9481156bb SHA512 9ffaddc527bae3ffea06e838d4a8d78f51118fc7b0131dbe17de171141f8d14408f81f21f1059d423fedb2e8846e27c6369b3870ab4bd3fd16c9d46b09c20faa WHIRLPOOL a0269ff0d70835934e62b9aaf5a76ed49e71ac5fb2930cb382c2e42feadc5c560415be80ca297f54ddbe6516ea3e15a9377757d886b1facaeb26b335bb7ce2e5
+EBUILD botocore-1.4.55.ebuild 1314 SHA256 223912df657473514b7ca2755fe040222861b6fecdf5ecb9d99c33e6d4f74a77 SHA512 94783565baba10a0d9e0d9ff7ca4a47642b7a355df129231a49958b9a5cb3d23801f8afbd4736381c86143b8359ca1d8742747162d0b258474f082045b5708f9 WHIRLPOOL abe73057513dff80e56d26215931686a3085d63ea586088e7f84d5f41198b8c9cd40305b530b1caaed75a20e1e60c1c1e8fca736f09b1222a6feb13faac45e44
+MISC ChangeLog 13574 SHA256 16fe8a25899c8c81392b2e4d34836c611ab649a87a2451bb5c9e7f1cee5be55b SHA512 902e0101a16de5236382abbb0f03db7d7cf99f17068bf485473330ad0e50b13649c911799772dab3730665162954c246cd4c7c3ad617b3af67c2b9baa369a64c WHIRLPOOL 89bd8a3201fc83b96ab7dbb71125fa9b4dd9f6d9faa60ae0a5402ac82890075cafae6f8d7627c5b4a31cf332c861d51494cdbc86b3977e2a83633ac3c64a1178
 MISC ChangeLog-2015 479 SHA256 3e53c9fa4c06129b6bcab3ffdbc61c3a57b2efe4e07d3b4ecb798cacd4d72f2a SHA512 2fa2e5d33cef27149e736e44651b86b46c94c1b8df8b8c12f89bc4a7ae8df6d14e7f3556e1083210bb0e93be5298d1906eb065b6aeb39ece66f2fbdb227a8597 WHIRLPOOL f7472f145114fc9323e8a8c3064cd5efe78020aa7f6812620495d4642e3835e6ddd893c49d4a38f26768b53aab9bb49ad3068f03ef973bc73b09621aada99815
 MISC metadata.xml 419 SHA256 7d300d8da93cbe8fa41fa544b529496aa98ad8e7a8e7123ab303edf0f7f95608 SHA512 b274233bddfb0f29313f42c93e1488a9a33f2b18feed2797cffc675c6d10c10898659c97f7fb7c65f8d3065bb305109cf1a79a8dafa172cf3e90f924ae3e8a6f WHIRLPOOL f931e2e00903a05667d2be3a9c0f5445844515a8e6e437c41021702cdbcec9b723b52f27a9eafa0ffe043c27bf653dea3db34f610eaf2a8065fad34fa78f43ef
diff --git a/dev-python/botocore/botocore-1.4.49.ebuild b/dev-python/botocore/botocore-1.4.55.ebuild
similarity index 100%
rename from dev-python/botocore/botocore-1.4.49.ebuild
rename to dev-python/botocore/botocore-1.4.55.ebuild
diff --git a/dev-python/docker-py/ChangeLog b/dev-python/docker-py/ChangeLog
index 9f797a3..dd8ff5a 100644
--- a/dev-python/docker-py/ChangeLog
+++ b/dev-python/docker-py/ChangeLog
@@ -227,3 +227,15 @@
 
   Package-Manager: portage-2.3.0
 
+*docker-py-1.10.3 (24 Sep 2016)
+
+  24 Sep 2016; Alex Brandt <alunduil@gentoo.org> +docker-py-1.10.3.ebuild:
+  add version 1.10.3
+
+  Package-Manager: portage-2.3.1
+
+  24 Sep 2016; Alex Brandt <alunduil@gentoo.org> -docker-py-1.8.1.ebuild:
+  remove version 1.8.1
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index 933a720..292f21e 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -1,11 +1,11 @@
+DIST docker-py-1.10.3.tar.gz 121064 SHA256 3042c0b3ca5333aaaa53f0aa7acc19b5a1258b0f2fcf0a90da0f96659f52f64a SHA512 39bb7440849fcc815f6a36dfe402e76635d01584f9af3d17610d0c70719f46aa16b697058feeda961b9830e463fba5aeac2cc28752881ea0bf1cd0c6ca41acb7 WHIRLPOOL 92a0b7dd9a3fdedee7538bc1518035bca470c91a436516c87b2645b50a36fd5b884517f92759bd4e7f02cd6545335072bd801692cbb5c2b424cb6f4320ddea27
 DIST docker-py-1.2.2.tar.gz 69685 SHA256 85284a5b1a965e01a5d0a91f9f639ad5069143a276c123198fdafc3659280b38 SHA512 bf00b19e0ab56e5c0e8459234d09722ca504ecd933bfba61cb4ab4805410f53f6ad6083f2e964ef5a6eded2ea05aa01a89c27621064386bae145c7258ed996ad WHIRLPOOL bd7ff4579f924e02d18581b1aca00790dcb84afda03e4cde70b349bfdb4ad43aa2e06da2bcbe780f6074d98f9af9b14fb9d2ab4da9265e56b73288902c9ede7a
-DIST docker-py-1.8.1.tar.gz 101171 SHA256 82dc8db8088576ec5c42c203f7c46a88a26963e137ee0dafbf7e33882d75eb47 SHA512 c05412a43a774cc402e8f1bbb6c389c17e7fc335db4cfbe2d8a7001d7389f74fe51b3a2120bbbde640d93c5788283651b992389e3a09852eecb10e87e13466a0 WHIRLPOOL 47bdb88c07385d98cf5922ee420f85a93a84c62cc807acd9b0093ce55c386a4bd9f3cca1603e00259d32b0c3f0617282c49f23e4f67ead803a1ea5850ddeafc3
 DIST docker-py-1.9.0.tar.gz 105939 SHA256 0ff58798c8cf79c7e459505786b3b83ca0552a077945b8fe20fc38ff3f732361 SHA512 49e6d4e8ab30c4e54165e7eff9e3034a1fe102348020bad2c5aefa238c44efdf39711536a7727fd9689e2e90483a348930bb91f1e76cade546161c82990f78ed WHIRLPOOL d60bca034f91569f37bef65ff42fcf950dfbc02bc42053bb650a9188661a8c0d9c21cb03128782a15799e6f208e88b32618286615ef94ba9396a4940ae3b6603
 DIST docker-py-1.9.0_rc2.tar.gz 105689 SHA256 30770466eef8fe5db3ac75ede506bb412de8a59600954089b385b4d134d54051 SHA512 8c4993aea477ae640660d10f80ca0a9b5f40f1d7a446cc67d392b824c78272ee32d42004952a70a3a55a105f313c06338266b206f4193cab736fa84c3c9b4d8c WHIRLPOOL bf1329f20095d519756a68bc3bd2a95d6d476366e1cfdc38eb38a6ad4a25da11964a20d039fb32af69dd4bd76b578b43b3b6b468767ba2fc8305b088019ae17c
+EBUILD docker-py-1.10.3.ebuild 1501 SHA256 01d8ad7bdb4b1bc95b9a450c6b14ff6ab3edb851bc904b2a93c7de7bf1fe4783 SHA512 63c82438e3c2a33592577b2a547cc279ef47baa00a5928aaf1f4661bb80538fbab1795c25cb916674cc165fa68f8b81e42a45e844faae4f57551b363b494d25c WHIRLPOOL dba9b542a8f34773b95dc8e38394659d795607f57dec897c4f4b528d4f1f23135d6bf78a0fa2a5a89b817679723de9b149da83ddaa249336eac760cd09f95175
 EBUILD docker-py-1.2.2.ebuild 1061 SHA256 ca750f4a6d44ecec904af749c28f178691258d7f5bded6ef31e4b5dc3f68a95e SHA512 25371c7bb5208dbed6aa01a8b07759007fd3aa45ead47a16f0829c491e313f7b204d87d2d55d9e4d168ea5c1d4b99cc6da7454e216e47bc3dcbb46f5f1ca223c WHIRLPOOL 39a5828e002cb49ced06e5f4708ae65bab7dfcd73b4af0540649207ea4842d07d722b969f49772127fafb7567b5b54ddc19f8cfcfcb2afbeb3cad84fb547eaba
-EBUILD docker-py-1.8.1.ebuild 1378 SHA256 fec46312717ce8c59db7e333e40babe6f3f81791c08eb84b596f8f6fd62bf350 SHA512 00a01b2b23e8d0c0581d6eabc7337eca14aecd32eb459282e34270d3fc7d82ddb4cd7d9b6a91e568231f9b27878187f8633187cec8f1e3f2b8e7a1cb141e4840 WHIRLPOOL 7fb8fa232e6b54045f9545173d31e35372fde6510d683d3b823f3e772084604d2437aef5da5522a910a3c5a6d69b54fac15a3636547745a9c9278f25e82d2f96
 EBUILD docker-py-1.9.0.ebuild 1357 SHA256 159797576dd35ec203e6d7e6ca078cfb6e6efa082bc24806d762d3a1b4b7adb6 SHA512 be96d7270dbe728def4840cef99dd199671122971a117728349527522d996158958d4373241a12432246dd9d60f07a4ec56949f6b5cb04cda270f531b6c9d527 WHIRLPOOL 7449409299c7d165fce640b89e84ce1a4a7381878ec6ee4be6fa9abfbb4b0ac06f5d2427996088ed7923c45825ab2600f33057a80c46cc37e0371e2303cf55f1
 EBUILD docker-py-1.9.0_rc2.ebuild 1378 SHA256 fec46312717ce8c59db7e333e40babe6f3f81791c08eb84b596f8f6fd62bf350 SHA512 00a01b2b23e8d0c0581d6eabc7337eca14aecd32eb459282e34270d3fc7d82ddb4cd7d9b6a91e568231f9b27878187f8633187cec8f1e3f2b8e7a1cb141e4840 WHIRLPOOL 7fb8fa232e6b54045f9545173d31e35372fde6510d683d3b823f3e772084604d2437aef5da5522a910a3c5a6d69b54fac15a3636547745a9c9278f25e82d2f96
-MISC ChangeLog 6911 SHA256 77cf4fa614294e022710f6857d3f8759c79c23194e6a0a9a116dabc72072a268 SHA512 266ad9b8e9d52981d0bc85ad844344c411b893d999df79bb5e27b99060178201d91cdacc5867ba736dd46456ebe663d1132f44afc1a0b8395964b94764050b83 WHIRLPOOL c51928be2ea18c827f3b32e5b2f41b8d9ec346e8c6f4ff6c81477c6a9749c85e642bed5c902b6fb084c8690ec84b9d774f06cf0814194e961ab6ee7d32e5d7d2
+MISC ChangeLog 7207 SHA256 673660443360ac6400d18c6d49865aee8ec96fc9c1ae6129a53cffb764263e3b SHA512 38da041aef9ebad5f1e92832db07ed6c0b496fe7bfc6b5c4ea9d9f4899a3f8d600d18e88d4460e2bfbfb7e1893265962d21beb59737d8bc349c2fa3c7d5f99b9 WHIRLPOOL 485cb8a3494b7217b475452edba37e73123e56312484f5845e8e27cb8b27be6f84cc1261fa37b3c24dda23dbeae6588c97e335966c069c1fe8c64cde34354be3
 MISC ChangeLog-2015 4931 SHA256 bb731371f5f8ff069b2d9288af740c946b96e808c6d886195594c75630002789 SHA512 0f3f52ec356ee461622bf9d1dde2ecfb636670f3905ae3d065b225be16d0912772c3fbe1adb6774dceacbfac8d31a14d14dfdf130aafc64e2105f1de2e070fc8 WHIRLPOOL b1614d7bbd5572b94d73ae05e2058b7b629223b214541792b2c5c76967a8cc8b534159aa6243a79d1e8fbf014e4748201e74a6fa06d4bbd8d201f636691df988
 MISC metadata.xml 444 SHA256 83cd9aec99286f16adb167f86f8790409594be079e254583b06a2ea1d06d20a7 SHA512 345f214dc85293b8b094657a8772d9906e7d694f36ea104100c2ef466d538640c988264afe2ebc4706112c86318fc39b0e002bff1e148a51b129048dbd5320a4 WHIRLPOOL 91ec1cded19b82cc09668d1d41b30aea5dc993fad1ff7b706e08cafa558658c16de69f57a0dd1f69b9bbde56eaf3eb91869ffe50e9d21a57cf742141494add19
diff --git a/dev-python/docker-py/docker-py-1.8.1.ebuild b/dev-python/docker-py/docker-py-1.10.3.ebuild
similarity index 78%
rename from dev-python/docker-py/docker-py-1.8.1.ebuild
rename to dev-python/docker-py/docker-py-1.10.3.ebuild
index 2c9b498..927bee7 100644
--- a/dev-python/docker-py/docker-py-1.8.1.ebuild
+++ b/dev-python/docker-py/docker-py-1.10.3.ebuild
@@ -7,11 +7,9 @@
 
 inherit distutils-r1 vcs-snapshot
 
-MY_PV=${PV//_/-}
-
 DESCRIPTION="Python client for Docker"
 HOMEPAGE="https://github.com/docker/docker-py"
-SRC_URI="https://github.com/docker/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -20,14 +18,17 @@
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/mkdocs-0.14.0[${PYTHON_USEDEP}] )
+	doc? ( ~dev-python/mkdocs-0.15.3[${PYTHON_USEDEP}] )
 	test? (
 		~dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		~dev-python/pytest-2.7.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.8.0[${PYTHON_USEDEP}]
+		<=dev-python/pytest-3.0.0[${PYTHON_USEDEP}]
 		~dev-python/pytest-cov-2.1.0[${PYTHON_USEDEP}]
 	)
 "
 RDEPEND="
+	>=dev-python/docker-pycreds-0.2.1[${PYTHON_USEDEP}]
+	<dev-python/requests-2.11[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
diff --git a/dev-python/docker-pycreds/ChangeLog b/dev-python/docker-pycreds/ChangeLog
new file mode 100644
index 0000000..1fbcdb9
--- /dev/null
+++ b/dev-python/docker-pycreds/ChangeLog
@@ -0,0 +1,12 @@
+# ChangeLog for dev-python/docker-pycreds
+# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
+# (auto-generated from git log)
+
+*docker-pycreds-0.2.1 (24 Sep 2016)
+
+  24 Sep 2016; Alex Brandt <alunduil@gentoo.org> +docker-pycreds-0.2.1.ebuild,
+  +metadata.xml:
+  add version 0.2.1
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-python/docker-pycreds/Manifest b/dev-python/docker-pycreds/Manifest
new file mode 100644
index 0000000..c605580
--- /dev/null
+++ b/dev-python/docker-pycreds/Manifest
@@ -0,0 +1,4 @@
+DIST docker-pycreds-0.2.1.tar.gz 7555 SHA256 93833a2cf280b7d8abbe1b8121530413250c6cd4ffed2c1cf085f335262f7348 SHA512 04a2dbd00c4e0a02bee13eaf23255e660b0e8640ef4225eff94e6c2391e5ceaf539b373ef932737dbc8eb4383746b374aca5a018a1f21c1eebb2f53160662338 WHIRLPOOL 5a3ef7689cf3cd7f5a1811b14f00468ab9d2fdd35ac0d2953164e3d453eb05efda951e169e1d59561c2134f097c8875a378f57d6327f032c4ca6db11039315f4
+EBUILD docker-pycreds-0.2.1.ebuild 517 SHA256 34ea32edbb35de8de54bdff962fcae498aa3e24e28e1d37a6623d7192f57b18a SHA512 aa69a882f488fc9e586d9613d529c6b353289c337ed261dbc995ddda794ff6e6170c8b3a2a8a222446740623add496193485e16690f3ebadeae50abc14cab696 WHIRLPOOL b77930b9a67671ee28c7603513a6ac932efba5fa01982a73466b2ddddf00d6b755d4641cf81382d58fb6888797e7c4668ab927d3318c645db37a919867c7419e
+MISC ChangeLog 333 SHA256 1bb801224808ce0bd2af42de8f53eb0469e2e919e53e68512063a6988a726e16 SHA512 374f7add1123b39d9d3658929275e2021ce75416e68015aaa7a15621595d9cd75c910ca502c8c9378b31814875b6ff6d7147791d4daf5d539560f358348ffe97 WHIRLPOOL 7c310b7c15d59a554eacac01322d066f82532ab8eb021338629905859daeb52861f25876aec3b95ad5fa4d252074811c7ee6e8f83a46c92c6b1f44c8f9a38d0e
+MISC metadata.xml 374 SHA256 f9caa3dc1e0b8d37c3da4399ee3616661bb172874a45fc5833dc50f5671997f7 SHA512 6db9204f82e2f238d4469ec01523b6faa5f20353333b7e10f00735504c88bb40574407c42c3b71b0d66d9c44e44d45fb17141862a1137911cb25e80417f86605 WHIRLPOOL 1ccbd3649662c083884323223fc2b567f7a5599fe8c60e52908961bfb5df325a70af0ff02ea35f80940d57c169fa6783e278297f81907e8083f3c377b45d7ab0
diff --git a/dev-python/docker-pycreds/docker-pycreds-0.2.1.ebuild b/dev-python/docker-pycreds/docker-pycreds-0.2.1.ebuild
new file mode 100644
index 0000000..bf78fe85
--- /dev/null
+++ b/dev-python/docker-pycreds/docker-pycreds-0.2.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the docker credentials store API"
+HOMEPAGE="https://github.com/shin-/docker-pycreds/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/docker-pycreds/metadata.xml b/dev-python/docker-pycreds/metadata.xml
new file mode 100644
index 0000000..3e6df16
--- /dev/null
+++ b/dev-python/docker-pycreds/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/fuzzywuzzy/ChangeLog b/dev-python/fuzzywuzzy/ChangeLog
index 6adc71f..b74d0c0 100644
--- a/dev-python/fuzzywuzzy/ChangeLog
+++ b/dev-python/fuzzywuzzy/ChangeLog
@@ -17,3 +17,10 @@
 
   Package-Manager: portage-2.3.0
 
+*fuzzywuzzy-0.12.0 (24 Sep 2016)
+
+  24 Sep 2016; Alex Brandt <alunduil@gentoo.org> +fuzzywuzzy-0.12.0.ebuild:
+  add version 0.12.0
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-python/fuzzywuzzy/Manifest b/dev-python/fuzzywuzzy/Manifest
index 3e3ed19..441c771 100644
--- a/dev-python/fuzzywuzzy/Manifest
+++ b/dev-python/fuzzywuzzy/Manifest
@@ -1,6 +1,8 @@
 DIST fuzzywuzzy-0.11.0.tar.gz 17260 SHA256 3d3d961c24aec15d48e9d2a60d7fdffce18d0a168d4e0ca2dd22571d5c53cc80 SHA512 a6f88f76ccf54f775a64e9325f4b06630db2f9fe9d5d34540a0bc48e23659964c0230aa66a9bd65214c22a7b2ee0621d12e3ee85a35b29614c8039398c023eb1 WHIRLPOOL 6c5a5ec77466c5d22a098d9a3b0314d1ab9ea6e286b4053e0e472cb84b4ba3995fc8c8c2f0328a0dd096cb17b4b65b6dac67ef5fd15d47d10ee26aba89e6a909
 DIST fuzzywuzzy-0.11.1.tar.gz 17364 SHA256 093365555f9c8f170d4d6af4db3c5f23c2d587d3a03ba150c9cab51b9bce3594 SHA512 20b28be5eb0a2b8e618c0c6238364ca56668c56a41489f1c2a7358e898ca36eef7b69029c74b5bc764e0aeda0cb10ece1b1ab3f10a14a47567781dff56214e89 WHIRLPOOL a41ed0bf16024703a9f121a0c1d67a6ca0f7c248814f6ffd711e7d779990a57d5bc9c0323e43afb369c96a0ef3d69a57d30bd545d004c268d647b6fd9f6e5d0b
+DIST fuzzywuzzy-0.12.0.tar.gz 25792 SHA256 0a39865799ada1d514c8ac612194a2d1c8a335f67c17078d5ab0bb9ec980ac33 SHA512 d4312342af9e3fc9383e1967e60b2856af73e8ad869f6b694d3f737d0280cd840dc42779b0407aefce2571d98c97ab780912943078c4d94dd77502c4e28bd2cc WHIRLPOOL 161c464690b9f2479f0eaa158619c764fa179371aa7bfe4757dd5e68ab84dc819e001da7a04f1be54815ad49de299cabc39c44fbf1bba7c5a2a29c50dd1975e1
 EBUILD fuzzywuzzy-0.11.0.ebuild 547 SHA256 b4a967f4929482f59f3332aef2854235700d5e3dc91fa8a75cd9febb513bebf5 SHA512 c77982a308b2ecc8290bd6fbdeaec34fc8f3fd4ee506e5f9bebdc97078ccf289851eb634f1517d73f55e0820576303d07c0b4c79669311bd054c2b8af5b5b2fe WHIRLPOOL 64522faedacec47b9377c7b0bc768ac208cab20deba16e95d900969e2419883c62a2529f4ce9a0d85e9b847f9ea1ca1c14769b6a522b416e41f7308a61a70ddc
 EBUILD fuzzywuzzy-0.11.1.ebuild 547 SHA256 b4a967f4929482f59f3332aef2854235700d5e3dc91fa8a75cd9febb513bebf5 SHA512 c77982a308b2ecc8290bd6fbdeaec34fc8f3fd4ee506e5f9bebdc97078ccf289851eb634f1517d73f55e0820576303d07c0b4c79669311bd054c2b8af5b5b2fe WHIRLPOOL 64522faedacec47b9377c7b0bc768ac208cab20deba16e95d900969e2419883c62a2529f4ce9a0d85e9b847f9ea1ca1c14769b6a522b416e41f7308a61a70ddc
-MISC ChangeLog 490 SHA256 e9415a6dab885f85ce6a08dec7cf8b126476e53d7337614ebefb81d74ff37d2d SHA512 4a716973e2772d791705fcc26ffeddbbd8695ca0cccd347caad05c4aef1cd62ea668f2576c24d247812ee91ce82aea64c580abeae69f91cb0ab40fdb74347210 WHIRLPOOL 5a420102347f918f9df3d19500af04054175ca168810840067a14da3eb3505c16dcf8d78cbf368901debd624f8cf8c24e55d76a8e52d34519780441c4da1364e
+EBUILD fuzzywuzzy-0.12.0.ebuild 547 SHA256 b4a967f4929482f59f3332aef2854235700d5e3dc91fa8a75cd9febb513bebf5 SHA512 c77982a308b2ecc8290bd6fbdeaec34fc8f3fd4ee506e5f9bebdc97078ccf289851eb634f1517d73f55e0820576303d07c0b4c79669311bd054c2b8af5b5b2fe WHIRLPOOL 64522faedacec47b9377c7b0bc768ac208cab20deba16e95d900969e2419883c62a2529f4ce9a0d85e9b847f9ea1ca1c14769b6a522b416e41f7308a61a70ddc
+MISC ChangeLog 656 SHA256 a4cc747327b002b4993e8f3429d035ce976b71e503308a07e84f2757e91557ce SHA512 c13689e48980a543bf0f238bca981929fa3a022959fbb81010424392d8e268bf8248cbe61aaa6e5b43d5e37df0072d7a32cc42a4df690def5b7053608a0415a3 WHIRLPOOL 6c1362bae445d26589dfdb569041ffa07c7a4ad52749f33ac5ce73f4085e7b8b3409e26628bfb09395133b99aa69a3f0bea3ad4ef25856f0517f8854589ab505
 MISC metadata.xml 374 SHA256 f9caa3dc1e0b8d37c3da4399ee3616661bb172874a45fc5833dc50f5671997f7 SHA512 6db9204f82e2f238d4469ec01523b6faa5f20353333b7e10f00735504c88bb40574407c42c3b71b0d66d9c44e44d45fb17141862a1137911cb25e80417f86605 WHIRLPOOL 1ccbd3649662c083884323223fc2b567f7a5599fe8c60e52908961bfb5df325a70af0ff02ea35f80940d57c169fa6783e278297f81907e8083f3c377b45d7ab0
diff --git a/dev-python/fuzzywuzzy/fuzzywuzzy-0.12.0.ebuild b/dev-python/fuzzywuzzy/fuzzywuzzy-0.12.0.ebuild
new file mode 100644
index 0000000..6368bfd
--- /dev/null
+++ b/dev-python/fuzzywuzzy/fuzzywuzzy-0.12.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+inherit distutils-r1
+
+DESCRIPTION="Fuzzy string matching in python"
+HOMEPAGE="https://github.com/seatgeek/fuzzywuzzy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_test() {
+	"${PYTHON}" test_fuzzywuzzy.py || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/libcloud/ChangeLog b/dev-python/libcloud/ChangeLog
index 149009a..c88b9ff 100644
--- a/dev-python/libcloud/ChangeLog
+++ b/dev-python/libcloud/ChangeLog
@@ -78,3 +78,12 @@
 
   Package-Manager: portage-2.2.27
 
+*libcloud-1.2.1 (24 Sep 2016)
+
+  24 Sep 2016; Alice Ferrazzi <alicef@gentoo.org> +libcloud-1.2.1.ebuild:
+  version bump to 1.2.1
+
+  updated copyright
+
+  Package-Manager: portage-2.2.28
+
diff --git a/dev-python/libcloud/Manifest b/dev-python/libcloud/Manifest
index 0e503b2..477c46c 100644
--- a/dev-python/libcloud/Manifest
+++ b/dev-python/libcloud/Manifest
@@ -2,10 +2,12 @@
 DIST apache-libcloud-0.15.0.tar.bz2 571365 SHA256 fcfea13c73279aaa846bbc6a22dad37864b2314b8497a3a4994b2b0632cf0633 SHA512 b0e85dba0a70701784903510e6eed1ada082b02e989a6af43122e3eaaaeee1cbd5da59660e1e78877219798b50f395d02d0738ae983bd1665eba0984d737e16c WHIRLPOOL eae1dd98b931ea88431d34b18325a3f62ab076d52fbeedc9ee9507234133fc1d99eed4cd24a3411e50870008aad3233f5d715341e3c2444aac29c6c3e35299ed
 DIST apache-libcloud-0.15.1.tar.bz2 570953 SHA256 557e3f29e0ab1f19a31e858a8e802c822cb7f07df5edce029a1c67d2b0f30d15 SHA512 0cbc02c955cb91e135d73a5198ad216d0f91fa942b88dd1ffc1c46a487190f45500f003d2825cdb4f6c96c4ca7e5cf2681709769b0c2d8801b08e5a41b3d69b0 WHIRLPOOL 0143a7d2c337603f769bb2d3fd4fb98df18c82dfaa09c12fe481f18eb300c65d9efd4e18756d0c75a691b6d755fff0f62d41ccda3c9006955870fb8631d8366d
 DIST apache-libcloud-0.17.0.tar.bz2 663406 SHA256 22a6360fccbd956398e3236dceacc469c397d0d8c0caad33352f224b352bd943 SHA512 a87d60362c43e3a1f1a4534641985d81b07ff8ad5029cd04b446fcb30cd3373471c86f62aeed75c98cbbe61d59aece50b2e8deead755535b609847ee60ce8027 WHIRLPOOL 727f0c5c2542a5357d20e587e005f7017754e6214646af170ec639c737325be0e5bbf9215d9b35ad3cc43f9edf3ecdabc93fb1907bfeff49f7fdd1073a606d27
+DIST apache-libcloud-1.2.1.tar.bz2 992983 SHA256 1f4f607855c1ff5d88dc709849e746a2213d99c6dfc7054244af8be1caf79062 SHA512 12e239f286d8eb523597488998582be02d6e8cd4e21a8fa7c639c829ba622833e4292ac4cd7cbc8b94670e19ec1711cb0032bc72433f421bf2ba2b8c70dcd954 WHIRLPOOL fb9574bfa81e08d34cbce6b96988425cf9b0aa44202397bf345383eee95e564de1427581cc3cb0095ea37912b64a40c65e1ca55383bac9a27ddce4ef63f4adbd
 EBUILD libcloud-0.14.1.ebuild 1030 SHA256 7face43b5e2193ba99a478a8b25c2201e8757f7e773bfa1f5999e8e3514048fe SHA512 b02222755795b86a5aabcece3643b1438aed6d5c005a9a5aa2d2f32b42a195035188e4e42a56a4ecd4c71edae50a72af4cb2fecfd812f435a56e3afe31e802f6 WHIRLPOOL e386cce6ac1e0c0053f235089162955b9e15a7ad5cbede7ca6992c13ec35ac0d513b4b5fc92d67fa5e4353e877bb85ffc61f13b31b00906d6d06ea56bddb1ab6
 EBUILD libcloud-0.15.0.ebuild 1071 SHA256 adf699f770822b0bd65435d2bdfaf75589b986d9f6a68d7adafa846fb6917947 SHA512 24cb266ab8799ca1f029228367bc3fb3542e52a483ed4ceb173e02f8547491bad20dddc414f2038093a7d6170306712dc41e35948e99b97d2d0f81c7925613ba WHIRLPOOL 358597197e5096b8328b7bb4565c4c4814657a2fb6048eee8a92fc6d701f0fc3d1659ddc82c82826cf4ddb8c593fbaf9372f6d37da9bc247e717ca4b95f6a4ce
 EBUILD libcloud-0.15.1.ebuild 1073 SHA256 900295a6de82405fefc8d8759613f6d1d7880fe18775004e25b0acb1deadae1d SHA512 85279e76ddbe9ac83970b9b050b865fb09e6e1bee017a5f33ca22e129fe3acc8b82538cbf8c868b1c43face09641e3b3a05475217bd0c79b3e181a9323ae6e60 WHIRLPOOL 4b62c7bb39b6bf8a77bb7865fe03c842c609af0a904015e956eb01e6da783d55a4910f8e8bd95e1d56315afe27a9505a122ea7c8f009f9bef3bc511762f6231d
 EBUILD libcloud-0.17.0.ebuild 1182 SHA256 931cc6638f466ae28124be331bea363777d32bda9d3206f6da76c40b8e187049 SHA512 4d55f1004cf2ea9679f2901467cbeb1ee2a2ac248b56dcb162b8f66626b1e10b2f10107ea655b0e8dbfbb324920dcd847ad3d7c152ebfdfca6d39ae94e6bed5d WHIRLPOOL 89f482190947f9837f48c5fa747561fdd8f5388bfb62a04fddf7b22c8ed6104169906f5432e9d277a3adff555996e3ac27af7c2abe656dcb7ee8fff37314f761
-MISC ChangeLog 2917 SHA256 112d692a2c4010443ee056ff0dc1a6fa69a7405b282f132a8469d818f2c08bd4 SHA512 1ba8bbd5ec85733afa8ea79984bf1465977f445a4cf7c5c98a80b0316ab2f6d15d406e62f9246a5033866b747c391e60f29c3e0bbeafbae2fd666eb5eefc4b25 WHIRLPOOL b7e6a0cb77f000dcb57258e89d986e7cf588d19c370b15b9fed01b6c37fe0fed58f7de743c63ede97b1a888c0c32a54140b7e87316b5d87a0e2c819dff2dd466
+EBUILD libcloud-1.2.1.ebuild 1182 SHA256 55532dc117dae1688f1533ebe005a485f17f1958c988d8be9612a2c58876f82c SHA512 95d3c70420a2d1135a7dfd6b1ee7819474432618c5ed54cd311bcf02918c749a1a4c327b902ff782c9f193ef452792b1c511a887d870bdab8bc99846aa1acbe0 WHIRLPOOL b3428ee8ff47f97aa6c4551dd08b8b9e9d8a52ce115005d27012456bbee041da7ad80649c11089811f9da26ee63e9554dc2510c98b070d31cb01da3a1d73e970
+MISC ChangeLog 3103 SHA256 8e9a4b12d8d491130b182093ff1a01e452a805584f32c6996bee7f839493664b SHA512 8603d148953c7e5d7b663d2a1064c1adebf7aeb4a39b24a0871f23435880bb41a1a88bf8663fcd40732f7ff1a7966ca21aba481951699224fc4b672069dd645d WHIRLPOOL 57500a526ed6b4f7e3da75194e8106032ac95acd00b4cfc78925ad0fad388cd999659b9ff0d0eee321295427cb1d361814f49e69d67c812c7327e0a9e3113f27
 MISC ChangeLog-2015 3296 SHA256 e997d4fe07d8a51bb3caf7ceb94160d9f3e563ecc95a8e33b62dc6a2bf349079 SHA512 4ea2fd458e4ca22efe545d8829b9cdfa624de21066e360422ba4059d472df1b7e54c26b34f5bbddb0580394c1d0ab7e36182e72867174f9f0c3974a087067fe2 WHIRLPOOL 92491e1b35684895e4d154dd6db3e7aa20515f6ba736190927cc4eed0fd371a75823164c943389241e37b3b89ae20f2672a97f395ddea6bdd125cbfa559342d7
 MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/libcloud/libcloud-1.2.1.ebuild b/dev-python/libcloud/libcloud-1.2.1.ebuild
new file mode 100644
index 0000000..c83366b
--- /dev/null
+++ b/dev-python/libcloud/libcloud-1.2.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# py3 dropped due to failing tests once lockfile installed
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Unified Interface to the Cloud - python support libs"
+HOMEPAGE="http://libcloud.apache.org/index.html"
+SRC_URI="mirror://apache/${PN}/apache-${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/lockfile[${PYTHON_USEDEP}]
+		 $(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python{2_7,3_4} pypy)
+	)"
+
+S="${WORKDIR}/apache-${P}"
+
+python_prepare_all() {
+	if use examples; then
+		mkdir examples
+		mv example_*.py examples || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	cp libcloud/test/secrets.py-dist libcloud/test/secrets.py || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/multidict/ChangeLog b/dev-python/multidict/ChangeLog
index ef576a5..fb74353 100644
--- a/dev-python/multidict/ChangeLog
+++ b/dev-python/multidict/ChangeLog
@@ -81,3 +81,15 @@
 
   Package-Manager: portage-2.3.0
 
+*multidict-2.1.0 (24 Sep 2016)
+
+  24 Sep 2016; Alex Brandt <alunduil@gentoo.org> +multidict-2.1.0.ebuild:
+  add version 2.1.0
+
+  Package-Manager: portage-2.3.1
+
+  24 Sep 2016; Alex Brandt <alunduil@gentoo.org> -multidict-2.0.0.ebuild:
+  remove version 2.0.0
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-python/multidict/Manifest b/dev-python/multidict/Manifest
index d53845d..62d2969 100644
--- a/dev-python/multidict/Manifest
+++ b/dev-python/multidict/Manifest
@@ -1,8 +1,8 @@
 DIST multidict-1.3.0_alpha1.tar.gz 98403 SHA256 05d5e5e6572a250fa4084bb5b3408621ccae6ff5ad2eb3130ca789b181786e46 SHA512 71831a567e7098aaf3f1273335249dab12a96595dd233f88dae114c7dd26beca53c6f55f9a5b2ec4145d62acf84f1734778d0ccb1a54c380569030ae4a3d2957 WHIRLPOOL 5cc1b3344f4c57250afe91e6168400c44bf39aaea25778a00907d9585b835754ac9e8b12ba584cf39c28e93945196a0fdb2a5f425629c1d417221acad56538c0
-DIST multidict-2.0.0.tar.gz 99480 SHA256 12a8a11bc76d9d7681dba7fb69c3c84b27568fee0ece54c5000bc8f5a5a9cfeb SHA512 fa3acd8b1325281f2b1a7e131b1d00d018067aeedcf8de2a1e3e92e5d252279f12a2e71099c733490f07116f9ea75ae0f1dcb373e238c5146dd4e99217855b22 WHIRLPOOL 6d5f3667a771e6d2bfd95eb5dd947b4cc644fe237234a2a93f65a190113449dffdd6bff9be9ea66f5d4aff0fd6fd08ce14e4dc5c40de12240603a6de2d3e4d16
 DIST multidict-2.0.1.tar.gz 27586 SHA256 465e0e62dcb68a1779b6428d8ff73134d84f986241b98e9ac0a6ff2b7f1370ef SHA512 2de3743256cdf3849f767613a510d707716b978c964626846fd082edb52d169a5fb47becf76dc287858f2d06c7f4bbf8aa0f662e41e8bc73becabfe0518f7836 WHIRLPOOL 513f0a2cdeef2742470c37a134a863ab8f2dce5753307f9e57cd8fa40b492cebdd3c4d54a38db37be2946d094fb14003cbe8dcbb02e08d2c8445ec7e83ec33bd
+DIST multidict-2.1.0.tar.gz 28131 SHA256 91c1b57f79a391cc8efaf6ada7b2a84c3954249ccf290c59d198a2df1ca4084e SHA512 124691f3654b202cc35c59bf4e1c38a9da7d89ca3fed71f800d15313fb4042b55c0df25c012be72b0cf64ca1b8cc00707f001d007df649840e0d7a76d171d385 WHIRLPOOL 6d8d00ca386d2a677fc8aada7c8342eac5163d3ad7ed62f0ace811048f18f72378cf9f874ec8f6ddaccf862735cb7c145cdab81c5b5141ae53354d42663f5931
 EBUILD multidict-1.3.0_alpha1.ebuild 876 SHA256 0a7b5416921a302d5e07ef3bd65d13a7168ff22570a3ed687281ed9a0d0a52a8 SHA512 aa2885a50219e710027178d178a8388891fb2f5c53f64b72b738064adefeff4a3a44e096f5ec1d3cde48a81b3d7254b18ac9612884f03a363d16a4a389d2931a WHIRLPOOL 7bfc5da4397431fa6a83af22ded559b675ce4ebcbf2906c346cd5aa15d72e1a10c32f0cafbf1fac889bca830f333d916acf4a80275ac100f19e60ff6e9eb1afc
-EBUILD multidict-2.0.0.ebuild 848 SHA256 aac30d48031edb256241e82b4bf05c69c1dccaae8561e90de72433d90278d9e8 SHA512 c790660372ec0cab931980fce1dd473bff8a682f29d09a41861bca3fe64eb98d9f3f2f58227ff3a12ede69c39aab0e4c4af91eacab1c234fdbb12adfedba1ee7 WHIRLPOOL 96c1455004b0a416bffcb5041aa60bb91cc96bfab22ff4ae34bfb8070a2fd5983d05f5c217128620c978f88c95721a95e59477cab2273c010a2bc3e43b1f7af8
 EBUILD multidict-2.0.1.ebuild 885 SHA256 4bbc7891300ce3d19df31e52c41ca776048fbe57a154ba4a8df607110bb702fb SHA512 d1dee604d31437c383ec4828ea7370b1103fcc25a8ff5d5d273ff911e0cb98116dcc901a9918e5ba71056be9cb95a50188fdc028d211932443a240e5f70cb492 WHIRLPOOL 648ac9c943897265beba2f8c2870052f8419bba0c943f6a502c1f3491ca6109e64dde51435f21e00c078dbbd6954f6811053958db8689969767f62f2835510ef
-MISC ChangeLog 2049 SHA256 d28f41bbfc986a4a7527a432234de459330a3f4ce365a7c24dfc23262fd3c4df SHA512 0b250fa308c7ae60eb2b632075d389dfeb2c0180e559ac7b834cd6c39939c98fefcfdb5a94b7df5565722a78bdbc56dbae9762c527dd783e7dba19adc5ee9cc0 WHIRLPOOL 234c9b828e8ca30705b353c6bb83a6fda0d5af18a40efbd1718482a44ff5fb070a727d458167e98e97cb6da9397f4e62c3f15f4acd2ec58c137e02c0d2f7ab3a
+EBUILD multidict-2.1.0.ebuild 885 SHA256 4bbc7891300ce3d19df31e52c41ca776048fbe57a154ba4a8df607110bb702fb SHA512 d1dee604d31437c383ec4828ea7370b1103fcc25a8ff5d5d273ff911e0cb98116dcc901a9918e5ba71056be9cb95a50188fdc028d211932443a240e5f70cb492 WHIRLPOOL 648ac9c943897265beba2f8c2870052f8419bba0c943f6a502c1f3491ca6109e64dde51435f21e00c078dbbd6954f6811053958db8689969767f62f2835510ef
+MISC ChangeLog 2342 SHA256 498d8cba384ba818edec75397553fae2aeabbf9f934bcafd83c6cc997cc3caca SHA512 88ab082b47fb401b82a38360d9e0bb326db11a242069f02cdbd959eb6c439d0a040247885c38b98f4b5f5e594aadab4f067b361f296c1a4a757da1a77f8c133e WHIRLPOOL 76bd8c966906f914d464e5bcfccfb4ff8b99ef6f26d66c2df0a2e722988f7fe7b766bb33b17476ff728b39e2f6a7d4da3f1ea300a33e59e01e903451d9ee2b65
 MISC metadata.xml 295 SHA256 e15ddc12bac68a6d1fba9794b60853df2776298c375e2ae1bef16f516223d044 SHA512 15893d346d16a5860e53526091600007d241e4a53e3e6f99fdcab39b427590db70faa61228f3c8cbc7764deb328b0f1266643108c07adc6d0f76fb04b7f38763 WHIRLPOOL 1daa0496a94c99c89b2bef3064c0de3000627b4aa24aaf594f919fe74d1f07dabcf41095ef3119c03079202bcac40e184206e327fd166ec5c296d0c5e18c7c59
diff --git a/dev-python/multidict/multidict-2.0.0.ebuild b/dev-python/multidict/multidict-2.1.0.ebuild
similarity index 95%
rename from dev-python/multidict/multidict-2.0.0.ebuild
rename to dev-python/multidict/multidict-2.1.0.ebuild
index d561c57..f43c16c 100644
--- a/dev-python/multidict/multidict-2.0.0.ebuild
+++ b/dev-python/multidict/multidict-2.1.0.ebuild
@@ -18,6 +18,7 @@
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
diff --git a/dev-python/nnpy/ChangeLog b/dev-python/nnpy/ChangeLog
index 52d0b9a..8c9a012 100644
--- a/dev-python/nnpy/ChangeLog
+++ b/dev-python/nnpy/ChangeLog
@@ -35,3 +35,10 @@
 
   Package-Manager: portage-2.3.0
 
+*nnpy-1.3 (24 Sep 2016)
+
+  24 Sep 2016; Dirkjan Ochtman <djc@gentoo.org> +nnpy-1.3.ebuild:
+  version bump to 1.3
+
+  Package-Manager: portage-2.2.28
+
diff --git a/dev-python/nnpy/Manifest b/dev-python/nnpy/Manifest
index e66a8b0..b1aec46 100644
--- a/dev-python/nnpy/Manifest
+++ b/dev-python/nnpy/Manifest
@@ -1,4 +1,6 @@
 DIST nnpy-1.2.tar.gz 3781 SHA256 0b3a894dd0be0f5b6f967e3cacf5ec3399e4fbc9ef83fdc3e7c6b17fa3284094 SHA512 ae88d52289c1b4e9853e81342aec94feee004f46e6b5801764ed1fc50f7e249cf45b8d24e85ae9f69003304052505cd9242f43ee33de42ab4f862b3f9cb20b3f WHIRLPOOL 09ab1e11bea3f163d78860ac69e604bb176f17e1e3049af139627e6baa4572bd9d40f38a29b0eb5a352e5279504652994003d84eb8f3a5c248f0fe96aad4c4ee
+DIST nnpy-1.3.tar.gz 4384 SHA256 50daf80693f355096a4926e8b5a8ec5f216a3ca28f0eb14ff819b218a3691f4e SHA512 66ec80169f4c107f2c9ea870153824a84f5bfdecbb0b40a455061a926b43ff61a723b4e62d9b0e9f5361cf6b486f706a5ff111681bbb4083180988337416e0f6 WHIRLPOOL 76ef6210c028cd83bb98fb89e452bec82a7b6cfb3a19bac37e8306a18b2e4d9f1a801624e3db31b525a831ad2ddee5d3dd87017eebeb20241e323037ab688e0d
 EBUILD nnpy-1.2-r1.ebuild 556 SHA256 37891dd448e88d11492d67d0de96aeec4cce7e271947d03a08c7175f4f1023e0 SHA512 2ec57a3fcc5feddb16f1c9e5b32c7b7d03fd8c071ab10dc1fdd7cf147e386105a2d97a33e86aeca50209e94edc7fadbedece1b034f5fe66a523f4d08212328b9 WHIRLPOOL 9a4a47e78dec563e4cf59a62fbec953225f7d65cc369d7b8f055f718b69832b60220b8fcbf6825c557880941a6967569fcee37fa195dc23bff1ce17ac93e2ddc
-MISC ChangeLog 889 SHA256 5c94e38cd128b7d54872389d0c14f4261c359d0e43cf834a287913d9f7e4e2ab SHA512 07f844727f7923d78f2adaf9ed231aa21629e5b133e84f289e3e4a77a10084ad9b992e31ddd95726cd0fad0fd241c9592f79e542e5d3b9bded11d61f49c12910 WHIRLPOOL 3c0f601a9b9fd4b03878dec8b45641cd8b44c19a9a749db4185eea78a2acf5f99a44b849732ec32e57c7c4a279881a99db56b81362e7fa3038863d26c572ee06
+EBUILD nnpy-1.3.ebuild 556 SHA256 37891dd448e88d11492d67d0de96aeec4cce7e271947d03a08c7175f4f1023e0 SHA512 2ec57a3fcc5feddb16f1c9e5b32c7b7d03fd8c071ab10dc1fdd7cf147e386105a2d97a33e86aeca50209e94edc7fadbedece1b034f5fe66a523f4d08212328b9 WHIRLPOOL 9a4a47e78dec563e4cf59a62fbec953225f7d65cc369d7b8f055f718b69832b60220b8fcbf6825c557880941a6967569fcee37fa195dc23bff1ce17ac93e2ddc
+MISC ChangeLog 1038 SHA256 727dd8cdc86c988dff6625c99c89252ce9b2aab2690ead206c5214713529b3e5 SHA512 2d2cea19d227dfa545a097354aff303b217d035c3c52b9e285c587cecd45bb9c9bf81fa6595146235d1da18ae74e38fde4567bbaefa33e9130871794e3ec8d0e WHIRLPOOL 694cc35840fe8d3d13738a6113e17b98d4eb1629429fa564afaf35617dfeb63ade6595bb2ec6086bb2bab7aae887a520833ecfc347af2d225a26e5714171b4ad
 MISC metadata.xml 347 SHA256 280e46ade4c57a7198c5a5a2dc6b28781dbe2ae7362403318960b9ef27708de0 SHA512 2217f01f3450435b5abbf9502053144ced65b3ef51ce7d7a9ade4bf526bfec04b2f06a495316fe19e8558cfe7167050466ffb5b0080d04dc90091ed620a86bf4 WHIRLPOOL df9d910a16e683c45358d9fb9dd068e6ad43d9eb7553e442a677eecf7eb9c9494a1fa53006b5347ea708d87a4be0df8d419b6d638dc01bf77b0bcefe7b9c00a5
diff --git a/dev-python/nnpy/nnpy-1.3.ebuild b/dev-python/nnpy/nnpy-1.3.ebuild
new file mode 100644
index 0000000..f851120
--- /dev/null
+++ b/dev-python/nnpy/nnpy-1.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="cffi-based Python bindings for nanomsg"
+HOMEPAGE="https://github.com/nanomsg/nnpy"
+SRC_URI="https://github.com/nanomsg/nnpy/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE=""
+
+DEPEND="
+	dev-python/cffi:=[${PYTHON_USEDEP}]
+	dev-libs/nanomsg:=
+"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	"${PYTHON}" "${S}/test.py" || die
+}
diff --git a/dev-python/packaging/ChangeLog b/dev-python/packaging/ChangeLog
index 063b00b..657797b 100644
--- a/dev-python/packaging/ChangeLog
+++ b/dev-python/packaging/ChangeLog
@@ -266,3 +266,12 @@
 
   Package-Manager: portage-2.2.28
 
+  24 Sep 2016; Mike Gilbert <floppym@gentoo.org> packaging-15.3-r2.ebuild,
+  packaging-16.0.ebuild, packaging-16.1.ebuild, packaging-16.2.ebuild,
+  packaging-16.5.ebuild, packaging-16.6.ebuild:
+  drop pkg_preinst
+
+  https://bugs.gentoo.org/574002
+
+  Package-Manager: portage-2.3.1_p4
+
diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index f47976c..52d1132 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -5,11 +5,11 @@
 DIST packaging-16.2.tar.gz 43398 SHA256 0eb4a6329c6d40a0deef725b4f510b6219ec8c365f888583babbb4454d761dd6 SHA512 2310efbd4d73498d5645d0c3a2f0cb162cd18cff28079ba2ac44b784e728363d84a8eae4d9e313c4491394841638ef01ef37ef7da3bac01e27af37a72e387dd1 WHIRLPOOL 5aff538bf5ee18474074048bb581140200c078ceb6366f5c709be931851b0835a8a725ecc17a1b2c34bae34cf79d8743a4422c6701e5c6e9ba99bfdc51aa439f
 DIST packaging-16.5.tar.gz 43810 SHA256 b763bd2a025e957323f761bf00fb72e8c17ac1c6d5eb8fb55c18802f2143f911 SHA512 60d4317f5a86518078d56a08a3121536ba2ed2232dfc44c7962aa0e17676c7116c25f710ff2056ca44a0f1b0db15e5f02d6f785f9db0ab3af613b2056430a6f3 WHIRLPOOL bdd83eb84af57dfc81aa318966b43b98f6915e7a81a6b3ae019c294cfb687a0fd491e84c8f15a3ae23d9568292f7c111ab4f17ff7e200ba4d1700e953bbf4fca
 DIST packaging-16.6.tar.gz 44194 SHA256 a335d0778b77d3525875dfe66c2b880529e3bbde08e1a6604710ac36f851021a SHA512 221bedd71f942516be77e8146f5b64d5fcfd5aeeb20a7d2f76dcf4aa0164595192e6bb5a829965cefb149ebf523560e57cf09214801b1bceb395b9f59a4cd993 WHIRLPOOL cee4ce64142c1ec3d8ae1c3547e6b840959ffe1c3c08833b61f316f531b0d0fdb751908618762fae40cd5a9d29205a99a8cacefd30ada8a7216186ac116dc3b2
-EBUILD packaging-15.3-r2.ebuild 1419 SHA256 ba4004f8aba93be3095740f18063f6dfa059526d3ddf337111a74c6b8f737f36 SHA512 529e767e7777db93c41512c3913011d0530f4e7dc47469c82a9237749737e01d45554267b548121eb2e55519186d363134d1c939c0bf5df25830fd3214c7ed1b WHIRLPOOL 4f12ebcbc659041bd8b346165553601fbc90e28066e5bf8767ba7d0f77c51dfa7e7e80f2742bfb18c807e84c425a275167b03e00c80627924c77b07082dd768b
-EBUILD packaging-16.0.ebuild 1446 SHA256 65772626f405e37dc915cf9978bbd0d3050f610f1890e840877de937543c5935 SHA512 0fb0b2031e44d50c5dbc1fe80052d4e70ce4de8a62738f2a02e219d320b7743e28b3ecaf015e8c5b0ac7bd27a5c4b384f166bb713e9a4cfe2a6c79701e56d817 WHIRLPOOL 3e2419fe2ccb1cdca2547567d6d9f23bab93d5e25bb3b2c1c7929c7ea6a0fa5c3277ed155a89054b332ad0016cef913d8df0cc3df5f2c3517fb860cd0dabcdd6
-EBUILD packaging-16.1.ebuild 1483 SHA256 0e97bb80574aa8716f1cdccea9ef375c9191ab2b111c88b7be68af32345aadff SHA512 3270c05092537144c3aad28e203bdf9a855ded6ad12babd326e8513db1c13a04ca77696246c65f2fa959145726d208c069e263d3edd235c5248fd2949b32185e WHIRLPOOL 3f7e63373c972b4158ff254305aed5e05f5347e8be24011bb35c5e60a876811e57d288fe0ac26a7e3c6c52edb5334b200cfd5722ad5d83959106d91c993dec08
-EBUILD packaging-16.2.ebuild 1483 SHA256 0e97bb80574aa8716f1cdccea9ef375c9191ab2b111c88b7be68af32345aadff SHA512 3270c05092537144c3aad28e203bdf9a855ded6ad12babd326e8513db1c13a04ca77696246c65f2fa959145726d208c069e263d3edd235c5248fd2949b32185e WHIRLPOOL 3f7e63373c972b4158ff254305aed5e05f5347e8be24011bb35c5e60a876811e57d288fe0ac26a7e3c6c52edb5334b200cfd5722ad5d83959106d91c993dec08
-EBUILD packaging-16.5.ebuild 1483 SHA256 0e97bb80574aa8716f1cdccea9ef375c9191ab2b111c88b7be68af32345aadff SHA512 3270c05092537144c3aad28e203bdf9a855ded6ad12babd326e8513db1c13a04ca77696246c65f2fa959145726d208c069e263d3edd235c5248fd2949b32185e WHIRLPOOL 3f7e63373c972b4158ff254305aed5e05f5347e8be24011bb35c5e60a876811e57d288fe0ac26a7e3c6c52edb5334b200cfd5722ad5d83959106d91c993dec08
-EBUILD packaging-16.6.ebuild 1483 SHA256 0e97bb80574aa8716f1cdccea9ef375c9191ab2b111c88b7be68af32345aadff SHA512 3270c05092537144c3aad28e203bdf9a855ded6ad12babd326e8513db1c13a04ca77696246c65f2fa959145726d208c069e263d3edd235c5248fd2949b32185e WHIRLPOOL 3f7e63373c972b4158ff254305aed5e05f5347e8be24011bb35c5e60a876811e57d288fe0ac26a7e3c6c52edb5334b200cfd5722ad5d83959106d91c993dec08
-MISC ChangeLog 7928 SHA256 7a6c11b4a546eeb4eec866d73344ba42a9ec6493ea91f457598e3ab5b91da469 SHA512 d9e5c2b511495cb0c6e39f090c95eea9cab590513776a7986297cc41ae6ff78d101f1f920a124559ac8d2c7da534ab46dd98d728c42256dfca27249b255ef797 WHIRLPOOL 29120040cb5e8b370b93d740135f06969f5f1e354e26b5af15f8ca8e0025fd90e9ccce69d10d3b637e6e8d95c644552c47f01c5deb946898359815b37daad2b2
+EBUILD packaging-15.3-r2.ebuild 995 SHA256 a51ccd56faa16a7adf1f46e4e07cd916f3999b34c7855de068c93c0d9a35db66 SHA512 3fd1c00c926ca63a40b2a8b73ec506ad0a841aa95739f36a67205e28886582cf3f5587cb8d432b6452b28221c3c5a350256ef867f3ce76e3f46184c82341e6eb WHIRLPOOL ccc777e490ae5b7ea8efe757e60da69ff3d0ce6ed0f8e100d82d83ed1d9c1452bd51b239c24dfeab444494bc5147a40bf2f4f9576b9652ed70ce257e176bf6f0
+EBUILD packaging-16.0.ebuild 1022 SHA256 4a978a5c242d2e58742184e620b70483889f8844422a4080f6157dae09ebb666 SHA512 d6d45ffe464e619a0e2b1bd16d005f5243010235016ddb370c9026730ad5613975e7b3ab14b4a1f2d76ed167e175ceaa72504b69dfe8b3c47a2df0d35a2a5717 WHIRLPOOL ae54f6a7532651eca298fc81c6f1e66b8e47dd423467d13f1cd18bd620fca47b6ff10ecadb001330eab133b07f4a0ddfeec8ad8384c8f75c9da51990428dc41a
+EBUILD packaging-16.1.ebuild 1059 SHA256 93d3e073ff3db47c346fc99779ec81b33e14c3372f79f2fc9697568b0d758908 SHA512 0c9996d145e249b021270ba2772328a00f940295ffb761b3cc5e52052d5852df1f589e57b65962e47e8e9a38a4884acb53da22a6e1a914fc0ce4c9b9bc95f9fb WHIRLPOOL 5756fbd01f2b4dde8f4e57caf3dca02c1694379f85d30d5d9db68073aad0d2ecf54ff5ebe39bf7fffbbd2cd550be96ecec13634b9c80e37195cef5fb219c6d29
+EBUILD packaging-16.2.ebuild 1059 SHA256 93d3e073ff3db47c346fc99779ec81b33e14c3372f79f2fc9697568b0d758908 SHA512 0c9996d145e249b021270ba2772328a00f940295ffb761b3cc5e52052d5852df1f589e57b65962e47e8e9a38a4884acb53da22a6e1a914fc0ce4c9b9bc95f9fb WHIRLPOOL 5756fbd01f2b4dde8f4e57caf3dca02c1694379f85d30d5d9db68073aad0d2ecf54ff5ebe39bf7fffbbd2cd550be96ecec13634b9c80e37195cef5fb219c6d29
+EBUILD packaging-16.5.ebuild 1059 SHA256 93d3e073ff3db47c346fc99779ec81b33e14c3372f79f2fc9697568b0d758908 SHA512 0c9996d145e249b021270ba2772328a00f940295ffb761b3cc5e52052d5852df1f589e57b65962e47e8e9a38a4884acb53da22a6e1a914fc0ce4c9b9bc95f9fb WHIRLPOOL 5756fbd01f2b4dde8f4e57caf3dca02c1694379f85d30d5d9db68073aad0d2ecf54ff5ebe39bf7fffbbd2cd550be96ecec13634b9c80e37195cef5fb219c6d29
+EBUILD packaging-16.6.ebuild 1059 SHA256 93d3e073ff3db47c346fc99779ec81b33e14c3372f79f2fc9697568b0d758908 SHA512 0c9996d145e249b021270ba2772328a00f940295ffb761b3cc5e52052d5852df1f589e57b65962e47e8e9a38a4884acb53da22a6e1a914fc0ce4c9b9bc95f9fb WHIRLPOOL 5756fbd01f2b4dde8f4e57caf3dca02c1694379f85d30d5d9db68073aad0d2ecf54ff5ebe39bf7fffbbd2cd550be96ecec13634b9c80e37195cef5fb219c6d29
+MISC ChangeLog 8213 SHA256 5ce40ece92ee032591046b176a35fa43181f8ea98a38dbebcf9feef7a6dff9c4 SHA512 e7fb87ee84beb1858a44f19b2ee6ffbc26a1c636304ebc8f27278b443f4906a1f2282b414f00156dc2952e60ead954a7b3ddbd441294a1e9f2f4296622455624 WHIRLPOOL eafc07e7d32ccb08cf14372467932127f4a38ad7a37c9985d29fe5c9f64f4714f871831d3f279f06aa46509bd1fc37ee33f29166bedacf1225c2774f67a9fbbd
 MISC metadata.xml 366 SHA256 dadab51670c0df56ef935d9530a45a0cde7c2a4f96ed57e2f684b6405f245f0e SHA512 f326b75f4603bc9e4455665dd526e381eb1973c8edc319e1d69b824f93ee885931fa29e74f9da8582f5af78a1ddba2fcc2d983fb98cbdc4cfd87b82c7a0f3ba4 WHIRLPOOL 8638a60d413feb5c3a7ae434bf204210103b6261daa4f7cbb8b50ecd98ca9d5f851498126ddae56c5f13f6ebc81878ee7d0badc31c646b81498862d705b2f594
diff --git a/dev-python/packaging/packaging-15.3-r2.ebuild b/dev-python/packaging/packaging-15.3-r2.ebuild
index b07b729..6dc31ae 100644
--- a/dev-python/packaging/packaging-15.3-r2.ebuild
+++ b/dev-python/packaging/packaging-15.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -30,16 +30,3 @@
 python_test() {
 	py.test --capture=no --strict -v || die
 }
-
-pkg_preinst() {
-	# Remove this in the next version bump
-	_cleanup() {
-		local pyver=$("${PYTHON}" -c "from distutils.sysconfig import get_python_version; print(get_python_version())")
-		local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
-		if [[ -d ${egginfo} ]]; then
-			echo rm -r "${egginfo}"
-			rm -r "${egginfo}" || die "Failed to remove egg-info directory"
-		fi
-	}
-	python_foreach_impl _cleanup
-}
diff --git a/dev-python/packaging/packaging-16.0.ebuild b/dev-python/packaging/packaging-16.0.ebuild
index aa01c02..199b5a5 100644
--- a/dev-python/packaging/packaging-16.0.ebuild
+++ b/dev-python/packaging/packaging-16.0.ebuild
@@ -29,16 +29,3 @@
 python_test() {
 	py.test --capture=no --strict -v || die
 }
-
-pkg_preinst() {
-	# Remove this in the next version bump
-	_cleanup() {
-		local pyver=$("${PYTHON}" -c "from distutils.sysconfig import get_python_version; print(get_python_version())")
-		local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
-		if [[ -d ${egginfo} ]]; then
-			echo rm -r "${egginfo}"
-			rm -r "${egginfo}" || die "Failed to remove egg-info directory"
-		fi
-	}
-	python_foreach_impl _cleanup
-}
diff --git a/dev-python/packaging/packaging-16.1.ebuild b/dev-python/packaging/packaging-16.1.ebuild
index 26279ce..87a84a8 100644
--- a/dev-python/packaging/packaging-16.1.ebuild
+++ b/dev-python/packaging/packaging-16.1.ebuild
@@ -32,16 +32,3 @@
 python_test() {
 	py.test --capture=no --strict -v || die
 }
-
-pkg_preinst() {
-	# Remove this in the next version bump
-	_cleanup() {
-		local pyver=$("${PYTHON}" -c "from distutils.sysconfig import get_python_version; print(get_python_version())")
-		local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
-		if [[ -d ${egginfo} ]]; then
-			echo rm -r "${egginfo}"
-			rm -r "${egginfo}" || die "Failed to remove egg-info directory"
-		fi
-	}
-	python_foreach_impl _cleanup
-}
diff --git a/dev-python/packaging/packaging-16.2.ebuild b/dev-python/packaging/packaging-16.2.ebuild
index 26279ce..87a84a8 100644
--- a/dev-python/packaging/packaging-16.2.ebuild
+++ b/dev-python/packaging/packaging-16.2.ebuild
@@ -32,16 +32,3 @@
 python_test() {
 	py.test --capture=no --strict -v || die
 }
-
-pkg_preinst() {
-	# Remove this in the next version bump
-	_cleanup() {
-		local pyver=$("${PYTHON}" -c "from distutils.sysconfig import get_python_version; print(get_python_version())")
-		local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
-		if [[ -d ${egginfo} ]]; then
-			echo rm -r "${egginfo}"
-			rm -r "${egginfo}" || die "Failed to remove egg-info directory"
-		fi
-	}
-	python_foreach_impl _cleanup
-}
diff --git a/dev-python/packaging/packaging-16.5.ebuild b/dev-python/packaging/packaging-16.5.ebuild
index 26279ce..87a84a8 100644
--- a/dev-python/packaging/packaging-16.5.ebuild
+++ b/dev-python/packaging/packaging-16.5.ebuild
@@ -32,16 +32,3 @@
 python_test() {
 	py.test --capture=no --strict -v || die
 }
-
-pkg_preinst() {
-	# Remove this in the next version bump
-	_cleanup() {
-		local pyver=$("${PYTHON}" -c "from distutils.sysconfig import get_python_version; print(get_python_version())")
-		local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
-		if [[ -d ${egginfo} ]]; then
-			echo rm -r "${egginfo}"
-			rm -r "${egginfo}" || die "Failed to remove egg-info directory"
-		fi
-	}
-	python_foreach_impl _cleanup
-}
diff --git a/dev-python/packaging/packaging-16.6.ebuild b/dev-python/packaging/packaging-16.6.ebuild
index 26279ce..87a84a8 100644
--- a/dev-python/packaging/packaging-16.6.ebuild
+++ b/dev-python/packaging/packaging-16.6.ebuild
@@ -32,16 +32,3 @@
 python_test() {
 	py.test --capture=no --strict -v || die
 }
-
-pkg_preinst() {
-	# Remove this in the next version bump
-	_cleanup() {
-		local pyver=$("${PYTHON}" -c "from distutils.sysconfig import get_python_version; print(get_python_version())")
-		local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
-		if [[ -d ${egginfo} ]]; then
-			echo rm -r "${egginfo}"
-			rm -r "${egginfo}" || die "Failed to remove egg-info directory"
-		fi
-	}
-	python_foreach_impl _cleanup
-}
diff --git a/dev-python/paramiko/ChangeLog b/dev-python/paramiko/ChangeLog
index 67540fe..d52ab6c 100644
--- a/dev-python/paramiko/ChangeLog
+++ b/dev-python/paramiko/ChangeLog
@@ -145,3 +145,18 @@
   Package-Manager: portage-2.2.27
   Signed-off-by: Justin Lecher <jlec@gentoo.org>
 
+*paramiko-2.0.2 (24 Sep 2016)
+
+  24 Sep 2016; Alice Ferrazzi <alicef@gentoo.org> +paramiko-2.0.2.ebuild:
+  version bump to 2.0.2
+
+  updated to eapi 6
+  updated dependecy
+
+  Package-Manager: portage-2.2.28
+
+  24 Sep 2016; Alice Ferrazzi <alicef@gentoo.org> metadata.xml:
+  add maintainer
+
+  Package-Manager: portage-2.2.28
+
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index a7c6ea0..e33aad6 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,9 +1,11 @@
 AUX paramiko-1.16.0-install_requires.patch 438 SHA256 4261783008214f57c620d5a6661c0a61842543558ac43c0ecff4539009468631 SHA512 ace0be9103050e397c584bd42077cbdd10296b0bd3fbf084dbd3242e3451d87c7cadb38d66bfebc128bce45eb1f1465f716c5004e586fd9f82a84a67002344a9 WHIRLPOOL a204d894794671bac9243ec936649b750a442a61ef5195a8cba937ea327b8d8b72da58e6455477b8b30a9efb361fca33de1ccccc39262118a0446173916f9484
 DIST paramiko-1.15.1.tar.gz 1219256 SHA256 6ed97e2281bb48728692cdc621f6b86a65fdc1d46b178ce250cfec10b977a04c SHA512 146076792e42965aaca08e74630c18422ed767a3da64c63fa63da9a464e1dade5a3f77635a5aae569e5a382d9a31eb4ee738399cd93895e355b4a57119c99f1c WHIRLPOOL 4f4bb6276363130d14c80e55d5c6858712a25404735e9671969d79ff1d1b1399918e24b6c80b275bbf76373a95cb407ca34fba5da8bc92bcd1322e4651ad1354
 DIST paramiko-1.16.0.tar.gz 1335094 SHA256 3297ebd3cd072f573772f7c7426939a443c62c458d54bb632ff30fd6ecf96892 SHA512 d75ed591c12898bab7d3e64b7281c9054ad49d00b6dba9e51826cca43ce30ae7c089ead0c3396f7542c2635183637e00a16f0b3d57360c0f65ec93d081489962 WHIRLPOOL 10053403a526e11d2e300cfccb8bb95889ee4424621853f8b20f42257c71fdb01aba6358c3fd9dd3ede2aa8d7291affac56582abbb3d9888dc1c217d3757c3f3
+DIST paramiko-2.0.2.tar.gz 1190464 SHA256 411bf90fa22b078a923ff19ef9772c1115a0953702db93549a2848acefd141dc SHA512 6e96a67fb496990967641c53a616f0d774716f1969b0e4f290815776d61071804d8c606c3cefadc010a95ce926ab05bad201233210f9bed772dcee377b336bb6 WHIRLPOOL 379d53534d098a0b0aa30d9ec41e9b6cba9789db0db111be4cf45b1dc3c538dc17618eed173602538bf8365f8fbe730cdc03c38488badc6c580e45f2faf06d14
 EBUILD paramiko-1.15.1-r1.ebuild 1140 SHA256 ee29041a675a4d21136a326897e0144b9893ba0a2cd8824999d22ce7304244ac SHA512 55fad915bf035cfad4edf28dadf36f73e468348dcbc1d4a28c2578b315adeb63d745436bd20722e4bc8a25fcd3969fbf5f9043d4918a5762ab45039596cd5f0e WHIRLPOOL 735c9d7bf59689c2249c422a46fa2d7e16121c03ebe762c1eb586315792b146e93e054d594e878abd4b52c9ab4bb65a93c2d3a16655bf4e315f0a2d5a38c3655
 EBUILD paramiko-1.16.0.ebuild 1216 SHA256 6b646c1164e1fe7c3a730e50a764fb1b2e92a2db0d0f2defaa39203da532a495 SHA512 a05f5ddd734031a1cc384c18c1f3516f9762238c88da7e23dc60c50773a38b5df5c9110f6dcd44c32e7b99dc744bd3de2290d8bc4d2758ac8b1893a9fe12f180 WHIRLPOOL 823feecbc2bffbf55df90f41adfc1f9ad106f10fda62a8107e5250924a4eade091eb22c8b582b4d6a5c7b7d542f814311ade71787df7985001ae5f5eee218a64
+EBUILD paramiko-2.0.2.ebuild 1130 SHA256 73cbefc3621f2e5fa9bc077371e1969db3e9fc69860f6dd5fe8ec1307aa8ab02 SHA512 5378a6197729aef37ee9eebe5ea776f2a5e9d9b2453913408c33b822c6bc0b8de6311bab4f98d9cfe8e7cf0e2cb3720e4c3072aa95fe7cd57fd68c4b4c0e0ead WHIRLPOOL e551d237e0a48795bc9e86554f67968ccbcc042fe42f45af42c80d56fd3e968becc9f20009d1f41ff9686cdb74db1dc363eaff9259f7599a2afdbf02494045a1
 EBUILD paramiko-9999.ebuild 980 SHA256 4920c93bea5f68ecda218e062e16c6a54dd56aab8da8e3e6c6a63a49c5ad9897 SHA512 5c3f7615464db9eab7134550534c2b114e38b41c524b4c23e674d5005e30e47d8187bec5c602d865fd01e52d311ff4f9db68a1df4e562d3395eafef705a4378d WHIRLPOOL 001b7dbd7d56a201033313be2b8dc9f5051f8961c0b043b022b9722578ad06b7f7a4215fcb2fad557f420579ca7c817a3c52dc3dae241a1ab5a8270a4e5869f2
-MISC ChangeLog 5016 SHA256 04ea5e71ff8b8407486f7aade39bdfc1d8915a04b0df8d32fc0082911c065927 SHA512 048b97464167a326f35296ac425cfb695b0c52bb72dacf2fc31e75a69192b89c13c44b9e225a01df3ce13cc932985dc250c2c43959d5326ac518270cc1b3f221 WHIRLPOOL b68f87f0f52e9f65799482fd79e2d4497778311a073dc2ae8073396bb5af56e2ddc7d71282f28db997a0471c27c13384d91989a9f6929e0b2de66251c800d474
+MISC ChangeLog 5339 SHA256 51d38ac7a0b4443f96bad686658e0073aefd4316a319aa38a7aa08a08357ed1d SHA512 36665e2726b1129659250f536e60d1f04885d5bb6c86f12bb1663918c9dadfe276d6f2899af9080e9cd267804a508e0fc89731bd66dfb2c73d6e8579cc7ad883 WHIRLPOOL 46cd74820ebcc709eb3a6c56622fdf28b7cbb2acdfc547774dd07e5c135c8b8fd777a30dfce515ac3848bf08cf80b5978d0fde47dd23f09777fa3f94da61b57f
 MISC ChangeLog-2015 16931 SHA256 bc7e1465ebb99e7cea4ac81cf530b2e7708302c1bca36da6152b717684729603 SHA512 27241d73c6ef3361b0a820749e8c28f14a1633f8ee856c4f4d6ad800efd36dcf260654927a5f4befafeffc828d13b741277981d43373a194fddc98d3b3f5a68d WHIRLPOOL 3985e20db84c410964eba18c23ac5bc52d585153da5362e7a2193f56bcf5ffc7b5a51b1747d1963779f832cfbfc6a32dbd4147f23d8068dda39aebd549be0836
-MISC metadata.xml 1122 SHA256 149294462881b0520406d68c1a1f6953653cc6b2abf033c70a3c8f35031fe098 SHA512 7bb94e905d2a6bf7d83f4c3f4a4a17556a5196046c5f1dc5ff8cda012c8f0aa410c41f69a7fec497aaba5d2653a648347b56c31d4c67b4d0eb4ed5ce9095a30b WHIRLPOOL d88874c940f53634fe6c3a2e62e096d0b6e9b60a2cd33a9bcab1602c13b6ba9023cb829dd74ba1016d514f4bfbcd57ac7009b9b945ad29f2d56948c6ae00a43b
+MISC metadata.xml 1236 SHA256 552cfc9d54ec5a51dd3335c2a71eed34528f6b225dc2ed4337427bbdbca7a6da SHA512 5cffe7297feb05b75be333fac0259655f6992baaa04248ccdb23f82790a0a807ecf328357207507a3b35944b7062d8a1aecb2daf5353d733646bb58d7a151529 WHIRLPOOL f189e094c2b8bfd50e9d96474d0d0e718b7b3c140b0084d1cc44c087038dd2d29fdd46fc592c821bb92c6320df074c47ea5a1734ffd6aa2818b53e9e00414f7b
diff --git a/dev-python/paramiko/metadata.xml b/dev-python/paramiko/metadata.xml
index f446027..054a7be 100644
--- a/dev-python/paramiko/metadata.xml
+++ b/dev-python/paramiko/metadata.xml
@@ -5,6 +5,10 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <maintainer type="person">
+    <email>alicef@gentoo.org</email>
+    <name>Alice Ferrazzi</name>
+  </maintainer>
   <longdescription>
 This is a library for making SSH2 connections (client or server).
 Emphasis is on using SSH2 as an alternative to SSL for making secure
diff --git a/dev-python/paramiko/paramiko-2.0.2.ebuild b/dev-python/paramiko/paramiko-2.0.2.ebuild
new file mode 100644
index 0000000..bc55976
--- /dev/null
+++ b/dev-python/paramiko/paramiko-2.0.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="SSH2 protocol library"
+HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.python.org/pypi/paramiko/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-python/cryptography-1.1[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# Required for testsuite
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	"${PYTHON}" test.py --verbose || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	use examples && local EXAMPLES=( demos/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pymetar/ChangeLog b/dev-python/pymetar/ChangeLog
index f5e671a..2a44672 100644
--- a/dev-python/pymetar/ChangeLog
+++ b/dev-python/pymetar/ChangeLog
@@ -76,3 +76,6 @@
   -pymetar-0.20.ebuild, +pymetar-0.21.ebuild:
   Actually bump to the latest version
 
+  24 Sep 2016; Tobias Klausmann <klausman@gentoo.org> pymetar-0.21.ebuild:
+  Mark v0.21 stable on amd64
+
diff --git a/dev-python/pymetar/Manifest b/dev-python/pymetar/Manifest
index a306c81..4d3c8a9 100644
--- a/dev-python/pymetar/Manifest
+++ b/dev-python/pymetar/Manifest
@@ -3,7 +3,7 @@
 DIST pymetar-0.19.tar.gz 22123 SHA256 2666c9bcb171bcc5cd6c174073a280836f049fbbd9c264ea24a2a023edb647c9 SHA512 2d6f93db41743eceee776f17dd57ce626b89e19d538a9e52a5a984c3ff858ae42abc5c6f129bceda6efccfd2ae7f1c9616f5b82d7e3795cc38d5ece430aec2a6 WHIRLPOOL cad04c3d8415ff67ff0a08070b787e61321eb7836aeafc3fe326382d9d81c46ac41045ead7100b9561d51dc268bd70522782c2d7937901843a3cf03605ad9a49
 DIST pymetar-0.21.tar.gz 22714 SHA256 331978d9c54d49948e3817a782b857f247db6c279b8bb5bebd4f5b1a4bb503ea SHA512 6c9e9e7906fe6fb327c667408d04992ca898d0d6037fe1bce08bc15ded59bcda670094da99e84b553c06c8cf991f33c6b3b7b41a9fbd47ba4c48dd4db1d8a2c0 WHIRLPOOL a48985480b82d66ee3092e0a1843d5ab55e37dbb9a64c56c55657533ea59b4433b251c7e77b7ee4e489e232b6edd33336fe16ab7b1e3bcbc27414b1099177c94
 EBUILD pymetar-0.19-r1.ebuild 580 SHA256 431f22d112f66a4585debcb6d531aed4e0a55933e3e993f007b5a08409b02228 SHA512 20e35e4d273ab7d5a8d41c99ed07b2de616c1500142fafd93ee14664e0cef353c358ff97a3c2d06fa54b8ff45107711ff9b568d1316019abf91abe2a4697376a WHIRLPOOL cc96542bbc5f6a5f3f106e768aab95f235db53c113a38c9740e19a074af194d9696acaf2afbce93f57aa2bbb34083f3ee515d2bdfcbd87a36d70659f80121109
-EBUILD pymetar-0.21.ebuild 557 SHA256 63c934cfa3b4b101af25ca10d31a323afa15439e4ba9c29311d64047d2791ab7 SHA512 c8f12767165fa51dd3b6545d60262dd39f77227047ec130f5a552d9d5ff26f2e65f8c3371f7cead063325fc5d76d213ced9cb998657c9b62df16a67795c89690 WHIRLPOOL 0ec3270d713843aee7dd9f51a91529ca290b5c07e185d2e43cb70aba04c9d8a63bbae89d5e06a967b81d47cb23ed928fc340af6a07036f3a093f73361bd8cd21
-MISC ChangeLog 2873 SHA256 8234f9ee55bb627564cc7385bc0d69e279cb7ca4f3c4cf53b00995af4511c8ea SHA512 26b5dd71bca757045483de7f5ae5ccaa425df83afd98382a09a44e0bf6349e1e7c3364b4bf1ef75f2365c81ea2ea2e61f30b317d4e4d1257600defcb79ea5ba6 WHIRLPOOL 4ee8b9e47e764c3150362e26d659b1481a7bc77cc6bdbea52c5c375f354d1a5017d236c9d3e6ff3fd312804f1935b5577b35d10212c23c56842d1ea4394c8b01
+EBUILD pymetar-0.21.ebuild 556 SHA256 0f8c650ccb698c751c87459553483dddac741ac9d80c77fb7875a3a315b49670 SHA512 90f55e5d1d2436fe11976272925370dac8965536798f10141cda74647b8ce459932e0186940ce436960f9169edd674d1e3b1f0b29b8fa1a73f18f2802bc241f8 WHIRLPOOL ebbbe91b24566de87cea584f1dfef27c301ee5fdc68a464c75d652bd74124342febc50fd44adb99f7617142253f254a1c6367fbe5f3186974ab369560f3238dc
+MISC ChangeLog 2978 SHA256 4eb84b778dd70b32d440e1b2c6f0a38e9bb71b79c6dd1321db9fc32a66110f18 SHA512 e3b37862f9876d9ee4962bdcd49afc82cd438068611d4b67e1ebdb157d352fbf89a5e96096c60a49ae744dd3bd5e2735999d32af2ee1087772a9c89d8f6ff124 WHIRLPOOL 960fa556dee0fb5bb043797ac4d158be8fd0bfd238bee3feeeb006e6b637c143c7b64810ed803c38f9519e57b4d4fd9d98d897b2bfff725cc382285d77641ed8
 MISC ChangeLog-2015 3414 SHA256 db123271d69e0c0361e47115ddeee1fd0173f2d04ef82fc9c1d96fc8e0f19f32 SHA512 519d403407f3acad45b2cfe85f8d023c70be5c670cdb492cd202526847213e381c3153f265f453e4174076e02426724d08415f166888679d650fc3b74fcaf5c2 WHIRLPOOL dc3a7181c7b81e335e0c26573bedc262d05304e7ba67028805007cc17937466e83c017d23d8e17b8a39485f7af64099a2ffb1f9ef8394fcad95af0c3cc0fceff
 MISC metadata.xml 959 SHA256 35141815d4d29de07550fecccaab75f5df09dc41b36ed96f8bc572fc47edb1cd SHA512 de0134cfbc608c80cccfd3029faf769fa6e8fae8c3df9ed2bb7afb6231f6d68c68a6bc97fd690987b552aa026c40358e3dbd70d8a8df2633f4c6368ca7651143 WHIRLPOOL acefc090ee157a275dd342eae3b7cc51d89aedd88125273d14578eb239bb1536a0819c6d7da2ba21549ca21e1f939eef702afa235b2084083426924ade7e7813
diff --git a/dev-python/pymetar/pymetar-0.21.ebuild b/dev-python/pymetar/pymetar-0.21.ebuild
index 418dc80..420e464 100644
--- a/dev-python/pymetar/pymetar-0.21.ebuild
+++ b/dev-python/pymetar/pymetar-0.21.ebuild
@@ -12,7 +12,7 @@
 SRC_URI="http://www.schwarzvogel.de/pkgs/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/pytest-aiohttp/ChangeLog b/dev-python/pytest-aiohttp/ChangeLog
new file mode 100644
index 0000000..bb4fc90
--- /dev/null
+++ b/dev-python/pytest-aiohttp/ChangeLog
@@ -0,0 +1,12 @@
+# ChangeLog for dev-python/pytest-aiohttp
+# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
+# (auto-generated from git log)
+
+*pytest-aiohttp-0.1.3 (24 Sep 2016)
+
+  24 Sep 2016; Alex Brandt <alunduil@gentoo.org> +metadata.xml,
+  +pytest-aiohttp-0.1.3.ebuild:
+  add version 0.1.3
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-python/pytest-aiohttp/Manifest b/dev-python/pytest-aiohttp/Manifest
new file mode 100644
index 0000000..647ca8f
--- /dev/null
+++ b/dev-python/pytest-aiohttp/Manifest
@@ -0,0 +1,4 @@
+DIST pytest-aiohttp-0.1.3.tar.gz 6192 SHA256 c2391c424b5342f9234f5f56f15183d167050b50c08c96258c1816cdb5a0283f SHA512 2271f7730b91812a619e04522c13b7e2ff76353179a4588226d0b943b67f7397b966c1d3c24016861cc3eda3a541b3f0d3b2858a6ca3586f7707e10581c34e4c WHIRLPOOL 8bf1608b655db5cc3a932316e48fbff6ab4045971e5e0d2e7240219798bcffdb2f130a8270163b67d8f213a15242127721b128b0edb2a97fa8e07f1ce2026d98
+EBUILD pytest-aiohttp-0.1.3.ebuild 578 SHA256 b8cd950c4d10048e60aeb99de687c8039e3db5edc88c32a0b8da63177247bdf1 SHA512 efd7cd9bee32d755d56a3c1d014ecabd78883e7c5a932569cac89f4adec3902bb3d5bf9402f83871a6e767ea162608a783b3dee2dc8ffef874670a284cde89a8 WHIRLPOOL 22bfeada754357100ff0dfea1cac31c30a5ff1da66b6d6a3ca47e6035c1688fb7e717b9bc78ed83d08c7e940ca1ab6429c97f6ffbdabba114f2facff8d4cc09d
+MISC ChangeLog 333 SHA256 349ddb0f2728e3816c7c701b8b1fcbb8e308eae0ed62c7ab4bb165f343568e50 SHA512 555148f01d921b26626a58aa4b1574868a25d63b796eb1930d1decea2332a82f41c79d0720217c6bdf6d5676f0ce639bc8398d9f13556085a53ac6fdf9b713fb WHIRLPOOL 4c7e9cc67bb194bfc2a40046ca48792033be986c54b7bea9031973f37e1397796913a6d2fbd8e32c0358b51e8283dcb3150d9f1d0ca77f639158401e270798f0
+MISC metadata.xml 374 SHA256 f9caa3dc1e0b8d37c3da4399ee3616661bb172874a45fc5833dc50f5671997f7 SHA512 6db9204f82e2f238d4469ec01523b6faa5f20353333b7e10f00735504c88bb40574407c42c3b71b0d66d9c44e44d45fb17141862a1137911cb25e80417f86605 WHIRLPOOL 1ccbd3649662c083884323223fc2b567f7a5599fe8c60e52908961bfb5df325a70af0ff02ea35f80940d57c169fa6783e278297f81907e8083f3c377b45d7ab0
diff --git a/dev-python/pytest-aiohttp/metadata.xml b/dev-python/pytest-aiohttp/metadata.xml
new file mode 100644
index 0000000..3e6df16
--- /dev/null
+++ b/dev-python/pytest-aiohttp/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/pytest-aiohttp/pytest-aiohttp-0.1.3.ebuild b/dev-python/pytest-aiohttp/pytest-aiohttp-0.1.3.ebuild
new file mode 100644
index 0000000..1552cc1
--- /dev/null
+++ b/dev-python/pytest-aiohttp/pytest-aiohttp-0.1.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 python3_5 )
+inherit distutils-r1
+
+DESCRIPTION="pytest plugin for aiohttp support"
+HOMEPAGE="https://github.com/aio-libs/pytest-aiohttp/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	dev-python/pytest[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-0.22.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/python-systemd/ChangeLog b/dev-python/python-systemd/ChangeLog
index da61d16..edbd444 100644
--- a/dev-python/python-systemd/ChangeLog
+++ b/dev-python/python-systemd/ChangeLog
@@ -104,3 +104,17 @@
   python-systemd-231.ebuild:
   dev-python/systemd: add alpha love
 
+*python-systemd-232 (24 Sep 2016)
+
+  24 Sep 2016; Mike Gilbert <floppym@gentoo.org>
+  +files/232-0001-tests-skip-fdstore-tests-if-not-implemented.patch,
+  +files/232-0002-docs-fix-sphinx-format-warning.patch,
+  +files/232-0003-build-sys-add-doc-sync-target.patch,
+  +files/232-0004-tests-add-workaround-for-pre-232-system-returning-EI.patch,
+  +files/232-0005-_reader-use-proper-ifdef-guard-for-sd_j_open_files_f.patch,
+  +files/232-0006-build-sys-import-pytest-instead-of-py.test.patch,
+  +python-systemd-232.ebuild:
+  bump to 232
+
+  Package-Manager: portage-2.3.1_p4
+
diff --git a/dev-python/python-systemd/Manifest b/dev-python/python-systemd/Manifest
index 202f069..423d6b1 100644
--- a/dev-python/python-systemd/Manifest
+++ b/dev-python/python-systemd/Manifest
@@ -1,8 +1,16 @@
 AUX 231-test_daemon-SO_PASSCRED.patch 1028 SHA256 c44c1920faa8bb567105aa40f2766da40ad72a69115941ce465f1e6c4c4ea3ab SHA512 289821ae88ea8d3de6e33bf679045cf8c960fa29269d5f67ebdffebf2b20fb403ed6e4a4321c5a0952df5f20b7ee7fdeb2db18ee8b2aff112ab822cc57a9e3f1 WHIRLPOOL 52bfd353edd02166ae3f5fa3c241dff0a2c2ef46c1f0fdc8317746d98194e831be48ff3153a25acadb530609e3ecacd9e2b0913c6ab52760ed699d9f6c19701c
+AUX 232-0001-tests-skip-fdstore-tests-if-not-implemented.patch 2181 SHA256 c301e28aab9a53a999a670f2d91827da320115860d067fe277f492542b5052ad SHA512 9a60e7b2b51edb18d7808649fab3c66d09c416d7871a9c3a885c17f29826b3859be3289fa6c4b0973808f358547f2e621f610da776bd66b38cb28d66cca718e7 WHIRLPOOL 22c3a1b970dd37add681680974caefbaf2c16bf0f66f688c2e9863b25bd70ff57a50ad7ec98069501a7ca36c0df2ad45ba01646951b6c9d43b84a7fcc3fbb592
+AUX 232-0002-docs-fix-sphinx-format-warning.patch 952 SHA256 064d825e57af80c9a4f45b84385a600be7cce77134a41954fc710b454eae2f03 SHA512 bc03107c29cca4d2d4c66cf6dd3a137fdaad91cb94a1aec835cf98d969ad1fa6f24c683cffad8dd50d832fa2f9f2a311086e4640ef826abffd01b234b4836e28 WHIRLPOOL a7b9cab4d89c95480cbf3d58950f60252299fe3b03446ceb86c4ee8cfe8ec51143701f37f5e06765202517c3c43eae25e9983c7e7127934cc5d11498102e348b
+AUX 232-0003-build-sys-add-doc-sync-target.patch 875 SHA256 3d78661ce2d04a90b6ff762875748877efdb5dce329300616197ed6b2512890e SHA512 61ba484bc7080c9b3126ad405c11e7c787371d17d02cc68ed210c861bd26aef638bdb29a504b4597638b1369a788d5736952f89c6393512087b7597def01b7e2 WHIRLPOOL 03949361a93b8a39d4254c33455018ed213c9f475bdd105949224d3df20580d9256fd700b7195a12ebd95f4b728bd2a70c783e7e29a729506ba59facd7ea04e0
+AUX 232-0004-tests-add-workaround-for-pre-232-system-returning-EI.patch 1969 SHA256 520498786404ef8e45408239d8ae94644a972553e165c048145be92de8b9c109 SHA512 724bec093d8b5a1e1c4fd369d563230fc08d768097267ec24f7ce3a2d6516de73f6f28efdf90e0a8cb772f4cfee316a395891e621986164f1114fedd580094bc WHIRLPOOL e330b605110632270de20e94d83b324f1bc206b81c445cf4346ccfd12ea113761f75bac9eb1c19a3fb35d465c50bcc7b98f52255c2adbbc061b559563a9550ba
+AUX 232-0005-_reader-use-proper-ifdef-guard-for-sd_j_open_files_f.patch 2085 SHA256 147f22562b94814c5528dc5cc40417771cdecf35371bba322318cb027f62a6df SHA512 9b2b6694abc74ab1c106fd5c7fb6bd052a7281b83023807a096e9369fb19d401c98d14ad48c6e40c68edee013e84467db091d4c957050b766851bf3578f00e4d WHIRLPOOL 2d569f21f34f6672335a59800607c5e8595602054edc634307ec7ed0509cb6cfcd4e040b63d360bd302ca4260e7cbd8767187f3db28edb8a7af6d5c7a2f5881e
+AUX 232-0006-build-sys-import-pytest-instead-of-py.test.patch 863 SHA256 3a39f988005f9b12b681af99764ad36970e726c9f2cd2301ba448e6f44f0b0f1 SHA512 af9f1041abd2416b1934c196332ab4bbd55cea7c32f018a7013e04e4db7c364272c92d85a283562a3f15803ab76ec404b15d2c8fca73c76d9fee711ccfd56fe7 WHIRLPOOL 40c81f6e9f04c14cf7fbfec18627022eafa7f8e8c3b14eba784ebfefe8a800659cdcf73c3f61d70b23e091255cae87de1dad386826fd3a971c6981fc0ecdf96c
 DIST python-systemd-230.tar.gz 39329 SHA256 656a83ff695f5de7d63411a86ea38601ad5a918595eebd0817d7b8e68642c64d SHA512 3c26c59b9005a45c3aeea8a6838ece9b5aa27dd7394ebe75319c1536b52462a847f18a79fdc8cf3bf6df9a70af63c84d5ff66a9587519dd9a006cc3df4966ce8 WHIRLPOOL 0de7ff6919bdf1c6c9cdafd71944801396157281fae1583bb060da4cf800369f97bb0c9f484f81635ed8b2e170db2bbbecf59adac0470a910167333f93c607e6
 DIST python-systemd-231.tar.gz 44430 SHA256 2c9cf53d041374898beead0c6f3b042c7d5b52425e6eb4d4b3c583d7eac12eea SHA512 b1567bd8e99025cc3b5aaeaab6539af8a5307068c403c0f1628bebc518ded80d0843b804244d1f252c858229f7f9578ce9aa988ded25f55999b0d355ce8a3455 WHIRLPOOL 4a1e05687080e8613ae607f837f39672727e60fc7bca1bca445f46413ce16280ab3bfaa30e969414d0da41f06420b7ef59043d2624dc50342cbe2d6df6add449
+DIST python-systemd-232.tar.gz 49211 SHA256 fc904704faa3dc2888a7336f1c660329c152fd4afb583267ef5d63c4a7f663a1 SHA512 3dfe8a17cd52fdcfce519ff1a64989ba153107d64839c95f93d8266239ed57d0d3510616726a1ab14dfa1b6df8216dc1d8e337d6240d1350378ec58148336325 WHIRLPOOL 34d2d0d1e11575b7fd6497f0543265542bbf7d68dd5a1a3e1c036e5a2518709254d04ee73794d72cb4c51d8f769079cede702fe61d1db7baa4993c213b8e9c2d
 EBUILD python-systemd-230.ebuild 637 SHA256 34e97fa43e990040a924dd8ff469bd67ec5480d253b74860a9b7b4e3a429ca84 SHA512 90c1337c1fbb7f88b6a61328d44b2bd96d8e9fc7c6b492c5d61f7a4b4a0e79b1f1da0c2593beb4d60613fe11dc1a0f045164d5bac3e91d0ea653e27c62b86f3c WHIRLPOOL 7878a9c4013e8d71ca949b763f3d260bfa6fb709b633bd2b982ff4401f5bdd05641f46b7be891918571dcb8f4380d19aaef55ef068177b579ec7ed4bf6e01034
 EBUILD python-systemd-231.ebuild 784 SHA256 dbddafb22f10ab3fef5bf727677c7364da2f884c75c149c30d7521f059af3554 SHA512 c37e6c9b83d54fed86f0ee64286efe15537920e2e86407e31308f3dddf1b82a36c1cb2ceae1d245598c3f66fcdc963d9f89b18ebcea652771eebb955311d0af5 WHIRLPOOL 63294a0085ad888d6e7c8e624eba8c53e2b714912ab56d98783b473ff6d23ad6c82cadb2b82ef203207dc24f5f8a19bfab51accda8c7a0ad094af6366a60055a
-MISC ChangeLog 3731 SHA256 8e071eeb9e6e655ce58a5411b10f959b0ca4188c1141f2eab673ace14105482e SHA512 ebe2db39074a55c23d2076a7d57cae43e91ecf49976ec1c5ff3475cc03d284c6a8a029a995d7548beb8e1b1ab0823288b802e52690383bfa14ca7244bca9c2d1 WHIRLPOOL 2d80f91cbe2c8c44b2cd7e411663233ec5f634096f9baba83f7d637f31359c2b4288b2ffa5fd11d25abf171f9cc7a14ee4e287ade9a1c44288a3f3c935763876
+EBUILD python-systemd-232.ebuild 1239 SHA256 c3e32ef098ab8e5daa68be887eb9edd3d81f0592cc838cbec1e4338d845838b3 SHA512 d9e77b2ec2f0b86e966efe37699fcfd8e687edb3ba0192a7733ea2091b1f72ec3557545f93942c0679ef6f5c0e5e9fa1cb480c0881156773179aee694685614c WHIRLPOOL 916a24482746e8c727ae7440c8ec29e42a1d87bcf4ff9a4a7a49b5587ddef8462064a0ed1f365bee5ef1e6b997dbeec6e22f84e4bcf7f20a5cc303d323d967cf
+MISC ChangeLog 4301 SHA256 9bcdfef5d898de0b82462671d67b4ddd09ee214f5aef6abf26b816f5d32da138 SHA512 d46595f276a67f134965329d4766529e4faf58d5f5acc521cdcae908125ad3ae75b437774317e227d15ed905d23f92775333cd64563c11f98513757bf375e5dd WHIRLPOOL e132379482ee61c7e0a4191d1bdb7057aeba16673310bb9464625ca7cc08c768897b95e43abbb8396a3bd6fefb624d8b5ec92076808b371ef58cd1e15cf5f294
 MISC ChangeLog-2015 543 SHA256 570be7466614d3cf54bc9380d46b8a8bc0d83847b7bd876b502f7152e4aa44ac SHA512 72246e55726c752864cac8a37de23aff67c3158c6ce8d7d9aead8d829aea97eeea013eee4475fd00b367974ce2278b91b6ff7968d908a2d005f468239df4959c WHIRLPOOL 6b25f1a474f78782b7b4c44288c0f188a4745ca0834fc6d56d3d1e4e67c6b0d14f51e0753e86e114fc19bec6a934e12757db7abfd8d74a6b56f577ef3c230885
 MISC metadata.xml 306 SHA256 cf7acf7bb77fa75b6716621d587ceba0864e083a6b96d6966236566e202e0cb1 SHA512 ca004982cde4fe1bcbd821109ec70f464a2014a2c0aa77f9976eedaec78ad68dc8d39e2e2f7023192bf807307e08259548f1ebb298ea7f3654c0b8658fba97f9 WHIRLPOOL a531166997ef2d4f0c576604a89032a74858e58617cca5e1b890c00f77d58bb9221853848d79860d050146e244a1b6180105484af999f46fcc1226c415e49c4d
diff --git a/dev-python/python-systemd/files/232-0001-tests-skip-fdstore-tests-if-not-implemented.patch b/dev-python/python-systemd/files/232-0001-tests-skip-fdstore-tests-if-not-implemented.patch
new file mode 100644
index 0000000..ab8affd
--- /dev/null
+++ b/dev-python/python-systemd/files/232-0001-tests-skip-fdstore-tests-if-not-implemented.patch
@@ -0,0 +1,63 @@
+From 177ac6d894e362b0d22a2765db280abed71cc07f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Thu, 22 Sep 2016 07:46:59 -0400
+Subject: [PATCH 1/6] tests: skip fdstore tests if not implemented
+
+Should fix #12.
+---
+ systemd/test/test_daemon.py | 18 +++++++++++++++---
+ 1 file changed, 15 insertions(+), 3 deletions(-)
+
+diff --git a/systemd/test/test_daemon.py b/systemd/test/test_daemon.py
+index 215f1f8..e827e1d 100644
+--- a/systemd/test/test_daemon.py
++++ b/systemd/test/test_daemon.py
+@@ -16,6 +16,15 @@ from systemd.daemon import (booted,
+ import pytest
+ 
+ @contextlib.contextmanager
++def skip_enosys():
++    try:
++        yield
++    except OSError as e:
++        if e.errno == errno.ENOSYS:
++            pytest.skip()
++        raise
++
++@contextlib.contextmanager
+ def closing_socketpair(family):
+     pair = socket.socketpair(family)
+     try:
+@@ -200,7 +209,8 @@ def test_listen_fds_default_unset():
+ 
+ def test_notify_no_socket():
+     assert notify('READY=1') == False
+-    assert notify('FDSTORE=1', fds=[]) == False
++    with skip_enosys():
++        assert notify('FDSTORE=1', fds=[]) == False
+     assert notify('FDSTORE=1', fds=[1,2]) == False
+     assert notify('FDSTORE=1', pid=os.getpid()) == False
+     assert notify('FDSTORE=1', pid=os.getpid(), fds=(1,)) == False
+@@ -216,7 +226,8 @@ def test_notify_bad_socket():
+     with pytest.raises(connection_error):
+         notify('READY=1')
+     with pytest.raises(connection_error):
+-        notify('FDSTORE=1', fds=[])
++        with skip_enosys():
++            notify('FDSTORE=1', fds=[])
+     with pytest.raises(connection_error):
+         notify('FDSTORE=1', fds=[1,2])
+     with pytest.raises(connection_error):
+@@ -234,7 +245,8 @@ def test_notify_with_socket(tmpdir):
+     os.environ['NOTIFY_SOCKET'] = path
+ 
+     assert notify('READY=1') == True
+-    assert notify('FDSTORE=1', fds=[]) == True
++    with skip_enosys():
++        assert notify('FDSTORE=1', fds=[]) == True
+     assert notify('FDSTORE=1', fds=[1,2]) == True
+     assert notify('FDSTORE=1', pid=os.getpid()) == True
+     assert notify('FDSTORE=1', pid=os.getpid(), fds=(1,)) == True
+-- 
+2.10.0
+
diff --git a/dev-python/python-systemd/files/232-0002-docs-fix-sphinx-format-warning.patch b/dev-python/python-systemd/files/232-0002-docs-fix-sphinx-format-warning.patch
new file mode 100644
index 0000000..d7fa5f3
--- /dev/null
+++ b/dev-python/python-systemd/files/232-0002-docs-fix-sphinx-format-warning.patch
@@ -0,0 +1,30 @@
+From b9767792b97fe56b37bb59ee3d207ae359f1651c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Thu, 22 Sep 2016 09:52:58 -0400
+Subject: [PATCH 2/6] docs: fix sphinx format warning
+
+build/lib.linux-x86_64-3.5/systemd/journal.py:docstring of systemd.journal.stream:15: WARNING: Literal block expected; none found.
+---
+ systemd/journal.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/systemd/journal.py b/systemd/journal.py
+index e930164..a74d62f 100644
+--- a/systemd/journal.py
++++ b/systemd/journal.py
+@@ -461,9 +461,9 @@ def stream(identifier, priority=LOG_DEBUG, level_prefix=False):
+ 
+     will produce the following message in the journal::
+ 
+-    PRIORITY=7
+-    SYSLOG_IDENTIFIER=myapp
+-    MESSAGE=message...
++      PRIORITY=7
++      SYSLOG_IDENTIFIER=myapp
++      MESSAGE=message...
+ 
+     Using the interface with print might be more convenient:
+ 
+-- 
+2.10.0
+
diff --git a/dev-python/python-systemd/files/232-0003-build-sys-add-doc-sync-target.patch b/dev-python/python-systemd/files/232-0003-build-sys-add-doc-sync-target.patch
new file mode 100644
index 0000000..08b4b29
--- /dev/null
+++ b/dev-python/python-systemd/files/232-0003-build-sys-add-doc-sync-target.patch
@@ -0,0 +1,29 @@
+From c3c412f90e481b88ca897e8542ced207c445c757 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Thu, 22 Sep 2016 09:59:04 -0400
+Subject: [PATCH 3/6] build-sys: add doc-sync target
+
+---
+ Makefile | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index df0555c..23b452e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -53,7 +53,11 @@ sphinx-%: build
+ check: build
+ 	(cd $(builddir) && $(PYTHON) -m py.test . ../../docs $(TESTFLAGS))
+ 
++www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/python-systemd
++doc-sync:
++	rsync -rlv --delete --omit-dir-times build/html/ $(www_target)/
++
+ TAGS: $(shell git ls-files systemd/*.[ch])
+ 	$(ETAGS) $+
+ 
+-.PHONY: build install dist clean distclean TAGS
++.PHONY: build install dist clean distclean TAGS doc-sync
+-- 
+2.10.0
+
diff --git a/dev-python/python-systemd/files/232-0004-tests-add-workaround-for-pre-232-system-returning-EI.patch b/dev-python/python-systemd/files/232-0004-tests-add-workaround-for-pre-232-system-returning-EI.patch
new file mode 100644
index 0000000..fd43b46
--- /dev/null
+++ b/dev-python/python-systemd/files/232-0004-tests-add-workaround-for-pre-232-system-returning-EI.patch
@@ -0,0 +1,58 @@
+From 35a5b281adea321ea3f7b7d688a994e735366fb0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Thu, 22 Sep 2016 20:12:15 -0400
+Subject: [PATCH 4/6] tests: add workaround for pre-232 system returning EINVAL
+ on some flags
+
+---
+ systemd/test/test_journal.py | 20 +++++++++++++++-----
+ 1 file changed, 15 insertions(+), 5 deletions(-)
+
+diff --git a/systemd/test/test_journal.py b/systemd/test/test_journal.py
+index 0902183..dceec3f 100644
+--- a/systemd/test/test_journal.py
++++ b/systemd/test/test_journal.py
+@@ -21,6 +21,13 @@ def skip_enosys():
+             pytest.skip()
+         raise
+ 
++@contextlib.contextmanager
++def skip_valueerror():
++    try:
++        yield
++    except ValueError:
++        pytest.skip()
++
+ def test_priorities():
+     p = journal.JournalHandler.mapPriority
+ 
+@@ -62,10 +69,12 @@ def test_reader_init_flags():
+ def test_reader_os_root(tmpdir):
+     with pytest.raises(ValueError):
+         journal.Reader(journal.OS_ROOT)
+-    j1 = journal.Reader(path=tmpdir.strpath,
+-                        flags=journal.OS_ROOT)
+-    j2 = journal.Reader(path=tmpdir.strpath,
+-                        flags=journal.OS_ROOT | journal.CURRENT_USER)
++    with skip_valueerror():
++        j1 = journal.Reader(path=tmpdir.strpath,
++                            flags=journal.OS_ROOT)
++    with skip_valueerror():
++        j2 = journal.Reader(path=tmpdir.strpath,
++                            flags=journal.OS_ROOT | journal.CURRENT_USER)
+     j3 = journal.Reader(path=tmpdir.strpath,
+                         flags=journal.OS_ROOT | journal.SYSTEM_ONLY)
+ 
+@@ -91,7 +100,8 @@ def test_reader_init_path_fd(tmpdir):
+         j1 = journal.Reader(path=fd)
+     assert list(j1) == []
+ 
+-    j2 = journal.Reader(journal.SYSTEM, path=fd)
++    with skip_valueerror():
++        j2 = journal.Reader(journal.SYSTEM, path=fd)
+     assert list(j2) == []
+ 
+     j3 = journal.Reader(journal.CURRENT_USER, path=fd)
+-- 
+2.10.0
+
diff --git a/dev-python/python-systemd/files/232-0005-_reader-use-proper-ifdef-guard-for-sd_j_open_files_f.patch b/dev-python/python-systemd/files/232-0005-_reader-use-proper-ifdef-guard-for-sd_j_open_files_f.patch
new file mode 100644
index 0000000..b751f2d
--- /dev/null
+++ b/dev-python/python-systemd/files/232-0005-_reader-use-proper-ifdef-guard-for-sd_j_open_files_f.patch
@@ -0,0 +1,55 @@
+From 8024fc61719d15b47ace1973b6b901881e17ff2f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Thu, 22 Sep 2016 20:41:21 -0400
+Subject: [PATCH 5/6] _reader: use proper ifdef guard for sd_j_open_files_fd
+
+---
+ systemd/_reader.c | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/systemd/_reader.c b/systemd/_reader.c
+index 0f6fd3f..3a2c218 100644
+--- a/systemd/_reader.c
++++ b/systemd/_reader.c
+@@ -283,7 +283,6 @@ static int Reader_init(Reader *self, PyObject *args, PyObject *keywds) {
+                         Py_END_ALLOW_THREADS
+                 }
+         } else if (_files) {
+-#ifdef HAVE_JOURNAL_OPEN_FILES
+                 _cleanup_Py_DECREF_ PyObject *item0 = NULL;
+ 
+                 item0 = PySequence_GetItem(_files, 0);
+@@ -293,9 +292,13 @@ static int Reader_init(Reader *self, PyObject *args, PyObject *keywds) {
+                         if (!strv_converter(_files, &files))
+                                 return -1;
+ 
++#ifdef HAVE_JOURNAL_OPEN_FILES
+                         Py_BEGIN_ALLOW_THREADS
+                         r = sd_journal_open_files(&self->j, (const char**) files, flags);
+                         Py_END_ALLOW_THREADS
++#else
++                        r = -ENOSYS;
++#endif
+                 } else {
+                         _cleanup_free_ int *fds = NULL;
+                         size_t n_fds;
+@@ -303,13 +306,14 @@ static int Reader_init(Reader *self, PyObject *args, PyObject *keywds) {
+                         if (!intlist_converter(_files, &fds, &n_fds))
+                                 return -1;
+ 
++#ifdef HAVE_JOURNAL_OPEN_DIRECTORY_FD
+                         Py_BEGIN_ALLOW_THREADS
+                         r = sd_journal_open_files_fd(&self->j, fds, n_fds, flags);
+                         Py_END_ALLOW_THREADS
+-                }
+ #else
+-                r = -ENOSYS;
++                        r = -ENOSYS;
+ #endif
++                }
+         } else {
+                 Py_BEGIN_ALLOW_THREADS
+                 r = sd_journal_open(&self->j, flags);
+-- 
+2.10.0
+
diff --git a/dev-python/python-systemd/files/232-0006-build-sys-import-pytest-instead-of-py.test.patch b/dev-python/python-systemd/files/232-0006-build-sys-import-pytest-instead-of-py.test.patch
new file mode 100644
index 0000000..04509ab
--- /dev/null
+++ b/dev-python/python-systemd/files/232-0006-build-sys-import-pytest-instead-of-py.test.patch
@@ -0,0 +1,27 @@
+From 911591a1188e03942e60f2ab1abf91562904f49e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Thu, 22 Sep 2016 20:24:31 -0400
+Subject: [PATCH 6/6] build-sys: import "pytest" instead of "py.test"
+
+Fixes the following error in rawhide:
+/usr/bin/python3: loader for pytest cannot handle py.test
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 23b452e..b10d6d9 100644
+--- a/Makefile
++++ b/Makefile
+@@ -51,7 +51,7 @@ sphinx-%: build
+ 	@echo Output has been generated in build/$*
+ 
+ check: build
+-	(cd $(builddir) && $(PYTHON) -m py.test . ../../docs $(TESTFLAGS))
++	(cd $(builddir) && $(PYTHON) -m pytest . ../../docs $(TESTFLAGS))
+ 
+ www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/python-systemd
+ doc-sync:
+-- 
+2.10.0
+
diff --git a/dev-python/python-systemd/python-systemd-232.ebuild b/dev-python/python-systemd/python-systemd-232.ebuild
new file mode 100644
index 0000000..1a7fad5
--- /dev/null
+++ b/dev-python/python-systemd/python-systemd-232.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module for native access to the systemd facilities"
+HOMEPAGE="https://github.com/systemd/python-systemd"
+SRC_URI="https://github.com/systemd/python-systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+COMMON_DEPEND="
+	sys-apps/systemd:0=
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	!sys-apps/systemd[python(-)]
+"
+
+PATCHES=(
+	"${FILESDIR}"/232-0001-tests-skip-fdstore-tests-if-not-implemented.patch
+	"${FILESDIR}"/232-0002-docs-fix-sphinx-format-warning.patch
+	"${FILESDIR}"/232-0003-build-sys-add-doc-sync-target.patch
+	"${FILESDIR}"/232-0004-tests-add-workaround-for-pre-232-system-returning-EI.patch
+	"${FILESDIR}"/232-0005-_reader-use-proper-ifdef-guard-for-sd_j_open_files_f.patch
+	"${FILESDIR}"/232-0006-build-sys-import-pytest-instead-of-py.test.patch
+)
+
+python_test() {
+	pushd "${BUILD_DIR}/lib" > /dev/null || die
+	"${PYTHON}" -m pytest -v . || die
+	popd > /dev/null || die
+}
diff --git a/dev-python/s3transfer/ChangeLog b/dev-python/s3transfer/ChangeLog
index f9eb503..e2d554e 100644
--- a/dev-python/s3transfer/ChangeLog
+++ b/dev-python/s3transfer/ChangeLog
@@ -54,3 +54,15 @@
 
   Package-Manager: portage-2.3.0
 
+*s3transfer-0.1.4 (24 Sep 2016)
+
+  24 Sep 2016; Alex Brandt <alunduil@gentoo.org> +s3transfer-0.1.4.ebuild:
+  add version 0.1.4
+
+  Package-Manager: portage-2.3.1
+
+  24 Sep 2016; Alex Brandt <alunduil@gentoo.org> -s3transfer-0.1.1.ebuild:
+  remove version 0.1.1
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index e66f01b..b02e19e 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1,8 +1,8 @@
-DIST s3transfer-0.1.1.tar.gz 82198 SHA256 6b9131b704819b0e559a97eec373ff6cc8a9b258e4c8f58ad339650b5019f00f SHA512 3e784b8e5a723ff18d587d8dc56bec3737f4be7c644320d5a9eba25b28912cb9ce488f4d37ef48c507eef6e1df6cb30dfd22109231a8cadb6f0d63ff40ae712d WHIRLPOOL 64447ef8ad10b02712b63e8dc5c9708827c4234e01571d825e7a10bc0645c5b0e11968fc43c2b4589bff7355efa639db65ae8c95d3645f3cffc83176bb246415
 DIST s3transfer-0.1.2.tar.gz 82681 SHA256 779d0cd9aa30fa65c6e8da8dc203d165ef7aa6cab0b7faa502b850e6cb9236dc SHA512 96cdc5744ba4297205d82d07aa5b8883269e59c9462baf1bd742ae6be385f17da0803fe09f3a2161c918f04a7c422f82d8e7075ea29d4424fc752a750dc98a6f WHIRLPOOL 14d367b8ab592b27c15519d0a972979baaef9ad3acf293e0908c70df7d3b2dfb4dfefac033490ca9f7fbab1e30b19b414daa73fc516c8f974b4eafd989a462b9
 DIST s3transfer-0.1.3.tar.gz 83873 SHA256 af2e541ac584a1e88d3bca9529ae784d2b25e5d448685e0ee64f4c0e1e017ed2 SHA512 c05ebd67f8295cd595ace77aaf1f437fa4572bfeb31a06df336ba05a17b8d420ce29ff3ba06ce31f75d8a8e9f43bf4dc23559fa1e78e477370ca989010fe23e1 WHIRLPOOL d62df0fb99647e82d82331f953eb943f9e03e930ef9529882e18fe6bcd886f7a8386b9aafcfcae1146b3c5e1f71d9d3d93bbe63715eeeefb5b4fb773f3245cc2
-EBUILD s3transfer-0.1.1.ebuild 995 SHA256 870088ea06b019d3d247a329c1de9938660ca3b84ddd3195b32cb33e8832c374 SHA512 0d4ace3e2167b1fcf9111b4cecf7d21ff3ac07c789c9181408f05cfaad9a7ac388edcc5f100fd0e3cd1148001248b41cb5eea439efe253b8b3aee8acf3b7151b WHIRLPOOL b45753a327bb15669bf1021d278016a30fbfc9594508ff3f1debb8a587f4ab1469cfa06e3b60104895d73dd6cc852f740e170b097961c5788865c4a9b736d3dd
+DIST s3transfer-0.1.4.tar.gz 87620 SHA256 c41d039ab9204e9eea72a6098ca5092ed001f2820274b80be622dbe582ab2d41 SHA512 ec56ff5f535ffab7d0c21d933b12d71c55cc4647260f82b54d6aebb97716f3b55d26f75f3640487dcd7275ed2b4a57d3f7b7995b873ec7775f53ec5a13ba0419 WHIRLPOOL bb615d142d9df7c602307c956fa2c8c868f9d35864cdb4ee9b452e34b3831bbcd7ae2c912ecd09177a42bb440c75510d9062c2ca458864d93bf481a3b54d2183
 EBUILD s3transfer-0.1.2.ebuild 995 SHA256 870088ea06b019d3d247a329c1de9938660ca3b84ddd3195b32cb33e8832c374 SHA512 0d4ace3e2167b1fcf9111b4cecf7d21ff3ac07c789c9181408f05cfaad9a7ac388edcc5f100fd0e3cd1148001248b41cb5eea439efe253b8b3aee8acf3b7151b WHIRLPOOL b45753a327bb15669bf1021d278016a30fbfc9594508ff3f1debb8a587f4ab1469cfa06e3b60104895d73dd6cc852f740e170b097961c5788865c4a9b736d3dd
 EBUILD s3transfer-0.1.3.ebuild 995 SHA256 870088ea06b019d3d247a329c1de9938660ca3b84ddd3195b32cb33e8832c374 SHA512 0d4ace3e2167b1fcf9111b4cecf7d21ff3ac07c789c9181408f05cfaad9a7ac388edcc5f100fd0e3cd1148001248b41cb5eea439efe253b8b3aee8acf3b7151b WHIRLPOOL b45753a327bb15669bf1021d278016a30fbfc9594508ff3f1debb8a587f4ab1469cfa06e3b60104895d73dd6cc852f740e170b097961c5788865c4a9b736d3dd
-MISC ChangeLog 1547 SHA256 b77d954a73285b42d6603914a57b478dab5912d69b6dbb3b22053a1c18e83c9c SHA512 78af248dac534397180ecaf0176e949cf327a251e3f86aead2dcf7cdf40e985fc1e11054f118b2360436ddbc6eeeebf4b32ce5135cdd2d4a95c2626a064cdabb WHIRLPOOL 5b62ae46ff8898949a6288c21381fad3aa77b2417fa0ee91078b0d7a058e4763e638d5fe6baae46f586c9e0823475cfb66d372efab5d88193438cd427944f00f
+EBUILD s3transfer-0.1.4.ebuild 995 SHA256 870088ea06b019d3d247a329c1de9938660ca3b84ddd3195b32cb33e8832c374 SHA512 0d4ace3e2167b1fcf9111b4cecf7d21ff3ac07c789c9181408f05cfaad9a7ac388edcc5f100fd0e3cd1148001248b41cb5eea439efe253b8b3aee8acf3b7151b WHIRLPOOL b45753a327bb15669bf1021d278016a30fbfc9594508ff3f1debb8a587f4ab1469cfa06e3b60104895d73dd6cc852f740e170b097961c5788865c4a9b736d3dd
+MISC ChangeLog 1843 SHA256 841fa822c1f436a2d37a904233ef0c748ee03c8e5094bbb5f2a23ebad6857877 SHA512 7edea217191c50eace9ab80dcab0ffdea29b13c02b0b287c3271ac529b3582e1f3fbf403ffebc381f60e0f633423d9613c56f3ea552cc2c39e90139be98688cb WHIRLPOOL bb76067bf18429f8f5d3ab3195745d3809a462883b685d61f3bbc276b19722c760469725c0f73be2e2cc704940317220a6b45e7a8937b89abc0d982753e8f08a
 MISC metadata.xml 488 SHA256 921f65c3fbf0375030486af3c71ce766c8d6dc2cfe19102e3c6faeee3498299d SHA512 a12b262b29e67031be1d03dbb4ab4d50cf174515d9ec3e37ca6c5576c581f93ab0d33f79d15b930e7178345ff7f762c16d31fd377ff30d45088dfe8f9750c11a WHIRLPOOL 0565c83f3129ebab85cd5478c95c8610680ce0438135f6125f7ccfaef7718d30f7d36b38f7712ba38b08b782078bfe6c65b0fb675530c826645b607a2d984019
diff --git a/dev-python/s3transfer/s3transfer-0.1.1.ebuild b/dev-python/s3transfer/s3transfer-0.1.4.ebuild
similarity index 100%
rename from dev-python/s3transfer/s3transfer-0.1.1.ebuild
rename to dev-python/s3transfer/s3transfer-0.1.4.ebuild
diff --git a/dev-python/setuptools/ChangeLog b/dev-python/setuptools/ChangeLog
index 39ece6e..f50328b 100644
--- a/dev-python/setuptools/ChangeLog
+++ b/dev-python/setuptools/ChangeLog
@@ -525,3 +525,11 @@
   14 Sep 2016; Tim Harder <radhermit@gentoo.org> +setuptools-27.2.0.ebuild:
   version bump to 27.2.0
 
+  24 Sep 2016; Mike Gilbert <floppym@gentoo.org> setuptools-27.2.0.ebuild,
+  setuptools-9999.ebuild:
+  install CHANGES.rst
+
+  Bug: https://bugs.gentoo.org/595034
+
+  Package-Manager: portage-2.3.1_p4
+
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index eac34c4..744aa1b 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -9,8 +9,8 @@
 EBUILD setuptools-24.0.2.ebuild 1848 SHA256 8cb91268cc245e71bb0ca5d91a8892c17b1dd5003d3022e44b31bbc6ee2b578f SHA512 19ea10346e22cf87a84d2f744170a59e3c9617b8bd9c470a569156faa96e655870fe0f444b3a718c64f8a52fc0c2b9023da81c4d7b85f3e34f10e3b8b9ce20b9 WHIRLPOOL 36848c6244f357cf406104ce0b916838a0f204fc0915c5e83fcf4fba252bc76c760e8105500b5c9111ab698d5b56fabc6431c5fc124b9f9b96388f3abdc027a8
 EBUILD setuptools-26.1.1.ebuild 1847 SHA256 00c16edd0545f97f7bd3959ae6ae2790c143abc66628410087558e1c75318dc1 SHA512 dd6149757ab1ac829f71a488d3f7f168f5d1d35d4223ad601eba29c06927191eb87f605ddf0b698474f69466eeabab8812da3e3233df91ce31271cc8b5429362 WHIRLPOOL cdcc1d72644254fe8431ac09ed1222e3d718f77baae9266229846a144acf9a1ba1f285e0c4bff00a793eddf4cc233007f1880582626808f32a6f1a4ac59aa65e
 EBUILD setuptools-27.1.2.ebuild 2079 SHA256 9890a00b8b05da624bcbaff9389285c6cc2d471b489e23be7fab7a1bcdd6e8b0 SHA512 3e0c590ddcaea823ad80c7f01eb80f0377c224ff1932b8d850443487f09e847f178a4c23b88b34d079a4ad407ce4ac7512f1aab034fed186a94f42b755cee268 WHIRLPOOL 7f14d6bee362e4693094ad486da971281a2ac0226dbdc7b41033e5a59e8295f2e184e3cca7e63c5118d6caa6a4668ebaa3a80721d0ff7f8ae5a528f397764cf0
-EBUILD setuptools-27.2.0.ebuild 2079 SHA256 9890a00b8b05da624bcbaff9389285c6cc2d471b489e23be7fab7a1bcdd6e8b0 SHA512 3e0c590ddcaea823ad80c7f01eb80f0377c224ff1932b8d850443487f09e847f178a4c23b88b34d079a4ad407ce4ac7512f1aab034fed186a94f42b755cee268 WHIRLPOOL 7f14d6bee362e4693094ad486da971281a2ac0226dbdc7b41033e5a59e8295f2e184e3cca7e63c5118d6caa6a4668ebaa3a80721d0ff7f8ae5a528f397764cf0
-EBUILD setuptools-9999.ebuild 2079 SHA256 9890a00b8b05da624bcbaff9389285c6cc2d471b489e23be7fab7a1bcdd6e8b0 SHA512 3e0c590ddcaea823ad80c7f01eb80f0377c224ff1932b8d850443487f09e847f178a4c23b88b34d079a4ad407ce4ac7512f1aab034fed186a94f42b755cee268 WHIRLPOOL 7f14d6bee362e4693094ad486da971281a2ac0226dbdc7b41033e5a59e8295f2e184e3cca7e63c5118d6caa6a4668ebaa3a80721d0ff7f8ae5a528f397764cf0
-MISC ChangeLog 16518 SHA256 13e7d9b6bff7787b34be7d6a1998ba899c21c68075e349f457c1f2d5fe53e3f3 SHA512 3e8f2e55c7f5c9c9e6294ac01e896643a590e16c598e582524f1e252428ca86a2c752fb52f85291d1f3c1391f1d17e78d7ae58c340de2261006cdb76221be112 WHIRLPOOL a817915885bee860ee1d5d4cfff26457618ba6347809a02a52f1126edfd15d44be772e1ee6362f6af8ecd5e7944c3f3a4e6fbf2f49439281ab28259307689c17
+EBUILD setuptools-27.2.0.ebuild 2089 SHA256 29b8daca6a79d66e88fd4cef7cec41d96428621764b578bd0cf3299a23787377 SHA512 d252edb82d1d07412d7560d3cf8466ce9a33b91b1f1c4732d684d9a8b9b58aba0b64b4fb88bd9ecad2615d5c49b5713217ab558b58a4358ef34b3e572ddef325 WHIRLPOOL 9008bf6beba3f7832f2ef6ec53f02fd459ccee289f672d72d2a73c05f48e997280e5593c4c2248f186d923319f2e47686ea34bba06f681fe37e2cd5a6c47d47e
+EBUILD setuptools-9999.ebuild 2089 SHA256 29b8daca6a79d66e88fd4cef7cec41d96428621764b578bd0cf3299a23787377 SHA512 d252edb82d1d07412d7560d3cf8466ce9a33b91b1f1c4732d684d9a8b9b58aba0b64b4fb88bd9ecad2615d5c49b5713217ab558b58a4358ef34b3e572ddef325 WHIRLPOOL 9008bf6beba3f7832f2ef6ec53f02fd459ccee289f672d72d2a73c05f48e997280e5593c4c2248f186d923319f2e47686ea34bba06f681fe37e2cd5a6c47d47e
+MISC ChangeLog 16718 SHA256 d0f4ec12910ac15cb831b9ed582d0dc6b00f3c71c51161dc65229bf2fb940aa3 SHA512 e0d8d9c65cb04661c45229c353979a36ddaf38b390b8d262f78b24991cb3a484d12aaa55283694952d5dc1ddc1599fe5a61ecc6ec42428cc778b1c635fcffc78 WHIRLPOOL ace826d35431d9bc34007d2e4b16a2fad5f6ace7e4d3ce5fc01464c9991548652acd04d830e6bee4bb7c8d238fe9a8936243a6dfdc2e79e0385358f48d2db349
 MISC ChangeLog-2015 40164 SHA256 688e239d071bc1023126c3f0bb1e62c72a1c217a7290312441ad91829ee51d84 SHA512 d009c942ddc4d8beb2ba9f756a0f00d292c1accd029288727ef23811dba8854b0cdffc4b753883975adaa1572c4cd15e5a1e14d9fb2afb50e852cb14e71b635f WHIRLPOOL dfe2b05139f33b1b94481d040c5b58cd687331b3d96f7d0cb6e49d28574c3b0f4325b22aec97cd5ba138ee7caec989f18c94456cdb0651bb19611328623e11be
 MISC metadata.xml 323 SHA256 2c36cbfb34236724d9008cb076052bea1ec6cfa443b6b65b045902950f197e9d SHA512 dfa3afda0fc84f6f3a9e0986b77c05a7ac35e789fbe2cebe210ce5062fbcb3f3076a93ab1b2fa73acf5c20542a5302274515b421300dd5989bbe4851b854e8a2 WHIRLPOOL 0ce1ca73a593495c4a92b8d89ff7c7f2f21f90e3913fd59af1e2b75a853656ef013be7252c30bd568148a3071000b416dac98d96bf59d177e46ac3d8877372b5
diff --git a/dev-python/setuptools/setuptools-27.2.0.ebuild b/dev-python/setuptools/setuptools-27.2.0.ebuild
index 136c3f5..c1bedfe 100644
--- a/dev-python/setuptools/setuptools-27.2.0.ebuild
+++ b/dev-python/setuptools/setuptools-27.2.0.ebuild
@@ -39,7 +39,7 @@
 # Force in-source build because build system modifies sources.
 DISTUTILS_IN_SOURCE_BUILD=1
 
-DOCS=( README.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
 
 python_prepare_all() {
 	if [[ ${PV} == "9999" ]]; then
diff --git a/dev-python/setuptools/setuptools-9999.ebuild b/dev-python/setuptools/setuptools-9999.ebuild
index 136c3f5..c1bedfe 100644
--- a/dev-python/setuptools/setuptools-9999.ebuild
+++ b/dev-python/setuptools/setuptools-9999.ebuild
@@ -39,7 +39,7 @@
 # Force in-source build because build system modifies sources.
 DISTUTILS_IN_SOURCE_BUILD=1
 
-DOCS=( README.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
 
 python_prepare_all() {
 	if [[ ${PV} == "9999" ]]; then
diff --git a/dev-python/six/Manifest b/dev-python/six/Manifest
index 7bfc59c..234a911 100644
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@@ -2,7 +2,7 @@
 AUX 1.9.0-mapping.patch 557 SHA256 f2756328651f4451c0f1a953f7ebeff1416bce303740b5638877956ef7fcdfcb SHA512 ed7e8530e8295390823f38adecfacaf5f494b1640b95995d1e150f5b96ab68e3961d241c27ee79309b71688d576b33b76c2817e6f3eab6881e83dfa14059fcb0 WHIRLPOOL 39264737d3be5503a6f7a1b7171575662b4e225d774d3bfea1a69637af2e92eb24e16b692ec57aa6c0ce8883d987a47cc3021d33eb7c947ad0fef963c005efa0
 AUX six-1.9.0-winreg.patch 953 SHA256 607d71d6b76aaf319a763306d6bc01e062382997b096e3a0b46b225ca22a40e9 SHA512 abf36a4199c59e53d393ec800bffcfca654bb87e718a8fc44248efd78ad86b24e8526626417359df6da9be79aba3092a9496b1202f68f1ef43e6e75d339c01c3 WHIRLPOOL 4a325bc7fbddacba7f9d94055247dcfaa5285a635b32e6df46993b9ef3fba534dd26f9412ab7745bace01cd273a82910620fa6453b645050ea5ae79deeb1713e
 DIST six-1.10.0.tar.gz 29630 SHA256 105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a SHA512 9a53b7bc8f7e8b358c930eaecf91cc5639176a699830153f586780c3e6d637f1bd31349a69c383574f99da19cb3a36524e7733a318f3572b27aefb69c6409c2e WHIRLPOOL aad2fc7438b0df029bf477a783161dc169795c355be1281f1fe7aa4eb959eae5abf3bc96d097a221e0e5ad0b0494c29025bbe99bc28ff0c29ae1776e8691a70a
-EBUILD six-1.10.0.ebuild 2137 SHA256 821ea4685ef6624a890fc03841a86ea981c009a80c23880ee6110852a2d47e6d SHA512 8ce54f950c055b974085e2daea0ecd80f8b099cb507b20c8ab0e671775895b7b1e2b16df1a87533e51919e38ee26996330ec11a962c03713c1fb2b053c18a4b6 WHIRLPOOL f8459bbe5008217785cca8d62e3c97819e6832a2545f00cfc0194019904671587fe850b39f359bbc79a2293e54816d38cc4cbc9e7dc9b4dcfcad1cc8c5673ffa
+EBUILD six-1.10.0.ebuild 2250 SHA256 7504146d0aea7272322f48f7180337c23f5cbe4982a71c54981d03cf737868b9 SHA512 790bb632fac1509857184330d6ac7223fa69858973711bb665bf57bbb9792aeccfa080e94474d220e64f9d6e90dff4d5fc3c4f37b623a9a39199de262e903ee2 WHIRLPOOL 3aee57476eca2faf2d995c10333bde4d8c3350467e7c7e0ad8bd030d0d366f9a0a916ba0bef3aedd60588ae6fe965edd91b5a9a9b41e526f9ea435b01ebb82fb
 MISC ChangeLog 8522 SHA256 b111c4b67d55d6ade8fbbfd583a8f008fecf0a78a113d29064859afe0a3f4749 SHA512 70f3a4d78d0f7be2d0dad6b71c9e2b9034b558c7dcb2ecb8ba35552b282cffa45ed9bbb0ca3d478f4f8e026222b572d36ee31838ea49fbaaa2556635cbbf59e0 WHIRLPOOL 3dfd71c807962283cf825641c6c7f1e0b7838178085930a2e40c28b8f05db3f5c63524f098f825821adee71ba8b1e5900bc4956ee546b1cb5108698d35752e70
 MISC ChangeLog-2015 8432 SHA256 f8702aa8815c9560e6ac791a0529133fba0550b856902065bc1c1050820f7a1b SHA512 b2795ad91e3be336a8af5b8199b22dfe9d3b8947578255f1dcb8f5a795574d852b7d7091e92eab7a6bf5e19f30a0c8e847c48ad4129d99f152e269b9a3360049 WHIRLPOOL 90ec283742f3afdf9b37e994931218fd0ebcaea89b8d018604598081257fb1209fcfa87ad9b642e1dcbefc57b49484d42090842893bb81354b8d95a76a3cf524
 MISC metadata.xml 373 SHA256 24d15670592163708c2d774b105edfb24662147fbb1b8032880207aaf17fff2c SHA512 13f285ac6a8c20fad92563e72f6b53b32411f2f0ab9ad9680e9fbc4f5720119a0a8acf6c701fc4b286fa10611bfcd0bdcb7c55731e192adbb917ef6556e06d01 WHIRLPOOL 26c68f4bd412f5159e298f456e905530c95cef6e200e02d01956bdf76a3e8972a5b9ab5dfacff6eb5898ca11b3c97191932b2eada8e53d8e3f398da08626db80
diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild
index 753971c..29971c2 100644
--- a/dev-python/six/six-1.10.0.ebuild
+++ b/dev-python/six/six-1.10.0.ebuild
@@ -68,6 +68,10 @@
 			rm -r "${egginfo}" || die "Failed to remove egg-info directory"
 		fi
 	}
-	cd / # Bug 585146
+	# https://bugs.gentoo.org/585146
+	local tmpdir="$(mktemp -d)"
+	[[ -n ${tmpdir} ]] || die
+	cd "${tmpdir}" || die
 	python_foreach_impl _cleanup
+	rmdir "${tmpdir}"
 }
diff --git a/dev-ruby/acts_as_list/ChangeLog b/dev-ruby/acts_as_list/ChangeLog
index 415d427..ced93aa 100644
--- a/dev-ruby/acts_as_list/ChangeLog
+++ b/dev-ruby/acts_as_list/ChangeLog
@@ -142,3 +142,16 @@
 
   Package-Manager: portage-2.2.28
 
+  24 Sep 2016; Hans de Graaff <graaff@gentoo.org> -acts_as_list-0.7.6.ebuild,
+  -acts_as_list-0.8.0.ebuild:
+  cleanup
+
+  Package-Manager: portage-2.2.28
+
+*acts_as_list-0.8.2 (24 Sep 2016)
+
+  24 Sep 2016; Hans de Graaff <graaff@gentoo.org> +acts_as_list-0.8.2.ebuild:
+  add 0.8.2
+
+  Package-Manager: portage-2.2.28
+
diff --git a/dev-ruby/acts_as_list/Manifest b/dev-ruby/acts_as_list/Manifest
index 5e19956..e0e398c 100644
--- a/dev-ruby/acts_as_list/Manifest
+++ b/dev-ruby/acts_as_list/Manifest
@@ -1,11 +1,9 @@
-DIST acts_as_list-0.7.6.gem 25088 SHA256 a8c1c2056f55968c31bf094dd15f557b5cea6f7242ab853d30cd2456b8339c18 SHA512 1009f934ae046723a336208a59c1b6fd31b9b2df38fbe5fe0bed29b928fb16296c8869fb035e8865d4c712a572fcd31868601195d9921f4ec8dfc01854f40eb0 WHIRLPOOL 745dd86398ca4bb06ab1c1d1de3b8a121383beaa836523f98046b15f4157ade661bc63457c7d0135ca7dd3c852b3052ccca4439f7375897cd5b2541baa4ef505
 DIST acts_as_list-0.7.7.gem 25600 SHA256 dca206b32860e6c846f747bc3fd4a820875830f7926260d0b093200b4b33e982 SHA512 e343c839ce4399851c33746c68aaec95b3b5e526943c9bd5209a5d2793ba18c53620b6084589271ea88d504ee6f9fed6e8a332e2da52ce3cac89a1f2abed5954 WHIRLPOOL 2a8f17b451033b96b3eb82dfe5d234ca07fbdff3028b373ea95359ba2a6e60a6e951cdb01af508bb8a44c832fd2cfda33b0f7bb0cf98a4345f96929a1e76d23d
-DIST acts_as_list-0.8.0.gem 26624 SHA256 262f368602a8d0039fe63a514548b8899ee7bd9df5dd74cc83b076f6fa0fd8aa SHA512 66cf173a5b5bd1d3c50ac65b6c90a6ac42a42ba815188da3066abca84bd05c95f2e54c34902bfae704839345807f3d4dbdfd920f15320bda802efaefda800b51 WHIRLPOOL 97fd010ce3b98075696b0a39150be59c91c82b6cf4e3dbdca2d8860b3d4800d3ee82e3f1a0dc77caf1638d80db4a52c83054164848583f24398747eced5a3681
 DIST acts_as_list-0.8.1.gem 26624 SHA256 2df2d08e8be17dc51169b730649abec5c4d342d511769e5e40f5e826069f84b5 SHA512 1d2e3b934a8846097662cfe4af81392eb0d176ff08a4c4ef6e422cf5404e9daacc0c5478642f4ef15d9874aca9aee7788b54077b958b96ca9cecf2b50343c8b8 WHIRLPOOL a65793c8b5821613d0585615945eab08caefb94cb89d5427d6f1c347833a741d0bef16461ea05a95c479755d0a7f90ab8b3546e45df5ef0093acc64ea05d87ee
-EBUILD acts_as_list-0.7.6.ebuild 901 SHA256 e245e1a80f2b417392706213ab85c0db042bc6455ee536b6e13c0a5e00c091b4 SHA512 e6ce6ba23092e512ba38237ee6ef150f958ab9ccebd36b1f60072933e7a61981d9ce051524365af4658d4a04d0f13904323d05a8abb6e831448746d0f35a5c02 WHIRLPOOL 22a967739eab67711ca6aa46b214ace388d7a93a3787021ecbefc68c87c33476087c802493211393a62f25b420572d0651bcd8d7641298db24ff29378ee63db2
+DIST acts_as_list-0.8.2.gem 26624 SHA256 999df2ddddecbc5b0a502b34f518ab6fe0e54bad62ef68f5d7acf019e5d9978a SHA512 145ee906252253fb436036d0a2bada7693039b87d9209dc31b5714b51579afe53201252ab1772aea0cdcb3450822e6ca8c47e89085aa2587c1c608f4d437d03e WHIRLPOOL 25e9d7ddc05facbea4dc5aa8f37227363198ec40b133e3ef6fbc067c2b730b704aab2c15066ef9d30cfac0131e329f5e019b1a397655546209fdb8204dc0baf4
 EBUILD acts_as_list-0.7.7.ebuild 901 SHA256 e245e1a80f2b417392706213ab85c0db042bc6455ee536b6e13c0a5e00c091b4 SHA512 e6ce6ba23092e512ba38237ee6ef150f958ab9ccebd36b1f60072933e7a61981d9ce051524365af4658d4a04d0f13904323d05a8abb6e831448746d0f35a5c02 WHIRLPOOL 22a967739eab67711ca6aa46b214ace388d7a93a3787021ecbefc68c87c33476087c802493211393a62f25b420572d0651bcd8d7641298db24ff29378ee63db2
-EBUILD acts_as_list-0.8.0.ebuild 901 SHA256 e245e1a80f2b417392706213ab85c0db042bc6455ee536b6e13c0a5e00c091b4 SHA512 e6ce6ba23092e512ba38237ee6ef150f958ab9ccebd36b1f60072933e7a61981d9ce051524365af4658d4a04d0f13904323d05a8abb6e831448746d0f35a5c02 WHIRLPOOL 22a967739eab67711ca6aa46b214ace388d7a93a3787021ecbefc68c87c33476087c802493211393a62f25b420572d0651bcd8d7641298db24ff29378ee63db2
 EBUILD acts_as_list-0.8.1.ebuild 901 SHA256 e245e1a80f2b417392706213ab85c0db042bc6455ee536b6e13c0a5e00c091b4 SHA512 e6ce6ba23092e512ba38237ee6ef150f958ab9ccebd36b1f60072933e7a61981d9ce051524365af4658d4a04d0f13904323d05a8abb6e831448746d0f35a5c02 WHIRLPOOL 22a967739eab67711ca6aa46b214ace388d7a93a3787021ecbefc68c87c33476087c802493211393a62f25b420572d0651bcd8d7641298db24ff29378ee63db2
-MISC ChangeLog 4380 SHA256 1e1c13c2007ce0ea8fcd201febc97a0ce633da0120c557d5e6af64ac57c19c4a SHA512 54687f7e1d55bd031f6ba74fe99db02f42aec9aa668fc607b9e3f2252f5beb5bcdfdde4968a714a23b5edd5017312058e0c9e099ce3889f7291054db7f918b54 WHIRLPOOL 0be250df18b9bba6e7d1b1f545d1e9b76971233740d83ddfaf1fa06822000cbb6e5e1a1e908d7458ffb37c1e543cfbb4c0344a99123d62004df7d334ac919f7b
+EBUILD acts_as_list-0.8.2.ebuild 901 SHA256 e245e1a80f2b417392706213ab85c0db042bc6455ee536b6e13c0a5e00c091b4 SHA512 e6ce6ba23092e512ba38237ee6ef150f958ab9ccebd36b1f60072933e7a61981d9ce051524365af4658d4a04d0f13904323d05a8abb6e831448746d0f35a5c02 WHIRLPOOL 22a967739eab67711ca6aa46b214ace388d7a93a3787021ecbefc68c87c33476087c802493211393a62f25b420572d0651bcd8d7641298db24ff29378ee63db2
+MISC ChangeLog 4695 SHA256 e3178b6d3ca6ebd73ae98acf45bcff033bca383542f7d7eaa23604bd4b2adc71 SHA512 45c80a260b39301511ce131efdcf4bdc0b28a0c96087ab13e6102847c371922b05557c6955e6edcef887106f66a7abcda086f1fa73435663ed0cc798f41712ba WHIRLPOOL 485f62fb81eb7439b340003994c6f996672609279bf2fad3ad66863cab933b98cfb09806ec5539950df3567c62858ff5654653d1a34af46fe4ead355e097ef5f
 MISC ChangeLog-2015 4150 SHA256 4dd18efd1da322b52b6eff1b6cd48ec49f597f558bb75c188e1951c442cc4130 SHA512 d7f9b63de79430449b4b25d6e1b4e3a7d600a01ab38e4d92d713191696c2ba45c041f6b4b3d644b2a27a4fba2c4d61f1389f0055349af179d0914de9ffde6a19 WHIRLPOOL 74e93958a5dae9a5a7c45826367c301b453d45d4f5e28e5e7ec9f3e893714e1ffa888f3ff3a50295eb0ce2ac6aac8d7f777e09ce2a14c6ff7c38fcf937466ee9
 MISC metadata.xml 347 SHA256 027cce2644e325528dde658f238580be16f0f72396e90bc5ff6078b4b0514b45 SHA512 eb41ba6c7f23b2c30522692f730bc0c7e360faa577c0bb25b4c386c09f1274890475a537d1dba9ac214a39e05ff56bae6f5bf7e3eda5de163159961171883085 WHIRLPOOL f3a50a8798fd77ccf1f58de744f9e32f434981cddd0b83af8525ec275dd0ed6308e93738756c8979cef4a76afb8d73fdb38910684efe41f1b5a2570ac1b300aa
diff --git a/dev-ruby/acts_as_list/acts_as_list-0.8.0.ebuild b/dev-ruby/acts_as_list/acts_as_list-0.8.0.ebuild
deleted file mode 100644
index 95ad760..0000000
--- a/dev-ruby/acts_as_list/acts_as_list-0.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
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-DESCRIPTION="Capabilities for sorting and reordering a number of objects in a list"
-HOMEPAGE="https://github.com/swanandp/acts_as_list"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~x86-macos"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activerecord-3:*"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/test-unit:2
-		dev-ruby/activerecord[sqlite]
-	)"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '1,9 s:^:#:' test/helper.rb || die
-	sed -i -e '/git ls/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/github_changelog/,$ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/acts_as_list/acts_as_list-0.7.6.ebuild b/dev-ruby/acts_as_list/acts_as_list-0.8.2.ebuild
similarity index 100%
rename from dev-ruby/acts_as_list/acts_as_list-0.7.6.ebuild
rename to dev-ruby/acts_as_list/acts_as_list-0.8.2.ebuild
diff --git a/dev-ruby/ammeter/ChangeLog b/dev-ruby/ammeter/ChangeLog
index f666e7f..ce9e5a8 100644
--- a/dev-ruby/ammeter/ChangeLog
+++ b/dev-ruby/ammeter/ChangeLog
@@ -87,3 +87,10 @@
 
   Package-Manager: portage-2.2.28
 
+*ammeter-1.1.4 (24 Sep 2016)
+
+  24 Sep 2016; Hans de Graaff <graaff@gentoo.org> +ammeter-1.1.4.ebuild:
+  add 1.1.4
+
+  Package-Manager: portage-2.2.28
+
diff --git a/dev-ruby/ammeter/Manifest b/dev-ruby/ammeter/Manifest
index 1f3a2fa..0ba5c11 100644
--- a/dev-ruby/ammeter/Manifest
+++ b/dev-ruby/ammeter/Manifest
@@ -1,6 +1,8 @@
 DIST ammeter-1.1.3.gem 18432 SHA256 7161be2080f78b5c41dbeb92ae1f0db450634493795c6b962e68d611ce03086a SHA512 57428515435dc50e6feaf64f647c64d28ea345360e8ef324d4b6c10902658bf30685902e862e4526be105291620aa191e134a80762abbc9625062c485fb45cf0 WHIRLPOOL dad6a009244daaa646ff333fae92f18fe5a09d24cd77ecea15aa87253a72a329f7676e0b578fa009b05ea3a3493897daa55e09e668147bfeecc67df6f5c2bc23
+DIST ammeter-1.1.4.gem 19968 SHA256 bc0184bf656533d807acf37267bec3c5b00ad6ad41e7927d0f062e59cfdeada2 SHA512 57d24c67be85fe34ded8feda045771974be7cdd828780a82ff0b2f6b52d0b35b48c2eb7e59dae70700fba676242918ef6463448090d7729d49db0f05f04b0131 WHIRLPOOL 1b306f4ad62fa1ee483272e5f84cd01e53c4c8f2921c815c0ca38a28e012f6128fae225063b99db08ff90d0664ac272042470871f586c8db2b316cba972fc007
 EBUILD ammeter-1.1.3-r1.ebuild 1606 SHA256 04db9a3dfb77bf35fb90e0cffd07e3191d5e801be7f849a0b5cace9eb3f2a749 SHA512 b7f211280365b864673e1c9a64aa2a673099c282b72ed96c7e8c6f852b314ffdcf9fb39d1425b6e227fdb3f2e9353f29b4d1b1672220bd56741b97acb6209b7c WHIRLPOOL ebba27afc88d1ec4e02fcea5ea26eec8242e5e462d27aa7b4508d87e1e6159fb374c294e0bbf549ff1cc9465ee31c5b14643df938ca62592c80cd510680ed906
 EBUILD ammeter-1.1.3.ebuild 1604 SHA256 6c3e00e66b4950c3a1e122114e16fba93a940a73b73fdfa169d43cb2c694f025 SHA512 ef74dd9585f56d7be2edd1a42be517dc2dc723b90f922dbd09bc438e60497ff15092299202bc68e2f3b8607b013b1fbfdef007639ee1a559d5c0910f25c7907b WHIRLPOOL 4d45d195dd150a64b4e7630ad9361b3f7557174ff3f580d13c80e1e48c859dcbbcb94dc44f9dd45a27a9a4281db5831d485bc7e5028b86ab85dfa33112a5175a
-MISC ChangeLog 2980 SHA256 d15974b6ac450a3a81d2a697781cba77a70b52d3043742eb103f5a05b41a440b SHA512 6344804ea4cfc37def25fe776b2ce007a7ad6a112b8253d3af6896b64b7824b24f9c24825b24cfe504eb0bdb8da7415eb95019202fb53d6da50f35627f309da1 WHIRLPOOL e5d1b857d9f93e653485b664e53551e8de8287642d2a014adc937740fb2b8c17cb45eb576c27ddcecfb70dd6e68e52547791fb6ce3cb1ce614476659e4ebaaf5
+EBUILD ammeter-1.1.4.ebuild 1606 SHA256 04db9a3dfb77bf35fb90e0cffd07e3191d5e801be7f849a0b5cace9eb3f2a749 SHA512 b7f211280365b864673e1c9a64aa2a673099c282b72ed96c7e8c6f852b314ffdcf9fb39d1425b6e227fdb3f2e9353f29b4d1b1672220bd56741b97acb6209b7c WHIRLPOOL ebba27afc88d1ec4e02fcea5ea26eec8242e5e462d27aa7b4508d87e1e6159fb374c294e0bbf549ff1cc9465ee31c5b14643df938ca62592c80cd510680ed906
+MISC ChangeLog 3131 SHA256 2a37c8b7ef6c98b8a17eda51464ec7aa1e8a15cd167526ef9bbb141bf7af5a1f SHA512 a18d2865b14cfe9eeff2fee5d79e23d59832cfcad5225b0e9b1527dca5b000c08f77429f4ebb3070fcdbba23da3743ff79c023d31fbee3ce19bcc985363ce27d WHIRLPOOL a7bb322adb4160fc211d4f7bc3a1341bfc2a4b913433b6d19063c282a77d5c1cc48454d2f0a68f3ff40453801282f2d5bf84798bb4fbaa1f21d70f984a4014e2
 MISC ChangeLog-2015 2587 SHA256 d7beab6ff7ade4294a056ec9651fa3e17a489464ef0ddd56118ea02bc287e8a5 SHA512 8e903293de31070b7e1a816aa4ff6662ded1e6f8093909ab9a5944d7847bb1a4ba53356efa0519cd0cd3bec2b6237be0f48ad83c0e1eeabd101aceeffa0edfca WHIRLPOOL 2abd0c8138dff38a019f4b209698172bdf49f0bf07e95f970de903a4ea55b03a429e70f3f7c891c8e3d46fd31fb95ed092c0f909387fb587ff918fb49ea42f87
 MISC metadata.xml 348 SHA256 b1771e315dce903c656fd8055201d679482044d20be45c905f88b7af74cb9131 SHA512 f81eb53098c1d67a4d5cfe32c9b3aace294cb90788775c639e189cf3932ef8101466d9a1541ceada391ebdacfedf926d9549f4591b42efd6c391e5fe6b0e72f1 WHIRLPOOL 179c09eb7501506c6f0dd51d7973b3b65421422e89ccdbc0bd092ced82eff00a58629e7eb306b2944b387a9949836f8618a8ffeae43466110f5602775ddae262
diff --git a/dev-ruby/ammeter/ammeter-1.1.4.ebuild b/dev-ruby/ammeter/ammeter-1.1.4.ebuild
new file mode 100644
index 0000000..9611c04
--- /dev/null
+++ b/dev-ruby/ammeter/ammeter-1.1.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Write specs for your Rails 3+ generators"
+HOMEPAGE="https://github.com/alexrothenberg/ammeter"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+# Restrict tests since they now require the specific rspec version to be
+# provided in an environment variable.
+#RESTRICT="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/activesupport-3.0:*
+	>=dev-ruby/railties-3.0:*
+	>=dev-ruby/rspec-rails-2.2:*
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/rails-4.0
+		>=dev-ruby/uglifier-1.3
+		>=dev-ruby/rake-0.10
+		>=dev-ruby/coffee-rails-4.0
+		>=dev-ruby/sass-rails-4.0
+		>=dev-ruby/jquery-rails-3.0
+		dev-util/cucumber
+		dev-util/aruba
+		dev-ruby/sqlite3
+		dev-ruby/bundler
+	)"
+
+all_ruby_prepare() {
+	# fix the gemspec; we remove the version dependencies from there, as
+	# it requires _older_ versions of its dependencies.. it doesn't
+	# really seem to be the case though. Also remove the references to
+	# git ls-files to avoid calling it.
+	sed -i \
+		-e '/git ls-files/d' \
+		-e '/\(cucumber\|aruba\)/s:,.*$::' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# haml-rails is not packaged
+	sed -i -e '/haml-rails/d' ${RUBY_FAKEGEM_GEMSPEC} Gemfile || die
+	rm -f spec/ammeter/rspec/generator/matchers/have_correct_syntax_spec.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bundle exec ${RUBY} -S rspec-3 spec || die
+}
diff --git a/dev-ruby/capybara/ChangeLog b/dev-ruby/capybara/ChangeLog
index 2bb889f..f80a035 100644
--- a/dev-ruby/capybara/ChangeLog
+++ b/dev-ruby/capybara/ChangeLog
@@ -147,3 +147,10 @@
 
   Package-Manager: portage-2.2.28
 
+*capybara-2.9.1 (24 Sep 2016)
+
+  24 Sep 2016; Hans de Graaff <graaff@gentoo.org> +capybara-2.9.1.ebuild:
+  add 2.9.1
+
+  Package-Manager: portage-2.2.28
+
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index 13158c3..c38cb1a 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,9 +1,11 @@
 DIST capybara-1.1.4.gem 72192 SHA256 33073d7e4920a3e74c61ec46d1afe655eb0f3361187113c5e146df498e4611ed SHA512 102738031281d0fabd645fa6d941cf0a9ddd56f90d53d7cc1c8a7b03a37b6af8f4cddd178e6fc07d6751a539a5039cf20502eabdd49e8001793601bb312b47a3 WHIRLPOOL 81eff318acfdc0806c9f8d4e212068edd57694d44db1e29bbefaa7a4db162f3a2354374d6ab97ad7c2372ff9e6f6bb864ed483050facad5c298c2223a39c63cc
 DIST capybara-2.7.1.gem 227328 SHA256 2c010cefb36e701bc576223c877ed173b316d06e5d50512eb242cde487bed513 SHA512 cb9249957bf24ce73c2465d6f1cd01fbc32c211b355ed47ce345e376fca705203da362ee2697e9f1dc72bb807df9c0728441635ee6f4681d1270a475cc606cc8 WHIRLPOOL c9b52c150c722b983b11dd466bbad79f1632a63fbd664f395d23d30636334b09f281d2d89329824ae37f7015699266f577c577b5c280005fc079dab72c649dfa
 DIST capybara-2.8.1.gem 234496 SHA256 72ce8c0cf65368e9ebd72beaf3bd1499d2f8d486d260c1d66493cc8779fa7cca SHA512 efd1807a93bdb15b5ed67f19370d2381d7f22d06233298194254b314240aada2c41fbb722dfff5c136cb6f7591559bed9823b35b1ac0a2f16ebfb160f3b559a7 WHIRLPOOL 50fe91119dc09249bde46bdf6f7c3dd9567566573e211ff3d9afdf7420f55ba449cbc98d57e663d211dc2cd3674464da7f544234e3c92365763106a27c4b1b6a
+DIST capybara-2.9.1.gem 240640 SHA256 6f723ccc2cb5ae221cea1877699e7ea1c84663eaf265f8b15fac259337fe3365 SHA512 919f1cfc4c8a4bf1d3d4781f198b9464b5aa579e789a03c794f62869cfd643f4a360ecaa74a6b764fe50d827c6caedcb36f14f0964d4c96c3395f3d8e8dc640f WHIRLPOOL 1eddc43aabdbdb30910f5425020ebafbed99803b1eaf0a0de23901e45565925cfbacbfef368e15350296959e3f995c1e3410490b0bfd94a3de56d1ab95cdd704
 EBUILD capybara-1.1.4.ebuild 1091 SHA256 59608b0d5b9dd0b8b1a55593a8eb161602864f4cc3ad949ba29a7df8f4f31e28 SHA512 33325c79826d524e5ba75a62811aad330114be2f7b08772b58ea425f802f09ca0e86f60f5e0a281be7dce0d8138be026de0d32472f18495af36fc144ee1a63a5 WHIRLPOOL cae9b6c2af7d8b450dd16d96d069753a42bb04037f379f3755d94f8cb4e306cfa2bf5d21b2abbaaef4fb13392a19b09cf64791b19a95ce17a1913e8e1301bc0e
 EBUILD capybara-2.7.1.ebuild 1217 SHA256 a19d04640ef0af18cfdce605079634436ca9bc6aa436028bd85ebb81f4af3383 SHA512 f52135001599b8c5523c79a2f34bb533fb7d48cf25c1cc2d89713761e0fb8791fd6b537e363e265e9ee6f2a28d3c602b955b7e04c8fc260ec390e2ba13f22489 WHIRLPOOL aa5fd9c7c33802504748cd637a6b895e0944b2f5809541680d2606a51c5cdc365bb5b27b386f099db742a897763aa923bab788c573bfe953b00ac48d03f32362
 EBUILD capybara-2.8.1.ebuild 1255 SHA256 742ea8d2ac5581055858faca5567504d9202ced2bd317fc07c250e8805aaa181 SHA512 8db9050ced993d2d54ecf00499698902cb39e13ed664b4a660585c3b1db8c842dd6191baee66e53823e28ed246ec37625059ac27a65dbe07f033a7c0b58fd88e WHIRLPOOL fb493e06f2ec70cbcad9175cc7d158649ba1af1475122f85b27f170b2a27066e0bc29d72dbb84dcaca9d4a86a7aaa4b9531e950445d9341006b72c4f1d1177ae
-MISC ChangeLog 4498 SHA256 43b7ad41fdd8a879100fa2b40f2d97a30bde4ceef05c9801ef9d7aa1ab94c137 SHA512 141006ae09fcf5044df18dfca225d19fd9c445b9e327bebb9b3bb6adb76bd4eada0c5359ff3196a3b7f9b47ec89a57aeaa07e5a0544a62e6ed6e4006fc3b94b8 WHIRLPOOL 2e57da36e7536bd6e6b87d08cb9c2693d9d5e058eb5434faeb21983f263b4aad1cd07e08099b5c51537c50e0ae06b0d915ef7dd5b38e5d6ab3182c878777f9c5
+EBUILD capybara-2.9.1.ebuild 1257 SHA256 334899faa54e3ea0c5d566e765f1b2c3e6b972155066e4af6f1fe79e67e46964 SHA512 24bb920f12c31efb367774ecc8d94ea456731d6a71288450ed6057456f0dd281eed573bc6b1ff2733dccf65baf01ea60b72e8d32e6f76baa6615ae2e2fef8207 WHIRLPOOL f52ae932e6b9296fe2b38ec93e967d1ae006fde4eef2fe3ca7660a16ba1b96bcca3ffc0c633a88ccc45fa661f398a35020d96aad9e5efee82d2d6ec55d8d5d12
+MISC ChangeLog 4651 SHA256 37db559863ce74d99fff448374ff70c324ce8cf7c2c2e3a8a1940b5041c52015 SHA512 1075b1fad51b573e098c40799f845d90731236874accd09b7d238b9797cf3e6e01a636b0331de275baf00538d1f7b07d306593a4cf14da7614535edd79d3c858 WHIRLPOOL 426a6155106c58bb4415f027a66bec46f1e11c833198ec7d3ecc898134ff4e0986fb6c659cb1416bff821966526c3b4ecd40e108fdb9613d216537d2be8ae098
 MISC ChangeLog-2015 3241 SHA256 fce042ab67e068e2ec64a79cbf2ab46e0b0d4ec08d28e70fc7ae1edcf2589e19 SHA512 35db619549930c1d45e5020268d82c22264ed756d089496f0fb134fa7d16ac4a4723fd64cee93b0169c969efb028cd30c21132aa239064c7f158923316c85dd2 WHIRLPOOL 86acf9afb280df7845b86bccea536aff10bba61e810dfe6b0bb775d4a9c48a836066a8e649f5263620062567c92e445ace3868d8096857e1f616b9b038dfabe2
 MISC metadata.xml 343 SHA256 e1fd12dc6d79a0a2ddc2a17fbf41e69cd68780ef2b9b1b7568118b965b7716b8 SHA512 1e526463690f3ff61390ed77cb528352bdd1c089b368c3f6ab587766d81167afe99f752b861233f755e10bf2aa6f09dde98a9dc359d51392f15b55462ba66e77 WHIRLPOOL 74deb51a93ebdb3f8cbf134f99cd69d0e07fb2f2e6cca8415a3abf3845dd3ed8b56c7bc5d4115facf0d96d4bcfdf1dae1db605dcc078f57cfb5221e51d789636
diff --git a/dev-ruby/capybara/capybara-2.9.1.ebuild b/dev-ruby/capybara/capybara-2.9.1.ebuild
new file mode 100644
index 0000000..8faf2c6
--- /dev/null
+++ b/dev-ruby/capybara/capybara-2.9.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+# Rake tasks are not distributed in the gem.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit virtualx ruby-fakegem
+
+DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
+HOMEPAGE="https://github.com/jnicklas/capybara"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="2"
+IUSE="test"
+
+DEPEND="${DEPEND} test? ( www-client/firefox )"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 dev-ruby/launchy >=dev-ruby/selenium-webdriver-2.0 dev-ruby/sinatra )"
+
+ruby_add_rdepend "
+	dev-ruby/addressable
+	>=dev-ruby/mime-types-1.16:*
+	>=dev-ruby/nokogiri-1.3.3
+	>=dev-ruby/rack-1.0.0:*
+	>=dev-ruby/rack-test-0.5.4
+	>=dev-ruby/xpath-2.0.0:2"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' spec/spec_helper.rb || die
+
+	# Avoid window-manager specific tests (sizes are specific for fluxbox)
+	sed -i -e '/#maximize/,/^  end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
+}
+
+each_ruby_test() {
+	VIRTUALX_COMMAND=${RUBY}
+	virtualmake -Ilib -S rspec-3 spec || die "Tests failed."
+}
diff --git a/dev-ruby/seed-fu/ChangeLog b/dev-ruby/seed-fu/ChangeLog
index 8a910ec..27f12c7 100644
--- a/dev-ruby/seed-fu/ChangeLog
+++ b/dev-ruby/seed-fu/ChangeLog
@@ -85,3 +85,13 @@
 
   Package-Manager: portage-2.2.28
 
+  24 Sep 2016; Hans de Graaff <graaff@gentoo.org> -seed-fu-2.3.5.ebuild:
+  cleanup
+
+  Package-Manager: portage-2.2.28
+
+  24 Sep 2016; Hans de Graaff <graaff@gentoo.org> seed-fu-2.3.6.ebuild:
+  add 2.3.6
+
+  Package-Manager: portage-2.2.28
+
diff --git a/dev-ruby/seed-fu/Manifest b/dev-ruby/seed-fu/Manifest
index 4f4bbba..5fbb050 100644
--- a/dev-ruby/seed-fu/Manifest
+++ b/dev-ruby/seed-fu/Manifest
@@ -1,7 +1,5 @@
-DIST seed-fu-2.3.5.tar.gz 13158 SHA256 6e7c996116102c36c27100716ce081ee492745448430f3366515114474874fde SHA512 1a0f91ae7a357789d2be57de89d57fb9e76552532f5cf2e3b933b6c67a46e42c54de260fdc0a68fa03bf9e59dc25ac019b959ac5ba178b1a1674559fbc1a9a89 WHIRLPOOL 4f3e643bc87666906c96a7bdc3f7d6dd69175bcc15d974775d4935382111faa67301447dd92cf9731a83be36f487455e6dbeee61b539981028b96cced4fc3b24
 DIST seed-fu-2.3.6.tar.gz 13177 SHA256 dd6bca1e045eb5d6c4409741a297806da885dcbc55cd9adbb99c5eebcdbddfb7 SHA512 90affb04a0a9b6917501e4961888cba6a13b0b779ca9d11481bad2267db05666467448cc58df995da71718ad46c744301de3bbbaa3edce6b1eb8884207d54771 WHIRLPOOL 14dfe69ed46e6fa0396697d02368f4b40b55a8b2cfa81aa3515999fcd49b58a113e72410d34650901443c58d2f8277d3b2526ef03482afd7a28de416bae5d82b
-EBUILD seed-fu-2.3.5.ebuild 779 SHA256 bdf5d6c86fe8223b87dfd12ff4f060915ca981fd6151cda0cbbfa6d00ba83037 SHA512 5a3c2ef418104ca85075825826746cb7f7e400e580a2dc9bdaf6a46cd90f2a7028c5e2b09abe355f0ee5badaf034181097edde319b3acd8eb75cb257a6c2f44b WHIRLPOOL a58d16ef07429007a82adbffe1ba9cb578ff43c7debfdd9b183dcf293ed82a93fe6ba40576571fed974257ae3edf6d0a6b9e21e65e6499f51184eb6f526412e5
-EBUILD seed-fu-2.3.6.ebuild 790 SHA256 c85eff89cff88f4eeeabfbb3ae73fd4a9d942908262a767bf7ef08239ad423e6 SHA512 55882052f8c12252f4245ee86ac0482bcb8dd149b11d486d24ccb0d684ce56ebf6c5b43bb63d44f1495fe61c9a932a0d10e4d62e6e5dc4a77ed615a39a06f3b6 WHIRLPOOL 105215bf1bbcc497ee3f5b436ad6be1c4eeea5405895c42a2e03c490a74701af0682d853d3324e5faef35124f8590f68dff8ce7030ef8b0ad7d29af283c77feb
-MISC ChangeLog 3036 SHA256 5b376f6897b0f33492ed61675012bd317739e8926ea5ffede7bde5291a0c895b SHA512 7d90a1575c249ea179c5d057dd8c5eaa4faafc684614df4b8103e696c7b9eb18b88324fedf5c80274dd8e98cb4d3345eaa5db4d06e318de6d57477bd4b5131ca WHIRLPOOL 1926d3b05b115ec34b6e6c9b053f74685b081edd07759ec54f187626a1f91b5c5e001fbb948be313f743386702ae34d886f712f1c18cdbc742b0a175ca48a9ad
+EBUILD seed-fu-2.3.6.ebuild 797 SHA256 e92feaf65a958866fd61f9287bc31eb37ee7800ed7e04774c3a67277cb2310db SHA512 5a8c8794ff21285d64065b43c45fbd190a71d25b10effaf8bf79081ec69f76c4b7c42fa197913e6cf4765a6a4b1793fd944bea88141ad405fcc3289d6052928a WHIRLPOOL d34985d4d3bc4d4dec37763f928858db79c432d04bb5d1ae210dfe78550f7a3e1130e2d9bcc4daab375a0f1513a6dc4d760c7e61cf6085f89b518958a82b92d5
+MISC ChangeLog 3275 SHA256 fe0f9b9ce48eef80d01f5b039713c22f6b5ca4f626279794c586cf7809d451e7 SHA512 5843d9e2611350e59155d70e88357ee7a625c54123a04e062d56c4175a006ae15bcbb171420dd61ff3c88df568320247616843b4a5f84323e3bd8bcde04a5ab7 WHIRLPOOL 64ad2ecdf34a2b4ad25cc9d7aa17d46489be2c6ead0891357d630b0084fa5c72aa341d44c30434d63367e061132e102a0ff94c78defdbebba2edd9818fcf1d43
 MISC ChangeLog-2015 1018 SHA256 48d1caa2f6e79e4276c7fc58817fec8b2e371fbf8376ca9942c16608da4c74bf SHA512 be65ff690c69b1eecb59881ba200194621f62f1037b581a3593ee59115eff883ce394aedc98befb7920195c4aeac9dcafe5d54d04888d174cfd42ba0454da478 WHIRLPOOL dc308a8ba7f7c2cc612e09c6594968a50055de72715913b21f257aaa4f5265d1a8d8c71ac7cbfd15c18a15f08c0e9340ca1806b0572a618f9643257209baf523
 MISC metadata.xml 341 SHA256 d5c2a2f0c795fdcd57b47f45fd253b5705b3e90c372f4cba2e80e56bdd506376 SHA512 7c3ff85e84c8566c1605d41e6bf9767817e01eb198732cf0e0e2adc44b3c803db2d2144acd47426408c8829b08609fb1ed7bc6a9527b869cfa34a97f9538e1da WHIRLPOOL aec63ef8bd70e0f554ac7b3a05cd1d2c0753df3d05ed66a438975b599f0cf8c0c450826ee03c4e606fd27c4d2e6aa2c9f2c083bd0c2aafeba06223a1ba8e8803
diff --git a/dev-ruby/seed-fu/seed-fu-2.3.5.ebuild b/dev-ruby/seed-fu/seed-fu-2.3.5.ebuild
deleted file mode 100644
index 73b5e67..0000000
--- a/dev-ruby/seed-fu/seed-fu-2.3.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Advanced seed data handling for Rails"
-HOMEPAGE="https://github.com/mbleigh/seed-fu"
-SRC_URI="https://github.com/mbleigh/${PN}/archive/v.${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RUBY_S="${PN}-v.${PV}"
-
-ruby_add_rdepend "
-	>=dev-ruby/activerecord-3.1
-	>=dev-ruby/activesupport-3.1"
-ruby_add_bdepend "test? ( dev-ruby/sqlite3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' spec/spec_helper.rb || die "sed failed"
-}
diff --git a/dev-ruby/seed-fu/seed-fu-2.3.6.ebuild b/dev-ruby/seed-fu/seed-fu-2.3.6.ebuild
index acfd7c4..62119a9 100644
--- a/dev-ruby/seed-fu/seed-fu-2.3.6.ebuild
+++ b/dev-ruby/seed-fu/seed-fu-2.3.6.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_RECIPE_DOC="yard"
diff --git a/dev-tex/latex-beamer/ChangeLog b/dev-tex/latex-beamer/ChangeLog
index c884033..e032a43 100644
--- a/dev-tex/latex-beamer/ChangeLog
+++ b/dev-tex/latex-beamer/ChangeLog
@@ -77,3 +77,9 @@
   Package-Manager: portage-2.2.27
   Signed-off-by: Alexis Ballier <aballier@gentoo.org>
 
+  24 Sep 2016; Tim Harder <radhermit@gentoo.org> latex-beamer-3.36.ebuild:
+  stabilize 3.36
+
+  24 Sep 2016; Tim Harder <radhermit@gentoo.org> -latex-beamer-3.33.ebuild:
+  remove old
+
diff --git a/dev-tex/latex-beamer/Manifest b/dev-tex/latex-beamer/Manifest
index 65c30d6..3dd6d57 100644
--- a/dev-tex/latex-beamer/Manifest
+++ b/dev-tex/latex-beamer/Manifest
@@ -1,7 +1,5 @@
-DIST latex-beamer-3.33.zip 4345792 SHA256 a0e59f464d69ed49d5998a674671209f6c7c1a6f095446c236b1144462bfa3b6 SHA512 c6fc019be08d9478b3b83a011d2ef726016581d93e67e37f12058ffd4b8c4889c25ab9c9e56f03d09505c5032fb5fccb7d3f9bf548988511aabe9c403afe42a8 WHIRLPOOL ecbf39035d29af073ca2df73a7689ca280f332d226fab5fa3859f332f76b2ca21e81ebd46d53a821892e9a02d2bdbab87a797bc887b8d44b1dbbdcd139fb05c2
 DIST latex-beamer-3.36.zip 4364333 SHA256 5bd5366da9942cec067dcf8a492d713ff45a73a4a48ff56151fd5ce01488bc63 SHA512 b93d91c2eb523d7e30ecee8fa1af625730bb465124da4f856f7708da32d31fc3bc68e5b57e120b8e39b8ed3b74fef0aeb208b92f4bbdf741c8bf377227fa84cf WHIRLPOOL 22df7b9fd3681b7ea0ada51ce1b71c16b3152e85fc52dfb3c096a1771232c3de7d1c0c2baa935b1d0814ce220208f49094a8a6c295a64d4ebcbe3b234eb11100
-EBUILD latex-beamer-3.33.ebuild 990 SHA256 5582863e5b7f4b372560b19d24de664885a9c7bf7338e0ca62abddce6f3a5fca SHA512 6800ecf6d2046f3549831fc31b616ae321792ddc862dfb91f794ccd4ac42d9e146e42344ddda40d4be0a5552e4e9ad264f7f9735f551238bec2467e3d9138d62 WHIRLPOOL 33be735260d90d2e2430ada78876b87f4c434d17952e7d3543d669a0f7c88be42eb2bcb494f3dbd3051dfd4c4d104a7d82b8cf4da6ce1dd93a841feb74645ffb
-EBUILD latex-beamer-3.36.ebuild 1063 SHA256 58cc01c136787ed19a476f4cd41b245a83a7641693f3b89d0ac6c525aeff8ec7 SHA512 8a0c288773ea05311e6c011607fb98f205fda164980aa4b6fa3726842b763912474209f3739f6255e0f64eabb10e876f11c1f3525bddf8295c01197bf5f3b907 WHIRLPOOL 3e1cadfa6bc7ade0013c618993c6d2376bbe9ae463d3ec5ad510f325f47f243990f675ecbbd87ca809b6b06a2c7fe31819b729e15d7ae238dcaf96c68835c9e8
-MISC ChangeLog 2972 SHA256 59006c6be0f24ae3f5d58ebf713ad7a70047b60e33a2d41abe62fe6b3981c03c SHA512 292c956113e5e15b692d7bf94cbfea3bbb219553f467c86cc6910cd4c28406ea70b9e0d3625067c316566b96fa4e448900213e923dbf445b7328a5a1ddecf2c9 WHIRLPOOL ebe144812b6c9d31fdd98f551d0c4f1f7f8c1a9c5329c5e3cd7427c8abcc0a50ff926344994964df3036e65c8b17370399dff36a4fe1bab9ad9c1442877bc386
+EBUILD latex-beamer-3.36.ebuild 1054 SHA256 ce95e9852f8fc0d1867ae6a12d4a722fcbc80ae2a0d2c35881f971cbbaf04248 SHA512 1cef285cb3acc5bf7b3b8cded77fce1061bdf3d35334eb4aae8d31a365c27b5f1cbb4881dfe04f2d59b466d0e7ca8faaaf2c199e61e57455ba3a4b1a06560796 WHIRLPOOL 0c6ba36a160a4cf8c4418a38671a9020a533637a109a59d8ead5683afb769241d66388a8fe2a59b146ed4522ec35501a372c7af268d4bf6b5d0f3b54f12cbb8c
+MISC ChangeLog 3155 SHA256 799f0b1a06f3bbe8b6c9f2e93954d1dc34948bb18b9566acfb08410f4e9375f8 SHA512 143e326b7ccbfd97c5dbfe469c4ae444e16f1f43d331f82959e7112c40af5e251bdcdd27795f4b594489c78e7d89f60cd5901ceb3468544b4378356e703c9f7c WHIRLPOOL a358b192dd9be8ed8811d4d79011aa1b1e1224b69e1daca4dbac362f8026625f8d6827f41f64ae5a1f1326860db7e1c1940ce3d0c71a28b98df81136e73c9c89
 MISC ChangeLog-2015 21392 SHA256 16ed05c632e2ff6e8d24bee5a109afcf6c2c4118d365d5431b75b2de38186d4e SHA512 e81fb36e3f2dbd1087a014290f1a6a6b753841bcfbd03916cb5544f8021c1243a9bba26daaa8085f9ed848a3da8563b63f5d6921b8e5ce9197986aca9f6da0f8 WHIRLPOOL 68392c6acd3732cee92110c34e48d0535bde0f80b424358f7c3e4d36bdeb6275750e3428e6f2c2d5ecca632d1e79f7bbb00ac538718d37f228b00cf292518d18
 MISC metadata.xml 331 SHA256 fab08c458c70d236bbe97a71dde9087569bed8c083e10dd5c3be690f23f9afb6 SHA512 23ecf661ff9e9d7b4604c8b0549bd8be5e219311f236a63bf047b9af718da277b8177af55b1eaf3ac183374adde925b4b884ce72277e3f8ed47669901931d8e8 WHIRLPOOL bfa1e31cbcb4ea9f37e6fddeab5417e8a019f31fcac4eb12c7a244d4e99ad80a971e8a6ef38ac85b6e9389df94f4121ab6eaf8ffe67cb3e39db585111a9767e3
diff --git a/dev-tex/latex-beamer/latex-beamer-3.33.ebuild b/dev-tex/latex-beamer/latex-beamer-3.33.ebuild
deleted file mode 100644
index 17a02c8..0000000
--- a/dev-tex/latex-beamer/latex-beamer-3.33.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit latex-package
-
-DESCRIPTION="LaTeX class for creating presentations using a video projector"
-HOMEPAGE="https://bitbucket.org/rivanvx/beamer/wiki/Home"
-SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.zip"
-
-LICENSE="GPL-2 FDL-1.2 LPPL-1.3c"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples"
-
-DEPEND="app-arch/unzip
-	dev-texlive/texlive-latex"
-RDEPEND=">=dev-tex/pgf-1.10
-	dev-tex/xcolor
-	!dev-tex/translator"
-
-S=${WORKDIR}/beamer
-
-src_install() {
-	insinto /usr/share/texmf-site/tex/latex/beamer
-	doins -r base
-
-	dodoc AUTHORS ChangeLog README TODO doc/licenses/LICENSE
-
-	if use doc ; then
-		docinto doc
-		dodoc -r doc/*
-	fi
-
-	use examples && dodoc -r examples solutions
-}
diff --git a/dev-tex/latex-beamer/latex-beamer-3.36.ebuild b/dev-tex/latex-beamer/latex-beamer-3.36.ebuild
index 647b854..fe08725 100644
--- a/dev-tex/latex-beamer/latex-beamer-3.36.ebuild
+++ b/dev-tex/latex-beamer/latex-beamer-3.36.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2 FDL-1.2 LPPL-1.3c"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples"
 
 DEPEND="app-arch/unzip
diff --git a/dev-vcs/git-annex/ChangeLog b/dev-vcs/git-annex/ChangeLog
index 0fca139..57754de 100644
--- a/dev-vcs/git-annex/ChangeLog
+++ b/dev-vcs/git-annex/ChangeLog
@@ -172,3 +172,26 @@
 
   Package-Manager: portage-2.2.27_p10
 
+*git-annex-6.20160923 (24 Sep 2016)
+
+  24 Sep 2016; Sergei Trofimovich <slyfox@gentoo.org> +files/git-annex.bash,
+  +git-annex-6.20160923.ebuild:
+  bump up to 6.20160923, bug #591831
+
+  Reported-by: Jonas Stein
+  Package-Manager: portage-2.3.1
+
+*git-annex-6.20160923-r1 (24 Sep 2016)
+
+  24 Sep 2016; Sergei Trofimovich <slyfox@gentoo.org>
+  +git-annex-6.20160923-r1.ebuild:
+  restore manpage installation
+
+  Drop git-annex-5.20150731-no-strange-installs.patch
+  as git-annex is now respecting $(DISTDIR). Woohoo!
+
+  Reported-by: Jan Kundrát
+  Bug: https://github.com/gentoo-haskell/gentoo-haskell/issues/506
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index 2b0d3be..fb4b008 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -1,12 +1,16 @@
 AUX git-annex-5.20150731-no-strange-installs.patch 239 SHA256 8626e3e04f63022e7a69992e7316165e7109f503b086a5d6d2339af7079745e5 SHA512 cc681590d5036c88f516237c68a10c8abbfc0643d4f9c690c22c5eaccdc043b80caac65cf7d3c659748f6b94ccd6809daeeb25a71dee6b04d0d56654aef50a46 WHIRLPOOL 9dc9f59e470f2f6548dcbb6dc0dc890d7dd1a57cd862412b84dd9a33ac67d76488b75a34e045411bee6aa689ac0caa124a0193e5198cad64b6ef6626afd76c73
 AUX git-annex-6.20160114-QC-2.8.2.patch 509 SHA256 0d181d974acef5102294917eeffed276bd07158d00fb615379121cfe7ac1fcf2 SHA512 2df4f294bd8e39a067cdf7adf0f44d08a7910d7954529d053fd35d35b263dc891ecb1390427783c3448d660e918b6076c86e6c01145f272226c20c8d7688cd1c WHIRLPOOL 38ad28b89e0b02ef33b86f92a1edbc088fdfef32649a88e7c177fe26788352242291d2d77d17c5442a568e5778a8ce2fdbc66cdf41f821e62673de74f248bb88
+AUX git-annex.bash 440 SHA256 1704c8456fb795069457a77be169996cf912d3f4db2ae97ac81522b1e05d5c49 SHA512 89b6520e4be14af9032638c1153df936a7e5707d6453b4251fe762712b8956ba1d39a4623b06910e5ac5724e33e157e654b724e070b6893f6f26578df730d326 WHIRLPOOL 6b99abade966604f3a31c47d2f771784673abe927b8a97245d7d3c1b44253e62dd2130d8ffd25900c826552555edc11ae98a1195d926fab453857bc62b19a2b0
 AUX git-annex.xpm 1961 SHA256 e9576b4d026cb8e61ee602d52639d65a2e8f2aadaaa3cfd9d8bfd8f55cf03803 SHA512 4a22ac448852160d66838c272f41b8c7599aa1b904e35ac03ea294d9ed15b855bde24b7e5407a2578937bfd51d482837ed6680af680166d030f71666316ae4d3 WHIRLPOOL a582bb82d01de4750e3bcb2e419cf0a334e11428972f68bbb70aa06ea5a357de89d48327d4576adf0f4101cd577f13c6f50b41d85d7c2fc6a0efb87124b88b60
 DIST git-annex-6.20160126.tar.gz 5146331 SHA256 dc59f670a3d0bdb90db8fc6cadba8003708219bb0dc3d56867a9246d825c0d11 SHA512 45828b5e9968ce037e48366deb537353368dbac9145fc93d56921444210c9f0d4af1460c047bcae3e85244ecdf7e272fb65860656a19c449add09bf697c0a37d WHIRLPOOL f9b350968e8e82f7e4523648d5aefd03689123165424e15fee71eaa67345d38a0efe71ea4fc1388b5b683925bc8f638dba130371c4f324ac5910d7a051ae5548
 DIST git-annex-6.20160318.tar.gz 5399078 SHA256 5c0067d161a3cd6b93822f85eb82e5cb4895d913b2593bc4fe3b74d3ed426e0b SHA512 62d0caef2f09a1d690229b720e81bf477715fd765a98c037b8e22e7e04ad72d91c81fdbe8bb61bdf4e0bf40cd5b81ea349e60a8e61690767db4a4b92541a063f WHIRLPOOL 96c0232790b0b2cf0d97df2984383a0616a56c695daac233da625fd08ccd8044ef26aed613341f47aa8b0ef70e806b5d0569ff733d3e0dee0e92ed7220b503bc
 DIST git-annex-6.20160419.tar.gz 5086638 SHA256 1452a55809ba7367847fc4a77f2d8a5365af92e130d5ca460bf0880a26a6fb8e SHA512 b8b250b700aaaa336ee85af3d053d893b422e2bf427dc0f1f38689b49a2a74fa240a725da09d98f5bdf86d35d68612765c0de878de52ae4ddbb8908fb32ad118 WHIRLPOOL 1a68daef4b271ec8945c0ab22439eba83400d7babac368ae65167bd8dfec29430913c8165046421d4b0a072d7beaaedf832464a04ac625250b401303afff16aa
+DIST git-annex-6.20160923.tar.gz 1084326 SHA256 964235a358814e081cf4a5d8dab798faacb1dabe5fc714ac6687b135e30fd93d SHA512 2204b5a3b76b22718e4cf5329e78035c4ff45a133e738a8ab627067551fd40a778d4be124862f6a08b583c49400844e3b0c61a682909f911e5ac51fdb6319295 WHIRLPOOL ed5f6c732210b0a720de095ce71c8907b5ddc636e28835f85697f81a01824be7b9f154335af1c4c4e1a304f967b6233487699a49da447f8f883519063be35a55
 EBUILD git-annex-6.20160126.ebuild 4788 SHA256 160dbce59e6b168d94e563edc157865f30fb80d74952bbd252a034a5ba3de8e1 SHA512 55d6156111a5a7619c91785b6d81da67cbe763a431ef87bec3e1fac81bf435dcee7ddbdedaf8b3e2212c33a7c759b57c8664a90613253061ee58078be3651c88 WHIRLPOOL 82f2a96e2806293b68353d0fa7025da991fce9f7741b9587a7a99697388611b73a96e756dbfed26fa915106035b973b5b816f7a206c380f634f637a8b50f81f2
 EBUILD git-annex-6.20160318.ebuild 5024 SHA256 e0de59bd488c674ee29446bf465edd53818da4640920a6fe4d6f7dee7226f002 SHA512 cabb7b017ffd189848882eef0e3d589411d6fb0305f1481778733a84d43f2153feae367fa3156703e0e270a9600156e0797cc758bf3165434fe3c22ff2a53c1c WHIRLPOOL 704f2e9ff7cd296194ab5372be5e78121d053e8dd276fb24676f8e0952bb234f60a4bd3f2e786669801821e9371114833d2cf59d76c90d248fa356aac51f522e
 EBUILD git-annex-6.20160419.ebuild 5024 SHA256 e0de59bd488c674ee29446bf465edd53818da4640920a6fe4d6f7dee7226f002 SHA512 cabb7b017ffd189848882eef0e3d589411d6fb0305f1481778733a84d43f2153feae367fa3156703e0e270a9600156e0797cc758bf3165434fe3c22ff2a53c1c WHIRLPOOL 704f2e9ff7cd296194ab5372be5e78121d053e8dd276fb24676f8e0952bb234f60a4bd3f2e786669801821e9371114833d2cf59d76c90d248fa356aac51f522e
-MISC ChangeLog 5901 SHA256 1c6b09929fa41746ef87080c7d6125d7bfb30f946520520781e9e22938afd899 SHA512 8a4911ae9808289e8fe839dd72f46c02288e3fed790841696bd611c1b4e23043be805111cf3a84e901f9890aaa0e0ca9a5dc67551316245ce65c439a832fb35b WHIRLPOOL 345d9ab5d6d5f044999004ba03abf13cdae828d002a239798eb149d97364e7d2d69fcf12ae4aa0cdb866400f31f7c8d2b1d399f934aba89034bb2711353b1b58
+EBUILD git-annex-6.20160923-r1.ebuild 4655 SHA256 d66f2032f2a2e5622b4567ca1d49c8c7ae6b0a0fac1d83cbac534a0eff63e929 SHA512 ab38e06478c9ab0af32381c738c0852b294c5b0a9a088fc3d9f982fb8412100d03e0a664d72bdf258e1f485d3365a2ece93885f353b40a812dad3daef1789e18 WHIRLPOOL 34adc0a7b9314973980207f76527539f38813dbca926daec32c7570d6b9d2e5a4a6f61c3d251c2ac9ce9d487ae9d5b089cf969acbd1b96c9bb527f6c7a9a9bb8
+EBUILD git-annex-6.20160923.ebuild 4834 SHA256 4bc41ba777b661d3fd1fc54f51ade51234113abe033442349a4fd8816d0d1446 SHA512 abb60860e3ab9c120d2af65c42d200497afc85726087393b497d88020b839243f93838da152bfb153947f66752fee02aaec14e8dd9fc8076ecf7dbd467f3d6a5 WHIRLPOOL 2f4ef15fb9bb972314cb8e9727c3a56e27adff38a2512ec62276f9848aa93f8e15c9d6f80d9f5aac43ef62732973f1285e6bd10010d3d898a024034e9e8b0a94
+MISC ChangeLog 6545 SHA256 b55b191bd835a485959b308f18e47d478aa13b2629b4ce6fdcd32a19d3cdcbe4 SHA512 87cee1cbf5c0aebfb7c4fe2c0b7e2e35a1141b9c673aa9025e2a232fc67a5b7f026aa6f3afa28b607e9ba48246c5f86ffa956dcee4b7a88696075576ccb65d91 WHIRLPOOL 1b25d39855fc5e48d54de2180bc184313d88d725e33a032b0efd733b8e5a931d083f4079f34741ca5ccf7c7f19c277c86505e11d794cc1887aa8536c57a2925a
 MISC ChangeLog-2015 7664 SHA256 37642d13a5b0268316a9b53b85b71df879fb0f0498dbb95941c2c426ddd5e693 SHA512 cad8a70744121072f608f37d6e68de5620b71cfe6c0d634507370a3e55be5e46d688eb594cf75aa65873ac5f6ffc38272b0d6941e7387203202b0a6c2f492c34 WHIRLPOOL 0b2c5553410baa2763504a3e6f16d50c46895367c03cca855794d67513c478ec0be0a17e113feace3a7e60b93a5ef76dce17341729e43815ae794a1d5f43478c
 MISC metadata.xml 1905 SHA256 839740978631539d6b0c69fd5a7d0d16d1720ca5656bd4e1e35f912e470133c9 SHA512 801e090ff6b90e7a4e8994e34fc5aa269cf53a1cf6b1c200ea4e49854dcd2e220a4ba59bfe736da1125901b0764f743ebb6810cfde3cf93d7792c56e6224465b WHIRLPOOL 5bb7a65636cb4c5fffa32503047da6f87f73adf900852ba48a3e148fd59a7c61019223c86a21c76abd2c6d70bae8804b23fc386ba2f86f34723af75e3211bd89
diff --git a/dev-vcs/git-annex/files/git-annex.bash b/dev-vcs/git-annex/files/git-annex.bash
new file mode 100644
index 0000000..309b221
--- /dev/null
+++ b/dev-vcs/git-annex/files/git-annex.bash
@@ -0,0 +1,19 @@
+_git_annex()
+{
+    local cmdline
+    local IFS=$'
+'
+    CMDLINE=(--bash-completion-index $COMP_CWORD)
+
+    if [[ "${COMP_WORDS[@]:0:2}" == "git annex" ]]; then
+        unset COMP_WORDS[0]
+        COMP_WORDS[1]="git-annex"
+    fi
+    for arg in ${COMP_WORDS[@]}; do
+        CMDLINE=(${CMDLINE[@]} --bash-completion-word $arg)
+    done
+
+    COMPREPLY=( $(/usr/bin/git-annex "${CMDLINE[@]}") )
+}
+
+complete -o filenames -F _git_annex git-annex
diff --git a/dev-vcs/git-annex/git-annex-6.20160923-r1.ebuild b/dev-vcs/git-annex/git-annex-6.20160923-r1.ebuild
new file mode 100644
index 0000000..281e2ea
--- /dev/null
+++ b/dev-vcs/git-annex/git-annex-6.20160923-r1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.4.7.9999
+#hackport: flags: -production,-android,-androidsplice,-testsuite
+
+CABAL_FEATURES="bin"
+inherit haskell-cabal bash-completion-r1
+
+DESCRIPTION="manage files with git, without checking their contents into git"
+HOMEPAGE="http://git-annex.branchable.com/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+RESTRICT="test"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="+assistant benchmark +concurrentoutput +cryptonite doc +dbus +magicmime +network-uri +pairing +s3 +torrentparser +webapp +webdav +xmpp"
+
+RDEPEND="dev-haskell/aeson:=
+	dev-haskell/async:=
+	dev-haskell/bloomfilter:=
+	dev-haskell/case-insensitive:=
+	dev-haskell/data-default:=
+	dev-haskell/disk-free-space:=
+	dev-haskell/dlist:=
+	dev-haskell/edit-distance:=
+	dev-haskell/esqueleto:=
+	>=dev-haskell/exceptions-0.6:=
+	dev-haskell/feed:=
+	dev-haskell/hslogger:=
+	dev-haskell/http-client:=
+	dev-haskell/http-conduit:=
+	dev-haskell/http-types:=
+	dev-haskell/ifelse:=
+	dev-haskell/missingh:=
+	dev-haskell/monad-control:=
+	dev-haskell/monad-logger:=
+	>=dev-haskell/mtl-2:=
+	dev-haskell/old-locale:=
+	>=dev-haskell/optparse-applicative-0.11.0:=
+	dev-haskell/persistent:=
+	dev-haskell/persistent-sqlite:=
+	dev-haskell/persistent-template:=
+	>=dev-haskell/quickcheck-2.1:2=
+	dev-haskell/random:=
+	dev-haskell/regex-tdfa:=
+	dev-haskell/resourcet:=
+	dev-haskell/safesemaphore:=
+	dev-haskell/sandi:=
+	>=dev-haskell/stm-2.3:=
+	dev-haskell/text:=
+	dev-haskell/transformers:=
+	dev-haskell/unix-compat:=
+	dev-haskell/unordered-containers:=
+	dev-haskell/utf8-string:=
+	>=dev-haskell/uuid-1.2.6:=
+	>=dev-lang/ghc-7.6.1:=
+	assistant? ( dev-haskell/dns:=
+			dev-haskell/hinotify:=
+			dev-haskell/mountpoints:=
+			sys-process/lsof )
+	benchmark? ( dev-haskell/criterion:= )
+	concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= )
+	cryptonite? ( dev-haskell/cryptonite:= )
+	!cryptonite? ( >=dev-haskell/cryptohash-0.11.0:= )
+	dbus? ( >=dev-haskell/dbus-0.10.7:=
+		>=dev-haskell/fdo-notify-0.3:= )
+	magicmime? ( dev-haskell/magic:= )
+	network-uri? ( >=dev-haskell/network-2.6:=
+			>=dev-haskell/network-uri-2.6:= )
+	!network-uri? ( >=dev-haskell/network-2.4:= <dev-haskell/network-2.6:= )
+	pairing? ( dev-haskell/network-info:=
+			dev-haskell/network-multicast:= )
+	s3? ( >=dev-haskell/aws-0.9.2:=
+		dev-haskell/conduit:=
+		dev-haskell/conduit-extra:= )
+	torrentparser? ( >=dev-haskell/torrent-10000.0.0:= )
+	webapp? ( dev-haskell/blaze-builder:=
+			dev-haskell/byteable:=
+			dev-haskell/clientsession:=
+			dev-haskell/crypto-api:=
+			>=dev-haskell/path-pieces-0.1.4:=
+			dev-haskell/securemem:=
+			>=dev-haskell/shakespeare-2.0.0:=
+			dev-haskell/wai:=
+			dev-haskell/wai-extra:=
+			>=dev-haskell/warp-3.0.0.5:=
+			>=dev-haskell/warp-tls-1.4:=
+			>=dev-haskell/yesod-1.2.6:=
+			>=dev-haskell/yesod-core-1.2.19:=
+			>=dev-haskell/yesod-default-1.2.0:=
+			>=dev-haskell/yesod-form-1.3.15:=
+			>=dev-haskell/yesod-static-1.2.4:= )
+	webdav? ( >=dev-haskell/dav-1.0:= )
+	xmpp? ( >=dev-haskell/gnutls-0.1.4:=
+		dev-haskell/network-protocol-xmpp:=
+		dev-haskell/xml-types:= )
+"
+# not generated by hackport:
+RDEPEND="${RDEPEND}
+	dev-vcs/git
+"
+
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+"
+
+# not generated by hackport:
+DEPEND="${DEPEND}
+	dev-lang/perl
+	doc? ( www-apps/ikiwiki net-misc/rsync )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.20160114-QC-2.8.2.patch
+)
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'http-conduit (<2.2.0)' 'http-conduit' \
+		'persistent (< 2.5)' 'persistent'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-android \
+		--flag=-androidsplice \
+		$(cabal_flag assistant assistant) \
+		$(cabal_flag benchmark benchmark) \
+		$(cabal_flag concurrentoutput concurrentoutput) \
+		$(cabal_flag cryptonite cryptonite) \
+		$(cabal_flag dbus dbus) \
+		$(cabal_flag magicmime magicmime) \
+		$(cabal_flag network-uri network-uri) \
+		$(cabal_flag pairing pairing) \
+		--flag=-production \
+		$(cabal_flag s3 s3) \
+		--flag=-testsuite \
+		$(cabal_flag torrentparser torrentparser) \
+		$(cabal_flag webapp webapp) \
+		$(cabal_flag webdav webdav) \
+		$(cabal_flag xmpp xmpp)
+}
+
+src_test() {
+	if use webapp; then
+		export GIT_CONFIG=${T}/temp-git-config
+		git config user.email "git@src_test"
+		git config user.name "Mr. ${P} The Test"
+
+		emake test
+	fi
+}
+
+src_install() {
+	haskell-cabal_src_install
+
+	newbashcomp "${FILESDIR}"/${PN}.bash ${PN}
+
+	dodoc CHANGELOG README
+	if use webapp ; then
+		doicon "${FILESDIR}"/${PN}.xpm
+		make_desktop_entry "${PN} webapp" "git-annex" ${PN}.xpm "Office"
+	fi
+}
diff --git a/dev-vcs/git-annex/git-annex-6.20160923.ebuild b/dev-vcs/git-annex/git-annex-6.20160923.ebuild
new file mode 100644
index 0000000..c4e7cd1
--- /dev/null
+++ b/dev-vcs/git-annex/git-annex-6.20160923.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.4.7.9999
+#hackport: flags: -production,-android,-androidsplice,-testsuite
+
+CABAL_FEATURES="bin"
+inherit haskell-cabal bash-completion-r1
+
+DESCRIPTION="manage files with git, without checking their contents into git"
+HOMEPAGE="http://git-annex.branchable.com/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+RESTRICT="test"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="+assistant benchmark +concurrentoutput +cryptonite doc +dbus +magicmime +network-uri +pairing +s3 +torrentparser +webapp +webdav +xmpp"
+
+RDEPEND="dev-haskell/aeson:=
+	dev-haskell/async:=
+	dev-haskell/bloomfilter:=
+	dev-haskell/case-insensitive:=
+	dev-haskell/data-default:=
+	dev-haskell/disk-free-space:=
+	dev-haskell/dlist:=
+	dev-haskell/edit-distance:=
+	dev-haskell/esqueleto:=
+	>=dev-haskell/exceptions-0.6:=
+	dev-haskell/feed:=
+	dev-haskell/hslogger:=
+	dev-haskell/http-client:=
+	dev-haskell/http-conduit:=
+	dev-haskell/http-types:=
+	dev-haskell/ifelse:=
+	dev-haskell/missingh:=
+	dev-haskell/monad-control:=
+	dev-haskell/monad-logger:=
+	>=dev-haskell/mtl-2:=
+	dev-haskell/old-locale:=
+	>=dev-haskell/optparse-applicative-0.11.0:=
+	dev-haskell/persistent:=
+	dev-haskell/persistent-sqlite:=
+	dev-haskell/persistent-template:=
+	>=dev-haskell/quickcheck-2.1:2=
+	dev-haskell/random:=
+	dev-haskell/regex-tdfa:=
+	dev-haskell/resourcet:=
+	dev-haskell/safesemaphore:=
+	dev-haskell/sandi:=
+	>=dev-haskell/stm-2.3:=
+	dev-haskell/text:=
+	dev-haskell/transformers:=
+	dev-haskell/unix-compat:=
+	dev-haskell/unordered-containers:=
+	dev-haskell/utf8-string:=
+	>=dev-haskell/uuid-1.2.6:=
+	>=dev-lang/ghc-7.6.1:=
+	assistant? ( dev-haskell/dns:=
+			dev-haskell/hinotify:=
+			dev-haskell/mountpoints:=
+			sys-process/lsof )
+	benchmark? ( dev-haskell/criterion:= )
+	concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= )
+	cryptonite? ( dev-haskell/cryptonite:= )
+	!cryptonite? ( >=dev-haskell/cryptohash-0.11.0:= )
+	dbus? ( >=dev-haskell/dbus-0.10.7:=
+		>=dev-haskell/fdo-notify-0.3:= )
+	magicmime? ( dev-haskell/magic:= )
+	network-uri? ( >=dev-haskell/network-2.6:=
+			>=dev-haskell/network-uri-2.6:= )
+	!network-uri? ( >=dev-haskell/network-2.4:= <dev-haskell/network-2.6:= )
+	pairing? ( dev-haskell/network-info:=
+			dev-haskell/network-multicast:= )
+	s3? ( >=dev-haskell/aws-0.9.2:=
+		dev-haskell/conduit:=
+		dev-haskell/conduit-extra:= )
+	torrentparser? ( >=dev-haskell/torrent-10000.0.0:= )
+	webapp? ( dev-haskell/blaze-builder:=
+			dev-haskell/byteable:=
+			dev-haskell/clientsession:=
+			dev-haskell/crypto-api:=
+			>=dev-haskell/path-pieces-0.1.4:=
+			dev-haskell/securemem:=
+			>=dev-haskell/shakespeare-2.0.0:=
+			dev-haskell/wai:=
+			dev-haskell/wai-extra:=
+			>=dev-haskell/warp-3.0.0.5:=
+			>=dev-haskell/warp-tls-1.4:=
+			>=dev-haskell/yesod-1.2.6:=
+			>=dev-haskell/yesod-core-1.2.19:=
+			>=dev-haskell/yesod-default-1.2.0:=
+			>=dev-haskell/yesod-form-1.3.15:=
+			>=dev-haskell/yesod-static-1.2.4:= )
+	webdav? ( >=dev-haskell/dav-1.0:= )
+	xmpp? ( >=dev-haskell/gnutls-0.1.4:=
+		dev-haskell/network-protocol-xmpp:=
+		dev-haskell/xml-types:= )
+"
+# not generated by hackport:
+RDEPEND="${RDEPEND}
+	dev-vcs/git
+"
+
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+"
+
+# not generated by hackport:
+DEPEND="${DEPEND}
+	dev-lang/perl
+	doc? ( www-apps/ikiwiki net-misc/rsync )
+"
+
+PATCHES=(
+	# does not respect staging dir
+	"${FILESDIR}"/${PN}-5.20150731-no-strange-installs.patch
+	"${FILESDIR}"/${PN}-6.20160114-QC-2.8.2.patch
+)
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'http-conduit (<2.2.0)' 'http-conduit' \
+		'persistent (< 2.5)' 'persistent'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-android \
+		--flag=-androidsplice \
+		$(cabal_flag assistant assistant) \
+		$(cabal_flag benchmark benchmark) \
+		$(cabal_flag concurrentoutput concurrentoutput) \
+		$(cabal_flag cryptonite cryptonite) \
+		$(cabal_flag dbus dbus) \
+		$(cabal_flag magicmime magicmime) \
+		$(cabal_flag network-uri network-uri) \
+		$(cabal_flag pairing pairing) \
+		--flag=-production \
+		$(cabal_flag s3 s3) \
+		--flag=-testsuite \
+		$(cabal_flag torrentparser torrentparser) \
+		$(cabal_flag webapp webapp) \
+		$(cabal_flag webdav webdav) \
+		$(cabal_flag xmpp xmpp)
+}
+
+src_test() {
+	if use webapp; then
+		export GIT_CONFIG=${T}/temp-git-config
+		git config user.email "git@src_test"
+		git config user.name "Mr. ${P} The Test"
+
+		emake test
+	fi
+}
+
+src_install() {
+	haskell-cabal_src_install
+	dosym git-annex /usr/bin/git-annex-shell # standard make install does more, than needed
+
+	newbashcomp "${FILESDIR}"/${PN}.bash ${PN}
+
+	dodoc CHANGELOG README
+	if use webapp ; then
+		doicon "${FILESDIR}"/${PN}.xpm
+		make_desktop_entry "${PN} webapp" "git-annex" ${PN}.xpm "Office"
+	fi
+}
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 717123c..60eedf7 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -1207,7 +1207,7 @@
 # Check whether the specified locale sanely maps between lowercase
 # and uppercase ASCII characters.
 _python_check_locale_sanity() {
-	local -x LC_CTYPE=${1}
+	local -x LC_ALL=${1}
 	local IFS=
 
 	local lc=( {a..z} )
@@ -1232,7 +1232,7 @@
 
 	if [[ $(locale charmap) != UTF-8 ]]; then
 		# Try English first, then everything else.
-		local lang locales="en_US.UTF-8 $(locale -a)"
+		local lang locales="C.UTF-8 en_US.UTF-8 en_GB.UTF-8 $(locale -a)"
 
 		for lang in ${locales}; do
 			if [[ $(LC_ALL=${lang} locale charmap 2>/dev/null) == UTF-8 ]]; then
diff --git a/games-board/gnuchess-book/ChangeLog b/games-board/gnuchess-book/ChangeLog
index 4c7f318..24b26e1 100644
--- a/games-board/gnuchess-book/ChangeLog
+++ b/games-board/gnuchess-book/ChangeLog
@@ -68,3 +68,11 @@
   24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
   Set appropriate maintainer types in metadata.xml (GLEP 67)
 
+*gnuchess-book-1.02-r1 (24 Sep 2016)
+
+  24 Sep 2016; Sebastian Pipping <sping@gentoo.org> gnuchess-book-1.02.ebuild,
+  +gnuchess-book-1.02-r1.ebuild:
+  gnuchess no longer uses games eclass (bug #594916)
+
+  Package-Manager: portage-2.3.0
+
diff --git a/games-board/gnuchess-book/Manifest b/games-board/gnuchess-book/Manifest
index 3b77bab..bb313fc 100644
--- a/games-board/gnuchess-book/Manifest
+++ b/games-board/gnuchess-book/Manifest
@@ -1,5 +1,6 @@
 DIST book_1.02.pgn.gz 26265281 SHA256 deac77edb061a59249a19deb03da349cae051e52527a6cb5af808d9398d32d44 SHA512 2fda39fae66a2afaf0084bd482465de04a65b842276760cde69cb6649c0d3b90c5341e10b4d344e06983bdc97ec8802582d622290bc419b8742d3cd6dd39688a WHIRLPOOL d49418d5f0ebae424e551be69601d82ba230bff9e503de21ce160241eb5640128e5848ba9dbd72809373df6d66fa0c2031b2780ce58db682732589685d385450
-EBUILD gnuchess-book-1.02.ebuild 613 SHA256 146a974e4559ba1a86f6d165b8b1260c6347a4329e778a36f02db24517d07e98 SHA512 4e8a3fa7de2db2244e85bc5aa5b473834f3a4ac0f94ece0294868a67e3400a210e5cc557c11ca5c87fb69efe6a26734e96b08dfe0de6c1e6c59e5aab96a91335 WHIRLPOOL acbe23e1f1d0e9e9aba5a802a5c43ca308f5c3391a74b615615b99ddeb79e7d48a91de76ee2b7ca611459be024d504c87eee1e11cb473faa317a076619d9010f
-MISC ChangeLog 2605 SHA256 5e27f43ba115d77181b572db53a3b7f3e644aa7bc54ca6ef414e25be84f18ed6 SHA512 915c7caa5c5c399ceeb3c1965029ec497acf2eeae292e1b6d0b32a4480c5fade181ba60963c096dd61b1407be92bb26eeea03ede009a60cbecab3af2afca01ab WHIRLPOOL 00dfd3cb2d87edd323665fd72465feedbdc625bb54cda5f40e55b272875a6e0a73dd3b9d803665e90a3aad3d55462c4603bcdf532ef0d8360503cb758bb3c17a
+EBUILD gnuchess-book-1.02-r1.ebuild 566 SHA256 2f2c24e49e952024d32da2e44114223e5aa73bf455b652a35b0b986af21858ff SHA512 9dd654a0348cc546067da65ace2d6e90c6a85881d8e10b38a14a022fbdb08a59c5c80fbf34d49642ea9255368cfa4fdcd3d5b041937a61b25eac419e98722a73 WHIRLPOOL b9d5dff5fa6cb1702066cde20d7c9f3f44eb40165bdfabe48ebd4c438e8e465a6a2ec9a38713ebda96ea65c540570e29766dcaecc03b12ce9b062cf3ba612118
+EBUILD gnuchess-book-1.02.ebuild 616 SHA256 df715b821dd56e88a0c48da0d2a32f64a203d39d7cdbe5a97cb426da16f6543e SHA512 09a500d33720a3eeaca45635ff243105eae723259905f4af77054f8c5d41d042b21dd872056a0092c7034ec7c6502363a9c3f8800b5c864dba1100313ad81d23 WHIRLPOOL ef6f1fb61f11ba93c9650b0c0660485ed8695770e1fdcd1fa9fcf991bbb9c45e55a410d666b9e04ceaff5f9986ac53c1a990c1669dcc4acb41a204888e888e0f
+MISC ChangeLog 2843 SHA256 04e04ee771a27c52def75c8ad18b7817c6491f901a131fd00fa01d8fe56e6597 SHA512 e6636db1873d4bdc924fcd49b798e784c995de02c25425071d23cf26c88126b6ea18048bcf3e912c4ca7f55ea3cc859f20e95936b1d704b6b1354189af7bc28d WHIRLPOOL ea80c64107d9f885f4678a670e3fdc3ac3ebbce2a48c697df8b6c223cc39c1d49c86f41e2f04081654100c6c18f40c3a5a26a71323e7c03cc723695d534d4eff
 MISC ChangeLog-2015 2522 SHA256 b93e36183c1d8d32af43685b8049fcc1215442b752a4f0e75b89b2cbe59a80f8 SHA512 0e805e7e46fead35b541196a17f5457d2dc2b85bae497432c27a57f6cdd3043fee796a9119fc81f43a17d89470a2fe030ad5e7b908497960d2b7bd1735a70968 WHIRLPOOL 16b3af90e9b870ab2998b0dd9dba5e6be54c74e13ea163daa6a1d7de36ab1820230ec303887417ee10acce1f42353c7bce7e74deb92c02ecb4f70c5a4ac60e24
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-board/gnuchess-book/gnuchess-book-1.02-r1.ebuild b/games-board/gnuchess-book/gnuchess-book-1.02-r1.ebuild
new file mode 100644
index 0000000..7e2cbc5
--- /dev/null
+++ b/games-board/gnuchess-book/gnuchess-book-1.02-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Opening book for gnuchess"
+HOMEPAGE="https://www.gnu.org/software/chess/chess.html"
+SRC_URI="mirror://gnu/chess/book_${PV}.pgn.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+RESTRICT="userpriv" # bug #112898
+
+DEPEND=">=games-board/gnuchess-6.2.3"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}
+
+src_compile() {
+	gnuchess --addbook=book_${PV}.pgn || die
+}
+
+src_install() {
+	insinto /usr/share/gnuchess
+	doins book.bin
+}
diff --git a/games-board/gnuchess-book/gnuchess-book-1.02.ebuild b/games-board/gnuchess-book/gnuchess-book-1.02.ebuild
index f89a607..a2ba676 100644
--- a/games-board/gnuchess-book/gnuchess-book-1.02.ebuild
+++ b/games-board/gnuchess-book/gnuchess-book-1.02.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@
 IUSE=""
 RESTRICT="userpriv" # bug #112898
 
-DEPEND=">=games-board/gnuchess-6"
+DEPEND="<games-board/gnuchess-6.2.3"
 RDEPEND=${DEPEND}
 
 S=${WORKDIR}
diff --git a/media-gfx/pngcrush/ChangeLog b/media-gfx/pngcrush/ChangeLog
index 7a41504..920982b 100644
--- a/media-gfx/pngcrush/ChangeLog
+++ b/media-gfx/pngcrush/ChangeLog
@@ -100,3 +100,15 @@
   24 Aug 2016; Tim Harder <radhermit@gentoo.org> +pngcrush-1.8.5.ebuild:
   version bump to 1.8.5
 
+*pngcrush-1.8.6 (24 Sep 2016)
+
+  24 Sep 2016; Tim Harder <radhermit@gentoo.org> +pngcrush-1.8.6.ebuild:
+  version bump to 1.8.6
+
+  24 Sep 2016; Tim Harder <radhermit@gentoo.org> pngcrush-1.8.5.ebuild:
+  stabilize 1.8.5
+
+  24 Sep 2016; Tim Harder <radhermit@gentoo.org> -pngcrush-1.8.0.ebuild,
+  -pngcrush-1.8.2.ebuild, -pngcrush-1.8.4.ebuild:
+  remove old
+
diff --git a/media-gfx/pngcrush/Manifest b/media-gfx/pngcrush/Manifest
index 8cd9cbd..507338747 100644
--- a/media-gfx/pngcrush/Manifest
+++ b/media-gfx/pngcrush/Manifest
@@ -1,15 +1,9 @@
-DIST pngcrush-1.8.0-nolib.tar.xz 60224 SHA256 baa7048351c341e3a0c4769db7093b3206d46aa66ca93ac039c896ace63563bf SHA512 270a9d5479f422ff396d025e73abdd4e9f4f715390d9398dfda1480348b26de644d974b41e9546f615f36f923aa9fa8bcddb96db951cb4d785496b5734fcc382 WHIRLPOOL c2d2426a0d85462f8f811d9b9b9007a3c53ea2f7c9c62550962245cd4cd5cf20d55c9cdecdeb76c872a762523b034bd79c3b4946393115e7f4ae9060323bf22d
-DIST pngcrush-1.8.0.tar.xz 358772 SHA256 94491583c625e284e580f102657f9c2b3036372ab486e08682112f6cbb66522c SHA512 b572d6ee3aebffdf60836adffabff84b6ac12a50f9b33b5d6e7749af728f6aa441d53cb66926d40d988a94864524351f92edba72d3f0f55206746aa45037d653 WHIRLPOOL 2209a267cd54e6e6fde6e7f2e693065e83585e990801e4b704f3cfaf11d953abc44aa82626c6e7badf524214f5bc692831e72b7f7f0cb61b1f104a220d2f2925
-DIST pngcrush-1.8.2-nolib.tar.xz 61588 SHA256 4a2b4a0445008f0d528cffebd143ca9b15ec41cbc5abb79ce244d6eedaf452b1 SHA512 f0bfd95a84c9eef48abe624ca8ea4c2064862e9b6330776f91d7647b2796b1221a9edccf8de73fdbad7031cdee0d161072ce44063c60a6a7880a51130fb5c0f9 WHIRLPOOL 07e5566bb12e82e34472d72d96c8eb35a34c7a3282763e5fb8d13f4551d3f31b4dd651e1c3fd5fee9f779d8978c8be933455329ff0ea965e68579237ece2096e
-DIST pngcrush-1.8.2.tar.xz 361644 SHA256 0fa49fdd8bbdc290aa6a9958ad9482ae60a7a229bb237bf35e7bcfe1ee216440 SHA512 6f5abc419f3a0c8dad237d941183b58678752157076bf5392d41cef1ced937ba891d0443164e832142d8c7e5281032f5c10ab1545c870f2ccffa5a452f97b43b WHIRLPOOL da9baca97b449215068f67601ea467c2eee27fbd2c956b6be6ecc0b361ef4a91f7dbb29ad308a62fca4a2997c090bfb985c03b56d129a3716d2c9b3fc7baee9e
-DIST pngcrush-1.8.4-nolib.tar.xz 63548 SHA256 4ef6d790677cf57f622db693337d841b60d62c044e8681299245c298bd56161a SHA512 f246a62727d5ecfda72e4be544c857ff4e67673cc54ac80ba60db5b1b2bea68c22780dd3999d76ee0ccfde5b8ca001c828ee22f46431e1b22e972b37f88f3192 WHIRLPOOL 3cac34b5b982711abb3c58c064830b0bd319420cf590939c569552ac01c2ce8ac25af42f3e5ab5349a54b4d8186a6e43373e69f1f4bc764803fe5af7d56bcd91
-DIST pngcrush-1.8.4.tar.xz 366980 SHA256 25cbdb0dec7fb9f6a1bddc172a807a3123ee88144cfe955f25502329ea620821 SHA512 2e9919f82f07b98e341a4eb65f814514d0dc731a36677e5ef18486fb858694c7d6b9a0c80e1b2cab2a9354eb14239ce8169f53efd64ebb42405066f1fb175ef2 WHIRLPOOL 7a5e63994b5d198c8a7b8e02564a41319a7fd2ec2b980e93f7dffd61ad121909cb3d3d6e31e4b58af53d1884101b22bae96cdc2693e8e70310cdd3dad0e38fec
 DIST pngcrush-1.8.5-nolib.tar.xz 64176 SHA256 1f843d836de8ef90b99b0a9e3e37f4ff4776278b5605293d5644b6efd537d934 SHA512 f76144e4b570cd0329243984404fdf34ea0959c4fa667808d773d1b7596e1c2e2d8c9cef4176d6cf609f17fcd8a8876a719da1bee5a0673bfe2533c7b4113a26 WHIRLPOOL d2f6ebeba60a3d4be6e096c96bface60a94b72e15e0c31c4b39db4a9ccc5fa6bf8de33d6abb85db710276f8767928d675dfa0c607bfc9a007a2825ec0db2b1da
 DIST pngcrush-1.8.5.tar.xz 367264 SHA256 95bd3dccba9db4f68a8f4cf2e33c4530fe86cc5030e824b9d40cefc820a74e78 SHA512 76a795a9ca865d455911e70b1a486631fe2a98cf96e3b170c714c0dcbb937bbda7fca2c4c93be45fef788ae0442a503788741ba77e73099758a06de0ee465089 WHIRLPOOL 4dd13ecffd2e81aace636f7d31365d57ed30a5847b3eee054ade8e7d5ca87e4223b0eaf28325bfef6c2f743f0434581401d090f374e02621e2769377fa5ead98
-EBUILD pngcrush-1.8.0.ebuild 863 SHA256 f3b3847f7fb0f6ede2c38c958281777fb7c3a84fd9d310778216b33073ec3f2f SHA512 b31e20bc3329c7e0630bddfc3db902aabd5b895ebab7114fe87f3fc9148a5ecbc929eb60a9839322471107595780ee237ffb6bde040f4b0f9d5adb379b56a668 WHIRLPOOL 2e6fce77a918aef95ab77e4179ff9355abb93569e1b957214ad50da0f0e1faa87b41394d15af06b390134e9f8bd3c0e3c2bcb500b72520278eaaa41c48ce5034
-EBUILD pngcrush-1.8.2.ebuild 864 SHA256 18df1ebb9799227250fc67c24ba8d3c150d00119caf87727fa7e6407ad27b3ef SHA512 a1407715697edb95b8502ae88a862239bf618717e2d2a610de495b4c5dfd36750782664430646400b88ad6f3befe51c26f1fac313dfc6555d777059b96300e03 WHIRLPOOL 79ef8b530316d40c21176c9182922521c523b4ad06afafea888e57623565d04f8891f3d9f866d24b576a196dfe2d3c9b0c761d1121cce4c6c48638cb080d5062
-EBUILD pngcrush-1.8.4.ebuild 864 SHA256 18df1ebb9799227250fc67c24ba8d3c150d00119caf87727fa7e6407ad27b3ef SHA512 a1407715697edb95b8502ae88a862239bf618717e2d2a610de495b4c5dfd36750782664430646400b88ad6f3befe51c26f1fac313dfc6555d777059b96300e03 WHIRLPOOL 79ef8b530316d40c21176c9182922521c523b4ad06afafea888e57623565d04f8891f3d9f866d24b576a196dfe2d3c9b0c761d1121cce4c6c48638cb080d5062
-EBUILD pngcrush-1.8.5.ebuild 864 SHA256 18df1ebb9799227250fc67c24ba8d3c150d00119caf87727fa7e6407ad27b3ef SHA512 a1407715697edb95b8502ae88a862239bf618717e2d2a610de495b4c5dfd36750782664430646400b88ad6f3befe51c26f1fac313dfc6555d777059b96300e03 WHIRLPOOL 79ef8b530316d40c21176c9182922521c523b4ad06afafea888e57623565d04f8891f3d9f866d24b576a196dfe2d3c9b0c761d1121cce4c6c48638cb080d5062
-MISC ChangeLog 3553 SHA256 fdf6ea901b82b277d5558f3cc73cd70d2ea9420c71f8ccfd2320adaa574be22c SHA512 4bc02254171d530cbe58c49918b26819b6c7492492d2b788fba85faf7c15c046b9ac4a15342acd3fdd048a5f7cb646dc5a58bb2c4be4bf801528f031ce9356d3 WHIRLPOOL bde3ccafaf350c45c165eda28bf254428e0f5a31147fe6603206fac211c91dbaa6262f6c4d3b0780486e11b9d2da974b2e2359f894556e191e5705e617025d3b
+DIST pngcrush-1.8.6-nolib.tar.xz 64364 SHA256 14e5975c856d732d1661397e292fa2c2f42a5d39070025f57ce03d77b6e0a3df SHA512 7d7455281230bc9c56a7586c28bc38866a05398ef10c2777aa4a21fd9fca7b955a968cae7f75cc6a164d4f5d76a89d2e7de2cca4f2d5d9da5d8c601a1495a994 WHIRLPOOL 0d04784178365306bfeaa2486e0b79f7cefa18236aa2fb7e387c92ce80e23caecd24fba68d878cae5657fd44727d7df929437b2d705691fed59af8333742a25c
+DIST pngcrush-1.8.6.tar.xz 374108 SHA256 4e31ba394382e85e2849841027641487ce73cbb4dfaab0bbbcd386d888c88bd1 SHA512 cc9b8941e32b6b20455169127e44b634bf2d18824f40a8735982895f12d8542ba86dd61c2890b72af3a3c45534faa7cdab8def3e60618b1d9b269ef902309780 WHIRLPOOL 292f08d30f0a4088fe3dd7895064914dbffcbf1ce31809559312c9c3ee53eb5d98133f2163d4cc65f51e44f26c5ae448a63274f13d871f675788da5e2ce5a423
+EBUILD pngcrush-1.8.5.ebuild 862 SHA256 ccc87f6cd8b840e1aff4d4b4b74adc4761333d1be73fcf886baa0024e808fbdd SHA512 1f7950aef3c4e4e932b608853215eeae9429674eb0c67019dc86fb82be70f01d44eb453e755ed160996fd8ed893372d5599987878ddcf7831d0c57871819fbca WHIRLPOOL 15cf5b902da608156ec273bc9e805451484008d982aea3347a354a228b89bf04f657dd6890bd799282821179e713b127e9970f5a4e4eb471570015fbbed4582a
+EBUILD pngcrush-1.8.6.ebuild 864 SHA256 18df1ebb9799227250fc67c24ba8d3c150d00119caf87727fa7e6407ad27b3ef SHA512 a1407715697edb95b8502ae88a862239bf618717e2d2a610de495b4c5dfd36750782664430646400b88ad6f3befe51c26f1fac313dfc6555d777059b96300e03 WHIRLPOOL 79ef8b530316d40c21176c9182922521c523b4ad06afafea888e57623565d04f8891f3d9f866d24b576a196dfe2d3c9b0c761d1121cce4c6c48638cb080d5062
+MISC ChangeLog 3910 SHA256 a8d47c72b79be2547139562af00a4a29056c0c491b4d33b62567c4f479f79e80 SHA512 d94fbc02d349ed266f540d95308c97d2cf40a477019e443021273fff4f86eff3166e61e8ec3a7b94aabe365ecf5b662c302458b9afe8e06a876311bb9e04c1d8 WHIRLPOOL 0df68607f96f55a482a0c16d3b2fc3629e50203790945afae74fd7d267c007c30d73011a2a1581af0035f8de900530f91544fa32621660d076fc7fa07106de8a
 MISC ChangeLog-2015 17815 SHA256 073449a46f058d812db6a464482875a97c44d240a658e753b8b86ae0db183434 SHA512 8e48877b58e4a7503a6f24c2cb6329bdb234017e50e7cdc8e8c81489bdf3136ddc1b8c853aa36603c209bfe8905fcc77bc4a243a8fde37beef4620d10945c125 WHIRLPOOL baff3c34a2c95159f5b2f2875e566a6ec099f1c1fc2ca506e3edabfef6ea95b3a65946b5d0fd0c11daec8263208eef40a9db8bcb2d6b8558239ada67e983cc4f
 MISC metadata.xml 635 SHA256 de2515e1d60739858722edb442e9d6d3f31ee7463d4f44b06c621d79bea0519e SHA512 9821899ae557a075512ff8764ca0b44212cc1ca4b64ba92e99ae6d2785154ea18ed70cb8b702b2f1460951a563235917f975bfdf64ad8bae7970b6e9d5776d6c WHIRLPOOL 00e7e34871bdd273b304d85cb70fb282759bdafc0f0a57fdc1d5a6480d008b3cb32961475155c9cbd5b63613bb92d5efa9d7daea6e2fd1312de588d93d6dc850
diff --git a/media-gfx/pngcrush/pngcrush-1.8.0.ebuild b/media-gfx/pngcrush/pngcrush-1.8.0.ebuild
deleted file mode 100644
index b54545b..0000000
--- a/media-gfx/pngcrush/pngcrush-1.8.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="Portable Network Graphics (PNG) optimizing utility"
-HOMEPAGE="http://pmt.sourceforge.net/pngcrush/"
-SRC_URI="system-libs? ( mirror://sourceforge/pmt/${P}-nolib.tar.xz )
-	!system-libs? ( mirror://sourceforge/pmt/${P}.tar.xz )"
-
-LICENSE="pngcrush"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+system-libs"
-
-RDEPEND="
-	system-libs? (
-		media-libs/libpng:0=
-		sys-libs/zlib:=
-	)"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-pkg_setup() {
-	use system-libs && S+="-nolib"
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} ${CPPFLAGS} -Wall" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-	dohtml ChangeLog.html
-}
diff --git a/media-gfx/pngcrush/pngcrush-1.8.4.ebuild b/media-gfx/pngcrush/pngcrush-1.8.4.ebuild
deleted file mode 100644
index d796850..0000000
--- a/media-gfx/pngcrush/pngcrush-1.8.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="Portable Network Graphics (PNG) optimizing utility"
-HOMEPAGE="http://pmt.sourceforge.net/pngcrush/"
-SRC_URI="system-libs? ( mirror://sourceforge/pmt/${P}-nolib.tar.xz )
-	!system-libs? ( mirror://sourceforge/pmt/${P}.tar.xz )"
-
-LICENSE="pngcrush"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+system-libs"
-
-RDEPEND="
-	system-libs? (
-		media-libs/libpng:0=
-		sys-libs/zlib:=
-	)"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-pkg_setup() {
-	use system-libs && S+="-nolib"
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} ${CPPFLAGS} -Wall" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc ChangeLog.html
-}
diff --git a/media-gfx/pngcrush/pngcrush-1.8.5.ebuild b/media-gfx/pngcrush/pngcrush-1.8.5.ebuild
index d796850..0af23be 100644
--- a/media-gfx/pngcrush/pngcrush-1.8.5.ebuild
+++ b/media-gfx/pngcrush/pngcrush-1.8.5.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="pngcrush"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+system-libs"
 
 RDEPEND="
diff --git a/media-gfx/pngcrush/pngcrush-1.8.2.ebuild b/media-gfx/pngcrush/pngcrush-1.8.6.ebuild
similarity index 100%
rename from media-gfx/pngcrush/pngcrush-1.8.2.ebuild
rename to media-gfx/pngcrush/pngcrush-1.8.6.ebuild
diff --git a/media-libs/exiftool/ChangeLog b/media-libs/exiftool/ChangeLog
index 3824e37..dcedd15 100644
--- a/media-libs/exiftool/ChangeLog
+++ b/media-libs/exiftool/ChangeLog
@@ -215,3 +215,15 @@
   -exiftool-10.17.ebuild, -exiftool-10.18.ebuild, -exiftool-10.19.ebuild:
   remove old
 
+*exiftool-10.27 (24 Sep 2016)
+
+  24 Sep 2016; Tim Harder <radhermit@gentoo.org> +exiftool-10.27.ebuild:
+  version bump to 10.27
+
+  24 Sep 2016; Tim Harder <radhermit@gentoo.org> exiftool-10.25.ebuild:
+  stabilize 10.25
+
+  24 Sep 2016; Tim Harder <radhermit@gentoo.org> -exiftool-10.20.ebuild,
+  -exiftool-10.23.ebuild, -exiftool-10.24.ebuild:
+  remove old
+
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index c15b206..9c3e7aa 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,11 +1,7 @@
-DIST Image-ExifTool-10.20.tar.gz 4142166 SHA256 f06ae200950cd3f441f20f7532163365965aa45a91d96114672b0eb176b76d2a SHA512 0c96010d39b4b5af1595f74df5ac7e27c88a5a610b8dd5eaeda8d3a7bdc335d237659d076b890784baa2e791e007a33d3aa60dc169c901c3771a2e308eccf93a WHIRLPOOL fdb4d34f0bda105bcf9a2355bebb15b0b7255ecda483331aa9e075840cf76dc76c2cfa5b9b796df41a654b1cf59eec1e37ad24b9d0bcd124b5058b73059c8e45
-DIST Image-ExifTool-10.23.tar.gz 4158833 SHA256 ce0d0bade2ee205c5e1251bb564c3bcaa9f9afc6b952e5b43b25ab53805b490c SHA512 ce0e0b761a3bfbe65028c5a213e69a6e2bfc14975f6ace040150057d36639f4abeca9e8eac86787411df71c0946929f955b813d0a1ac2c26d6add566e38f4e6a WHIRLPOOL 4ddc0653d8697a7cba3229459dbf07db19626d1add869b3984c23babf6673da9bea55893389324bfd06252019e91e6eed5481c8f610497d63fe58ee9351117d2
-DIST Image-ExifTool-10.24.tar.gz 4161183 SHA256 c5315c75acf74db713746e6889e8d6c4c394934952c0151a3b053b429c66f58d SHA512 d748bf627b37d0b42c6fc0712d8ac01e69636d0e779a4375d0ff8bf3728e56116b30f29ba1a7c7e02be0536a89a692bb40b32033d1e4fe6de0e71cd292b3f82c WHIRLPOOL c93b3c36154ddecf1f9f5f9ac8585124823227284c6a7c00c55998d5567354d561e180e1faa8fece3c471ad45c5976fafd349b585aa808d4c770b824c5f2e771
 DIST Image-ExifTool-10.25.tar.gz 4161833 SHA256 edc2de5848375f7ccb88cd7d0260c98c4c581ffd509c4c249949f0cd1f522dd0 SHA512 6f3c9e432198a0be00efed1dc6044ea1be330099ec3d47bab8e761230c8fadc48bc26571202aea16e82890a9315ea752f25e06a2c7e5fd6d7690387e681870c7 WHIRLPOOL 49f11b61ada48c3d4d3d36d79f110a248c535bb8eb8625cdd7f5c4ef714c94676369b765abe63076589ea05b7c5cbf7ee5401c1c93e344cf704e26a091c5d464
-EBUILD exiftool-10.20.ebuild 537 SHA256 a9896dd8a4c2ab401dc113ed2baa6cf272c6e6ac5658ccf1ab9607d060ca369e SHA512 77dc45962edc0c998a4b056c161b883776687fd06174709e206ade90f357a8168761fdcbe7b2d6530be91c315e77ba1973e6ee698eb0777cd8330b99a3afb291 WHIRLPOOL 93ae23dd692d3d90a85748cc45d0f120163a0f341883b146b2dd5694a6248d897fb03453de5d21484d29ae6b88050f846d2e6cacc917ed59407d5f0826258303
-EBUILD exiftool-10.23.ebuild 541 SHA256 36dedd1f8401a11813a3ac376573af9a8cb25b56be3e263a6625092d3e6937c0 SHA512 f85d85c7ed72d0d595cc56526c12de5ff65cdb4374953fea2848cd6be4c6aaf6d8bec67b74862382d304a932a7bfa8899ee61dcaeb7da9e02dec98fa300efa84 WHIRLPOOL 29c4aa3acddf7148eee9c8489b068cffd08352665b2e6c6161d7e7005a3a5b038a7f09b45f07b5cfe0f387636447fd2ea18920676b9a92eb14a952ef39698bee
-EBUILD exiftool-10.24.ebuild 541 SHA256 36dedd1f8401a11813a3ac376573af9a8cb25b56be3e263a6625092d3e6937c0 SHA512 f85d85c7ed72d0d595cc56526c12de5ff65cdb4374953fea2848cd6be4c6aaf6d8bec67b74862382d304a932a7bfa8899ee61dcaeb7da9e02dec98fa300efa84 WHIRLPOOL 29c4aa3acddf7148eee9c8489b068cffd08352665b2e6c6161d7e7005a3a5b038a7f09b45f07b5cfe0f387636447fd2ea18920676b9a92eb14a952ef39698bee
-EBUILD exiftool-10.25.ebuild 541 SHA256 36dedd1f8401a11813a3ac376573af9a8cb25b56be3e263a6625092d3e6937c0 SHA512 f85d85c7ed72d0d595cc56526c12de5ff65cdb4374953fea2848cd6be4c6aaf6d8bec67b74862382d304a932a7bfa8899ee61dcaeb7da9e02dec98fa300efa84 WHIRLPOOL 29c4aa3acddf7148eee9c8489b068cffd08352665b2e6c6161d7e7005a3a5b038a7f09b45f07b5cfe0f387636447fd2ea18920676b9a92eb14a952ef39698bee
-MISC ChangeLog 6996 SHA256 eb5c28cf9c0bb945192bffed513ea4c54ffd21e68834bd8a52509074c999379a SHA512 efd6112eaad0826500ed4165d199dc05fc5c16b3e83b71c79f1ed45e874fec2cae50bce485370653fb28b56568d6c2e7f067a92c99d8dac1fe097925e76f920d WHIRLPOOL 14492bebf57e9cc1c101085893a1154b5fba6d262cef2500b166673322636ba85a945ae6bfc0230e863b12974fecf3b834c44713f4a9c3081cfb19e415dec8af
+DIST Image-ExifTool-10.27.tar.gz 4176031 SHA256 344f201a37f61a9f02ed7831cd86c89ccb14ea163ea77e129f094dc92e4b8852 SHA512 2f90c36afb7d870e4ea39e598afd15ab6183645b53d760cd2b1c883e424df22e1e50d4e2851abe8bf54a4e04a015597ca947053f9d1597f0709e6c0ff342f1c2 WHIRLPOOL fee344bc2354f16cb303a24f7f6b530d28fc4b4823b9cf11adbc2215c18c2a2e5c2608cfeeb5732e420b64f8cefbc35fb4c49a714a0da87a0e8313729c4291d2
+EBUILD exiftool-10.25.ebuild 537 SHA256 a9896dd8a4c2ab401dc113ed2baa6cf272c6e6ac5658ccf1ab9607d060ca369e SHA512 77dc45962edc0c998a4b056c161b883776687fd06174709e206ade90f357a8168761fdcbe7b2d6530be91c315e77ba1973e6ee698eb0777cd8330b99a3afb291 WHIRLPOOL 93ae23dd692d3d90a85748cc45d0f120163a0f341883b146b2dd5694a6248d897fb03453de5d21484d29ae6b88050f846d2e6cacc917ed59407d5f0826258303
+EBUILD exiftool-10.27.ebuild 541 SHA256 36dedd1f8401a11813a3ac376573af9a8cb25b56be3e263a6625092d3e6937c0 SHA512 f85d85c7ed72d0d595cc56526c12de5ff65cdb4374953fea2848cd6be4c6aaf6d8bec67b74862382d304a932a7bfa8899ee61dcaeb7da9e02dec98fa300efa84 WHIRLPOOL 29c4aa3acddf7148eee9c8489b068cffd08352665b2e6c6161d7e7005a3a5b038a7f09b45f07b5cfe0f387636447fd2ea18920676b9a92eb14a952ef39698bee
+MISC ChangeLog 7353 SHA256 b9995a06d2a5c6c518437600692c07296f8138e7ec59d6b210e527c606c640eb SHA512 c900a1f59ffa17ab0ae522d6e915915e3b3490257bfb026c158ccf0fe458627bd408e4b52ad2489d396f730efe1d4668b666610c81a37191a42a261dba27e308 WHIRLPOOL 57935d98d0f62bb6997b33ae50cd2be780c6595e52569f3b483cf058db903ebf2df73ad06cf1e8c030e9398f9c282d7a52de6a1df29fde7a1528a086ca8527ee
 MISC ChangeLog-2015 21462 SHA256 6e383b131d092c798a8705c06687fb1d4ab6b8343d775366814f5709e3a3b42d SHA512 c48d7c80bc283e061b10ec73ecbd0a2218ef034b9cc7095376dafe12df8cf634e44c2391f15b093ca852e2071fec7acd0187c2d2e809c90ab99f08321e32eeba WHIRLPOOL 5469c93d15acd8ae441354ef227da7708d88c4a65c0677bb9ace69c9eeff410b5c5e271cc1267b6f5f1a776a83ad1c72e8bc4b3afdca2a6bed8b29ff5c5a8454
 MISC metadata.xml 10188 SHA256 9a875147a2a9768a29971da840d7fe38af0abb3eb25f1ce15e6a716dacdebfa8 SHA512 987ca7e8fdf9e00786b401327bab96ceee5238749027652dfa2c0fb2338a7651dd6da1336b947cd195d20e6cec107dbcbf3b16ab31d8df11a8c82922cac44749 WHIRLPOOL 982a1a871dbeb2ef31bfe5dc3af3a2bb890fce9e25371ae23999d054e1704cdee2d3a35e92b0b631fc80f155522d3f3c39d7d27e7cabcd476334491c02f0117f
diff --git a/media-libs/exiftool/exiftool-10.20.ebuild b/media-libs/exiftool/exiftool-10.20.ebuild
deleted file mode 100644
index 2a3c8fe..0000000
--- a/media-libs/exiftool/exiftool-10.20.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-DIST_NAME=Image-ExifTool
-inherit perl-module
-
-DESCRIPTION="Read and write meta information in image, audio and video files"
-HOMEPAGE="http://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
-SRC_URI="http://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x64-macos"
-IUSE="doc"
-
-SRC_TEST="do"
-
-src_install() {
-	perl-module_src_install
-	use doc && dodoc -r html/
-}
diff --git a/media-libs/exiftool/exiftool-10.24.ebuild b/media-libs/exiftool/exiftool-10.24.ebuild
deleted file mode 100644
index e1513a9..0000000
--- a/media-libs/exiftool/exiftool-10.24.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-DIST_NAME=Image-ExifTool
-inherit perl-module
-
-DESCRIPTION="Read and write meta information in image, audio and video files"
-HOMEPAGE="http://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
-SRC_URI="http://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
-IUSE="doc"
-
-SRC_TEST="do"
-
-src_install() {
-	perl-module_src_install
-	use doc && dodoc -r html/
-}
diff --git a/media-libs/exiftool/exiftool-10.25.ebuild b/media-libs/exiftool/exiftool-10.25.ebuild
index e1513a9..2a3c8fe 100644
--- a/media-libs/exiftool/exiftool-10.25.ebuild
+++ b/media-libs/exiftool/exiftool-10.25.ebuild
@@ -12,7 +12,7 @@
 SRC_URI="http://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~x64-macos"
 IUSE="doc"
 
 SRC_TEST="do"
diff --git a/media-libs/exiftool/exiftool-10.23.ebuild b/media-libs/exiftool/exiftool-10.27.ebuild
similarity index 100%
rename from media-libs/exiftool/exiftool-10.23.ebuild
rename to media-libs/exiftool/exiftool-10.27.ebuild
diff --git a/media-libs/gd/ChangeLog b/media-libs/gd/ChangeLog
index b37b939..eb9d355 100644
--- a/media-libs/gd/ChangeLog
+++ b/media-libs/gd/ChangeLog
@@ -306,3 +306,9 @@
   RepoMan-Options: --include-arches="amd64"
   Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
 
+  24 Sep 2016; Markus Meier <maekke@gentoo.org> gd-2.2.3.ebuild:
+  arm stable, bug #587662
+
+  Package-Manager: portage-2.3.0
+  RepoMan-Options: --include-arches="arm"
+
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index f9a7f7a..0c237bd 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -2,7 +2,7 @@
 DIST libgd-2.2.2.tar.xz 2105628 SHA256 489f756ce07f0c034b1a794f4d34fdb4d829256112cb3c36feb40bb56b79218c SHA512 65c2f22ff35b5d62889921d7963d9cf808700299aece9292716555ac544e8c52ca435d6c5f817610553162e249343868a9164bf0fef9d59b61cd8075334c7e8d WHIRLPOOL 862588677be868c56af7c312e4aa66a5e67f10ccbc3cc7209b0fd23bcc3aae594c1e092b4b08ca7f913b334be47a486e696bced69d3f461056649f9ea8cc130d
 DIST libgd-2.2.3.tar.xz 2164152 SHA256 746b6cbd6769a22ff3ba6f5756f3512a769bd4cdf4695dff17f4867f25fa7d3c SHA512 bdc6d086bc054beda6574ec46baa4cd94048a5f2f357f875ba05983e92d247f1b731434b9e438c6aef09d46fa96f1a7e1f330a25a77ffd2dd78aa8a32d652557 WHIRLPOOL 1f290bb446618e402422488e77e1b88626ea3d9679653f10392b90386cf2ae861f9f8fdf624ebd96d152b764cfa3bf6f01859f58a033585db01ef8ea77c21e1a
 EBUILD gd-2.2.2.ebuild 2112 SHA256 e47d3c0d3208316dab73ee92c52bbb0100b9e23e828f292a642998f3465f118d SHA512 1d982d9abb4cbfcc096a5a85e21f494521704eed7e1b990fcf45f639ae4ed60abb4ee768c14ee45746026ba1b27f38be9a7f742f80adbabc76811c443cf358e7 WHIRLPOOL 0742445834979f70912387a94e0d1f9fa62e065efa985610f681a1c99c0f2b99637be8d9fb38342d171580fefebfed6f4791416464e970dc8ff9bb2246600c9d
-EBUILD gd-2.2.3.ebuild 2064 SHA256 37bcff6fbab66830eac4d4e16fbad457335e4894149570141b8311157d1dce3b SHA512 6f0959e84f4a1e53826eebab629863f2468f44066499fe8b24e4d3ba46520ffe2a9fd80f7a08ad71b6bff1cd183a77c5198bf29a33085cb1a8ef887860c7dde2 WHIRLPOOL 0a0bba84cfc0717356512fe056e4f66a48b1be5bd5ff09dc37661d83a572c49bf7d14a2245538c4e6e43520892c7b40db376b16e53812028b0a6625371a235ee
-MISC ChangeLog 10205 SHA256 1516011ece2703a20bbec54ee8e0c6b8e620b9261d897992bd523d507182238c SHA512 be2924c229e80d65664a663166097689167dd9d503d236fe02cf288995b272daa86de0d24a6b6414ed666c94895e45119761b6f41f00743be54c1c9a06c6b020 WHIRLPOOL 66c22e1abe72b853f147015c01b3f771b6d379027e3fe7fa1042ccbd1319f4ddc99c58bc412f00aee30c0a5b7fc09cfa52c7e02889e7dc0387b8d20c019a7fc7
+EBUILD gd-2.2.3.ebuild 2063 SHA256 2595c86ac77d2aca9e70c4e95ce7df69392799ac2e282cd0bdc2996980dc8d5e SHA512 4ac0e743a76240054fc0a8c05a70a06b8b6014f39fd5160eb546c8b0afcb870e0ccc7f7b457ab62d965a9ce847d258b1c187fc6c6c17d54efc1f4395aa81c853 WHIRLPOOL 6424b64a530cd34408fd6b64ffaf24811a5c7bd411e86f2debd156e48ec3720a27ed8ca1f124a2235b74e0a0c0c5e7dedd1503ddd0871e426033ae73209307d3
+MISC ChangeLog 10373 SHA256 def59c76c313e596c672748b261bd10c0e3dc769cf7fcc92e58402a59da7aa48 SHA512 f792fd6cdcc89e364261309f1a2883fe25eadc088cd7404f171b4dcadb07586f5a0a8fa8d95e4b4f1cf25c9c6ef0caadecc806150e9aec6cc62d3084b7777e8b WHIRLPOOL 07ec182daa999199252d83f6dafcffdb7cceae0a31499defa857f01e32bc5bd0940c41fa4814231557fc3668901638d5a22460c6c4d1c844ff5255477b2f4506
 MISC ChangeLog-2015 20092 SHA256 e7c76aba32580b9d1c023047fef0902ca083334af88282d3765719cb6be79f76 SHA512 3ba68dfb947f4f959cfcc1d518ef9e59d87b99a9268a90ae3da0d55a01951a16053be88db03303f88a94d120d05878d4846fd75916af012f7f336fe87e7f6693 WHIRLPOOL b424a773cf66bd121711c5b361fb7037c5ea4660545f0804c13f828185a4f202f4beff192053b3662da714994cc780dd79743a825740645bf35f103732a765d7
 MISC metadata.xml 1585 SHA256 0286478beeb511b10aa933e9adb32aa8ca1d5da104483b4969075e55efdb0fd2 SHA512 b153415e14980d822fd0fe3c70e132e9a7bee930da527d0181fa608d4f869cc678bdc06214bfd5187d631f82f821f997de4995d3f11e7621175d6628a2e40a7b WHIRLPOOL 93578f8d73438d58296805901f3e1550d07130249b1a256ab8b7efbd97cacde803c5a1ceb5b8bb407418b5f8043a8efd9d21d6fc65a801434c0539ff75603b9e
diff --git a/media-libs/gd/gd-2.2.3.ebuild b/media-libs/gd/gd-2.2.3.ebuild
index 2cf3e7d..d85456c 100644
--- a/media-libs/gd/gd-2.2.3.ebuild
+++ b/media-libs/gd/gd-2.2.3.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="gd IJG HPND BSD"
 SLOT="2/3"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="fontconfig jpeg png static-libs tiff truetype webp xpm zlib"
 
 # fontconfig has prefixed font paths, details see bug #518970
diff --git a/media-sound/abcm2ps/ChangeLog b/media-sound/abcm2ps/ChangeLog
index 872f058..f2daf5b 100644
--- a/media-sound/abcm2ps/ChangeLog
+++ b/media-sound/abcm2ps/ChangeLog
@@ -90,3 +90,8 @@
   -abcm2ps-8.5.2.ebuild, -abcm2ps-8.8.3.ebuild:
   remove old
 
+*abcm2ps-8.12.3 (24 Sep 2016)
+
+  24 Sep 2016; Tim Harder <radhermit@gentoo.org> +abcm2ps-8.12.3.ebuild:
+  version bump to 8.12.3
+
diff --git a/media-sound/abcm2ps/Manifest b/media-sound/abcm2ps/Manifest
index 05f0289..b90edc3 100644
--- a/media-sound/abcm2ps/Manifest
+++ b/media-sound/abcm2ps/Manifest
@@ -1,8 +1,10 @@
 DIST abcm2ps-8.12.1.tar.gz 237316 SHA256 792eb95495f8b731d9487728a97778c7bcc2f3a389ad775e9dc0392fbb4bce60 SHA512 2cd21cdc842ef000ce8aaaac372842d0056b3df43c1741a80b4653dc584bcd1279196835917b5f16869896f3b0ad2c8f7bffaff0cf159547985607b251e37be7 WHIRLPOOL 8c572a5e0f74e624d7e39abf1871becc227ede2267b2d38a4d5b3430151472238e7c87e9fe07916615988ba544b6b4694ab64b02463ce822e08547610ca64f71
+DIST abcm2ps-8.12.3.tar.gz 237918 SHA256 d599a851b51e93659813445efe9b31177d62f779daffc9e5a67e67a5324789a6 SHA512 d64d993b94aa8faa432cb43d54d23fff84dbe4fb3caac6cd215149b7802780ba8a885410880239498331b5c980cc3f243b8cda016e0afbc836260f71b6087591 WHIRLPOOL 43dc1dd23ade129562ca0deab5f3850fb006dbb0d2b50ffec47ead9ce1f1c215b628ef1c6f45df265a10e8f097674f849c1add4b163d05ef292482b6b2505b1a
 DIST abcm2ps-8.8.4.tar.gz 238574 SHA256 961ba76372832bbff5e07eb89c8e9ff98817fa3d7f4d13b6eedd16937120937b SHA512 f139f2bd324742a23ee9db3768746792974e6e8a78e65547cec527a7b10d4bcbacf1687dd7966791910efb8ea972042031186f89913d1051d52fb46787b34229 WHIRLPOOL 11f6287d2549d9a8d804eb9c363f505385552a5a6b3c80c676214890c0fdbd874124ff2f3cf5f4e4b72d4611e2805cea8c4a45e1ad7c65cc71b8d8a1783d3ca6
 DIST transpose_abc.pl 21045 SHA256 bd6960872bfbc9f71f183f36d533ea33b8cf62a6027b447f0b0b8adfa25a2848 SHA512 dc2623608a7b59d7e0c4d25160e69f696f170e9938dc3e035edbaf6f0163b4c6139892ec8734ea2aaba997507dcf32208562e898690600dc3c199046d4d151f3 WHIRLPOOL 81e327bbd76b40826adab06f7756c79c60289b21432b792c848db3ba1354528fa4f1a074cba890b6087cfac6e712427c6cbb2c9e6679c8ced22c362f6ec005f3
 EBUILD abcm2ps-8.12.1.ebuild 935 SHA256 a4594dc8cf77389a5d9c7529e22d8ef81d7881479dd850a03ded077c9da990a2 SHA512 9aac3923c3adbedee2caf7d32a6d3095b0d1867e9f3dbe78263bb45db122c97112bfae2681fa2ec12efdcf47310e79e9bfb84aea47d06ca0a44d51acd0f33749 WHIRLPOOL d7b5883be56ee926b40f801738883259fb94d4df3c3bc22daebeb5dedcba7357bd7056b3ea9b3d1717c93b99598c9b0da9f81726e8b18ae77fb0a7e4d8990314
+EBUILD abcm2ps-8.12.3.ebuild 935 SHA256 a4594dc8cf77389a5d9c7529e22d8ef81d7881479dd850a03ded077c9da990a2 SHA512 9aac3923c3adbedee2caf7d32a6d3095b0d1867e9f3dbe78263bb45db122c97112bfae2681fa2ec12efdcf47310e79e9bfb84aea47d06ca0a44d51acd0f33749 WHIRLPOOL d7b5883be56ee926b40f801738883259fb94d4df3c3bc22daebeb5dedcba7357bd7056b3ea9b3d1717c93b99598c9b0da9f81726e8b18ae77fb0a7e4d8990314
 EBUILD abcm2ps-8.8.4.ebuild 933 SHA256 0973f839c203c5a2533e3f2da5f99d032ce31ac1355b0a998b2dd5ae1e84f1ca SHA512 a8fdc39fb6c676426a4e27f7ed2db505432805eb2500e0a1d57845258d6f00a3d724336c3dfc5af8d3b5d5373ed2ad74161ee8073bb7a909f956a5b373fddc84 WHIRLPOOL 70166ac8669f48a787f531551221dad43ada95587bef51400f11ffce8cc7ca8e881d05cac199a07574ace0c654d13885ba7f32572fd4e4f3a40e5cbbb5d0b081
-MISC ChangeLog 3231 SHA256 f73b94e931ac6d5d1ac7cbbbce407a1b886ef3b442d9fef087f90da837f53804 SHA512 2d29303569131cea9d15d3d3ca0e1981446e2cf82ad886151cb65e88a4b8e36f60b56c1d23af53871b9ee67547ae1a727ae260f8340178f5822047310cddb077 WHIRLPOOL 428ee761d4b1162734452156304e6927226856148f4df7c2be88f54852b97dbdfbb5ce8c96e965ff38736b0d5234ea0b32aaf468af0a4db186eaf18ffb4b80ba
+MISC ChangeLog 3361 SHA256 c6d18364fd1c3de2f9d526a6985c46d3328428e2210f39451c48c71064c9f4ca SHA512 860c0213fe5c5aac1f67fb2844cb1d9b933c7fa53e64d50675736883b28966f78436c82e8a2cf7e0afe5b43cefec1bdaaf05addcf6da18b5989094b3768e9c5a WHIRLPOOL 233a0b069a9728edef32ddbfe67f231f8ce4799052d77d698edcf11def0a0410b46ce241adcd5909e5efd555591fc1e2b01c2c48fb5916753fbbfe7458d087fc
 MISC ChangeLog-2015 13409 SHA256 2b7f32fd6ee644516113d38768cc93fd4281c7343cac492bbc261a1277a2f33e SHA512 9092f3c6994e567e814960ec8062836d10909d8dd6e819991e2cd0510a42d8f5b093ed3e37a21210d22d4d9484f4780a5596471aa6df5cd91883d0abf284f2d4 WHIRLPOOL bff8cbc6fbcc86fd5256c470e7338d6031494da2f20a0d593e08a1632847df11b9f8b08ee3fe47cdb2b1e0dfb5afeb6fc8aba78c1de13f7484bec90987941b57
 MISC metadata.xml 360 SHA256 9aed43a52872c6198eba7a70cb3060b69da0a4e07cdeda066f567770d91f456a SHA512 7612e5473e6185cac8f54baf6e1bc1bb75e9e6b252d2cd59ed8865c190e0fee1924cbe6e6fc79c03fedfbcf5f9228d45244483b7ec2ccd7a8bd4997c4b6893c9 WHIRLPOOL a8821135e24e8e1b3758c5735bbfebbd11e8d17831a7e6553dad460c5a2297d866234791cd69589c70074068ac7a58265e55d20bd76ec085cc0e71f813f37a21
diff --git a/media-sound/abcm2ps/abcm2ps-8.12.3.ebuild b/media-sound/abcm2ps/abcm2ps-8.12.3.ebuild
new file mode 100644
index 0000000..ab13763
--- /dev/null
+++ b/media-sound/abcm2ps/abcm2ps-8.12.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="A program to convert abc files to Postscript files"
+HOMEPAGE="http://moinejf.free.fr/"
+SRC_URI="http://moinejf.free.fr/${P}.tar.gz
+	http://moinejf.free.fr/transpose_abc.pl"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples pango"
+
+RDEPEND="pango? ( x11-libs/pango media-libs/freetype:2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--enable-a4 \
+		--enable-deco-is-roll \
+		$(use_enable pango)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin abcm2ps
+
+	insinto /usr/share/${PN}
+	doins *.fmt
+
+	dodoc Changes README *.txt
+
+	if use examples ; then
+		docinto examples
+		dodoc *.{abc,eps}
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	docinto contrib
+	dodoc "${DISTDIR}"/transpose_abc.pl
+}
diff --git a/media-sound/abcmidi/ChangeLog b/media-sound/abcmidi/ChangeLog
index 9ad5fe5..fe686ac 100644
--- a/media-sound/abcmidi/ChangeLog
+++ b/media-sound/abcmidi/ChangeLog
@@ -98,3 +98,8 @@
   19 Aug 2016; Tim Harder <radhermit@gentoo.org> +abcmidi-2016.07.20.ebuild:
   version bump to 2016.07.20
 
+*abcmidi-2016.09.20 (24 Sep 2016)
+
+  24 Sep 2016; Tim Harder <radhermit@gentoo.org> +abcmidi-2016.09.20.ebuild:
+  version bump to 2016.09.20
+
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index 9d3be01..c1b64d6 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -3,9 +3,11 @@
 DIST abcMIDI-2015-08-25.zip 665906 SHA256 614d8e7bac0d9092e08b69ec79066fe202e0dd5dd79a2d99b16e88dcda9f7c31 SHA512 2253d13611c41d2faff6393497f15dbbda583ff99093df6c368942ce2227ac22f2c0f84a33eb96ba7e6553325c6363dd9f550d432571a253f83e9a94cd0ed12b WHIRLPOOL b36e3af032f298954630e3adc25397054c4b5c2ddde42b48d2bb92736f91b8a1ad6814446d9acb8688021ea743bd2d24c532702e54c1b1e59c5dfc227561a154
 DIST abcMIDI-2016.05.05.zip 671937 SHA256 6000e11172552c3eb0194267c1acadca620514bd35e141978f85bc4ec47aa22b SHA512 c3525ea399a5b71d7d0604cb04334e07e8d92613cd62313c8500143ed776a49c45b6ee22dd251d35a690b774ec807a2a8ba4533d81d33b1c146c3233d163aba0 WHIRLPOOL 3ef0ec16df40ae1dadbbda9b78c7561f29de394b70eaba950f6a0ad1cbf0f71060b64f273fe3f40c6c58a731f380b5791e9cc9afa702558152f35d3073f4bc2b
 DIST abcMIDI-2016.07.20.zip 672095 SHA256 a5539c2c3b3b23aec75ac2b9bafa79ea26e70cc0de021096f021e47a0641e75e SHA512 414ea0386747f26e3d1dabd5960e5f46e0da26e818671bfcf31621be9a60caf41ef49069ccff021a416125cbc2fe5cb4a61d60b579b03f5d6463408a63c0522f WHIRLPOOL 3a02f8349eaf27a854534fd48555ef12d572fd0c934aa347b00453e95969952fd8854286027a286ab71d9143d1c69f8545b6b4562668bbd385ed4d9915544015
+DIST abcMIDI-2016.09.20.zip 672225 SHA256 1f42170d767dc4ded941ad00735ed7e88073237d4b10ae4f3f70d715663b7ff2 SHA512 c18942ccc4c14fd2fda7f1a3b68d745109ef3432d4fcfa28f2bd19fcc1aba7df49dc6f3bbd563f6cec921da2d88d5b8e8f32a5520f155be253c1e876da1e40a7 WHIRLPOOL 23c8e3120ea985d620a6245b3ff8fef529ed251dd22295be4066e1929cddddacc498e616a19a5a602465e8f6280d326776c886a1249966d47ed6958f6695faeb
 EBUILD abcmidi-2015.08.25.ebuild 839 SHA256 a77e06a2bdf2ec44cf596a63a12d424bef4b39b559093e5b3371cf8295acef98 SHA512 04c1a638f6a9295bf0c9e83efa97fe10d0999798983c39af41144aa096f70a76ffe93b4c12ca29c4dbb5b3184ea87bf76b1bc918a5402ebb0608171bcb5434ac WHIRLPOOL 78960e10c8f9c3f817316c714ce40564bec6a630b80af05151c0d96f5529f0f85e0fa3f6c670eea7d219677fee434a0b8253496624e7124f685099422d473f9b
 EBUILD abcmidi-2016.05.05.ebuild 794 SHA256 e3fa75b4a9ac933f6d5433cf357e67b28b93f31b60982f3e7154b77268797d7b SHA512 0fe8c3314ca4b152b33e3efbec789bba98a5c8637a4bd074990a7420f6fb7092d5b53341d8819ecf3d714768813debfccebfc646b2f493da7f7de8518415b91d WHIRLPOOL ce761d072e8c931fd063878fbaf188a546cd36b0279d230790618794ea0bce585e8c9dd0d8f0ab8a0092c1ce8e2da93ebc35bb0f11adc1e9929a5ca6ed41a04d
 EBUILD abcmidi-2016.07.20.ebuild 801 SHA256 3d28b7c03238a2bffae01552a1e2f4d7feac706723a79f82bc2d3d66f6c13e5a SHA512 e678596128e7ca3e075eed556cd168a0d5f899c966158ef7561df4714e30ad4b8ef0ca7311a857fcdb861cf2a4a1c42d705918aa870678e9f4027afc06b8b0dd WHIRLPOOL f843f2789239ae0ba2e4d61b3950efc2e47125ab2d4f4c7c545fdeb377d34fec50ebed1a37df62ae48eb8858972b05a921c77ecae5747458a0870139cb69335e
-MISC ChangeLog 3664 SHA256 2b2d918b6b54e69f752863b34a78af4e4f02a298c35ad2fc6cd24e7169c1d024 SHA512 4702ed1fddf0073cbc09653c3db949f433ff22d042042fcb28ccd00a3194683ea36f151c9f564294b1cec249221d05b2f17b9f3de3eb0c55e0aa6c0ee28dea99 WHIRLPOOL 11d2063c8e671a47c1fd873191d2b3d1191374a12d206bef87a908f022c882c622dc6eeb1b6fafefbcf42b2152ac4d79eb5fb07498c508f3d63298145ae31b1c
+EBUILD abcmidi-2016.09.20.ebuild 801 SHA256 3d28b7c03238a2bffae01552a1e2f4d7feac706723a79f82bc2d3d66f6c13e5a SHA512 e678596128e7ca3e075eed556cd168a0d5f899c966158ef7561df4714e30ad4b8ef0ca7311a857fcdb861cf2a4a1c42d705918aa870678e9f4027afc06b8b0dd WHIRLPOOL f843f2789239ae0ba2e4d61b3950efc2e47125ab2d4f4c7c545fdeb377d34fec50ebed1a37df62ae48eb8858972b05a921c77ecae5747458a0870139cb69335e
+MISC ChangeLog 3806 SHA256 42bc6309a71ffe3ca6949552a81e0fd5fc8142ac8f4311e19cbda9ed606fb7f2 SHA512 cd32b127f9b43cacf49b0a7c601537d80b189cd140a5b85768f85fe04d23501d7912e5581b57663cd3bb938b5e5dac1af34aeec4c3888c67a57b2869e74d03bd WHIRLPOOL 6eb6152ed61c3a2893b55c63f3fea090c75e1d851490174c03b13ba89ba439ab780787f46822732ce96e5542123fadccd7657e0d6584a05b5b27fd6f252cc153
 MISC ChangeLog-2015 8942 SHA256 eaebb0e8329e2be37d2750a40b5c6a32911c969934ae77dfde9ccc9f4053e91c SHA512 b3cf908c40b8b93d64ef4f0c4d787a3261e90a744f3cb5a7dc237829cc141bb2e2727c6ecce1111a94ed0e323ec49895fa6f17ca621c548475488ad4fbb03d1b WHIRLPOOL 9819d47080919e62c107480691acad5124dda6c63177164899e5aa2cae853e8d84d03d7de0f9a2fcb4cf6e5d98e2235edee9f4e08679209625c07ce403db1c2a
 MISC metadata.xml 326 SHA256 a2ccc6f3b97c41d5636859e54cb6731fcc2717c551ecb22b440116b17f5b0ddd SHA512 aad9a108325a4a1a827ba64b96ef8410017ea1f3c8db6b51660f987df26b42ce4a6f034c6df3be5c58d44fc40e80b7f4dd3900fb4ba45c448764265273741a7a WHIRLPOOL 40eacbc7470fc238963f173dc58df5d55aaf97381bc9f8a6b3ba28adb173b2bd26324b5980ebd4e95191de81cd2deb8192052c467eccd218f289ccb39a9a8acb
diff --git a/media-sound/abcmidi/abcmidi-2016.09.20.ebuild b/media-sound/abcmidi/abcmidi-2016.09.20.ebuild
new file mode 100644
index 0000000..9d2ae4c
--- /dev/null
+++ b/media-sound/abcmidi/abcmidi-2016.09.20.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools
+
+MY_P="abcMIDI-${PV}"
+DESCRIPTION="Programs for processing ABC music notation files"
+HOMEPAGE="http://ifdo.ca/~seymour/runabc/top.html"
+SRC_URI="http://ifdo.ca/~seymour/runabc/${MY_P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	local PATCHES=( "${FILESDIR}"/${PN}-2016.05.05-docs.patch )
+	default
+
+	rm configure makefile || die
+	sed -i "s:-O2::" configure.ac || die
+
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc doc/{AUTHORS,CHANGES,abcguide.txt,abcmatch.txt,history.txt,readme.txt,yapshelp.txt}
+
+	if use examples ; then
+		docinto examples
+		dodoc samples/*.abc
+	fi
+}
diff --git a/media-sound/darkice/Manifest b/media-sound/darkice/Manifest
index b01f01a..f1fdaeb 100644
--- a/media-sound/darkice/Manifest
+++ b/media-sound/darkice/Manifest
@@ -1,7 +1,7 @@
 AUX darkice-1.2-gcc47.patch 236 SHA256 bcd7e2bd9d5901e1118971c3db02ef26206198a0a850421b8c155358f7df1d16 SHA512 4f77a2694f2bb574c600edfe1d2b88dd1d9c932ff8280e8fe0739c50f5ec346c284d49ac34993e351582c1a4909b9dd380073df7a16b62b8db71c66b0f1c7326 WHIRLPOOL e90bd4880e44bef724e5ea37f4c253b0eb4b865b002cc210eaa8605c5b7a3f3aaceb61651c778a4a5fa95cb04cf59301108e445ab012d63aa482c2e8d8930a08
 DIST darkice-1.2.tar.gz 357026 SHA256 b3fba9be2d9c72f36b0659cd9ce0652c8f973b5c6498407f093da9a364fdb254 SHA512 d8959819d70eb9b44a34d087fcf3897be5e4cb23681c049f8d88e251d83dfd86b90fdd37744fe27d861dfcbb6bb6e1521b48c5c7b4967bb061ede75596f0a823 WHIRLPOOL f12ff32ce31cf508f556146baeb64860b3a698edf0836675a62c817b34fa1df499c3a281a3e2a66a1db5be3eb89d5fc91438184c998f4a7a0ad24e27fd7fea1e
 DIST darkice-1.3.tar.gz 371411 SHA256 2c0d0faaa627c0273b2ce8b38775a73ef97e34ef866862a398f660ad8f6e9de6 SHA512 710dde580005e999e9b11981affdefab6c01868710e9de29d93fb0f40db3321dfe3ab6ed2dc1887bb22ac9a0789fe1648d948f4453c92feb312f7af97c253674 WHIRLPOOL 60cb890227303468a58fa1610fec84cf878b71fbbd3f199dbe0c8ea37971340b7e3f87db2731e2186f7e5e87789b942961e12acd16dc2fac6aac6ee35e108d69
-EBUILD darkice-1.2.ebuild 1345 SHA256 cfd90962d9333eb234c89d4f3babdee09e51685db22ff8ce6ccf541ba304e4a6 SHA512 f3aefd8de779c241a3c42f29b682d0a12b566b2624373cb858f79ab329dc113a0de7d8fd7701acd11281122ca6737ba3b34c907152c16788b727a22b1094d8f8 WHIRLPOOL dbc4f0143e3e069c23a4ea8e6ce5974844f95836528fd92a65e3a09f38b1b881e83a680757d8cfa728cad4eec470c7fc1468f18d5339eaf1ada299a4c367a9f6
+EBUILD darkice-1.2.ebuild 1438 SHA256 7de31acd94fca223cf961dffb8e251a8f1d6effffe04e78c3b5a134170472c0b SHA512 b661443d2f151f72fce241320e8b7e2f503f303e4102a467823f4a60cfd57e4de35387fe9651f9856a3cab356142d562649869c56f0fec30cf8262ccf11426f4 WHIRLPOOL 353800c8a284e31930087cd5bd2bcda0282028f62ff338151825711dbc77aa27dad8b379deb9b5b493c6500675304fdf5fa893ccc51db81bfedfaebd4b994fad
 EBUILD darkice-1.3.ebuild 1316 SHA256 341234f7ad0d6bd4dc0926d360159626174583e49dcbe8d81bf98f73422c16cc SHA512 1e9480a5e6f81db9c96628d765943a390a34df4e0da5126608dff11d35569e67f6ae85296253ea4907debb79247cbc381ac0a31b00db24d43f7be39c90c44fdc WHIRLPOOL 687afcb5ace853f212d73dddabf1bb17ee129dce926a27f9ee799e7a755f1a3b6bbb8de62d63a538bf7e5bb43e151f803d7c76398a9c4dd2798a01bb77924b0b
 MISC ChangeLog 3155 SHA256 bf96939d223248862d24e91ccd7fc2f372b8a68d0d73fc1b2434d806adc5caeb SHA512 dcb3384ef26c30a449f1291676a7bc88282fd813ecb7cbedcc8e01d689d44401b4940de65883483a0790029253fa888e9d9bcdb205663106ee1a14b5b5920641 WHIRLPOOL 88e103b0987637714839e53b1f661f630ec556294d9012f0d5c438e680a2b46155a5875055ebfce2298711902f56a00bea51e8895a7467c2cc21751d9bf3183f
 MISC ChangeLog-2015 8906 SHA256 1d23ee17d82646c3d2918c01a2094929a9aea0288e37725ab496a0c82457c502 SHA512 dc84035208ca3dc4f03375f523e45d3e0b0dbd92e299c1f41ff2bfac4c5ebdf1462f284966f02fdef88c049e3d08b88fa445c2b122d63fde6880dc85102dd397 WHIRLPOOL 5e92e2d0dd4e64e25bfabd75a0b3a8cbb3e24ff0de78ab11538ae89b0b6198fbe5d0a4a73a2785161589eaec3bd3dedf341731e187b4439124d5515d1b09f40a
diff --git a/media-sound/darkice/darkice-1.2.ebuild b/media-sound/darkice/darkice-1.2.ebuild
index 5e2df69..1060f39 100644
--- a/media-sound/darkice/darkice-1.2.ebuild
+++ b/media-sound/darkice/darkice-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -26,7 +26,9 @@
 	vorbis? ( media-libs/libvorbis )"
 DEPEND="${RDEPEND}"
 
-REQUIRED_USE="|| ( aac aacplus mp3 opus twolame vorbis )
+# Version 1.2 doesn't check for opus as input codec (bug #593790).
+# This is fixed in version 1.3
+REQUIRED_USE="|| ( aac aacplus mp3 twolame vorbis )
 		|| ( alsa jack pulseaudio )"
 
 src_prepare() {
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 792519d..6ea43be 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,13 +1,11 @@
 DIST mpg123-1.18.1.tar.bz2 853423 SHA256 bc6d384f7e038f2458cb05a4d175325e5cb25e0aed441d7b02960e8ec186652d SHA512 973af5e9de67c489dd609d18234ba4118a635d63bb6f1b919f9b89f57adc4bddca9a5bf41a47f1da588f14c84ed130d8ac8e674a081f06d35f5ace85924a70b5 WHIRLPOOL 4959edd4002f021092fffb4c84d864c612b2692b8d9bfa5dd3c16ae7bcdbcf179c20f3af6609260646cb71305fe9831c7f080678783aed1af187251a1d13970c
 DIST mpg123-1.22.4.tar.bz2 870889 SHA256 5069e02e50138600f10cc5f7674e44e9bf6f1930af81d0e1d2f869b3c0ee40d2 SHA512 d8552b3522fa58647cee7c43227737993851452a15dc6d3ae6948c6c62d4a8f6064e2b284f170413aa3f805a3f3e1a6f1faac7d19daddd25c6790863e4925212 WHIRLPOOL 079ac4dacbee6bbfb915a84c1f2c5738f1edff69b75a7d1c1e6bc9b323c2e1d574985c91339c5ecab8cc0de93d72fc95c8c278676a92511da0c23d210d64a0dd
-DIST mpg123-1.23.3.tar.bz2 890370 SHA256 5c431da7e7446fae586c9207772dc0038ce2bfe75f0274a7933d1b4a7d84e6c6 SHA512 a5ebfb36223a3966386bc8e5769b8543861872d20f9de037d07857e857000f20e198e0b1db04bdc56b18b19d5b4027d8261a104af0216d6ea45274b21a18dda4 WHIRLPOOL 3d2715f45d1821bdd47b7e62dc496d85f671e66da2965f0f87cf4b885096fff4740b0b3183642b54c1ef300a9d8feac666e1acf673ef54321a25b6ab250be33e
-DIST mpg123-1.23.4.tar.bz2 892706 SHA256 3495e678dec9a60f29cbcd4fc698abc4c811ec60d1276e744f7a10ac35023b48 SHA512 12660c8f78b53d6310195cea6e24b73323aed66354665e9d4c9f1b2b2c71c5154fbbe239e3cf42a2de22fa48ba9e898e725ae46ddcb2ffc48d7fdeee1afb5862 WHIRLPOOL be2500b7237349b4cc81aa9d455c1d9939565fbd063ccc23293693ebe60e4848462085590cd1a8be1e1fd268fcb67aac3bf8d6af785d274174f27a9cf3cd5cd9
 DIST mpg123-1.23.6.tar.bz2 893351 SHA256 4073d9c60a43872f6f5a3a322f5ea21ab7f0869d2ed25e79c3eb8521fa3c32d4 SHA512 2fe11f921227c0866717c9268e7034d28a09086d96e3748188dcf41189238d8e605347f3200aa419031ca2975dc61ab9dfa51879e26f9a0d2f736a9c20089e3c WHIRLPOOL 4992224ecbf5a576e7d20ce4727cc3734ff08a261348ed114ad8225f0dd08314aa0b3b751c36aa7ddddf2f287efee968eb7d4bfbb24fde20fff9c66a7185120a
+DIST mpg123-1.23.7.tar.bz2 893054 SHA256 934047120953159e364c790e059684b681d7e670884fe179e1954d17d1c6334b SHA512 f63e8f6849447c1b3821e032908c2f7c2c78fa68869bbbb909c4ac9f8732387e5be2440e2f40e349dc103306eed56c409d4f5dd10aaea08ba18dca49a677bf2f WHIRLPOOL 66d6a14176c22202bc7e0a0dedc255b5953c68de31b72e82dcba27adffe912319d9a4b297de55b6d806b40a7fe054ffd139581e7ec1a91bdd648dbe8edf7f842
 EBUILD mpg123-1.18.1.ebuild 2876 SHA256 8c776795b23e37a39341b4a1af1b2ad442bc2753416892bdc7dd7ecfc336eefb SHA512 f492927765a2c2b67642efa0a07b78badcae2c8def7150aa198126d106cc962c2c212402c47e7a6da57f7c2b2bbb4bcc818b36c11faa8cf4a1a108c0837096d1 WHIRLPOOL bf1adf3da8e6d7c6f602d46095e9d9a7c81456fbfc7ad96eb42c3e95ae0b03bfbdc67c22a34108be734bc72b9227eb02e40dab7a04aa2dcec32aa7086a942563
 EBUILD mpg123-1.22.4.ebuild 2918 SHA256 cfdd8b4085289f06dbf9c194275a73b8a1ab84eab79f5d51ddd3994c6acd8c56 SHA512 dadb97934c957f117881a57a35d458b4da692e41b2ceed44024d30957daa41f120c6f519d4e58ea1d401a3f89c97208acb7b316501e06be4577412211e3954e1 WHIRLPOOL 7d4a0233344585aa8ac36f56b454a87baac667988b4c0cee3a6c3c30f33f2d164a57192e1ad32c348c25cb36fdc0a49e4ee81ebabdf3de986875357828f00589
-EBUILD mpg123-1.23.3.ebuild 3098 SHA256 7bbb7753d893a0d22dd26505e10da1020024a0f98922319561cfe34bc15acf26 SHA512 b79573625fedd304c8081333e9bd91020e8e92044dd3d38d896d631f0cc914fbef03bf181072926efe35f532dc8378a5585b9dd838463e25ea76fc0ae03f6c9c WHIRLPOOL 933f1bbb461e438649fd9aaf385a524ff8804baa6258c7fd7aab1eff9dc2ac0f5ca0b2fd40bc9b86e65a089b6c919fb2858282ac6563d43611a0de3ddc5069f7
-EBUILD mpg123-1.23.4.ebuild 3098 SHA256 7bbb7753d893a0d22dd26505e10da1020024a0f98922319561cfe34bc15acf26 SHA512 b79573625fedd304c8081333e9bd91020e8e92044dd3d38d896d631f0cc914fbef03bf181072926efe35f532dc8378a5585b9dd838463e25ea76fc0ae03f6c9c WHIRLPOOL 933f1bbb461e438649fd9aaf385a524ff8804baa6258c7fd7aab1eff9dc2ac0f5ca0b2fd40bc9b86e65a089b6c919fb2858282ac6563d43611a0de3ddc5069f7
 EBUILD mpg123-1.23.6.ebuild 3098 SHA256 7bbb7753d893a0d22dd26505e10da1020024a0f98922319561cfe34bc15acf26 SHA512 b79573625fedd304c8081333e9bd91020e8e92044dd3d38d896d631f0cc914fbef03bf181072926efe35f532dc8378a5585b9dd838463e25ea76fc0ae03f6c9c WHIRLPOOL 933f1bbb461e438649fd9aaf385a524ff8804baa6258c7fd7aab1eff9dc2ac0f5ca0b2fd40bc9b86e65a089b6c919fb2858282ac6563d43611a0de3ddc5069f7
+EBUILD mpg123-1.23.7.ebuild 3098 SHA256 7bbb7753d893a0d22dd26505e10da1020024a0f98922319561cfe34bc15acf26 SHA512 b79573625fedd304c8081333e9bd91020e8e92044dd3d38d896d631f0cc914fbef03bf181072926efe35f532dc8378a5585b9dd838463e25ea76fc0ae03f6c9c WHIRLPOOL 933f1bbb461e438649fd9aaf385a524ff8804baa6258c7fd7aab1eff9dc2ac0f5ca0b2fd40bc9b86e65a089b6c919fb2858282ac6563d43611a0de3ddc5069f7
 MISC ChangeLog 5959 SHA256 42d52df467cc1ab603de4ae81c88f912685e9d11b9b491a44fd33147f35ff77c SHA512 75cd27f31d6c9f4e90be8400ba65b23b884a0401662663791c633c535d7dcd2dae664f24f6e29c4d407403bd6c00d66b3efd88bd00a8b743d6c8b2bd121f3a83 WHIRLPOOL 7ce666a7baa8c54965f4915490a16d35e591451d3350f7c44d47b4a2ec66adbd25f5f38bbcc82731c3ab03a95c95b2ebbc011a25ba3ec33e125bef589a9a11fc
 MISC ChangeLog-2015 43285 SHA256 0b49de609f234bd5f9bc052cd06c3586fc103e1cd6629b6fc314b03f96a5174f SHA512 803af43862eaaf7cf696255bf78c568080c5506c3ff42d85606acddc3fc0d70f174bf3760bf40cd96e2a3c28d3126d99a9c1266ed510184ef30c2fc7d747af30 WHIRLPOOL c2ac239fe9540a463a6d6832613cf142376acf4d078f0609918397fe0a5545e7eec00176e9628db22e7aea4b459a41057da000643564c96cff7bad621c33065f
 MISC metadata.xml 525 SHA256 8f3bd14f8c41f21d6c397a7a2f2a7f32d2927b808187b48ecebbcaba6b52eed8 SHA512 06621f91056d0eb4131385dd430c15839c943d6560c59b711508064a8141020b795d0f7193f884365092332c4b3464dd0cd493e921519c9eab8b7ea4d9ce03b7 WHIRLPOOL 25b27fb06caeb3a09d54a20aafcf6f268668b112e2363bb4c9c9cc6c48cb85b0b2259f55baf2851687baa82226686f0c7a9cc01cdd44206ccfeb4b0acee5a302
diff --git a/media-sound/mpg123/mpg123-1.23.4.ebuild b/media-sound/mpg123/mpg123-1.23.4.ebuild
deleted file mode 100644
index 253e153..0000000
--- a/media-sound/mpg123/mpg123-1.23.4.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit flag-o-matic toolchain-funcs libtool multilib-minimal
-
-DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
-HOMEPAGE="http://www.mpg123.org/"
-SRC_URI="http://www.mpg123.org/download/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~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="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
-
-# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
-RDEPEND="app-eselect/eselect-mpg123
-	|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )
-	nas? ( media-libs/nas )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-soundlibs-20130224-r9
-		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
-
-pkg_setup() {
-	# Build fails without -D_GNU_SOURCE like this:
-	# error: ‘struct hostent’ has no member named ‘h_addr’
-	append-cflags -D_GNU_SOURCE
-}
-
-src_prepare() {
-	default
-	elibtoolize # for Darwin bundles
-}
-
-multilib_src_configure() {
-	local _audio=dummy
-	local _output=dummy
-	local _cpu=generic_fpu
-
-	if $(multilib_is_native_abi) ; then
-		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
-			if use ${flag}; then
-				_audio+=" ${flag/pulseaudio/pulse}"
-				_output=${flag/pulseaudio/pulse}
-			fi
-		done
-	fi
-
-	use altivec && _cpu=altivec
-
-	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
-		use cpu_flags_x86_sse && _cpu=x86-64
-	elif use x86 && gcc-specs-pie ; then
-		# Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504
-		_cpu=generic_fpu
-	elif use x86-macos ; then
-		# ASM doesn't work quite as expected with the Darwin linker
-		_cpu=generic_fpu
-	else
-		use cpu_flags_x86_mmx && _cpu=mmx
-		use cpu_flags_x86_3dnow && _cpu=3dnow
-		use cpu_flags_x86_sse && _cpu=x86
-		use cpu_flags_x86_3dnowext && _cpu=x86
-	fi
-
-	local myconf=""
-	multilib_is_native_abi || myconf="${myconf} --disable-modules"
-
-	ECONF_SOURCE="${S}" econf \
-		--with-optimization=0 \
-		--with-audio="${_audio}" \
-		--with-default-audio=${_output} \
-		--with-cpu=${_cpu} \
-		--enable-network \
-		$(use_enable ipv6) \
-		--enable-int-quality=$(usex int-quality) \
-		${myconf}
-
-	if ! $(multilib_is_native_abi) ; then
-		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	mv "${ED}"/usr/bin/mpg123{,-mpg123}
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-}
-
-pkg_postinst() {
-	eselect mpg123 update ifunset
-}
-
-pkg_postrm() {
-	eselect mpg123 update ifunset
-}
diff --git a/media-sound/mpg123/mpg123-1.23.3.ebuild b/media-sound/mpg123/mpg123-1.23.7.ebuild
similarity index 100%
rename from media-sound/mpg123/mpg123-1.23.3.ebuild
rename to media-sound/mpg123/mpg123-1.23.7.ebuild
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 5ddea21..4cb9850 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 24 Sep 2016 00:40:38 +0000
+Sun, 25 Sep 2016 00:40:38 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 5ddea21..4cb9850 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 24 Sep 2016 00:40:38 +0000
+Sun, 25 Sep 2016 00:40:38 +0000
diff --git a/metadata/md5-cache/app-accessibility/SphinxTrain-1.0.8 b/metadata/md5-cache/app-accessibility/SphinxTrain-1.0.8
index ee02449..b0e5af7 100644
--- a/metadata/md5-cache/app-accessibility/SphinxTrain-1.0.8
+++ b/metadata/md5-cache/app-accessibility/SphinxTrain-1.0.8
@@ -9,5 +9,5 @@
 RDEPEND=app-accessibility/sphinxbase dev-lang/perl >=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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)]
 SLOT=0
 SRC_URI=mirror://sourceforge/cmusphinx/sphinxtrain-1.0.8.tar.gz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
 _md5_=bbfefa4768e92cf637b386da8f526243
diff --git a/metadata/md5-cache/app-accessibility/accerciser-3.14.0 b/metadata/md5-cache/app-accessibility/accerciser-3.14.0
index 8838574..55a9cef 100644
--- a/metadata/md5-cache/app-accessibility/accerciser-3.14.0
+++ b/metadata/md5-cache/app-accessibility/accerciser-3.14.0
@@ -9,5 +9,5 @@
 RDEPEND=>=app-accessibility/at-spi2-core-2.5.2:2 >=dev-python/pygobject-2.90.3:3[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=x11-libs/gtk+-3.1.13:3[introspection] dev-libs/atk[introspection] >=dev-libs/glib-2.28:2 dev-libs/gobject-introspection >=dev-python/ipython-0.11[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pyatspi-2.1.5[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pycairo[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] x11-libs/gdk-pixbuf[introspection] x11-libs/libwnck:3[introspection] x11-libs/pango[introspection] python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 SLOT=0
 SRC_URI=mirror://gnome/sources/accerciser/3.14/accerciser-3.14.0.tar.xz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=05700f5fea408a64157126ed273a5cce
diff --git a/metadata/md5-cache/app-accessibility/brltty-5.2-r1 b/metadata/md5-cache/app-accessibility/brltty-5.2-r1
index a834cb30..9a7bb70 100644
--- a/metadata/md5-cache/app-accessibility/brltty-5.2-r1
+++ b/metadata/md5-cache/app-accessibility/brltty-5.2-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api ) tcl? ( api )
 SLOT=0
 SRC_URI=http://brltty.com/archive/brltty-5.2.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	findlib	9909e5ca0f77ff5b693885a3d7aeadb7	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	udev	73058269b3e70e34e084fa3981282338	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	findlib	9909e5ca0f77ff5b693885a3d7aeadb7	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	udev	73058269b3e70e34e084fa3981282338	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=82b56912792a9e50ba931ad9798446c6
diff --git a/metadata/md5-cache/app-accessibility/caribou-0.4.20 b/metadata/md5-cache/app-accessibility/caribou-0.4.20
index 1300ec8..c79b35a 100644
--- a/metadata/md5-cache/app-accessibility/caribou-0.4.20
+++ b/metadata/md5-cache/app-accessibility/caribou-0.4.20
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/caribou/0.4/caribou-0.4.20.tar.xz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e8ba99b7ac66e3f0b2202b605dccca06
diff --git a/metadata/md5-cache/app-accessibility/caribou-0.4.21 b/metadata/md5-cache/app-accessibility/caribou-0.4.21
index 52d5a6a..f75cce3 100644
--- a/metadata/md5-cache/app-accessibility/caribou-0.4.21
+++ b/metadata/md5-cache/app-accessibility/caribou-0.4.21
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/caribou/0.4/caribou-0.4.21.tar.xz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4e956edb901d3c0873cbcbfffd24c159
diff --git a/metadata/md5-cache/app-accessibility/orca-3.18.2 b/metadata/md5-cache/app-accessibility/orca-3.18.2
index 44892c0..21dea2a 100644
--- a/metadata/md5-cache/app-accessibility/orca-3.18.2
+++ b/metadata/md5-cache/app-accessibility/orca-3.18.2
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/orca/3.18/orca-3.18.2.tar.xz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=651fc588c024a3217c5eef7b43154ba4
diff --git a/metadata/md5-cache/app-accessibility/orca-3.20.3 b/metadata/md5-cache/app-accessibility/orca-3.20.3
index 05a9a94..b495fb4 100644
--- a/metadata/md5-cache/app-accessibility/orca-3.20.3
+++ b/metadata/md5-cache/app-accessibility/orca-3.20.3
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/orca/3.20/orca-3.20.3.tar.xz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=9b8633f4de48af2bb2327167ba5b9270
diff --git a/metadata/md5-cache/app-accessibility/orca-3.20.3-r1 b/metadata/md5-cache/app-accessibility/orca-3.20.3-r1
index e5c4e1c..134b1ae7 100644
--- a/metadata/md5-cache/app-accessibility/orca-3.20.3-r1
+++ b/metadata/md5-cache/app-accessibility/orca-3.20.3-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/orca/3.20/orca-3.20.3.tar.xz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a67bc50bc124e39faf9d24c0b2fa3577
diff --git a/metadata/md5-cache/app-accessibility/pocketsphinx-0.8 b/metadata/md5-cache/app-accessibility/pocketsphinx-0.8
index e74cdf5..4a06276 100644
--- a/metadata/md5-cache/app-accessibility/pocketsphinx-0.8
+++ b/metadata/md5-cache/app-accessibility/pocketsphinx-0.8
@@ -9,5 +9,5 @@
 RDEPEND=app-accessibility/sphinxbase media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 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(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/cmusphinx/pocketsphinx-0.8.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ba280b6e5781bc328f0134f1d4fa4cec
diff --git a/metadata/md5-cache/app-accessibility/speech-dispatcher-0.8.1 b/metadata/md5-cache/app-accessibility/speech-dispatcher-0.8.1
index 3027975..acc05ac 100644
--- a/metadata/md5-cache/app-accessibility/speech-dispatcher-0.8.1
+++ b/metadata/md5-cache/app-accessibility/speech-dispatcher-0.8.1
@@ -10,5 +10,5 @@
 REQUIRED_USE=python? ( || ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 ) )
 SLOT=0
 SRC_URI=http://www.freebsoft.org/pub/projects/speechd/speech-dispatcher-0.8.1.tar.gz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
 _md5_=922b563e9a9d1086b523f9a6e80099fa
diff --git a/metadata/md5-cache/app-accessibility/speech-dispatcher-0.8.3 b/metadata/md5-cache/app-accessibility/speech-dispatcher-0.8.3
index 016c876..eaeec5e 100644
--- a/metadata/md5-cache/app-accessibility/speech-dispatcher-0.8.3
+++ b/metadata/md5-cache/app-accessibility/speech-dispatcher-0.8.3
@@ -10,5 +10,5 @@
 REQUIRED_USE=python? ( || ( python_targets_python3_3 python_targets_python3_4 ) )
 SLOT=0
 SRC_URI=http://www.freebsoft.org/pub/projects/speechd/speech-dispatcher-0.8.3.tar.gz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
 _md5_=6279452465802bd9313c0d2a31fa488c
diff --git a/metadata/md5-cache/app-accessibility/sphinx3-0.8-r1 b/metadata/md5-cache/app-accessibility/sphinx3-0.8-r1
index c123e6f..db56743 100644
--- a/metadata/md5-cache/app-accessibility/sphinx3-0.8-r1
+++ b/metadata/md5-cache/app-accessibility/sphinx3-0.8-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/cmusphinx/sphinx3-0.8.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e5d48d14038cee73ef9be5654c421721
diff --git a/metadata/md5-cache/app-accessibility/sphinxbase-0.8 b/metadata/md5-cache/app-accessibility/sphinxbase-0.8
index 48c762b..acc5591 100644
--- a/metadata/md5-cache/app-accessibility/sphinxbase-0.8
+++ b/metadata/md5-cache/app-accessibility/sphinxbase-0.8
@@ -9,5 +9,5 @@
 RDEPEND=media-sound/pulseaudio lapack? ( virtual/lapack ) 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(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/cmusphinx/sphinxbase-0.8.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=80c25ed6af01b2bdfee60289c570585b
diff --git a/metadata/md5-cache/app-admin/abrt-2.0.12-r2 b/metadata/md5-cache/app-admin/abrt-2.0.12-r2
index 6c8e4df..4249ba3 100644
--- a/metadata/md5-cache/app-admin/abrt-2.0.12-r2
+++ b/metadata/md5-cache/app-admin/abrt-2.0.12-r2
@@ -10,5 +10,5 @@
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://fedorahosted.org/released/abrt/abrt-2.0.12.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6ddbd76acf040b7f5dc231eb2904c149
diff --git a/metadata/md5-cache/app-admin/ansible-1.9.6 b/metadata/md5-cache/app-admin/ansible-1.9.6
index 3c30cbc..590aaa2 100644
--- a/metadata/md5-cache/app-admin/ansible-1.9.6
+++ b/metadata/md5-cache/app-admin/ansible-1.9.6
@@ -11,5 +11,5 @@
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible/ansible-1.9.6.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=29f11f7b9f8bdb04b38544b27e0b2b07
diff --git a/metadata/md5-cache/app-admin/ansible-2.0.2.0-r1 b/metadata/md5-cache/app-admin/ansible-2.0.2.0-r1
index 5e10a0e..9cdccebe 100644
--- a/metadata/md5-cache/app-admin/ansible-2.0.2.0-r1
+++ b/metadata/md5-cache/app-admin/ansible-2.0.2.0-r1
@@ -11,5 +11,5 @@
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pypi.python.org/packages/b3/0e/5f3ee8884866a3d5e3b8ba86e9caa85ecdec75adabac8924b1c122339e7f/ansible-2.0.2.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=32e7f6bb46aba6c53e25f083b0dc9279
diff --git a/metadata/md5-cache/app-admin/ansible-2.1.0.0 b/metadata/md5-cache/app-admin/ansible-2.1.0.0
index 8992e93..fd98b3b 100644
--- a/metadata/md5-cache/app-admin/ansible-2.1.0.0
+++ b/metadata/md5-cache/app-admin/ansible-2.1.0.0
@@ -11,5 +11,5 @@
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pypi.python.org/packages/26/6e/3974858f047641de6ceffad0f51ab7cafa5f2c09d1474c6221ec96434f58/ansible-2.1.0.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1e4416dd2579983c0bc3ecbce8079595
diff --git a/metadata/md5-cache/app-admin/ansible-2.1.1.0 b/metadata/md5-cache/app-admin/ansible-2.1.1.0
index fd35ff1..9d5a402 100644
--- a/metadata/md5-cache/app-admin/ansible-2.1.1.0
+++ b/metadata/md5-cache/app-admin/ansible-2.1.1.0
@@ -11,5 +11,5 @@
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pypi.python.org/packages/26/7c/4c717d39afac30bc324744a35fda077c969d3881daf71d396969958e01b7/ansible-2.1.1.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=459c1c171c129a1f31841c205aa17f46
diff --git a/metadata/md5-cache/app-admin/ansible-9999 b/metadata/md5-cache/app-admin/ansible-9999
index 2ff5e63..1c09c18 100644
--- a/metadata/md5-cache/app-admin/ansible-9999
+++ b/metadata/md5-cache/app-admin/ansible-9999
@@ -8,5 +8,5 @@
 RDEPEND=keyczar? ( dev-python/keyczar[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/sshpass virtual/ssh 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
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=03509932e357e9bb835dcf81a20efc99
diff --git a/metadata/md5-cache/app-admin/bcfg2-1.2.4-r1 b/metadata/md5-cache/app-admin/bcfg2-1.2.4-r1
index e0eb940..835d702 100644
--- a/metadata/md5-cache/app-admin/bcfg2-1.2.4-r1
+++ b/metadata/md5-cache/app-admin/bcfg2-1.2.4-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-1.2.4.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=dce80cf9ecbb785b218c32e0d5e7d28a
diff --git a/metadata/md5-cache/app-admin/calamares-2.3 b/metadata/md5-cache/app-admin/calamares-2.3
index 73715af..1d08567 100644
--- a/metadata/md5-cache/app-admin/calamares-2.3
+++ b/metadata/md5-cache/app-admin/calamares-2.3
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=5
 SRC_URI=https://github.com/calamares/calamares/releases/download/v2.3/calamares-2.3.tar.gz
-_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	e93658f249f8a4533bec25fd7b32155c	kde5-functions	88f6106f109af6607cdcec5d3fa5ce69	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	e93658f249f8a4533bec25fd7b32155c	kde5-functions	88f6106f109af6607cdcec5d3fa5ce69	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=25c420f9ccead841a954f5343fda04e7
diff --git a/metadata/md5-cache/app-admin/calamares-2.4 b/metadata/md5-cache/app-admin/calamares-2.4
index bd58c57..42f41ce 100644
--- a/metadata/md5-cache/app-admin/calamares-2.4
+++ b/metadata/md5-cache/app-admin/calamares-2.4
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=5
 SRC_URI=https://github.com/calamares/calamares/releases/download/v2.4/calamares-2.4.tar.gz
-_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	e93658f249f8a4533bec25fd7b32155c	kde5-functions	88f6106f109af6607cdcec5d3fa5ce69	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	e93658f249f8a4533bec25fd7b32155c	kde5-functions	88f6106f109af6607cdcec5d3fa5ce69	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=25c420f9ccead841a954f5343fda04e7
diff --git a/metadata/md5-cache/app-admin/cdist-3.1.13 b/metadata/md5-cache/app-admin/cdist-3.1.13
index ed9087d..7c9c01c 100644
--- a/metadata/md5-cache/app-admin/cdist-3.1.13
+++ b/metadata/md5-cache/app-admin/cdist-3.1.13
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cdist/cdist-3.1.13.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3729942650dded021be72aa57bd7eee3
diff --git a/metadata/md5-cache/app-admin/cdist-3.1.9 b/metadata/md5-cache/app-admin/cdist-3.1.9
index 15c42f4..47645e1 100644
--- a/metadata/md5-cache/app-admin/cdist-3.1.9
+++ b/metadata/md5-cache/app-admin/cdist-3.1.9
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cdist/cdist-3.1.9.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3729942650dded021be72aa57bd7eee3
diff --git a/metadata/md5-cache/app-admin/checkrestart-0.47-r3 b/metadata/md5-cache/app-admin/checkrestart-0.47-r3
index 4393550..f1e2a07 100644
--- a/metadata/md5-cache/app-admin/checkrestart-0.47-r3
+++ b/metadata/md5-cache/app-admin/checkrestart-0.47-r3
@@ -9,5 +9,5 @@
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://arcdraco.net/~dragon/checkrestart-0.47-sep.tar.bz2
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
 _md5_=c907b72db8cff7cec8e234bfdcbc7263
diff --git a/metadata/md5-cache/app-admin/checkrestart-0.47-r4 b/metadata/md5-cache/app-admin/checkrestart-0.47-r4
index c579d5c..0b40428 100644
--- a/metadata/md5-cache/app-admin/checkrestart-0.47-r4
+++ b/metadata/md5-cache/app-admin/checkrestart-0.47-r4
@@ -9,5 +9,5 @@
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://arcdraco.net/~dragon/checkrestart-0.47-sep.tar.bz2
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
 _md5_=ab2ae56f14071c7943307d465e8b98db
diff --git a/metadata/md5-cache/app-admin/clustershell-1.6 b/metadata/md5-cache/app-admin/clustershell-1.6
index 4f69e88..a92d6f5 100644
--- a/metadata/md5-cache/app-admin/clustershell-1.6
+++ b/metadata/md5-cache/app-admin/clustershell-1.6
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/cea-hpc/clustershell/archive/v1.6.tar.gz -> clustershell-1.6.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5265a0881e5b45e1e7862c03c462ad3e
diff --git a/metadata/md5-cache/app-admin/clustershell-1.6-r1 b/metadata/md5-cache/app-admin/clustershell-1.6-r1
index 5b1df79..b3360aa 100644
--- a/metadata/md5-cache/app-admin/clustershell-1.6-r1
+++ b/metadata/md5-cache/app-admin/clustershell-1.6-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/cea-hpc/clustershell/archive/v1.6.tar.gz -> clustershell-1.6.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=de260205c7a19a0bff97a68e52ea1f92
diff --git a/metadata/md5-cache/app-admin/collectd-5.5.2 b/metadata/md5-cache/app-admin/collectd-5.5.2
index f6e5ec6..c45223c 100644
--- a/metadata/md5-cache/app-admin/collectd-5.5.2
+++ b/metadata/md5-cache/app-admin/collectd-5.5.2
@@ -10,5 +10,5 @@
 REQUIRED_USE=collectd_plugins_genericjmx? ( java ) collectd_plugins_java? ( java ) collectd_plugins_python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) 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 ) ) collectd_plugins_smart? ( udev )
 SLOT=0
 SRC_URI=http://collectd.org//files/collectd-5.5.2.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	fcaps	6a1091a98b1dde01cc26ab3252da1a9b	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	libtool	4890219c51da247200223277f993e054	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	165fc17c38d1b11dac2008280dab6e80	perl-functions	aac50de73be0a80ebe780e0b20850130	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	fcaps	6a1091a98b1dde01cc26ab3252da1a9b	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	libtool	4890219c51da247200223277f993e054	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	165fc17c38d1b11dac2008280dab6e80	perl-functions	aac50de73be0a80ebe780e0b20850130	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=41845db2ec62e885dbdcb09481f725e9
diff --git a/metadata/md5-cache/app-admin/collectd-5.6.0 b/metadata/md5-cache/app-admin/collectd-5.6.0
index e266a96..11047e4 100644
--- a/metadata/md5-cache/app-admin/collectd-5.6.0
+++ b/metadata/md5-cache/app-admin/collectd-5.6.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=collectd_plugins_python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) 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 ) ) collectd_plugins_smart? ( udev )
 SLOT=0
 SRC_URI=https://collectd.org//files/collectd-5.6.0.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	fcaps	6a1091a98b1dde01cc26ab3252da1a9b	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	libtool	4890219c51da247200223277f993e054	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	165fc17c38d1b11dac2008280dab6e80	perl-functions	aac50de73be0a80ebe780e0b20850130	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	fcaps	6a1091a98b1dde01cc26ab3252da1a9b	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	libtool	4890219c51da247200223277f993e054	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	165fc17c38d1b11dac2008280dab6e80	perl-functions	aac50de73be0a80ebe780e0b20850130	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7456f16584d3e840ce4b91ec9e758f69
diff --git a/metadata/md5-cache/app-admin/conkyforecast-2.24-r1 b/metadata/md5-cache/app-admin/conkyforecast-2.24-r1
index 58c28ef..2ef3e46 100644
--- a/metadata/md5-cache/app-admin/conkyforecast-2.24-r1
+++ b/metadata/md5-cache/app-admin/conkyforecast-2.24-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://launchpad.net/~conky-companions/+archive/ppa/+files/conkyforecast_2.24.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2ea70a2c00dbbd28cf83ce41b0fd44e4
diff --git a/metadata/md5-cache/app-admin/denyhosts-2.9 b/metadata/md5-cache/app-admin/denyhosts-2.9
index 56139a1..9744adf 100644
--- a/metadata/md5-cache/app-admin/denyhosts-2.9
+++ b/metadata/md5-cache/app-admin/denyhosts-2.9
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/denyhosts/denyhosts/archive/v2.9.tar.gz -> denyhosts-2.9.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8dbebb47a25d9bfe63eba0bc9a30bf61
diff --git a/metadata/md5-cache/app-admin/denyhosts-3.0 b/metadata/md5-cache/app-admin/denyhosts-3.0
index ef31f95..97b51cc 100644
--- a/metadata/md5-cache/app-admin/denyhosts-3.0
+++ b/metadata/md5-cache/app-admin/denyhosts-3.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/denyhosts/denyhosts/archive/v3.0.tar.gz -> denyhosts-3.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4a0d4622ab031612c52cfe2b3ae978aa
diff --git a/metadata/md5-cache/app-admin/denyhosts-3.0-r1 b/metadata/md5-cache/app-admin/denyhosts-3.0-r1
index fc3abec..cb0a1f0 100644
--- a/metadata/md5-cache/app-admin/denyhosts-3.0-r1
+++ b/metadata/md5-cache/app-admin/denyhosts-3.0-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/denyhosts/denyhosts/archive/v3.0.tar.gz -> denyhosts-3.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ee10571ef302a5b1a14c3b576b8b8482
diff --git a/metadata/md5-cache/app-admin/diamond-4.0-r1 b/metadata/md5-cache/app-admin/diamond-4.0-r1
index 0fdc639..7552fc7 100644
--- a/metadata/md5-cache/app-admin/diamond-4.0-r1
+++ b/metadata/md5-cache/app-admin/diamond-4.0-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/python-diamond/Diamond/archive/v4.0.tar.gz -> python-diamond-4.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=30edef31dd763ac573b9ba9d15c7c210
diff --git a/metadata/md5-cache/app-admin/diamond-9999 b/metadata/md5-cache/app-admin/diamond-9999
index aba0dae..bcadb42 100644
--- a/metadata/md5-cache/app-admin/diamond-9999
+++ b/metadata/md5-cache/app-admin/diamond-9999
@@ -8,5 +8,5 @@
 RDEPEND=dev-python/configobj dev-python/setproctitle mongo? ( dev-python/pymongo ) mysql? ( dev-python/mysql-python ) snmp? ( dev-python/pysnmp ) redis? ( dev-python/redis-py ) !kernel_linux? ( >=dev-python/psutil-3 ) 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
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=955ca1af410fca5a0bd93323e3001969
diff --git a/metadata/md5-cache/app-admin/drush-6.7.0 b/metadata/md5-cache/app-admin/drush-6.7.0
index 0e7e73d..86b9d5e 100644
--- a/metadata/md5-cache/app-admin/drush-6.7.0
+++ b/metadata/md5-cache/app-admin/drush-6.7.0
@@ -2,10 +2,10 @@
 DESCRIPTION=Command line shell and scripting interface for Drupal
 EAPI=5
 HOMEPAGE=https://github.com/drush-ops/drush
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/php[cli,ctype,json,simplexml] dev-php/PEAR-Console_Table
 SLOT=0
 SRC_URI=https://github.com/drush-ops/drush/archive/6.7.0.tar.gz -> drush-6.7.0.tar.gz
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=6ca3485b80c33b6427091d5f3ea296f6
+_md5_=445a834999b866452b38dd1cc1e474dc
diff --git a/metadata/md5-cache/app-admin/eclean-kernel-0.4 b/metadata/md5-cache/app-admin/eclean-kernel-0.4
index 9589471..5276e6c 100644
--- a/metadata/md5-cache/app-admin/eclean-kernel-0.4
+++ b/metadata/md5-cache/app-admin/eclean-kernel-0.4
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_3 )
 SLOT=0
 SRC_URI=https://www.bitbucket.org/mgorny/eclean-kernel/downloads/eclean-kernel-0.4.tar.bz2
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=214ec5d703c31d65046b50fa0ec391dd
diff --git a/metadata/md5-cache/app-admin/eclean-kernel-0.4.1 b/metadata/md5-cache/app-admin/eclean-kernel-0.4.1
index f928dac..8366bc4 100644
--- a/metadata/md5-cache/app-admin/eclean-kernel-0.4.1
+++ b/metadata/md5-cache/app-admin/eclean-kernel-0.4.1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://www.bitbucket.org/mgorny/eclean-kernel/downloads/eclean-kernel-0.4.1.tar.bz2
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b19fd4b4b6ba2c5c3f02fd5afe8efddd
diff --git a/metadata/md5-cache/app-admin/eclean-kernel-0.4.2 b/metadata/md5-cache/app-admin/eclean-kernel-0.4.2
index a8e79d5..dfe7459 100644
--- a/metadata/md5-cache/app-admin/eclean-kernel-0.4.2
+++ b/metadata/md5-cache/app-admin/eclean-kernel-0.4.2
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://www.bitbucket.org/mgorny/eclean-kernel/downloads/eclean-kernel-0.4.2.tar.bz2
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b19fd4b4b6ba2c5c3f02fd5afe8efddd
diff --git a/metadata/md5-cache/app-admin/equo-302 b/metadata/md5-cache/app-admin/equo-302
index 3c419d8..209b51a 100644
--- a/metadata/md5-cache/app-admin/equo-302
+++ b/metadata/md5-cache/app-admin/equo-302
@@ -10,5 +10,5 @@
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sabayon/sys-apps/entropy-302.tar.bz2
-_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
 _md5_=ba383a261834b296a27483a70735dfd0
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.5.0 b/metadata/md5-cache/app-admin/github-backup-utils-2.5.0
index 9287984..f9dd433 100644
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.5.0
+++ b/metadata/md5-cache/app-admin/github-backup-utils-2.5.0
@@ -9,5 +9,5 @@
 RDEPEND=net-misc/rsync
 SLOT=0
 SRC_URI=https://github.com/github/backup-utils/archive/v2.5.0.tar.gz -> github-backup-utils-2.5.0.tar.gz
-_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
 _md5_=e4fbe42cb7880d5a31ccfd5d927c0a94
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.6.0 b/metadata/md5-cache/app-admin/github-backup-utils-2.6.0
index c4a4d8a..d1f02c1 100644
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.6.0
+++ b/metadata/md5-cache/app-admin/github-backup-utils-2.6.0
@@ -9,5 +9,5 @@
 RDEPEND=net-misc/rsync
 SLOT=0
 SRC_URI=https://github.com/github/backup-utils/archive/v2.6.0.tar.gz -> github-backup-utils-2.6.0.tar.gz
-_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
 _md5_=e4fbe42cb7880d5a31ccfd5d927c0a94
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.6.3 b/metadata/md5-cache/app-admin/github-backup-utils-2.6.3
index 4c06328..b5cebda 100644
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.6.3
+++ b/metadata/md5-cache/app-admin/github-backup-utils-2.6.3
@@ -9,5 +9,5 @@
 RDEPEND=net-misc/rsync
 SLOT=0
 SRC_URI=https://github.com/github/backup-utils/archive/v2.6.3.tar.gz -> github-backup-utils-2.6.3.tar.gz
-_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
 _md5_=e4fbe42cb7880d5a31ccfd5d927c0a94
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.6.4 b/metadata/md5-cache/app-admin/github-backup-utils-2.6.4
index 5ef5fba..9fdf663 100644
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.6.4
+++ b/metadata/md5-cache/app-admin/github-backup-utils-2.6.4
@@ -9,5 +9,5 @@
 RDEPEND=net-misc/rsync
 SLOT=0
 SRC_URI=https://github.com/github/backup-utils/archive/v2.6.4.tar.gz -> github-backup-utils-2.6.4.tar.gz
-_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
 _md5_=e4fbe42cb7880d5a31ccfd5d927c0a94
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.7.0 b/metadata/md5-cache/app-admin/github-backup-utils-2.7.0
index 96a45dc..6f4034c 100644
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.7.0
+++ b/metadata/md5-cache/app-admin/github-backup-utils-2.7.0
@@ -9,5 +9,5 @@
 RDEPEND=net-misc/rsync
 SLOT=0
 SRC_URI=https://github.com/github/backup-utils/archive/v2.7.0.tar.gz -> github-backup-utils-2.7.0.tar.gz
-_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
 _md5_=e4fbe42cb7880d5a31ccfd5d927c0a94
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.7.0-r1 b/metadata/md5-cache/app-admin/github-backup-utils-2.7.0-r1
index 17dddd9..21a162e 100644
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.7.0-r1
+++ b/metadata/md5-cache/app-admin/github-backup-utils-2.7.0-r1
@@ -9,5 +9,5 @@
 RDEPEND=net-misc/rsync
 SLOT=0
 SRC_URI=https://github.com/github/backup-utils/archive/v2.7.0.tar.gz -> github-backup-utils-2.7.0.tar.gz
-_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
 _md5_=261af0d492e0a76ec65bca4c5296bd10
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.7.1 b/metadata/md5-cache/app-admin/github-backup-utils-2.7.1
index 4aac2e3..e9e3242 100644
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.7.1
+++ b/metadata/md5-cache/app-admin/github-backup-utils-2.7.1
@@ -9,5 +9,5 @@
 RDEPEND=net-misc/rsync
 SLOT=0
 SRC_URI=https://github.com/github/backup-utils/archive/v2.7.1.tar.gz -> github-backup-utils-2.7.1.tar.gz
-_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
 _md5_=261af0d492e0a76ec65bca4c5296bd10
diff --git a/metadata/md5-cache/app-admin/glance-12.0.0 b/metadata/md5-cache/app-admin/glance-12.0.0
index ce0b5b3d..5ff54e7 100644
--- a/metadata/md5-cache/app-admin/glance-12.0.0
+++ b/metadata/md5-cache/app-admin/glance-12.0.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/glance/glance-12.0.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7871cb0e50558853e2251f8fd837c99a
diff --git a/metadata/md5-cache/app-admin/glance-2016.1.9999 b/metadata/md5-cache/app-admin/glance-2016.1.9999
index 9b566b0..e265bcd 100644
--- a/metadata/md5-cache/app-admin/glance-2016.1.9999
+++ b/metadata/md5-cache/app-admin/glance-2016.1.9999
@@ -8,5 +8,5 @@
 RDEPEND=>=dev-python/pbr-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) postgres? ( dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-3.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-concurrency-3.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-service-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-3.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/futurist-0.11.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/taskflow-1.16.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keystoneauth-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keystonemiddleware-4.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/keystonemiddleware-4.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/WSME-0.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/prettytable-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/prettytable-0.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/jsonschema-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/python-keystoneclient-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/python-keystoneclient-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-db-4.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-messaging-4.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-policy-0.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/osprofiler-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/glance_store-0.13.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/semantic_version-2.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/castellan-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/cryptography-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/monotonic-0.6[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=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5119b37845d3d102dd98832b6f3723c5
diff --git a/metadata/md5-cache/app-admin/kedpm-0.4.0-r2 b/metadata/md5-cache/app-admin/kedpm-0.4.0-r2
index c8d925f..67e9887 100644
--- a/metadata/md5-cache/app-admin/kedpm-0.4.0-r2
+++ b/metadata/md5-cache/app-admin/kedpm-0.4.0-r2
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/kedpm/kedpm-0.4.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=de48d585557ab5b438bf388d38162316
diff --git a/metadata/md5-cache/app-admin/lib_users-0.9 b/metadata/md5-cache/app-admin/lib_users-0.9
index 3b35ac6..31096da 100644
--- a/metadata/md5-cache/app-admin/lib_users-0.9
+++ b/metadata/md5-cache/app-admin/lib_users-0.9
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=http://schwarzvogel.de/pkgs/lib_users-0.9.tar.gz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
 _md5_=61e60f82a2ea6730a3e832cd5fc9e23a
diff --git a/metadata/md5-cache/app-admin/lib_users-0.9-r1 b/metadata/md5-cache/app-admin/lib_users-0.9-r1
index c5557ad..608772e 100644
--- a/metadata/md5-cache/app-admin/lib_users-0.9-r1
+++ b/metadata/md5-cache/app-admin/lib_users-0.9-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=http://schwarzvogel.de/pkgs/lib_users-0.9.tar.gz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
 _md5_=8a9348391a95e609cf139ed86862e1da
diff --git a/metadata/md5-cache/app-admin/matter-302 b/metadata/md5-cache/app-admin/matter-302
index e3271bc..e524394 100644
--- a/metadata/md5-cache/app-admin/matter-302
+++ b/metadata/md5-cache/app-admin/matter-302
@@ -9,5 +9,5 @@
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sabayon/sys-apps/entropy-302.tar.bz2
-_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
 _md5_=c47df79db964b70cb8716bb15703cd4a
diff --git a/metadata/md5-cache/app-admin/ngxtop-0.0.2-r1 b/metadata/md5-cache/app-admin/ngxtop-0.0.2-r1
index d64ab0f..8735013 100644
--- a/metadata/md5-cache/app-admin/ngxtop-0.0.2-r1
+++ b/metadata/md5-cache/app-admin/ngxtop-0.0.2-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/lebinh/ngxtop/archive/0.0.2.tar.gz -> ngxtop-0.0.2.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=9f2a129155be705a52721a2639f6a3b7
diff --git a/metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201 b/metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201
index 10ba4a9..720b33e 100644
--- a/metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201
+++ b/metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/ngxtop-0.0.3_pre141201.tar.xz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2775a45116608efcc8b5328f42d4a95c
diff --git a/metadata/md5-cache/app-admin/packagekit-base-0.8.15-r1 b/metadata/md5-cache/app-admin/packagekit-base-0.8.15-r1
index de445a2..c075fcb 100644
--- a/metadata/md5-cache/app-admin/packagekit-base-0.8.15-r1
+++ b/metadata/md5-cache/app-admin/packagekit-base-0.8.15-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://www.packagekit.org/releases/PackageKit-0.8.15.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	mozextension	3d8ee4835f89ff39d4666656aa603433	multilib	165fc17c38d1b11dac2008280dab6e80	nsplugins	bf5bfcef1d2f0adad7e6230455df8e91	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	mozextension	3d8ee4835f89ff39d4666656aa603433	multilib	165fc17c38d1b11dac2008280dab6e80	nsplugins	bf5bfcef1d2f0adad7e6230455df8e91	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=66748640701df9d3dae0e5fdcd653f47
diff --git a/metadata/md5-cache/app-admin/packagekit-base-1.0.11 b/metadata/md5-cache/app-admin/packagekit-base-1.0.11
index aa84245..48d8141 100644
--- a/metadata/md5-cache/app-admin/packagekit-base-1.0.11
+++ b/metadata/md5-cache/app-admin/packagekit-base-1.0.11
@@ -11,5 +11,5 @@
 RESTRICT=test
 SLOT=0/18
 SRC_URI=https://www.freedesktop.org/software/PackageKit/releases/PackageKit-1.0.11.tar.xz
-_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	mozextension	3d8ee4835f89ff39d4666656aa603433	multilib	165fc17c38d1b11dac2008280dab6e80	nsplugins	bf5bfcef1d2f0adad7e6230455df8e91	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	vala	764817a25b405b65269d8619e203a52f	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	mozextension	3d8ee4835f89ff39d4666656aa603433	multilib	165fc17c38d1b11dac2008280dab6e80	nsplugins	bf5bfcef1d2f0adad7e6230455df8e91	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	vala	764817a25b405b65269d8619e203a52f	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=aad4ed0c85275fb9417d03aed05e87cd
diff --git a/metadata/md5-cache/app-admin/packagekit-base-1.1.1 b/metadata/md5-cache/app-admin/packagekit-base-1.1.1
index 1ac5449..d422176 100644
--- a/metadata/md5-cache/app-admin/packagekit-base-1.1.1
+++ b/metadata/md5-cache/app-admin/packagekit-base-1.1.1
@@ -10,5 +10,5 @@
 REQUIRED_USE=python_targets_python2_7 vala? ( introspection )
 SLOT=0/18
 SRC_URI=https://www.freedesktop.org/software/PackageKit/releases/PackageKit-1.1.1.tar.xz
-_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	vala	764817a25b405b65269d8619e203a52f
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	vala	764817a25b405b65269d8619e203a52f
 _md5_=02077414e413877bf4aca01e6746ed4a
diff --git a/metadata/md5-cache/app-admin/puppetserver-2.4.0 b/metadata/md5-cache/app-admin/puppetserver-2.4.0
index 4eb9a2d..92efba1 100644
--- a/metadata/md5-cache/app-admin/puppetserver-2.4.0
+++ b/metadata/md5-cache/app-admin/puppetserver-2.4.0
@@ -4,10 +4,10 @@
 EAPI=5
 HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
 IUSE=puppetdb
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.7.0 app-admin/puppet-agent[puppetdb?]
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-2.4.0.tar.gz
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=594b0a77514233a63676bb164d520f03
+_md5_=3fd7ae2da64123757ed69a320a6133c7
diff --git a/metadata/md5-cache/app-admin/pydf-12 b/metadata/md5-cache/app-admin/pydf-12
index ec82898..2073a09 100644
--- a/metadata/md5-cache/app-admin/pydf-12
+++ b/metadata/md5-cache/app-admin/pydf-12
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=http://kassiopeia.juls.savba.sk/~garabik/software/pydf/pydf_12.tar.gz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
 _md5_=fb88421674c8c4185be71691e8574d1b
diff --git a/metadata/md5-cache/app-admin/pydf-12-r1 b/metadata/md5-cache/app-admin/pydf-12-r1
index 0ee9541..f4392b6 100644
--- a/metadata/md5-cache/app-admin/pydf-12-r1
+++ b/metadata/md5-cache/app-admin/pydf-12-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=http://kassiopeia.juls.savba.sk/~garabik/software/pydf/pydf_12.tar.gz
-_eclasses_=multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_eclasses_=multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
 _md5_=812b9bf52a2871e68455286cd288b457
diff --git a/metadata/md5-cache/app-admin/salt-2015.5.10 b/metadata/md5-cache/app-admin/salt-2015.5.10
index 654a605..917f8d4 100644
--- a/metadata/md5-cache/app-admin/salt-2015.5.10
+++ b/metadata/md5-cache/app-admin/salt-2015.5.10
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( raet zeromq ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-2015.5.10.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c79d64bc11e70d32278812d89fdc2ee1
diff --git a/metadata/md5-cache/app-admin/salt-2015.8.10 b/metadata/md5-cache/app-admin/salt-2015.8.10
index d0c152d..0dcbe0c 100644
--- a/metadata/md5-cache/app-admin/salt-2015.8.10
+++ b/metadata/md5-cache/app-admin/salt-2015.8.10
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( raet zeromq ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-2015.8.10.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8cb0caaab2c48d216fbd26cce135bbc2
diff --git a/metadata/md5-cache/app-admin/salt-2015.8.11 b/metadata/md5-cache/app-admin/salt-2015.8.11
index e263393..8bed76f 100644
--- a/metadata/md5-cache/app-admin/salt-2015.8.11
+++ b/metadata/md5-cache/app-admin/salt-2015.8.11
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( raet zeromq ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-2015.8.11.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8cb0caaab2c48d216fbd26cce135bbc2
diff --git a/metadata/md5-cache/app-admin/salt-2015.8.12 b/metadata/md5-cache/app-admin/salt-2015.8.12
index 3a2bf77..0167cf8 100644
--- a/metadata/md5-cache/app-admin/salt-2015.8.12
+++ b/metadata/md5-cache/app-admin/salt-2015.8.12
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( raet zeromq ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-2015.8.12.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=9ab8da5f7f64432143193791343b5409
diff --git a/metadata/md5-cache/app-admin/salt-2015.8.8 b/metadata/md5-cache/app-admin/salt-2015.8.8
index 227c800..01613c9 100644
--- a/metadata/md5-cache/app-admin/salt-2015.8.8
+++ b/metadata/md5-cache/app-admin/salt-2015.8.8
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( raet zeromq ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-2015.8.8.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6b10129019187ae2865544d1a50fce06
diff --git a/metadata/md5-cache/app-admin/salt-2016.3.1 b/metadata/md5-cache/app-admin/salt-2016.3.1
index 038554a..4cdc52e 100644
--- a/metadata/md5-cache/app-admin/salt-2016.3.1
+++ b/metadata/md5-cache/app-admin/salt-2016.3.1
@@ -11,5 +11,5 @@
 RESTRICT=x86? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-2016.3.1.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c3cbf4333b68a771c5e8fb35d4b2c759
diff --git a/metadata/md5-cache/app-admin/salt-2016.3.2 b/metadata/md5-cache/app-admin/salt-2016.3.2
index 973b0f6..e64c590 100644
--- a/metadata/md5-cache/app-admin/salt-2016.3.2
+++ b/metadata/md5-cache/app-admin/salt-2016.3.2
@@ -11,5 +11,5 @@
 RESTRICT=x86? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-2016.3.2.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=34b99edbd20fdd1790565c42ad5323e1
diff --git a/metadata/md5-cache/app-admin/salt-2016.3.3 b/metadata/md5-cache/app-admin/salt-2016.3.3
index b0fb5fb..47d87ff 100644
--- a/metadata/md5-cache/app-admin/salt-2016.3.3
+++ b/metadata/md5-cache/app-admin/salt-2016.3.3
@@ -11,5 +11,5 @@
 RESTRICT=x86? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-2016.3.3.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=31a7508db89b81c6bd501836c3e070d4
diff --git a/metadata/md5-cache/app-admin/salt-9999 b/metadata/md5-cache/app-admin/salt-9999
index 85d2d11..bd5143a 100644
--- a/metadata/md5-cache/app-admin/salt-9999
+++ b/metadata/md5-cache/app-admin/salt-9999
@@ -8,5 +8,5 @@
 RDEPEND=sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=www-servers/tornado-4.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-libs/openssl:*[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) profile? ( dev-python/yappi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) vim-syntax? ( app-vim/salt-vim ) 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=|| ( raet zeromq ) || ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=eb6332bf64b563deb82f52bcc7503d7d
diff --git a/metadata/md5-cache/app-admin/setools-3.3.8-r7 b/metadata/md5-cache/app-admin/setools-3.3.8-r7
index 907ec77..5e2ac01 100644
--- a/metadata/md5-cache/app-admin/setools-3.3.8-r7
+++ b/metadata/md5-cache/app-admin/setools-3.3.8-r7
@@ -10,5 +10,5 @@
 RESTRICT=test
 SLOT=0
 SRC_URI=http://oss.tresys.com/projects/setools/chrome/site/dists/setools-3.3.8/setools-3.3.8.tar.bz2 https://dev.gentoo.org/~perfinion/patches/setools/setools-3.3.8-04-gentoo-patches.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=15340b9d273dd2d517ddde1c0d786e31
diff --git a/metadata/md5-cache/app-admin/setools-4.0.1 b/metadata/md5-cache/app-admin/setools-4.0.1
index 16e3400..5a19039 100644
--- a/metadata/md5-cache/app-admin/setools-4.0.1
+++ b/metadata/md5-cache/app-admin/setools-4.0.1
@@ -9,5 +9,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/TresysTechnology/setools/archive/4.0.1.tar.gz -> setools-4.0.1.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1afed886fcbe72521d75ddfff8323fb5
diff --git a/metadata/md5-cache/app-admin/setools-9999 b/metadata/md5-cache/app-admin/setools-9999
index 77f7376..cd05b78 100644
--- a/metadata/md5-cache/app-admin/setools-9999
+++ b/metadata/md5-cache/app-admin/setools-9999
@@ -8,5 +8,5 @@
 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(-)] >=sys-libs/libselinux-2.4:=[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/networkx-1.8[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(-)] app-arch/bzip2:= dev-libs/libpcre:= X? ( dev-python/PyQt5 ) 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
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=996d658acdd7450c4f843f66c152f671
diff --git a/metadata/md5-cache/app-admin/supernova-2.0.9 b/metadata/md5-cache/app-admin/supernova-2.0.9
index 7d3b560..88f9b2a 100644
--- a/metadata/md5-cache/app-admin/supernova-2.0.9
+++ b/metadata/md5-cache/app-admin/supernova-2.0.9
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/supernova/supernova-2.0.9.tar.gz
-_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6e80e13714f03d2d6e05232b346b49e8
diff --git a/metadata/md5-cache/app-admin/supernova-2.1.0 b/metadata/md5-cache/app-admin/supernova-2.1.0
index 99958fc..fd48075b 100644
--- a/metadata/md5-cache/app-admin/supernova-2.1.0
+++ b/metadata/md5-cache/app-admin/supernova-2.1.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/supernova/supernova-2.1.0.tar.gz
-_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6649a725083ac93c58c2f575a9873973
diff --git a/metadata/md5-cache/app-admin/supernova-2.2.0 b/metadata/md5-cache/app-admin/supernova-2.2.0
index 70e61f0..42a9b90 100644
--- a/metadata/md5-cache/app-admin/supernova-2.2.0
+++ b/metadata/md5-cache/app-admin/supernova-2.2.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/supernova/supernova-2.2.0.tar.gz
-_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6649a725083ac93c58c2f575a9873973
diff --git a/metadata/md5-cache/app-admin/supervisor-3.1.3 b/metadata/md5-cache/app-admin/supervisor-3.1.3
index 5bcae9a..ba72d86 100644
--- a/metadata/md5-cache/app-admin/supervisor-3.1.3
+++ b/metadata/md5-cache/app-admin/supervisor-3.1.3
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/supervisor/supervisor-3.1.3.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1d731a5620a48bbd3689ef5fc4a75284
diff --git a/metadata/md5-cache/app-admin/supervisor-3.2.1 b/metadata/md5-cache/app-admin/supervisor-3.2.1
index b780981..f2daf35 100644
--- a/metadata/md5-cache/app-admin/supervisor-3.2.1
+++ b/metadata/md5-cache/app-admin/supervisor-3.2.1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/supervisor/supervisor-3.2.1.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ccc92f8dc778b534f1c32a988d74c6d1
diff --git a/metadata/md5-cache/app-admin/supervisor-3.2.2 b/metadata/md5-cache/app-admin/supervisor-3.2.2
index 8edb51f..6812334 100644
--- a/metadata/md5-cache/app-admin/supervisor-3.2.2
+++ b/metadata/md5-cache/app-admin/supervisor-3.2.2
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/supervisor/supervisor-3.2.2.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ccc92f8dc778b534f1c32a988d74c6d1
diff --git a/metadata/md5-cache/app-admin/supervisor-3.2.3 b/metadata/md5-cache/app-admin/supervisor-3.2.3
index 32f7f76..bf83938 100644
--- a/metadata/md5-cache/app-admin/supervisor-3.2.3
+++ b/metadata/md5-cache/app-admin/supervisor-3.2.3
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/supervisor/supervisor-3.2.3.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ccc92f8dc778b534f1c32a988d74c6d1
diff --git a/metadata/md5-cache/app-admin/supervisor-3.3.0 b/metadata/md5-cache/app-admin/supervisor-3.3.0
index 0a79d7a..58508c3 100644
--- a/metadata/md5-cache/app-admin/supervisor-3.3.0
+++ b/metadata/md5-cache/app-admin/supervisor-3.3.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/supervisor/supervisor-3.3.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=24bd6933e8968a303e925e821613fabb
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.7.2 b/metadata/md5-cache/app-admin/syslog-ng-3.7.2
index dcf3d9b..6ae6f0a 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.7.2
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.7.2
@@ -10,5 +10,5 @@
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.7.2/syslog-ng-3.7.2.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ac57726ce2c3859ec198880ce4ac665b
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.7.3 b/metadata/md5-cache/app-admin/syslog-ng-3.7.3
index 0cc6c6e..8f43f1b 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.7.3
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.7.3
@@ -10,5 +10,5 @@
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.7.3/syslog-ng-3.7.3.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9ec49824e1fb679a9d60302800e145f7
diff --git a/metadata/md5-cache/app-admin/syslog-summary-1.14-r1 b/metadata/md5-cache/app-admin/syslog-summary-1.14-r1
index 23a7700..7865b9d 100644
--- a/metadata/md5-cache/app-admin/syslog-summary-1.14-r1
+++ b/metadata/md5-cache/app-admin/syslog-summary-1.14-r1
@@ -9,5 +9,5 @@
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://github/dpaleino/syslog-summary/syslog-summary-1.14.tar.gz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
 _md5_=a82b1b09b3572d352360a9e9d5f3d438
diff --git a/metadata/md5-cache/app-admin/sysstat-11.4.0 b/metadata/md5-cache/app-admin/sysstat-11.4.0
index d2d5e43..bee8999 100644
--- a/metadata/md5-cache/app-admin/sysstat-11.4.0
+++ b/metadata/md5-cache/app-admin/sysstat-11.4.0
@@ -4,10 +4,10 @@
 EAPI=5
 HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
 IUSE=debug isag nls lm_sensors selinux static
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=isag? ( dev-lang/tk:0 dev-vcs/rcs sci-visualization/gnuplot ) nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) selinux? ( sec-policy/selinux-sysstat )
 SLOT=0
 SRC_URI=http://pagesperso-orange.fr/sebastien.godard/sysstat-11.4.0.tar.xz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=76706b0076289fbfed118c46fef0bc94
+_md5_=982efee76d41b215d2551afdc61982d4
diff --git a/metadata/md5-cache/app-admin/system-config-printer-1.4.8 b/metadata/md5-cache/app-admin/system-config-printer-1.4.8
index a52cd70..6595855 100644
--- a/metadata/md5-cache/app-admin/system-config-printer-1.4.8
+++ b/metadata/md5-cache/app-admin/system-config-printer-1.4.8
@@ -11,5 +11,5 @@
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cyberelk.net/tim/data/system-config-printer/1.4/system-config-printer-1.4.8.tar.xz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=03d46b267f4ccd361c00de0cd739d275
diff --git a/metadata/md5-cache/app-admin/webapp-config-1.52-r1 b/metadata/md5-cache/app-admin/webapp-config-1.52-r1
index 431c999..b75bee1 100644
--- a/metadata/md5-cache/app-admin/webapp-config-1.52-r1
+++ b/metadata/md5-cache/app-admin/webapp-config-1.52-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~twitch153/webapp-config/webapp-config-1.52.tar.bz2
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5454231962fdc29202fd7b79de360d6f
diff --git a/metadata/md5-cache/app-admin/webapp-config-1.53-r2 b/metadata/md5-cache/app-admin/webapp-config-1.53-r2
index 60836e5..b466044 100644
--- a/metadata/md5-cache/app-admin/webapp-config-1.53-r2
+++ b/metadata/md5-cache/app-admin/webapp-config-1.53-r2
@@ -11,5 +11,5 @@
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~twitch153/webapp-config/webapp-config-1.53.tar.bz2
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3cf2514f00cb23821d79b6c6376bbd06
diff --git a/metadata/md5-cache/app-admin/webapp-config-1.54-r1 b/metadata/md5-cache/app-admin/webapp-config-1.54-r1
index a6e9bd8..db52765 100644
--- a/metadata/md5-cache/app-admin/webapp-config-1.54-r1
+++ b/metadata/md5-cache/app-admin/webapp-config-1.54-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~twitch153/webapp-config/webapp-config-1.54.tar.bz2
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b39459a689e1c1ff4e0a493971bc68ce
diff --git a/metadata/md5-cache/app-admin/webapp-config-1.54-r2 b/metadata/md5-cache/app-admin/webapp-config-1.54-r2
index b3f8e5c..bc4712a 100644
--- a/metadata/md5-cache/app-admin/webapp-config-1.54-r2
+++ b/metadata/md5-cache/app-admin/webapp-config-1.54-r2
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~twitch153/webapp-config/webapp-config-1.54.tar.bz2
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=17e5410e5630112165252f52eb254a09
diff --git a/metadata/md5-cache/app-admin/webapp-config-9999 b/metadata/md5-cache/app-admin/webapp-config-9999
index 4e16cdca..3ee8902 100644
--- a/metadata/md5-cache/app-admin/webapp-config-9999
+++ b/metadata/md5-cache/app-admin/webapp-config-9999
@@ -8,5 +8,5 @@
 RDEPEND=portage? ( sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=32379fbb608e3496e7c83f95a94974b5
diff --git a/metadata/md5-cache/app-arch/bloscpack-0.5.0 b/metadata/md5-cache/app-arch/bloscpack-0.5.0
index ea4a6de..48c3980 100644
--- a/metadata/md5-cache/app-arch/bloscpack-0.5.0
+++ b/metadata/md5-cache/app-arch/bloscpack-0.5.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bloscpack/bloscpack-0.5.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b69e7c3ab474a44ddf87abab466ac770
diff --git a/metadata/md5-cache/app-arch/bloscpack-0.6.0 b/metadata/md5-cache/app-arch/bloscpack-0.6.0
index 2f90414..a279458 100644
--- a/metadata/md5-cache/app-arch/bloscpack-0.6.0
+++ b/metadata/md5-cache/app-arch/bloscpack-0.6.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bloscpack/bloscpack-0.6.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b69e7c3ab474a44ddf87abab466ac770
diff --git a/metadata/md5-cache/app-arch/cfv-1.18.3-r1 b/metadata/md5-cache/app-arch/cfv-1.18.3-r1
index f1eb2dd..8d9c81b 100644
--- a/metadata/md5-cache/app-arch/cfv-1.18.3-r1
+++ b/metadata/md5-cache/app-arch/cfv-1.18.3-r1
@@ -9,5 +9,5 @@
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sourceforge/cfv/cfv-1.18.3.tar.gz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
 _md5_=a0d2afefdd7b353cd099369ae8fccc5f
diff --git a/metadata/md5-cache/app-arch/createrepo-0.10.3 b/metadata/md5-cache/app-arch/createrepo-0.10.3
index e40fda4..d101db8 100644
--- a/metadata/md5-cache/app-arch/createrepo-0.10.3
+++ b/metadata/md5-cache/app-arch/createrepo-0.10.3
@@ -10,5 +10,5 @@
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://createrepo.baseurl.org/download/createrepo-0.10.3.tar.gz https://dev.gentoo.org/~pacho/maintainer-needed/createrepo-0.9.9-head.patch.bz2
-_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
 _md5_=5bcf7aa729349416c887f1ad5b3cea96
diff --git a/metadata/md5-cache/app-arch/createrepo-0.10.4 b/metadata/md5-cache/app-arch/createrepo-0.10.4
index 3d56e86..e911dc4 100644
--- a/metadata/md5-cache/app-arch/createrepo-0.10.4
+++ b/metadata/md5-cache/app-arch/createrepo-0.10.4
@@ -10,5 +10,5 @@
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://createrepo.baseurl.org/download/createrepo-0.10.4.tar.gz https://dev.gentoo.org/~pacho/maintainer-needed/createrepo-0.9.9-head.patch.bz2
-_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
 _md5_=1ee06f2c06d5c92c06eaa9261bdfbbd9
diff --git a/metadata/md5-cache/app-arch/deltarpm-3.6 b/metadata/md5-cache/app-arch/deltarpm-3.6
index 2622fbb..5ce331b 100644
--- a/metadata/md5-cache/app-arch/deltarpm-3.6
+++ b/metadata/md5-cache/app-arch/deltarpm-3.6
@@ -10,5 +10,5 @@
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://pkgs.fedoraproject.org/repo/pkgs/deltarpm/deltarpm-3.6.tar.bz2/2cc2690bd1088cfc3238c25e59aaaec1/deltarpm-3.6.tar.bz2
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
 _md5_=9426718396c7623b837061ed7aa5a3b0
diff --git a/metadata/md5-cache/app-arch/ipkg-utils-1.7.050831-r2 b/metadata/md5-cache/app-arch/ipkg-utils-1.7.050831-r2
index 15e021d..2ff9155 100644
--- a/metadata/md5-cache/app-arch/ipkg-utils-1.7.050831-r2
+++ b/metadata/md5-cache/app-arch/ipkg-utils-1.7.050831-r2
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://handhelds.org/download/packages/ipkg-utils/ipkg-utils-050831.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0695150a675b1a68e943f921cce07ac9
diff --git a/metadata/md5-cache/app-arch/patool-1.12 b/metadata/md5-cache/app-arch/patool-1.12
index cd72c07..dcfc1a8 100644
--- a/metadata/md5-cache/app-arch/patool-1.12
+++ b/metadata/md5-cache/app-arch/patool-1.12
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/patool/patool-1.12.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0e985f7f4f4bb02b69b01c628b932f12
diff --git a/metadata/md5-cache/app-arch/rpm-4.11.0.1 b/metadata/md5-cache/app-arch/rpm-4.11.0.1
index 78df53a..05b4363 100644
--- a/metadata/md5-cache/app-arch/rpm-4.11.0.1
+++ b/metadata/md5-cache/app-arch/rpm-4.11.0.1
@@ -10,5 +10,5 @@
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://rpm.org/releases/rpm-4.11.x/rpm-4.11.0.1.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2d863626a76dc06bb2e18ea45f14eaed
diff --git a/metadata/md5-cache/app-arch/rpm-4.11.1 b/metadata/md5-cache/app-arch/rpm-4.11.1
index 2490d46..8a2e6e6 100644
--- a/metadata/md5-cache/app-arch/rpm-4.11.1
+++ b/metadata/md5-cache/app-arch/rpm-4.11.1
@@ -10,5 +10,5 @@
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://rpm.org/releases/rpm-4.11.x/rpm-4.11.1.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ace2f98fa30aeb1c3b872c38642c1681
diff --git a/metadata/md5-cache/app-arch/rpm-4.11.2 b/metadata/md5-cache/app-arch/rpm-4.11.2
index abf23e6..f882822 100644
--- a/metadata/md5-cache/app-arch/rpm-4.11.2
+++ b/metadata/md5-cache/app-arch/rpm-4.11.2
@@ -10,5 +10,5 @@
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://rpm.org/releases/rpm-4.11.x/rpm-4.11.2.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ace2f98fa30aeb1c3b872c38642c1681
diff --git a/metadata/md5-cache/app-arch/rpm-4.11.2-r1 b/metadata/md5-cache/app-arch/rpm-4.11.2-r1
index 14df157..9089485 100644
--- a/metadata/md5-cache/app-arch/rpm-4.11.2-r1
+++ b/metadata/md5-cache/app-arch/rpm-4.11.2-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://rpm.org/releases/rpm-4.11.x/rpm-4.11.2.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=67827fe662d3053192f6c09999ee4a94
diff --git a/metadata/md5-cache/app-arch/rpm-4.12.0.1 b/metadata/md5-cache/app-arch/rpm-4.12.0.1
index f05d1e0..4c36b96d 100644
--- a/metadata/md5-cache/app-arch/rpm-4.12.0.1
+++ b/metadata/md5-cache/app-arch/rpm-4.12.0.1
@@ -10,5 +10,5 @@
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://rpm.org/releases/rpm-4.12.x/rpm-4.12.0.1.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=46ede4b099ddd347974cf7c0dc8104a1
diff --git a/metadata/md5-cache/app-arch/tardelta-1.0.1 b/metadata/md5-cache/app-arch/tardelta-1.0.1
index 44997a0..f2396e1 100644
--- a/metadata/md5-cache/app-arch/tardelta-1.0.1
+++ b/metadata/md5-cache/app-arch/tardelta-1.0.1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/zmedico/tardelta/archive/1.0.1.tar.gz -> tardelta-1.0.1.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8d0d7483787f3a918635b19cdcf1c577
diff --git a/metadata/md5-cache/app-arch/threadzip-1.2-r1 b/metadata/md5-cache/app-arch/threadzip-1.2-r1
index 8d3b724..8f402ee 100644
--- a/metadata/md5-cache/app-arch/threadzip-1.2-r1
+++ b/metadata/md5-cache/app-arch/threadzip-1.2-r1
@@ -8,5 +8,5 @@
 RDEPEND=lzma? ( dev-python/pylzma[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] )
 SLOT=0
 SRC_URI=https://threadzip.googlecode.com/files/threadzip-1.2.tar.gz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
 _md5_=abfaa2eedcbcd1faca44e3b910045331
diff --git a/metadata/md5-cache/app-arch/unrpa-1.4.1 b/metadata/md5-cache/app-arch/unrpa-1.4.1
index 81c064b..600e211 100644
--- a/metadata/md5-cache/app-arch/unrpa-1.4.1
+++ b/metadata/md5-cache/app-arch/unrpa-1.4.1
@@ -9,5 +9,5 @@
 RDEPEND=>=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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)]
 SLOT=0
 SRC_URI=https://github.com/Lattyware/unrpa/archive/1.4.1.tar.gz -> unrpa-1.4.1.tar.gz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
 _md5_=a70b08a48597c62a3e46d8d77440452b
diff --git a/metadata/md5-cache/app-arch/unrpa-9999 b/metadata/md5-cache/app-arch/unrpa-9999
index 80a6d51..c4cdf16 100644
--- a/metadata/md5-cache/app-arch/unrpa-9999
+++ b/metadata/md5-cache/app-arch/unrpa-9999
@@ -7,5 +7,5 @@
 LICENSE=GPL-3
 RDEPEND=>=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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)]
 SLOT=0
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
 _md5_=a70b08a48597c62a3e46d8d77440452b
diff --git a/metadata/md5-cache/app-arch/vimball-0.5.1 b/metadata/md5-cache/app-arch/vimball-0.5.1
index c26c04c..a0c7296 100644
--- a/metadata/md5-cache/app-arch/vimball-0.5.1
+++ b/metadata/md5-cache/app-arch/vimball-0.5.1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/v/vimball/vimball-0.5.1.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ce5f9b80f0fcbdb176294fc21c829c98
diff --git a/metadata/md5-cache/app-arch/vimball-9999 b/metadata/md5-cache/app-arch/vimball-9999
index f888377..973bcc6 100644
--- a/metadata/md5-cache/app-arch/vimball-9999
+++ b/metadata/md5-cache/app-arch/vimball-9999
@@ -8,5 +8,5 @@
 RDEPEND=dev-python/setuptools[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ce5f9b80f0fcbdb176294fc21c829c98
diff --git a/metadata/md5-cache/app-backup/attic-0.16 b/metadata/md5-cache/app-backup/attic-0.16
index 1c13de6..d2b3bf4 100644
--- a/metadata/md5-cache/app-backup/attic-0.16
+++ b/metadata/md5-cache/app-backup/attic-0.16
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/jborg/attic/archive/0.16.tar.gz -> attic-0.16.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ede45275364a4326f44c90be418dca81
diff --git a/metadata/md5-cache/app-backup/attic-9999 b/metadata/md5-cache/app-backup/attic-9999
index 5952efef..8c62123 100644
--- a/metadata/md5-cache/app-backup/attic-9999
+++ b/metadata/md5-cache/app-backup/attic-9999
@@ -8,5 +8,5 @@
 RDEPEND=dev-python/msgpack[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-python/llfuse[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python3_4 )
 SLOT=0
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ede45275364a4326f44c90be418dca81
diff --git a/metadata/md5-cache/app-backup/backintime-1.1.12 b/metadata/md5-cache/app-backup/backintime-1.1.12
index ff21743..5080191 100644
--- a/metadata/md5-cache/app-backup/backintime-1.1.12
+++ b/metadata/md5-cache/app-backup/backintime-1.1.12
@@ -10,5 +10,5 @@
 REQUIRED_USE=^^ ( python_single_target_python3_3 python_single_target_python3_4 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 )
 SLOT=0
 SRC_URI=http://backintime.le-web.org/download/backintime/backintime-1.1.12.tar.gz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-util