Sync with portage [Thu Dec 29 23:42:54 MSK 2016].

2016-12-29 23:42:55 +03:00 · 2016-12-29 23:42:55 +03:00 · 7101246e1b
commit 7101246e1b
parent 1229e2c488
2437 changed files with 8422 additions and 12115 deletions
--- a/app-accessibility/festival/Manifest
+++ b/app-accessibility/festival/Manifest
@ -12,7 +12,7 @@ DIST festvox_cmu_us_slt_arctic_hts.tar.gz 955706 SHA256 adcc187fc7db39e17c119811
 DIST festvox_kallpc16k.tar.gz 4104056 SHA256 9eb6336f35c202c8069d37e489fb009a7e9fd8539cd47644329db1e92c6aba83 SHA512 ad8d45e04cb704f31a01de8f4d1b3adb4530563728e8b331b0a730c762bd0c0590e5d49f893404a0199f51fb6afce4b786107ae1fdbc4d1b61c3139ce805267c WHIRLPOOL c0242c9abb733c30cbba75178de8aa825a0be17bc24a2851eff64147a080c2cbd0d374de1e6e4a8bce562f727474d1e80d26535efe12e8ed640d7eb7bce75832
 DIST festvox_rablpc16k.tar.gz 5369001 SHA256 54835837ca734e62c0210c0f9dd27380d2ad89819ae91ec6e8cfab4e515b7bdc SHA512 11539bfb822eec9c4803c8526364d3cf6ad735a0edfd018471e95df1447e0cd3e19fdee44faaf0f0fbceed281a06b21a971f0c2a3a3ff6c46ea8272202f53f11 WHIRLPOOL 08266d82182ebc939965f52ef591043de664ed8380105e42eb39b4a96f50bda5d8958d9b7850e963fe1e8324fd6a5d05a5d1d7ab41f4c88940e61fe783dbf557
 DIST speech_tools-2.1-release.tar.gz 1681999 SHA256 ff6167cd929a88e2f91b47191c6c4dae87c9c06ba39fccc4465af9d79e9b2be9 SHA512 6ef9a7dd01ede152c4dafd0b2037312d62a79d875813d74ea048899a52eee505b93ffbabef9b6c0a1d15aeadb5508fd18a2f392e85276847fe071173aec5db96 WHIRLPOOL 6df6ca5168462599fadf209827e367c963af5ca6be05277618c9d09aac34a3b151665b860a14fa4742482cc77246e372671ac94b23bdca63bbbb7b8c7b234644
-EBUILD festival-2.1-r1.ebuild 3649 SHA256 c1712cbe32f801e5a65b912560e913ab20bcccc35a10f784369eff1f0de1d222 SHA512 9790203328b4cb80bdb20287c2e255a5444556062e11126b37574bdf1e9bc6f9c53c297c8725ebe87cf5066229c9ed687fc44ef19f617896a83446c8c0efd34a WHIRLPOOL 8e2a24b3aa0004bc62e2a649c091dc40e2c815c5cb1053f3ca32a54b09db03990953bf5cc0f6946eaca6357602290cc7ab81fe2c559bc8f226bb7b04ebd98dcf
+EBUILD festival-2.1-r1.ebuild 3674 SHA256 84d834986b1190a412040d6191a60f90e49b2d6b0fa8964a0cfe78ad50820a30 SHA512 341371380332d4f829d3246222c3c0c5209d98386c901537401dab2086074a83d08a734e8861dbd4105d2d5baa233980e0461eb90000bc04df2fc8501c5f565b WHIRLPOOL 3dea521c5e2a2edc3975f07a2410ec559134ce834b2ea384de744c0917682d6163875464a7611988269d5dd562c3f1c6f674882988b23861bc5c0f75020101b9
 MISC ChangeLog 2712 SHA256 c86041ce3939bb15c55a4b60d2ec10b9b7f3a2fede4260bdd96c8e550640b0bd SHA512 8106b814c8a2b3d1eeafa3b350ac28c93c904b18c6c19c419f0199b2b711b4d7a8ca048d3eafe621a43c9e41831a696ff6ab63c40089d564f0f49c9b0a08957a WHIRLPOOL 5f4f166af918e9f34fa5ce232d505c772270f4aa1a1e2aee4b083e9b912e3d136437e2692fce8a87e77aca8107f0821ad752629de0673f5162021ba644dca94b
 MISC ChangeLog-2015 21631 SHA256 0b2658058802ac8f8a7f2863750ff37c7c9b19c2b7835774fe1a1fd8873caf05 SHA512 fba6e700ebda57551c447a73684b544410ade20d6f888a32a6b8c094b1bd9ec738295a07cdec9744b13c819f1153718676e00639e0472e692b26c4e3da68ade8 WHIRLPOOL 19fba883debb1996a8d44b1c8575830fd7a0c0761214cf6210e3b124f59a4559a1e4ff8fb4343e094bef3dca1ad46e186694f02c10de6975621e745e7275af47
 MISC metadata.xml 375 SHA256 2d266a45b4fb056159839f940687765d7e13a01d0748fac50bbbcbb4a19d2483 SHA512 affeb58d8d6f6659fc2d00b01bb627307920575589c7c78358b26074c94831af9a40bc2b0ba9e55758f968adf7b6a15bbc1542db83b1457107fd9fbdd2a3d224 WHIRLPOOL 4509576afbf26fe58f3dbac4b99d56b01588c69ee22f65bb50694d214ec6c06c5eaf7136cacb2da1259486d499d643b73726744e3d942bdfd5a3849630612644
--- a/app-accessibility/festival/festival-2.1-r1.ebuild
+++ b/app-accessibility/festival/festival-2.1-r1.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$

@ -29,7 +29,9 @@ IUSE=""

 DEPEND="~app-accessibility/speech-tools-2.1
 		>=sys-libs/ncurses-5.6-r2"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	media-sound/alsa-utils
+"

 S=${WORKDIR}/festival

--- a/app-admin/drush/Manifest
+++ b/app-admin/drush/Manifest
@ -1,9 +1,7 @@
 AUX update-bash-completion-script-for-2.1.patch 1332 SHA256 9bab3ce5bbe7611bc7483cfd2c7926c6d443d3af772c5b241fd94a438fb1316a SHA512 2e19a6be652684c1b1a2a9d6605c1404272391950408cd6ae964b2bdd9f95b1e59deec5111c1eaa563a92837ea394fcb2315a3032b2ab02996509b98eb7d1cf0 WHIRLPOOL cddf67a8834ed4d01fd5215f2044388628360e7613cfb54c45a3cbbea7c36659f0bd5a8399008e971d2fca48560ed16115dc3b55d0f707776a5c569efe41d901
-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-r1.ebuild 1725 SHA256 8e04b1998b75f9586a72dc42838deef229311ccccd1e1c496a3ac01353e06d69 SHA512 8d2772c8465a128edfee757b83527a68cd011e69ef02d72817396823bf6c3e6f52e177a9112f926664cf76afa544a91f83450d510ff3f7aeafd3fa0f228d302e WHIRLPOOL 421a8652cfc36df13a1a44fcd3d774a66d17273bd78b6ce7537e0d4fe361f6f4a4505693f5431dc21a68d972ad32a26a66f9767238c50d1002ddf45066c60c6c
-EBUILD drush-6.7.0.ebuild 1715 SHA256 721e2cbfc348da50e1dcc9acbe47bf53bf05f1bf7d8a44d46b5f29a65f05dc39 SHA512 6fb4dfbbc9b00dba5848d5f14a77f2bcb3b55759f3d6244232b772bb5e9af2506532f8b0a418bec02075c4faca994f86fec16285ccfe0d9bc40c89fc99025d02 WHIRLPOOL dc66983459acae4f87d550da5863f2b6afc2364e200c302f94992342ff55e0ca7208fd8bcbeb22976d83457dbdfca6a5ef321fca4e96f5a2b122201d96a652ae
+EBUILD drush-6.7.0.ebuild 1714 SHA256 2d175f816da4dfa76e842db87afee66021bbd8ed6cc021b650758dd80424219d SHA512 c82221d10dcc17974d956c54fb4a2c0ec4e8efd24737c3c35bca425e190649ed98c47a52b39972c51c9e6f4e064922af5c4416ee2fc35aade2da4b2362e1eb34 WHIRLPOOL fd32005d32c018eeb64097f901cba46630940ac930984dfb7ab0f9f2b263e4ad5ece565c792a8c96c602f69f0f0e85b90ba94d33703b44ed63f4bdb249d92b88
 MISC ChangeLog 3977 SHA256 0532e96c4c8667ed5d16a6d73d35f1a25b901763d4faec9a5ca5294e777b25fc SHA512 ad785c5f0b44eb2ccab42b70d2826e8747aac8cfb2f0b381f7cbe441f81178f8c7775a48424b07b0b4c56e159d9d04f1f69ad5a410b8498342bb690c62284525 WHIRLPOOL 69eed8d236136fde24882f4bb27a42a890b38367962bbeafa5bc31f650e12a1a487406c65511b76ea9e89c37415825d3bb6762c99a4419b335cc6e4e85bf1bc4
 MISC ChangeLog-2015 2376 SHA256 1c59279d88781a3f927086c2c692aea5666e149a9604ad6eb89fd326f5f901fa SHA512 8f5948a9e05a96934c07df74a612d0740419e11143b732a2817c39119326fdb71bbf884726a0976ec665714c727ccc7b552dc55cede4ac90dc60b694760f69c8 WHIRLPOOL d81b2c1f8ae62a6fead1a361b9b9fb33a7cc24ff2205c721d12fcf11e912b0f4166f41728f107e195593529eb832a780bcf256a64b5531a59d57feb2387a1b50
 MISC metadata.xml 531 SHA256 c177512601aafe47fff0e583e71ea0a02b9bf3b75378d37bb6f0b641b4801441 SHA512 27cfde1e0c618050f645abf589511ccf87675ac00da8eb147b6a38d1e48d0d688fef2310ec015d394a202b56b3f09aca32b6d6c9bedaab98e469139349472aa4 WHIRLPOOL 9a5f730e1139e26422d23df83499053f0ac70b95cd086de3b39ee7a1a1f7cb3d883f8203c8762b64183ca004e27cd392cb2b36e3d41689748e321e3ff3fcc9be
--- a/app-admin/drush/drush-6.5.0.ebuild
+++ b/app-admin/drush/drush-6.5.0.ebuild
@ -1,64 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bash-completion-r1 eutils
-
-DESCRIPTION="Command line shell and scripting interface for Drupal"
-HOMEPAGE="https://github.com/drush-ops/${PN}"
-SRC_URI="https://github.com/drush-ops/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/php[cli,ctype,json,simplexml]
-	dev-php/PEAR-Console_Table"
-
-src_prepare() {
-	# Fix the bash completion script, check the patch for Gentoo/upstream
-	# bug numbers.
-	epatch "${FILESDIR}/update-bash-completion-script-for-2.1.patch"
-
-	# dodoc compresses all of the documentation, so we fix the filenames
-	# in a few places.
-
-	# First, the README location in bootstrap.inc.
-	sed -i -e \
-		"s!/share/doc/drush!/share/doc/${PF}!" \
-		-e "s!README\.md!\0.bz2!g" \
-		includes/bootstrap.inc || die
-
-	# Next, the list of documentation in docs.drush.inc. Note that
-	# html files don't get compressed.
-	sed -i \
-		-e "s!\.bashrc'!.bashrc.bz2'!" \
-		-e "s!\.inc'!.inc.bz2'!" \
-		-e "s!\.ini'!.ini.bz2'!" \
-		-e "s!\.md'!.md.bz2'!" \
-		-e "s!\.php'!.php.bz2'!" \
-		-e "s!\.script'!.script.bz2'!" \
-		-e "s!\.txt'!.txt.bz2'!" \
-		commands/core/docs.drush.inc || die
-}
-
-src_install() {
-	# Always install the examples; they're referenced within the source
-	# code and too difficult to exorcise.
-	dodoc -r README.md docs examples
-
-	insinto /usr/share/drush
-	doins -r classes commands includes lib misc
-	doins drush_logo-black.png drush.info drush.php
-
-	exeinto /usr/share/drush
-	doexe drush
-	dosym /usr/share/drush/drush /usr/bin/drush
-
-	keepdir /etc/drush
-	newbashcomp drush.complete.sh drush
-}
--- a/app-admin/drush/drush-6.7.0.ebuild
+++ b/app-admin/drush/drush-6.7.0.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$

@ -12,7 +12,7 @@ SRC_URI="https://github.com/drush-ops/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""

 DEPEND=""
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@ -4,7 +4,7 @@ AUX logstash.confd 798 SHA256 188b0765c8a99a299777461e101cdbb98a8e8a6243774bd98f
 AUX logstash.confd2 784 SHA256 188b6987e6959aebf0cb72526bba6153371b5cfb81552031c00020c9ed0e9ffc SHA512 375fb82b12f758a1f5889c0929117f338200db6c47a48b1d197bed95e8a5877ab5e4192ac807aa66f7bb76587a5c32fdee9cf8e48299a89e3d78cb94388af68d WHIRLPOOL 82e427ae9066b18b9df4952b782f552679038b4459d7dc26c63c734191c6eef02341ef6ab3c333f8059a6be81a591d088b5f2c0b3dc46a624f3a98055ba913af
 AUX logstash.initd 2001 SHA256 3d81b69b22e98adf23d9d2d1481d44d14d802b43c6ff17c726c646794b95ab5d SHA512 fee844a719bbb9838aecb961a763a203318bf3209918d2c42d101b9e37e1dd7cf98a3b9506b7f1dcb9da23daba0025e613568a9731ae3282d64788c5f6fe0292 WHIRLPOOL 2c576f712966df95df2d0fa9badb38daf6f3530e5daa5cc88a72391a3b6663d702d91f2c4e045cf1c44ec500b40b2682c7d57355835ce7621aa384725e071396
 AUX logstash.initd3 2016 SHA256 8643908d39268ea64f2803a2bff3dc37942370724e6dbb0609676954573718b9 SHA512 5f20971facfa527bcffadc41a9bf19ee875a99ec36f8b19935c9bc04fd3b2b117247aaf3abd5933fd6bf8a675483d9ea1c33059db080400779f4961339c3ea9d WHIRLPOOL ba9054554540a6f30631b74de08945c1b1abcf615b87741d77d6114e7fb12b8a2624f538dc6a93105d93faa13284e4e7fb83c64ddcc089a45e4f1a3310dc5998
-AUX logstash.initd4 2115 SHA256 ae76bd599b927840bca09653b0a95d53e595266d2dcfb48770b04f0d4322082a SHA512 66e167b48babf6175e9811c9c2a9183d13bf485adf8fa58140197e47ebcb1db9e5f615ef5f6398171f4901d7682611009236f01fca815394a41afeba4cd9819f WHIRLPOOL 298d637e976d3a8556eb203422a2d3da4e5586723a9abd4a824d79053389bcfd29ccd9f464c5e741c9ef62a317172a172d8d76854ad1170e4cc0890329e54648
+AUX logstash.initd4 2009 SHA256 f0ac486905c52b9af4352d377ad379ef1fdc7b76ffe31fa4cac8cd6b89da0ddf SHA512 8d512fe2d69c3c2912640296bd6e7afbc96f36728830dc82918bcfc048eb17d62a9f27669354ce990a449cc98567ed33817593617881574d7828de2c6df20876 WHIRLPOOL ccfe2d02975eb2a853b78217775f44c7b5da75ba50bd4748a90615937d88736a11cb2d35ffd1d737efbfd615104f07913c963b165c1e87843f746643610dc042
 AUX logstash.logrotate 103 SHA256 404746c99df44f7dd617fc6c435251018ceffa3820995a00f1241ac4065da124 SHA512 a5b508d49889dc27722ba82322082b3845449ce99e9e65a4936ed2a49ba2a25a55c0d3bdb31f560da94190d41b39192548f63074ecf5376b9b2b9b73fdaa0ff6 WHIRLPOOL 0a6900c95dea6e52bc8370f21c4becd1b1d2d23c5ac2419fae7f182129874de6ca4f53c36cd7f1a86d117646933ddb2f2866d6d21952af46f8f0924e34875eab
 DIST logstash-2.3.4.tar.gz 79779303 SHA256 7f62a03ddc3972e33c343e982ada1796b18284f43ed9c0089a2efee78b239583 SHA512 cc5d6c04e414daf63c836141df87204e0cbc63f71ee02abb69496e29587d5b0803dd738949de559a597979c9f6c6bf9d11d55f4b084ce875f24fb362f2c9bd3b WHIRLPOOL 71b6d915153d80d9bc81d10454ffd14af4643c61557964d7fd8edf50bf1a5d1c53ce0b09c2aec9b079918df596bbb5b07420b8661572bf7ea659e9703694f07c
 DIST logstash-2.4.0.tar.gz 83882952 SHA256 622c435c5c0f40e205fd4d9411eb409cc52992cf62dde4c7cd46e480cd8247cc SHA512 27f7e22fcfbeabe58bef1220399a80b32b56b5e2af17c0279e3f583ed5170be649b961b92c3eef33120ce238f126a3cb32e614bd8109bd8c266b538888c5324d WHIRLPOOL 2d1db78ff21d86e22f709600b086dfc253120e6a659d46c1e6ebc6d62dfffd48f0a440c33fa9a1cd7014108f5ae88afa4ccd25211ce57b1a4856f756a855c71e
@ -17,7 +17,7 @@ EBUILD logstash-bin-2.4.0-r3.ebuild 1817 SHA256 50d1442aa5209294e5fd28cc5e5c19ec
 EBUILD logstash-bin-5.0.0-r2.ebuild 1667 SHA256 7bb0d49f68c91a85f375a210b1afe489109221774420690aa89be61bd90793bf SHA512 3f474501cb3d58886002e52edd624c49ac73d992524584e17193627598d0a6476b02b884181788acd09df4d07f05c27b048ded8d6439cabfcca92ffba6e2d1a8 WHIRLPOOL de203e7eac3dc3ce2a07213f68a5c5ec58b2bfd2465379650252ce1b5a8b921e1b34db6d20a461924ded63547e81da66bd393e9d43d1461e5b8b8a4c2f164784
 EBUILD logstash-bin-5.0.1-r1.ebuild 1668 SHA256 d8727b581d084194e6480604bd50e89245cd31fae400a57ffa0139e4f229529e SHA512 12d8899ee2961229ed7d495cc78b1ca5e282dcbc89d8ba069ae34ebdce194ffc64a452f61e60d83daecebe599d73c813f3ae37ba3d161572b381d18d68ad5765 WHIRLPOOL d5a333f4da97a2ebb41064d0adb198b308a4de894addb88ec3d74df9f6550b8bbcd68f61b38dd14eab78d249ef9f65cb2b3882637b5c64a35e0d5ce660828687
 EBUILD logstash-bin-5.0.1.ebuild 1667 SHA256 7bb0d49f68c91a85f375a210b1afe489109221774420690aa89be61bd90793bf SHA512 3f474501cb3d58886002e52edd624c49ac73d992524584e17193627598d0a6476b02b884181788acd09df4d07f05c27b048ded8d6439cabfcca92ffba6e2d1a8 WHIRLPOOL de203e7eac3dc3ce2a07213f68a5c5ec58b2bfd2465379650252ce1b5a8b921e1b34db6d20a461924ded63547e81da66bd393e9d43d1461e5b8b8a4c2f164784
-EBUILD logstash-bin-5.1.1.ebuild 1691 SHA256 657dbba1981301ba1c949d2e945b0858eefec95776a86848ac47d8164a867f87 SHA512 573dd208d8084dbb838e699811aaa8d9bef13e44fa4dc57bcf375f00d78d01280bb2055d169ec04f54a616d555f56ffcb094fd4b539bb599d20ccf5f405f5bc7 WHIRLPOOL 6bdce41d2943b1396334316e56d3d52ea603f9d7b32ca331d23fe497cf02c326721295c75410e68b4c1e5709aead23d5f59edb8823d8ea87e73a4b41a10d9367
+EBUILD logstash-bin-5.1.1-r1.ebuild 1691 SHA256 657dbba1981301ba1c949d2e945b0858eefec95776a86848ac47d8164a867f87 SHA512 573dd208d8084dbb838e699811aaa8d9bef13e44fa4dc57bcf375f00d78d01280bb2055d169ec04f54a616d555f56ffcb094fd4b539bb599d20ccf5f405f5bc7 WHIRLPOOL 6bdce41d2943b1396334316e56d3d52ea603f9d7b32ca331d23fe497cf02c326721295c75410e68b4c1e5709aead23d5f59edb8823d8ea87e73a4b41a10d9367
 MISC ChangeLog 11629 SHA256 9309ec6269563641ab027dac18b6db0643e4097ca03ece455adb5f35148ca672 SHA512 d7b9200f9d2ea056eff3f564ac0bae29d018af1596e954d69d8f57f16678ba5b90fa76e1f74f8e0a830bf2ffa8255a2b9987470aa1a83bbd6135410aaf19586b WHIRLPOOL c31c703601c3b788946591ee5eeb7962c27b368fe4b95235e51947be90510917901a50b1134ffc2cdde8a3e7503c52de140f6af21bf0c4e74e8fe11dfa40daa5
 MISC ChangeLog-2015 1201 SHA256 b789b9b4f8fa642f89efadd1fc139304bea788fb2e91899556992e95811194a7 SHA512 f13b81a399382943cd6982303660b36633e108f71ecff4457ceee3ca3d8ee3ddfa75df69e3502839249eb68e2823833aaf9089c165569453e8208198b44755ee WHIRLPOOL bebb44c1c904ea0bf0c0c907c041399583479840c591946cad10523ad78e75b4739bb5f4728e1e91dbed4f42fe381a329e61103e9d8c65636547f38f3f7396d7
 MISC metadata.xml 805 SHA256 b7dba42e3e339dd1c1f04b3960434e79b45eeeb53355ec0989b3b3bab5054e60 SHA512 830c9eb2ba0b42983c4f8307a4f61b2e2a39545282f20874d43dd13075b7075cb0ae6dd786022d78814affbb1d74f33af95f2e4397cd5757554da46d92821c58 WHIRLPOOL 6a8cd0d08eda8b36703ff59b525201c80c924d56c5a7eda63033f9325b05b499b99b3cc21827a2380cc8a36e1fa27ca5a5e376e30b0ec8046f070f6e1573c3dd
--- a/app-admin/logstash-bin/files/logstash.initd4
+++ b/app-admin/logstash-bin/files/logstash.initd4
@ -54,10 +54,12 @@ start_pre() {

 	rc_ulimit="-n ${LS_OPEN_FILES}"

-	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "${LS_INSTALL_DIR}/data"
-	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${pidfile}")"
-	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "${LS_LOG_DIR}"
-	checkpath -f -o "${LS_USER}":"${LS_GROUP}" -m640 "${LS_LOG_DIR}/logstash-plain.log"
+	local d
+	for d in "${LS_INSTALL_DIR}/data" "$(dirname "${pidfile}")" "${LS_LOG_DIR}"; do
+		checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$d"
+		chown -R "${LS_USER}":"${LS_GROUP}" "$d"
+	done
+
 }

 stop() {
--- a/app-admin/logstash-bin/logstash-bin-5.1.1-r1.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-5.1.1-r1.ebuild
--- a/app-admin/perl-cleaner/Manifest
+++ b/app-admin/perl-cleaner/Manifest
@ -1,10 +1,10 @@
 AUX perl-cleaner-2.20-prefix.patch 4874 SHA256 fb814277eba1dee0084e6b395183ae7acc22b60283daa10bfa45dea283e4b038 SHA512 217ab3c7958e791c7e71ede8763ff98db7479d7eaeaa5fc9b0eb8607ed4a28ee1e7bb648a8e6fbc05913755b6eb0555fb70cd81c9124ebf562119b24ce66cb6f WHIRLPOOL 65b1f78e3691a49e67e8603064b7e5f871761328474a7384c80b4bbdd9a8ebe2a765684e449666604c8939b57ea4f6d05110cd59a36e46bf3cb05f9f6d9c408f
 DIST perl-cleaner-2.20.tar.bz2 6704 SHA256 ecc3b160d01466a5c9a070e12f3e11719bedb45a92a2ea0227d745be6b77cf64 SHA512 29888b4ee19a186ddaa1209d893ac57bed683b551546f63aeb874f8cc1fcab4ea0b0401247968aed0fb3b9a7d7196a803d6713e85b44cb94bc6642a44fbc4cf1 WHIRLPOOL 2ea9ca19738e8dd3bed076051efbccd1cced25b768ee8e95843c885b9057e1c6960247dd8f867b8ef7ab11ffffaddbedbcc01f20023203f4d3cbe7f09fd01e51
-DIST perl-cleaner-2.21.tar.bz2 6288 SHA256 6ea83c08ff83d59c3691435dbeafbd52680c57f2d8603288410a4eb4ba343e96 SHA512 b13d32bd09009c96b9074c786e8cb5da359b4eb8343b7818b88151cc1bb870cb29775e462e9e9d9f4f55f4040847cb9f7b5d2311e06124aaea5deb9053ea95ee WHIRLPOOL 27e5c9db0c371676842c814e7e6962333c828b261b798a380f23092afa7cd7ec1eaa550cca7103dd5691883945e4be31d2fea96db3b11ee1996aeaf290ab8b9d
 DIST perl-cleaner-2.22.tar.bz2 6407 SHA256 fed20de199e178012380e436f06668705746ae16e84fbc15b23653cc07bf5bbb SHA512 a822ea4178e1f36aadcad8c21e1adefe547e2b7c0cfecd34fa53d2d0f7c154ce5bcbb6f8d5a78f633b42842e08ea50cf68c151d97a46529e378dfb6c8fcb7d78 WHIRLPOOL 4025842fcfba7723768b7d5f23f23d0d9970a397a3313fe30d3b04d10e89328257977cba60ad183b4941453bd4dcd727bf871d8206e537ba89dbfa10b3779cad
+DIST perl-cleaner-2.23.tar.bz2 6495 SHA256 b7d25021997bd9a98f5df930d16cbaec84d19674e7b0a6eb7727c11725e0f91b SHA512 e0879f75737746479cd1032acfed50f20aad183d834e1e0e9b847edeb14577b32ac8fd4b0f5ff54c03937f181d8f5702c3bd009587a5930d40eee59a13fe6624 WHIRLPOOL 5645da862594cb8b65828ab740f433cb279cb4cac84a3005f8adcced1586b54ff766cfd3bba48fe4eab8b978f4155e29de6701d62c5164bce77cea3f730bd01e
 EBUILD perl-cleaner-2.20.ebuild 1297 SHA256 1b9a1c6c22d2e47c98a17a140237d32bc6ac2b4051a59502bb0f85e464df11cc SHA512 ab29ebf9c294ed827b4047ae3b25a4a008245edddc56cc0f63e3b3eca8b0793b65d738e89a6449c19ccc92f3488d9d75dbba62fd3dcad05b37dc9b4d2c249f72 WHIRLPOOL f6e4bf835bef5d966c512dfec8cf7d34981c70ce133eb198cb0f65208abf4c5a3957a1ba501b4e80063de58942869cec35b32eb67882dec5b1d94615146d84db
-EBUILD perl-cleaner-2.21.ebuild 875 SHA256 36a7c9e213899660b465ac3629265a82cd8880a85b229cf2499f769915b64f30 SHA512 915a289c3acfe83a4c29f11b6e2b6fad5f89e772274a374787eaeb84fb8d1572cc61c443d9d88fc9b3ecf9829e568e30936d6d8a71e83bacfd1ccb991c40338e WHIRLPOOL 7b38a5bc7192e1688254dbb8797ba5e9f973b022e27d9f0804dda677bbea092a1ef927fe97641953af36fa4ea32eee849d4a40e33df37dc56701193573bc6a83
 EBUILD perl-cleaner-2.22.ebuild 1145 SHA256 748db21146cdcd01b8cf7a04bc4e7eb92f3132b7453ed7f6d42d97d7a84937e1 SHA512 594a1466f44a46f792e6658db2b680b2a6b15fd011ae48ea8f8dfd3228397869143a0523b9c514f712707a48ccf877fb7c88641173563a667f9d399f4a395da4 WHIRLPOOL 7cf1853cdda4d61b5b2ec04c086de8d0989a9e545ce289505ab7b6b7ea42c5c76ec94d1635c581d81a41864afd0960aa6199da535926bf2835c60beb62e4601c
+EBUILD perl-cleaner-2.23.ebuild 1145 SHA256 748db21146cdcd01b8cf7a04bc4e7eb92f3132b7453ed7f6d42d97d7a84937e1 SHA512 594a1466f44a46f792e6658db2b680b2a6b15fd011ae48ea8f8dfd3228397869143a0523b9c514f712707a48ccf877fb7c88641173563a667f9d399f4a395da4 WHIRLPOOL 7cf1853cdda4d61b5b2ec04c086de8d0989a9e545ce289505ab7b6b7ea42c5c76ec94d1635c581d81a41864afd0960aa6199da535926bf2835c60beb62e4601c
 EBUILD perl-cleaner-9999.ebuild 1145 SHA256 748db21146cdcd01b8cf7a04bc4e7eb92f3132b7453ed7f6d42d97d7a84937e1 SHA512 594a1466f44a46f792e6658db2b680b2a6b15fd011ae48ea8f8dfd3228397869143a0523b9c514f712707a48ccf877fb7c88641173563a667f9d399f4a395da4 WHIRLPOOL 7cf1853cdda4d61b5b2ec04c086de8d0989a9e545ce289505ab7b6b7ea42c5c76ec94d1635c581d81a41864afd0960aa6199da535926bf2835c60beb62e4601c
 MISC ChangeLog 4791 SHA256 1f20e1dfe4fdec7791ce89a19c9dbb36349e0a0efe0cb722c71d8514c5967f68 SHA512 5d4bd6321aa1c97bc7384865cd31fc626afaac449b859e2766a4460f04c7fcaaf2f15c836ad36c4a70b67f4c125c4908cbf89f615ea43f17d5730197f3e65562 WHIRLPOOL eba674ffc7a9a6bc8a0dedac486583c220c87d22d3ea684b464ca67c23b62e869749ec2d5e4df8aab3c725234bb60d8cf0e189cc9f9c460b4c76e56aaff3b1b5
 MISC ChangeLog-2015 16130 SHA256 e1176e1195bbb7b7b5b47c129f614dcc7e593ce2ec520e8d45b6e11bf704cf97 SHA512 20853af561ba3e1e8b956676bcafde29c9855298f57de9b0204b20861e49a80fce9f8e15f5896ee1768c8a7c60fd63bfdcf3e1d7da251f41da029e08dbce0fff WHIRLPOOL 819680af6d310e3ad5d1c3a5d608da29c013a68170a7c61f2f6cd5884252ec6fd6bd49c3cd85091605346e4ab84a094f5316a34ecd4a983e19b75b178ec0ff23
--- a/app-admin/perl-cleaner/perl-cleaner-2.23.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.23.ebuild
@ -1,8 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI=6
+
+inherit prefix

 DESCRIPTION="User land tool for cleaning up old perl installs"
 HOMEPAGE="https://www.gentoo.org/proj/en/perl/"
@ -12,7 +14,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi

 LICENSE="GPL-2"
@ -30,6 +32,11 @@ RDEPEND="app-shells/bash
 	)
 "

+src_prepare() {
+	default
+	eprefixify ${PN}
+}
+
 src_install() {
 	dosbin perl-cleaner
 	doman perl-cleaner.1
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@ -3,7 +3,7 @@ DIST puppetserver-2.3.2.tar.gz 33673099 SHA256 81e92875c07f73e636143405804f1214f
 DIST puppetserver-2.4.0.tar.gz 33822659 SHA256 81d574f7483760bd70cafc079486fe14d243137612f0c130069d94ba7d4fded4 SHA512 c9afab58bb2f432874d302cb63fb213ead561e2bcecc44f776be49dc09eb86deda3019eae1bddb7369bb7bdc1a3d82f47f6053d526b2b28b189358a2bdded852 WHIRLPOOL 079186ecd239a1be1dde847b23a5fe1bc4dedc543b510f2197cd776bc59f943166d3f403727e1cc0ac0232a8519a36944cb4e6ec6bb6bfdc0e822405c4b7fd96
 DIST puppetserver-2.7.1.tar.gz 33989388 SHA256 9e2ad86fedb719e824d42055383dbbbb4f66c621e21c4c285e70b5c1dbc158c0 SHA512 91fd1ee7bf9726e3d2fca9a81227756076b1945b3ad6fd63bf5be85957cdda81601cd707af2533c53fe182fe6945ec48c75b0f7cfef5a64e81643adf633df778 WHIRLPOOL 3661d09f04e85db94320acf6afc842557bde66d969a7e3164edcc9f74e4f1f8a5849b7a766fcf98339d47652d6ae4cda1d766e5a09e5a54d062b27306863aa1d
 EBUILD puppetserver-2.3.2.ebuild 3813 SHA256 a95c3e6e2f82660b88ca491c36ec8fa2cf5130d053f3f0f77d292156a51cfdf8 SHA512 8e761c3aaece4e31b1d2f16c897aa732fa20814d6d02e2bfe35127cfbeaf38a8058571abe654a650da23ebd5b0db176fd05e90cb9b00c3c36299f6026672cce6 WHIRLPOOL 7365ec6eca39affcfd592229f53d7c8c1ca748f7167799fea0334621438ebb860bb61a7a33416cc5823ff3c11c3f573c55644347550cca4c3c3ac6fc6882b550
-EBUILD puppetserver-2.4.0.ebuild 3814 SHA256 201620974c153b7f7014462a883d4334ade93ff1d6ac6658c2b0516f47f1fde7 SHA512 905101daeabecfe7bf235b420b14cb436d04f8a6dff7dbba910166a7b20def4bdbeaaef4882f98b0eaebbe66c122cf75994b5cf066e428b73beaf6e678535ca1 WHIRLPOOL de6f239869663e7b0a4c43ff4d7325ab2f8e5c76dcfc8d0b6609506179d6a526bdaca919ee276696a928246aff8cdea88a0e4c3208723e45cba5808aeeacbfbf
+EBUILD puppetserver-2.4.0.ebuild 3813 SHA256 a95c3e6e2f82660b88ca491c36ec8fa2cf5130d053f3f0f77d292156a51cfdf8 SHA512 8e761c3aaece4e31b1d2f16c897aa732fa20814d6d02e2bfe35127cfbeaf38a8058571abe654a650da23ebd5b0db176fd05e90cb9b00c3c36299f6026672cce6 WHIRLPOOL 7365ec6eca39affcfd592229f53d7c8c1ca748f7167799fea0334621438ebb860bb61a7a33416cc5823ff3c11c3f573c55644347550cca4c3c3ac6fc6882b550
 EBUILD puppetserver-2.7.1.ebuild 4054 SHA256 c5af4dad2912f3d9f84b20157e385d2dec646b73a5ba83c62c5c1536380bef89 SHA512 c839ca7ef56f2213c952c0a4b8f57b09b30b4cee56c937aecbd6e47105a123f786bbc18fa37ca2bf95b395432d52d8f66947522d8c4c55f19a554ca1a7351f15 WHIRLPOOL bac886a1e7e3505930fdfe10743d1846ce0a16defb57056425c891a2a42650c5826248218c10d8652797ded91f297283fb51bd09c38cead4c850b44a640f8cff
 MISC ChangeLog 7993 SHA256 9a47868558e376193b4e988493a375526e8a01b780cb28e7ac140958522e0843 SHA512 473e51d6f52a3fbe7224caeba4aa4363357c87acb5939ba2d238f9857f1c72dba6eb5ccc3d76e9cce6d8c564df7888185ee960c963b7b8308006cd3f53d7c716 WHIRLPOOL af4fa4e71885c9a6cad8a59712e7de6c7854629c07a235915ad0b882fa0539c9e996e2e222eb2a835580049bcc0bf59618e36b825842c48c696f65f5fd0537d4
 MISC ChangeLog-2015 878 SHA256 55c43d296cd6cf910139ea29afe0d041358cc5a8ea0366936dfb75ba21640eae SHA512 5ad7c7171faf5a1c05cb9afaf307880e37744cdf472b1f6f1a72c1ab98f58f2e2150d8582ad72ad0ab9b45a075b7c1ce700603c942b183328a18cee505a186b7 WHIRLPOOL 7c5aaee9bea21577e2864ccc6c31d5accafd4a74ebb79d4f73388a0b3995de84471ed7b18c896747c8730349236136cd23f44f5c71a7aff3a08ef13ef42cc682
--- a/app-admin/puppetserver/puppetserver-2.4.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-2.4.0.ebuild
@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords as puppet
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"

 RDEPEND+="
 		>=virtual/jdk-1.7.0
--- a/app-admin/sagan-rules/Manifest
+++ b/app-admin/sagan-rules/Manifest
@ -5,4 +5,4 @@ EBUILD sagan-rules-20140617.ebuild 565 SHA256 894c48debbc7542c9ddb9809d6e8ce43e4
 EBUILD sagan-rules-99999999.ebuild 542 SHA256 fddab1128953adf8e2aabfb3bf3333ce5ebdd5c4f2e13096d7265028d4c2db09 SHA512 c15119f00fc76389bafabc93c5fff3d72b046a4376859c92abe0542ff4f6f72e9e0ab963ee220629cfd62fd0faaf772038a796a9dc0e72fc7bea1ae36596528c WHIRLPOOL 343c7d47e74c5ce7fa5f00bace447c76580d34eff216dcc6c67b42c7a872439f5ab5dd26c7e1707e194fc09b9a4409561aafaa8f2f9d95019d0209e84dcc1333
 MISC ChangeLog 3166 SHA256 9b60b520934df05d3c70bf083b6111f97894935737bb44933c76011efb928a52 SHA512 a582a4ccad4d951ea64674cb381f3620d79dc8bb72d06e579e05ddf8cbed739eb3bc3c838286e21d6d6bf9ed6af8699812d09ce457ecaba6b938085f96c4b85c WHIRLPOOL e235e4b38d947ed5709b4d93132e012014b4eeb49eaaadf2a11a1cd0d920b6881c45e186e63bafe9bf189d6ead37775ab9a9d59926cebe7f2185f7cd058056ed
 MISC ChangeLog-2015 3473 SHA256 8ac0443306708cb8d87864205843a92b2ead3acbe1d55fb0d29b39e7a95ff156 SHA512 037cd74b318f336542f5d9c13149249aac2eeb5079211f4ff5f71c8a9f8f18af83c40b7852a64cf0a359eabf14def7e37620f7b026b7aa2f835033b6b8b6edf9 WHIRLPOOL 983110a37ffebab4ac065c2fa4d3943cf61252e9a8df7ed7f816b029f6119c1d5f56b083632e4d9b2f2edcc02d16ab6eba119c65859e9920c1549085b8eeaadd
-MISC metadata.xml 608 SHA256 e2b4ab0491fc3c74ea309058bdcb3e9edc48063bbb9e916da5bb06fb2abd4c78 SHA512 4a8388a2cc4976b1533615faacb501864d48508e4f10fd1f865491ce070c7bc4ba8b75cf6466eb805125a7cb445d7abb93f40b437e3b67d9e318d34b4dcbb2db WHIRLPOOL 6a8d25df8bc232febf4c447022cb54ef8f67cb2a4670db8f1d213b4f643874f383ea4ff97de6bc77c4b71926a430c78f7b555160c200071adc9446ce7d60551c
+MISC metadata.xml 328 SHA256 1244d3f56e7beb99ebd0ff3f5ef010394076fd1f20e49102aef85637c2311ef6 SHA512 ae3c3a6eaa10ad3bc7c9d09fbbb69ad43fc9d35a3420eaea4c3615a9b788367b43defe9015002efc525891d4ae57181f45614ef876d179e992374776df6f8f28 WHIRLPOOL 5a690ae661cf51bba6b30e5bcc3dd3f2e3038246d05d015a5c288122998a3e1f91f89d39de433f37f68de7ec221fc7c853f9360398ec0efd2b386602bdce296c
--- a/app-admin/sagan-rules/metadata.xml
+++ b/app-admin/sagan-rules/metadata.xml
@ -1,17 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>andreis.vinogradovs@gmail.com</email>
-  <description>Proxied maintainer; set to assignee in all bugs</description>
-</maintainer>
 <maintainer type="person">
  <email>maksbotan@gentoo.org</email>
 </maintainer>
-<maintainer type="project">
-  <email>proxy-maint@gentoo.org</email>
-  <name>Proxy Maintainers</name>
-</maintainer>
 <use>
 	<flag name="lognorm">Install normalize rules support with <pkg>dev-libs/liblognorm</pkg></flag>
 </use>
--- a/app-admin/sagan/Manifest
+++ b/app-admin/sagan/Manifest
@ -9,4 +9,4 @@ EBUILD sagan-0.2.3.ebuild 2029 SHA256 d229023b184187d8eb42816ded0b4a67f60236ee05
 EBUILD sagan-1.0.0_rc3.ebuild 2085 SHA256 9895626fa91f7d96e25735fe8b5aaccfe8865be7d0054045fe9b275e188a66af SHA512 995aaefa800f24c5fd918f7217deb9153a18324c591c6aa83c6f2addf53a57f251f0f023ed752884b937d6c5f0ee51df1dcf6829ce765c46d0681e55b2785022 WHIRLPOOL 75e0485b22f49d82639ae1528ff03cb373b0400c3876ba247c62fabb354ad07a5c896b5334aca2000a896638b91bcfe87e36f373eb0facfe4b23aae1b743c1b2
 MISC ChangeLog 4500 SHA256 d2f9145d32180a78c0447acb82b007125c798eaaf4b64de4b288054b6303abfe SHA512 6aa63a942d97cb7d1e2d1b6fcfdd59c345046fd12d1966e41c8c927644aaf5a8fee32bfa8e38de954069b51760401d419248288a215f3b57d292347784b420ab WHIRLPOOL 97943207512885971a8e4bc3022706a49f966f19b9272aa73fb75ad0388edc86f31ac3bf11cb3ed5a7a0ea31a4de9bd102283b821720ee0d7ba239422221baba
 MISC ChangeLog-2015 4561 SHA256 02442352cdc3e2334c6c6de92a97be3a6d9c9349d0df3330b7a95d35c01e3453 SHA512 e9e451bdd0585e26c76e877b630a6160ad8f3ffcae2dfcc34ca70e7c132f0d148421a3f3c8cd6d6eed8f55ecaaac20e005047c117af9253f599de50dc11827c4 WHIRLPOOL f60b36d66edcb4099b1a285539a85bb44d3c81b6bec7226d9c46ef1ae16b773f09b8490d39b353d0eb43b25ce732ffe1f63cf22461f230eb318850f2d665ef0b
-MISC metadata.xml 1030 SHA256 142ed62e903fd4eecacafba0ab47d52c282524b42ab3451d22b8e5229ce911a9 SHA512 f109e488c84edf56d455f19d732f7481718dbbad625b93b5e9430b8872d34310679d09511e6964a458134397c605270eb8a51289c4a1400614a2c31aec628401 WHIRLPOOL 5b24b7b7ff77e2d4e7312f76dc2d642bcaf475e4671a51535b550a548d15428a479285bc3615fabc63337888ceb245e1317d5e19876f2042c1f57ffade2144b4
+MISC metadata.xml 711 SHA256 ebff359dc39537473536a42dcb182a944a440af02fd3e07dbd9006c10bb22039 SHA512 0ddee4d50afea4e3813b9ffc57d444b95c56773f58a469e28d99a85bda787143a23f4adae995632283b2ec5269cbe38e3ffecd294448c675169c4ef10033afb6 WHIRLPOOL 806ff18cb87653a6977e666d6f93ca8d0cd9d1a84147266282e57c2f1065cb137c09590fff9729c9e19d23f356b62c0b6e744c8a618347cfdfb443975b812d3d
--- a/app-admin/sagan/metadata.xml
+++ b/app-admin/sagan/metadata.xml
@ -1,19 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>andreis.vinogradovs@gmail.com</email>
-		<name>Andreis Vinogradovs</name>
-		<description>Proxied maintainer; set to assignee in all bugs</description>
-	</maintainer>
 	<maintainer type="person">
 		<email>maksbotan@gentoo.org</email>
 		<name>Maxim Koltsov</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<use>
 		<flag name="smtp">Build witch SMTP (E-Mail) support</flag>
 		<flag name="lognorm">Add support for log/rules normalizations via <pkg>dev-libs/liblognorm</pkg></flag>
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@ -5,7 +5,7 @@ DIST sshguard-1.7.0.tar.gz 769779 SHA256 5ce784bc25dc9801fbfadc4117669ee02397526
 DIST sshguard-1.7.1.tar.gz 832220 SHA256 2e527589c9b33219222d827dff63974229d044de945729aa47271c4a29aaa195 SHA512 205f45f0f1260ebf2a1efabe5b4391b23c219f37df096383d87c220e7392cf58827a4e509be65287bac5b2af49fa0fc390775e1472cff4fb28f2323821f00fd1 WHIRLPOOL 2810c8c77d623dd21baace30bcd4c20efe1f7544e0db3a8abe84ca823e4cc391ecde072d56e63e10c2a490d1417e18fcd9cae16692ac72fffbf216a23036798e
 EBUILD sshguard-1.5-r1.ebuild 1251 SHA256 98146da908c38b47e2e4c11833197d1ba97f8cedc74036c38554f637f776175b SHA512 46072a8c9c912843137e79844f17d83d064f32d148e43726c24e7a46d61061a7073b0a508d83e963af22feba96103e2b71312f801176f7e7810e1c9dfadb4c4a WHIRLPOOL a2c2802cbe6e7bd07cc1b4f2223c337a6a925d525a4d1cabc2365a9e9e39a5d53c09c47e755efd20062aeae54c59055b12016a357d13f3389adbbc0ee1f5fe02
 EBUILD sshguard-1.7.0.ebuild 1251 SHA256 7b0c659a97de32cee877fa644d186228db541b45b0ef80ca4d7dd05186412e0b SHA512 668ff5e47887bd7e8157c38ea4e0ce252c8d52f1cf36647f0bba39cd94030f53a1d1c3a4fd1a02771c7deaafbb0651ebd281fd73ea8a266ef101d08904ce54e7 WHIRLPOOL f2b5a0dc56b9a33271b576935c2db07a328b84e120a8adafa59513bba6c9ad6be91542db9c081bf3086a54117b676494694454f88b7f19c11724ddfce432b75e
-EBUILD sshguard-1.7.1.ebuild 1252 SHA256 f21251f92635874ece451a9ffa05f11076d0ed163750da3327e59a2a7f3a082a SHA512 739070d9f9531f238a348a9c91dd44bfa5b7398ab880b12940ff717fdca2f1593b8a2c0017f7057d467e52a7e09b383d7f284c19e85ec1fe662e41be8f5b6e29 WHIRLPOOL 489ba5a044240ed91a9426c0e826a5db5159c1cd95efedf5e57dc2ca3b3aa1cabadf49ed8925e7c12e2923d8d8d16c64e53cc4945742a3a91df6662375963475
+EBUILD sshguard-1.7.1.ebuild 1250 SHA256 ab73e2ed8599a2db3536aaff304300b25f007aa5dd9229382ed5204c4caba54c SHA512 c5b6e929baab25d619141a0c544378a333d2b2abf6840452c64fc245ae75442f65b8fdc681ce8a8145a6ce8207e1d1fc8a54570e1c97a23425923ad0cadc0f80 WHIRLPOOL 8bf84520c389f1f831bc99626b466840609df197a509262a9d6b24f40178ada73ff8ca6c10f18b8071aa784c13f7301e8d002cf0da13f674f729c116fc370173
 MISC ChangeLog 4254 SHA256 eaa6f2711106460318d556aef3f7f0e62dc82f10177d193f60f3a400e4ba94ca SHA512 ef97796e890fab12c8b03707a42d76759457dd1350ecbd772f40e66f39f5b1a643958fa20c8c0c2324b630ecd6ebb3ef890aad477a0457b77fd6e29172a1b296 WHIRLPOOL 109df28dadc52bdbf8d5d3d6fbbee7a0c5e34b936331a0a22284f7367ba063bb6705d65044413e40a8b87ca3568e96f73484376372d5713cabd62c928dcb6ea8
 MISC ChangeLog-2015 3411 SHA256 0b12c834f0a95041a023e9e36432da480f9ca49dd19d105865cc8d02517ed16a SHA512 5bd3f8a5f63a0dc036f5320243bb07d96953bc03d9a2ff51820778a817612f2ab9e07e59db9f2e76d68db5cdce39dfa93cb90955db18caa06a9d96407b914edd WHIRLPOOL 19d9a00d8dcfc869cf49618f20b1debb59c3cd967cbb1b8591749f5d97669084589d8af2a68a2302e7abcea8ae85526785e4ce5e0de843fa098437d7ae212de1
 MISC metadata.xml 467 SHA256 b423370fb24f542610016f009bfab7cbd668b4211c9fb0e88e4c14302f4c9993 SHA512 3d936c9b01370bdee03cf23d2ff8632eabc3352054b1b7797baa6e8f1496adc35e79ae286a63bc9a9d6ae5f1e920300f417c08f637ad78e0c40711f2e51dc7b9 WHIRLPOOL 138db6422139317a253113f2cce164cfe6d91c330ed0f6963ddd5b620fdd5b0941454276e511f9f2c8f49c1d50ec6904b15db43a67bbdcbd3a185822888780cb
--- a/app-admin/sshguard/sshguard-1.7.1.ebuild
+++ b/app-admin/sshguard/sshguard-1.7.1.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE="ipfilter kernel_FreeBSD kernel_linux"

 CDEPEND="
--- a/app-arch/pxz/Manifest
+++ b/app-arch/pxz/Manifest
@ -1,5 +1,5 @@
 DIST pxz-5.0_pre20110811.tar.xz 11192 SHA256 0059ce89a35ed9d14634903ba1c7aae0a4af6116a6b0f04e10c4602862690ad7 SHA512 d7a837a1b777aad397752efdb0416778bd7b0da93db40528db384b5573702ff9c387c8223a65d1cdec3261cad07ca51ba8dc3bd8be18871d66f63009e144799d WHIRLPOOL f6b9dee63c2888f360f6298b04fb8d58ff20d57838faefa7e96296a37a98263d42b414380820642c9fc57d8ca4f5ff6d1eb7ddca66d09943c2676bf34b0e3a01
-EBUILD pxz-5.0_pre20110811.ebuild 475 SHA256 b447c864f1cd7bc37b0d4151da0db3bc5083a3765da8e8de75c0c61d96c3ed91 SHA512 d540c67f524b360dd319bab40307f8cdd3a917e740735e181bb28fe51019955900ad0481337b39aa1f329a90ed23f0ded07c9499e4030da63fc32a212e22b027 WHIRLPOOL 81ae86cdde1bbe8236d709edcf391290ec8c98e3b73ef15c2a07db9f08868cacbffeab6dbda8bfedcab607cc4d74659827b8992091bdc047d6905791fb079aa9
+EBUILD pxz-5.0_pre20110811.ebuild 473 SHA256 1ee537a6e2d62fbe495088ed5cabaa26fbd151fa7dbdcc33e758832dfb8aa1e2 SHA512 69a05746362dedbdaa0bbf464d0672a219dc710c9550c6496b1d30cb8c318eca1fe59e23efed590b515bd8d2918ef9c0d03f454ac5353b652bc2ea483357ec1a WHIRLPOOL 11888aef9c7dba9dae5541fb244a430cefe4ff12618420b170ed6542b6aaad6f3867d82c5dc10f170d9c29cfcac426417a55a395a0e3f5217f2d3bd0c403e5de
 EBUILD pxz-9999.ebuild 949 SHA256 6b2f87d5c8ebfcea85bb31b851ac74c26d3441e0ab62d7e3ae6570b697297cb0 SHA512 4afda002acfd852737e86f0f63304e4ca029fcdb1a701dfc0cce72af88e317c8ee11d36ffa6f90517314ee29cf2687c9b2888eb435ebb8f0522d24917bbc4bc0 WHIRLPOOL 78895dddf7ed0c145cda673dd6acc2af4e89fbfd493410abe1d9dc5ccb296613201892a498ed67d145a35bec5d880570b477edddf3eeae504785362090cfecf3
 MISC ChangeLog 2619 SHA256 f3de9b455ec8061b5b2ff36c1f49ceba821814a4378364bc5bdab4c39d00065f SHA512 2af9eaf157a86a86638e3e30e0cc732e662b8ec8ffc0806c49fc0f5f77418e1458a685dc6ef60b1413aa9529a0a775140970c44870797ce731f48f0970ee8400 WHIRLPOOL dd94df5e595692673efdb2d4175ffde083dcdbb1171f07e3a52d31fa0a7534a2ae66a75a752b4219be89df20b9f3220c12e3fc611dd391c648630644793e068a
 MISC ChangeLog-2015 491 SHA256 c14f247f7cb759d0640faabbb4e4b7754a607e6d05f32476577a92479942ffac SHA512 ba29c72d8f559c0d6a4787c3826a41e3b7bfa4a5ad4e6dbf023c996799f940ca9081215c81dd26d933b59ab6a858fa9fb62e91702c7123bda96a9f1d8b846994 WHIRLPOOL 0197031dd1967c73a910bce019028d76008c5e31a4011d4df88fcbe7003b70a047ce288d0e0a2a3888c4bf1ef5a0a7a250c78f066cf46e810553153ad74da376
--- a/app-arch/pxz/pxz-5.0_pre20110811.ebuild
+++ b/app-arch/pxz/pxz-5.0_pre20110811.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 x86"
 IUSE=""

 RDEPEND="app-arch/xz-utils"
--- a/app-arch/unshield/Manifest
+++ b/app-arch/unshield/Manifest
@ -1,9 +1,5 @@
-AUX unshield-bootstrap.patch 644 SHA256 6f86a978778f91a103776e571a24588077d530cdc08c3151dfac1ba106cbd614 SHA512 fdf6137dab6b8a0516e3319fe85ea475d29589d031156c264055fd08515a026a31de79071e7fc3b2b7566b484edd1017784e879d68ef92a80956ade8398463c6 WHIRLPOOL 47e92cbff46bace208e1df16006bbc0526b84f8786e94da8cac3952789b776ed718b959af8383fb5ccc079f7e14edf6c62f00859a4cdc5864e15c2dc7a512b39
-DIST unshield-0.6_p20120308.tar.xz 31924 SHA256 5f857a496ff54b9e1121b8ce2ceaba78133e91e254203e81340010ee05224da6 SHA512 7eec3c401af4c43f599e1b1abae3efdc6b91bd132a86b6658656bec4f00040eed2b0addede7b555953ecc7b1c976fa03013820a25a68a226cf1b973caffb25c4 WHIRLPOOL 12d307b8345b604d10c42b52c28e1eb4eb9745a7b542da188b2a24c4a993b45cfd98a01740f3f30362c9b2714ba61d5e4c6f66a26e599356b5cef5b76130fc34
 DIST unshield-1.4.tar.gz 37199 SHA256 8ae91961212193a7d3d7973c1c9464f3cd1967c179d6099feb1bb193912f8231 SHA512 b09c29fa8e5785f2ca90b40105304802d00d201dde42ef4f5e4b5504ca8edf10da426c7ed1daa8c0685980f085eb20437162812a2068a0c03c0dfd240edbf944 WHIRLPOOL 886c6272d8666192e67fd0978f3d038b9a023ffc8456689b0e6ce6d2c0913f21a1ad8e2baa3d57991605cf64d59a5991a4f8ef3f8856ecabbaccb664bbc3c91d
-EBUILD unshield-0.6_p20120308-r1.ebuild 892 SHA256 399d154ecbfd664c37906fd79c8cee3c4f651e7e01d63aee60f610121882bb60 SHA512 bcb5e6cd9eaa85e89b2cc5cbf6f9fcef19d9b20a1c66fac5599623c796573f81774bccbc82316ba6ffa50962ea15dbefb80fe97118a666ef58c2d2d6f071f822 WHIRLPOOL b35dd1529c3e07596ae870bd7a5e66aac1e9fcaf73df3dad1c1f8e6278da82688a0f305d9f53afa0f846553c4528913a84c7361dc62ed9e4b03800624c91dcfd
-EBUILD unshield-0.6_p20120308.ebuild 827 SHA256 34d83726365d9a073ac965d33a52f5730eb9b08a8f39143e09e966d23a1bcda0 SHA512 add430ef3bb4b0839084b7d653a9a39cefacb723cae9868512387bd8ea4b07b43c6b5532fb0e716c9ab65276b7dd04f757a4fdfe02b2fa3090add0ed97951f32 WHIRLPOOL 42b79291eb6916bfbe6ec6d69373b7a8b7a676f09151bf0fd40c98612ec9e2537f621ce0557ac6860040265992970ab1d1d5ad94e4b96163d3fb4ea021555456
-EBUILD unshield-1.4.ebuild 940 SHA256 a6d7527ae226373c6aa3579efa71c021a4cb355ad7db49271751e1a2c7f0df0a SHA512 127547166d9f1877785d8630317b1c733981241ed8f465b01e43c675ccad905eb302f3f5f2fea4933aa7d64026cf90278d8842f6d5fa9cea21f37d8d58bd268e WHIRLPOOL bea8c267a454f7282c0255e71b339b1e10a19ff4e92a38dea0f6db4f7607fd5500da67f1c38b4985163603377b17a1d578e2008b5f5cee4e5ef971e574d0b727
+EBUILD unshield-1.4.ebuild 939 SHA256 bf862a520f37c3e1621569ab2b6a7395a1894fc28e3e090c2b6fbeecd5bdff74 SHA512 eea720749a18818c7b27561985e4d5a5076b8433a74c3a63230d3949a39d9fc87dedaf4f424fce1ef7f2c5b3b57d8741b49979f08de568b3bdcc831c54413a7c WHIRLPOOL 5ce6b4ed892db59dcdb2187ca330d8340350b7d8e6f9ebfe120155cf588b4558ef322c55f2f7c7f83810e4c5fe853b9c680f7d65d77a246074a59ddb04447180
 MISC ChangeLog 3948 SHA256 5b875027d626005a7dce9fa1caaebd4cc6fb8c2f8c3d90d263d58e933be7c20f SHA512 26c65bee23ff2e0486fa94fc41775ee7354f29f467c8a15649b6a61380d03bc0e36df07e4e54fc846807502b78f4777f842e7580957b380191ba6a48ec885a31 WHIRLPOOL 33cc1fa82faa5aa4018d05f52f852c3167149cac214131d07f3e2e5b51c767c6fe9ab68f1831763920bc75798f5fbc418601f5f25dff35ac188563785cd8b31c
 MISC ChangeLog-2015 3948 SHA256 1e3c07bd6e6e8736e66dc5ef1c511f3bee0ac43dce6d8f08f8c5b00346637bcf SHA512 f92a5feef0319fc288a62b8c025b7b4217571be0bd42a294cab498b4638eaec9003be893a7481154d1f99789daad25efa399a0d7b2a5aabc2ba51fc5737d561d WHIRLPOOL 495fd38350565d7907926822ed39ffaffedf4b0a6d9460d64cdfd0958f58f73f10a569ca7b912c1fa094ef295f4785479024cd8abbddc213cb913e41c87ac1bf
-MISC metadata.xml 276 SHA256 6637cfc43cae18e62da96e54c99b6d82827a6c89ea3a942c6d6d0214969f14c1 SHA512 a6aaf4eff5f90e0f2345af6768039c62daac8436eaf353060accd516f42162c6ef3cbb73048dcb239220b7c2b716f329644a70489443ac8a2c32d24a0c126721 WHIRLPOOL ba62f0e00c701ed6d4f4c47d002a1f277c4a5ea294f6d7da175eac6e20c50c51163dcdbf6dec991aa640d0cb4db6881c71485c7c1ebac42d37380ab754ea91d8
+MISC metadata.xml 224 SHA256 1a209c2b9a233bbf348df12a4ec946c08bf8658cf1cd34e4b755cc46d1d3e902 SHA512 3c955bc3bb3a290848f9cc01472321c321ad63b98a10eb1a7986024db98c099e5a18c628c6398b37c42e69d333fe88d74cca5c22293aba196991aa317e6ed670 WHIRLPOOL 5c1d3edfbf61c9e4fee24b84e949b8c67a51798eecb9896500dba6399533d73f368de507bb00b7b339503d352aaffee4652fdfab9b75365c3eda8b88d99476cc
--- a/app-arch/unshield/files/unshield-bootstrap.patch
+++ b/app-arch/unshield/files/unshield-bootstrap.patch
@ -1,32 +0,0 @@
-This is replaced by `AT_M4DIR=m4 eautoreconf` in the ebuild.
-
--- bootstrap
-+++ bootstrap
-@@ -26,17 +26,17 @@
- 	INCLUDES="-I m4"
- fi
- set -x
-aclocal $INCLUDES
-autoheader
-+# aclocal $INCLUDES
-+# autoheader
- 
- # Check For OSX
- # rhcp011235@gmail.com
- 
-KERNEL_NAME=`uname -s`
-if [ "$KERNEL_NAME" = "Darwin" ]; then
-	glibtoolize --copy --automake
-else
-	libtoolize --copy --automake
-fi
-automake --copy --foreign --add-missing
-autoconf
-+# KERNEL_NAME=`uname -s`
-+# if [ "$KERNEL_NAME" = "Darwin" ]; then
-+# 	glibtoolize --copy --automake
-+# else
-+# 	libtoolize --copy --automake
-+# fi
-+# automake --copy --foreign --add-missing
-+# autoconf
--- a/app-arch/unshield/metadata.xml
+++ b/app-arch/unshield/metadata.xml
@ -3,6 +3,5 @@
 <pkgmetadata>
  <upstream>
    <remote-id type="github">twogood/unshield</remote-id>
-    <remote-id type="sourceforge">synce</remote-id>
  </upstream>
 </pkgmetadata>
--- a/app-arch/unshield/unshield-0.6_p20120308-r1.ebuild
+++ b/app-arch/unshield/unshield-0.6_p20120308-r1.ebuild
@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="InstallShield CAB file extractor"
-HOMEPAGE="https://github.com/twogood/unshield https://sourceforge.net/projects/synce/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="libressl static-libs"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-bootstrap.patch
-	./bootstrap
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467548
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--with-ssl
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README
-
-	find "${D}" -name '*.la' -exec rm -f {} +
-}
--- a/app-arch/unshield/unshield-0.6_p20120308.ebuild
+++ b/app-arch/unshield/unshield-0.6_p20120308.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="InstallShield CAB file extractor"
-HOMEPAGE="https://github.com/twogood/unshield https://sourceforge.net/projects/synce/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
-IUSE="static-libs"
-
-RDEPEND="dev-libs/openssl:0
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-bootstrap.patch
-	./bootstrap
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467548
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--with-ssl
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README
-
-	find "${D}" -name '*.la' -exec rm -f {} +
-}
--- a/app-arch/unshield/unshield-1.4.ebuild
+++ b/app-arch/unshield/unshield-1.4.ebuild
@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/twogood/unshield"
 SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc x86"

 # OpenSSL (or LibreSSL) is detected at build time, and used to determine
 # whether or not a hand-rolled md5 implementation is used. The build
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@ -29,7 +29,7 @@ EBUILD bacula-5.2.13-r5.ebuild 12213 SHA256 c55c47bb8f7a9a64eebd092c6a86d949b4e7
 EBUILD bacula-7.0.5-r1.ebuild 11562 SHA256 23f7e9105c60643d259fbf05c4b55b6ddfc13ee57a05d4f23c200d2b2d688e9c SHA512 e2bb77fb2a26cb83f39820cac3bf09d87269ef04f19d7208703aeda9a4bccc1d03da9fe704c7ccf266d5273c46d5f7ef42379275b8d26dbea17db0278d34c409 WHIRLPOOL 0463d522a03ed30f1bbcdda1e5a3629e4db4eb3bd29ddd98913d75cd6926a58035128ca8bcee76b63818d53afc040691a8d2f2ef772fb356c69d20ca82239a93
 EBUILD bacula-7.0.5-r2.ebuild 11671 SHA256 65c6962d60b8d8c1523df6db78c1b09fd5014e6c97bedb77b290a634a5033ba3 SHA512 20aff038b0361559458bcb505583af427ebdf70fa3a23a52ff9dbceed363c47ada6907cf46e5ac875427661a2ed3a0bbf3c3ab8531422538175733fb223304d8 WHIRLPOOL a0b30d28357f954bc097812f160499a584e3eeb4c0f72d93f795e16ffd20d26e6e4bed40d1e69cc3748dc0eaf050f762c380c0b62e47d90fa0a62b648606e6a1
 EBUILD bacula-7.4.3-r1.ebuild 11839 SHA256 8b1c0246ffe478494ee9e8fa2dd08561e19c098f6784b95691ae260efa738e5a SHA512 76d8c8cf6b09e36b05d0964247dd64a4f88f50aeb72d8cbbabe96f7495e6326c108fd315a24177b60fbe7190dc94d01e3f3e45eacca89fa82e921682e10fb6ee WHIRLPOOL 6855333ab3e20566d5b4a29e87b5c09137cf5b80be9e0bce5e7b5ae750837780eefa81ea88cf748e756e4090df12bfcea3e78b73482864d78e5f946f08cf86b5
-EBUILD bacula-7.4.3.ebuild 11748 SHA256 f88ecfa57b2cd7492b5d7cb81ea22332fb76b53426ca8748cec334c17e6b0fad SHA512 111d44c1e9f6ef61f3bc1cd8d9b1b071ff53ffbf770df5bf927de24e998b13c564e96f78e227b5f3adad66123e83bdce9e5141bbc29ddea2a41d2ac868260a1c WHIRLPOOL 0c673ca60150f6b254ec0a3a53b3e2a21f3d5c01d334a3b7b4913cb778431f5bbb1a3f5682d6058cfcdc49455516c3fc5f8b35a4f40123111d59ae2cc30a061c
+EBUILD bacula-7.4.3.ebuild 11747 SHA256 d14617bd2927e8a5a3ea391d1e813c63213c31ffbe05eb8962df0fd258cbb58a SHA512 98af0178ed3ca75f7eab4eb482b0b9714de37717fdcc36d3795b396e3efdf73333602e45b68121f10d72682c9469c06ad7bf4f3411772d1bf0895900261e5be2 WHIRLPOOL e024b956ed23a7d69aaf19594c36e0763e67568748b9f272cf5c4145989b02f18b92ee2cbaf7158c654ab9680af0ec8a3a079af393f6ed07de1dd348a6875dbf
 EBUILD bacula-7.4.4-r1.ebuild 11760 SHA256 c443713f87a0ae7bd1bcb861aa69c33ed728a2540593763f5c442ecafd0e5979 SHA512 d2af5f1e01ddb4673d81bdf1b2560a6d6a6afd1743788688de223597ac8f8ca3c1f3a2ba082d945bcc308e60aac1ac8f9c186093b156dafea0560da5c8b78de3 WHIRLPOOL 3c9e382c4b40a3ebed92bdd397adcc29aa8bf722b4c0e32176b1efbefe980f84816775027dc40efe51508d66595ac25f7905eca156b2b09718c587cfcbb27412
 EBUILD bacula-7.4.4-r2.ebuild 11850 SHA256 67e8303914b1694734af40453f9e1f846699e783a0e6981e496189c7605e6b54 SHA512 16e1b54685f950eeebc784b235f0270b1e6a5cb4946ad300306bf129a6b01bf475b4605bd25d53100dd56d1e43c8c285b3cf5f07e7264618ed2480378728517a WHIRLPOOL 054f6e5e3f2723398d05fcb0ffb667f472a73467b460994bfc78d994054f60ecc27cb2a92299248882a0ffc093184b5bf8ca944af7e4220141e3914e06f736fb
 EBUILD bacula-7.4.4.ebuild 11749 SHA256 5b297f34864741f0973753d0fdee3759ece0125503c3562f2d557f2283f6c44c SHA512 152d06d149d8f8050ab00260af8961caaa855007db11dedbb163713a6ee130ef1827ca6fa7d143b529159092137fda78daec413aa93d779b29f753a626596b5b WHIRLPOOL 6c4223e448ad4c1ce0bc4d731458649e683073b6bf5be6d77d8f8223d65f353b6dc34c450d03d178c32451c1b80a28befafe57b46a5bedf94f42aa493581ee13
--- a/app-backup/bacula/bacula-7.4.3.ebuild
+++ b/app-backup/bacula/bacula-7.4.3.ebuild
@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"

 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 libressl logwatch mysql postgres qt4 readline +sqlite ssl static tcpd vim-syntax X"

 DEPEND="
--- a/app-backup/btrbk/Manifest
+++ b/app-backup/btrbk/Manifest
@ -1,7 +1,7 @@
 DIST btrbk-0.23.3.tar.xz 69388 SHA256 779636116261e3e0fe64ec986e39be594c04454d87be8005115c8577f62b1725 SHA512 d9fc29b8e2a6e191be93c7845c7f1f99ab60fb4ec910d8b60947ef902b7fdaf789bc73a4884bdd6060f1b180cafaacd5fa8f93dc29624dfea8a2890618ce4012 WHIRLPOOL 4cc9aa102c46feccfb0b90e65d03dd53bed07d78e5a9ddd2afeccfe21fb29f9a2aeba8389771ee7c203598858fb94d59c0d19b73ce1fa29b3772e916bbf4f23b
 DIST btrbk-0.24.0.tar.xz 72308 SHA256 032671c2905005d91a87b85acf8daec05df09bfad9e191092610094fb9a65906 SHA512 fbe180743743ead1241968765b5ae6eff37b2925bee8379443568c126426f2098d280a3f62d13e5f5b63f967ac9889ad9331d73f354d0cd441c907ba92258267 WHIRLPOOL 19052093dcec40d4a8bd5593538f6ec44ea2bbaf6a846f966cebb1f1ff76b9c94700a0bad6f16f33258f92fa05180efc2ba770f02db5553e755beb21b6761ed9
 EBUILD btrbk-0.23.3.ebuild 738 SHA256 5b37c59f2d2978d7c1cee62e600dd206ea768bc92eee076fc043cb31c9a0053c SHA512 06413aae124fdf2018fd3474a7f42caa274dde5f7ffbe7394a5d4508c1c8502bb63a5ec6424ff9b64f0443f715efcfaccb72cfda718853666c38f2b9d886930b WHIRLPOOL 298b31324027c331f2cd01c1e83536568927f7e3252ef1706129c0a29df099cce4b1f512ce1797f90992ffe6ee87dfe10f234695fd034863d2741e343dddc1d9
-EBUILD btrbk-0.24.0.ebuild 739 SHA256 635a74f1b680c2a304ca0da9b7fae526f18c86fdd00c12b202338344ec72a083 SHA512 806cc53207e21b8bf0f81b7c79a3b6f578ed76135548a333e824fef739859151f40b7d8f98fad8c594f73e635a0536cfa19c8f4ccba168064950c182b1715b0a WHIRLPOOL 03e0eeae096e94051115dd22ac7f8e98cb01567f56c7181719625b71833005a1e1455e1c0334bb9a31d59621754fe1920b8d0e4a7d31b67b83aff68955ba8139
+EBUILD btrbk-0.24.0.ebuild 737 SHA256 fc9707039f8574b05ca947ee6a181c65dc39e11122e3bb836813d08885f2fbef SHA512 a0ae392dcf8eba47c7200f8a4d664ad57288e9bf0361b6f2d08e9cb2f184ddb8d651f2c1bc5293f505e53132603b4ad9226ef01e41f47de9964f82be9ff1e826 WHIRLPOOL a97fc4aac688588901abb264650f1038159910198e43461c9925ee728ea0379267b0610d3279c2d8ac48359718e43831508aa97277ad053b840fe17ece7047b2
 EBUILD btrbk-9999.ebuild 734 SHA256 b8ea69f8bcfcce54c85dce07d12288ecbba1dc04c8ddbeb4a8262c926deb29ef SHA512 251bdca12730064ed3d5c9f1fff95fb24413f3d4cb9f7dc0eb55bbdfb87bfbd316ada6d1207a1bd470d3677e75229baf6456363977b0dd618f02457978701454 WHIRLPOOL d59562d1242dcd2ba7f3dce124835198bb1e091ab76fd5c70690bb983e583904dea1ff66ab65bdb815bdec8a4575c754072a986c3ea8b142a55679f8d1653056
 MISC ChangeLog 1286 SHA256 5604921fc169564d3cf64b6019264bed359be6b8386e61848c71b046ea1a781b SHA512 1604ea86d959c589918165ca9dcb3dae1d02022136fa4104476019a001acf9d96c5378de99be37935c829abc6163c20f8728ec6e2b0e4e5cf06cb0ab89084e6a WHIRLPOOL 7fd405e092d1d1694569641b37cd50aef6c5ff54e8c9d42ff3cef339fd02251be4f090bcd0042bf44212886f7e046767812464fabad3f224991719b35aaea2a9
 MISC metadata.xml 1217 SHA256 c31206a142829afbbebbe1f909dba4b501dc16a22cff21a052a95786752efc79 SHA512 456f29255c4a04f4f3b3559f3ffd81822127ce64325a4851277f2ab9bd889fefcf628f41b911d09b420883e3ed0f157ef3687044701afaf667682acf6edc30ff WHIRLPOOL 59f2d994963000d9cc31ab491716149f2e2752f601315eb567cdb6ae828a1e5676f4f111981919ae7ba0728943c843e3c6e27cf8681c5e666df76cf6c53550b2
--- a/app-backup/btrbk/btrbk-0.24.0.ebuild
+++ b/app-backup/btrbk/btrbk-0.24.0.ebuild
@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	KEYWORDS=""
 else
 	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 fi

 DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
--- a/app-backup/burp/Manifest
+++ b/app-backup/burp/Manifest
@ -9,7 +9,7 @@ AUX burp.initd 1158 SHA256 bb88181621ea92e7f960eab3e6c4d987e8c2c720b7a4af0057cb9
 DIST burp-1.3.48.tar.bz2 683509 SHA256 bb456c208998d2f5806828357934e794cd9675448cb6545473364fd9e6d73509 SHA512 08de252f25ff7aa448dd6768272a9a14622902347445313b570c857b4e690374e92956379d5b388f446a88427fc4924f9c0df83cba390aa15fd040b8e92f1946 WHIRLPOOL ac99abddd74bcc753037841afc78c74c7af23ad550334f0585540f056ce93243b8958cbdc37cae15cb98a02c2884c928dd65ac03820e1ef53ea031128a831a44
 DIST burp-1.4.40.tar.bz2 712937 SHA256 4108eb45e14740de990d918a2adbb661d88f90de48d6e2e3a6b54fd12b16fa5e SHA512 b44ba3a63d3b75f6fee55bbfef70ac07fa87e78ddb22a398e31a86670dfa3f2db1c9dbc58de3d0038cdc409bd5ae52c8e901cb26975fd7dbe0f773c4841af10c WHIRLPOOL 636120b3fa2d4a3217567177f3c8abbdeb562d298043fd6bd685842287964d835f2a369e36db0bc32ce908ce8f96e4e2677569e6ca4bac80f8d9958a2364a62d
 EBUILD burp-1.3.48-r1.ebuild 2313 SHA256 3e43f196790b12b95ce3a54de2a7404bdb3732f02eff77ada44cd52deaee39c6 SHA512 e2285b442a5f77e99c953e547f51cd5a561fed50afdb803e831fad668bdb8cdd20162cf690a29cdd3bbd1c3dd4b38ca45ef721b7d9dd55f9f499d0933fbfef65 WHIRLPOOL 29734cda27a8e99ad9517415c658f80ec48c39b47ad9c8718d5dbb4ed12162f05252d538d0fa92c656974841b3a43d6843fdcdd616aa6a7e03e9cd8531374084
-EBUILD burp-1.4.40-r5.ebuild 2860 SHA256 b74c12dca669471ba51e062b0b0108aade3cc544d525c2435dccbc080589371c SHA512 e50fe56ae41cba630cbccebde3a9d156f3b8166512f6a9ea61c417e05223e4ad2b27d89ae6fd81591d65099072aec1cad59031428b57fd7200990cbd938aa8cd WHIRLPOOL 977f6fa3705004f67361812b43b4dbd5bdf06f4a6a96522dfa0fa58d312fdba6b36fd8329ecaa7be2d965b7d3a2a13b392f4e9661154b7cc69a1c47ae5d7f971
+EBUILD burp-1.4.40-r5.ebuild 2859 SHA256 b0739ce9c24e66bc084d3ea6678f060a2c3ebc89b1b8f99fbef7fa850e82605e SHA512 b613719e5ea565a7ef0e902216aaa052deaa9d1ba599788c3c7094f8cbdf76ed9c42fe9156341545831c6f59e3a07ed7152b5f28db22c83fe35f42d85df2549d WHIRLPOOL 4fa567d5622772e5b3c92a52365923045718c0e343f787a84f08ed9d275d5f0f291d9d4a5574bbcd5121369043e052e5f5f9389c300fb805560e5274ed50de46
 EBUILD burp-1.4.40-r6.ebuild 2864 SHA256 2bcc2c0ae196151e35fb093b4de9ec278763239d1adda7ca74819279cb93c0b9 SHA512 ea8bf676494e5bd0683fd69c5a1928fa2ed4504ff43384f55f00962e53dc0b94f00ac40b4db0822d0f0e858e21925fb86a040b18adc9f5015c5d52031b1a015e WHIRLPOOL 091d1604538e4089852ade6e7ac9a068df8e6b5213563a5aed6def50d223a460d6ef2ffa7fa278e7c5fcc4dfad86d4994e3b44b603c22695322a13f88b58b407
 MISC ChangeLog 10104 SHA256 552c019805ee1e4755e4664f42be74855d814c07e2aee1d8fc6e83f5907040bb SHA512 c0b2ec70e96501bd5fee5ae166fe544c2bb0bcc4bf07648c591014c68840c08075f0e00ddd2ae3aecc4fdc821191f4da60bc2762bf4e593937ed427a7b6f9c48 WHIRLPOOL fce81ea70cb8c766ab06269059b4c7686635598af06bcbd673ecc2d99da9153b2d5bb20ac21b10a5bc08768f339bf54935e5b326f42541bdf59c90b010afa36f
 MISC ChangeLog-2015 2905 SHA256 c565b278d85dabb20721a04664fc3e04e1ea1b76c6877b2fd4e329491dc8a7c7 SHA512 a2fcf2df1fd47bab040ba6d29bb5d0bbe169e5846694765cecade311c0c1f4730638bab9adb09ceeaa2503a7b5320468282958028953b1ff2955baef76a44a77 WHIRLPOOL 46d9603bc20c6c11229d575e5ded0eb057fd0081f6007d4f3339ecf1820e021fbb1f0f12003ba8fb9016befe6f5bcc6dbeb0635b8a7bc41cfa4083301ff2e62a
--- a/app-backup/burp/burp-1.4.40-r5.ebuild
+++ b/app-backup/burp/burp-1.4.40-r5.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2

 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="acl afs ipv6 libressl nls tcpd xattr"

 DEPEND="
--- a/app-backup/duplicity/Manifest
+++ b/app-backup/duplicity/Manifest
@ -4,7 +4,7 @@ DIST duplicity-0.7.07.1.tar.gz 1539310 SHA256 594c6d0e723e56f8a7114d57811c613622
 DIST duplicity-0.7.10.tar.gz 1543523 SHA256 485fef15526d163c061e00ec08de216cf7d652e67d41de5dc3bed9fb42214842 SHA512 d04273384749c88d0a4f46bc1dcdcbb945ec1a78fb21064f12f0ca6c92cc73ad36fc3149461dbe0a660cd752a1147b2fa5d2b4056a5414c7790747eb5983e0bd WHIRLPOOL 1532b1e5ffc764951155ce248662d3ebf23fff71c538270ee1b2d37c7ad0a90705361b34418a323dfb4947ede42cd356e0daba18e4124e7342e5baadc5d0af22
 EBUILD duplicity-0.6.26.ebuild 1202 SHA256 c335bcb8cc66f528d392024a41922ef71e622101e20c9ae378547527fec5789b SHA512 2d5d9270eb008a1fb6be4bff6354fa88b15b91ebe71b8688dcf42b2417313490be6d1777c80e86de575c4724ccf80b87d5652a0de72c4e80b54d70039ba22923 WHIRLPOOL 83a682a030079881004d90a1b3b636e91c713329a3eef6ff706eeb86d9ea5c8da7c769d5965aded2a54908b4d09d798354efe0c29b02422a41131883b1ae5e34
 EBUILD duplicity-0.7.07.1.ebuild 1256 SHA256 58132e1dd9d6724dc30168226c1e69370f88b16c59f4822006353b7c44db6e7e SHA512 f5093a08d87a535c3583ed7aca0a404c207a5794cbddf3cff510bbe86b992429e5a0d8fb4756977fdbee1c067c830e53763e58b6f29107a9846183dc59bb97f8 WHIRLPOOL 522f38670d717f01c3f06fe2404a4aad77201af1abbd6c2795e87d36a90414f0a34ac72a67c78ea108db81fd37fbc70eff107b7b189158eb8638189232b03fd4
-EBUILD duplicity-0.7.10.ebuild 1253 SHA256 7e073e8fb64d92b8074d3b4906376640354db9b30cf59fe5478e1035c6b28162 SHA512 4c4862464e548e04ebeeab09e1e90776053e194636d0c310a1d1971486204e5c13d23ca8b48e35edb39e0cbd986a0ca75fcf49b4ec43dc052b696034d7f249b2 WHIRLPOOL 6fcc7df4bd49d5efd3ecd52996e901ccc41f030719126a14dacce840d14f8574fa6f70c0beab8578be402feed781101b8ff9bc952e94fa27d24f6a59e277be84
+EBUILD duplicity-0.7.10.ebuild 1252 SHA256 1878562ac314bb1710f54082c97475bb86ced3e6c4b67def630a49658be39353 SHA512 cc6cafaee1fca132fb18ffa55e3b7bf9a095a7741798d9abef8fe5c1f8951d98234a1791c109ce070213c7dfaf4cd77befc43964dcab73f3d39cc8441793627b WHIRLPOOL c983813579e1b92e6d271018a6aacfeccd98d5a14013697079b66bb536b3e1fb6ad3d656784f126692bad26a7fb6580c3dd70fdece43ff38cbb1110a1c1ac2c5
 MISC ChangeLog 4263 SHA256 591850f488d0ffbb448170824948b7b1c1b5d36ac5489fe2021f7d43a4015cf3 SHA512 67f9569cd2fa359f215b2fbbf563628a0536d661c8b81ece0cdb1fa62a8d9866a85300fb7d2b474dd2d79f3de5dd35ba2834a7c89a5631cb972fdf17777ebaf1 WHIRLPOOL b34bc432d3a4fb3cbcd7f688942880e0b3532cd5505b2c5a14c9eceb6253bb31b31e4b8d9a79b2f1dd63cfad88bc4d25dab2f2712aae93858fb39bdaf5b53192
 MISC ChangeLog-2015 16219 SHA256 b21f513ad0ad91c9794189c63f801f11252b4a4060f5aafa52808f33f00fe25e SHA512 c46d3267ba72688adbf022aefcb2c37185cbcc28f0e14f1b7887e3ce8b178e8a04559a414f495903ec7e665f2748f6b9c2651c42997eed5ce3783790eeb59685 WHIRLPOOL bd3032f136b5f28caaf661eb6ad52894f49a2f6e9a0710ad3c9f2ac989ab6c908d281624c31676d5f342a41981adf0b84a84998172993b95d23f0085816ae449
 MISC metadata.xml 438 SHA256 8b43ef79ef703ad2ca0850bf877a44669bed24ce8e37a56781665cee33f7c507 SHA512 d21a61eaada281cf520260d2868ef1dd3ddffa5d1dc6bc2feaf5c2daa8f8fda977d3527de0b5a7b862b18df7f0bbf6371bcb736fe751e5979ec95a66640e4756 WHIRLPOOL 3d15b16f964f55667dd1a4241b4383a853a79c3e4c7b051be81d9cb19c4e91c71219cf5da4b3fc22ad1b15ae2c28d2be1806430814dffd7161d9e39092c69194
--- a/app-backup/duplicity/duplicity-0.7.10.ebuild
+++ b/app-backup/duplicity/duplicity-0.7.10.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://code.launchpad.net/${PN}/$(get_version_component_range 1-2)-ser

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="s3 test"

 CDEPEND="
--- a/app-backup/vzdump/Manifest
+++ b/app-backup/vzdump/Manifest
@ -2,4 +2,4 @@ DIST vzdump-1.2.tar.gz 20296 SHA256 356216d38281d956cb7ba21d7c56df9a57b51bf23410
 EBUILD vzdump-1.2.ebuild 761 SHA256 6af5dd86e5419efc5ed758dd9986032d99985aac92cbdab593b210b4864379b6 SHA512 8d5cd01db52aa48bf7ff7f6f82b21fc9ac487af352d99c58683a3a52dfab380162109c60a79e6b6bccb9504ea9658fa800517a479556f2116487cd69514587d0 WHIRLPOOL 43359aab0bc75b9cbce686ef64dd16702775696c2bd264d7a1bddd5283115f462ec64dea684624ccbdc976f46b5f906d3339dd7e0201c077d05c55fb7bee3d3d
 MISC ChangeLog 3023 SHA256 a587842a41fa92f1409af64f5f926467a7a5036fbca96ef53163d175a38d8282 SHA512 ebaadc2bf8b99c6dbd355ab9369e0a982f03efd5a04edf18abef5bda6634edcca8da26e2646b5a408715fe3a21cef143e787398651c760f460944135a9408d8b WHIRLPOOL c939e01e916aae81ca560ff63c4097bed25fb16ff57290e82269df1387095e6a47e25d398cf48f10cf47ccee3ca75cbcd449e3145a9408e0637bcc76f1ea95ca
 MISC ChangeLog-2015 1013 SHA256 bbb6fed7760fcfa68927bf7c8301180cc09fdbfb724d12e2696a8d92935b4877 SHA512 95f98774002133fb9c64fcd9cbaafb5a720295bf9f24182b289f63211fcf8444882f7f831a18ac1a57ea2b47cbd5a8f6d97f9db77818257dedc4406d121843a4 WHIRLPOOL c3964df0da9a1d662500982378ff5e5819f0dec6862d59521fa005c84734f20a97363c467a87d01bd6e33e142875e1f1fb7f75a08af51459c05a94a9718c12d6
-MISC metadata.xml 847 SHA256 7f54da84633cdbc564b58ddb29fd9f6a3f955c95e1f472fd47fe13636402d9f1 SHA512 ceb4e86fc696348d7f5973160457263abe42e0b735dac1a29ae61c113311773dc4eadbbc23997a178146a3d08ca16172c6f4def5d8026ff01080f542ae2e433d WHIRLPOOL 89084de9b321d04fe96192e88995eec9b47021df5580dda37c6806b07bdf5aaf97b26518e08bd8559ee8f8fc86011842b4dab15def776ed5fd6e3457a710d745
+MISC metadata.xml 568 SHA256 21859d4b346d08d6613fa5b8a5543266507bb3b73842707f66c81f2f1dfa1ad3 SHA512 a3b126c86aa2b924f258a9077248a0381a118f8083432138b4e634c91bfb2d69994f779b947501fddf76e51caf578b9488f1a53b2f10d7db75be6993acf5ad43 WHIRLPOOL 8d73e05c0c51ea5c9f1fb173d2679ed0610bbdec74a6f0904840022f9519baf485866ead170061da4ba4b07f48d697b06c18134674633a79653487c7addb3673
--- a/app-backup/vzdump/metadata.xml
+++ b/app-backup/vzdump/metadata.xml
@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>andreis.vinogradovs@gmail.com</email>
-  <name>Andreis Vinogradovs</name>
-  <description>Primary maintainer, assign bugs to him</description>
-</maintainer>
-<maintainer type="project">
-  <email>proxy-maint@gentoo.org</email>
-  <name>Proxy Maintainers</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription lang="en">
 vzdump is a utility to make consistent snapshots of running OpenVZ VEs. It basically creates a tar archive of the VE private area, which also includes the VE configuration files.
 There are several ways to provide consistency:
--- a/app-benchmarks/bonnie++/Manifest
+++ b/app-benchmarks/bonnie++/Manifest
@ -3,7 +3,7 @@ AUX bonnie++-1.97-zcav-array-indexing-fix.patch 1474 SHA256 8a50c7121cf3726f1c7c
 DIST bonnie++-1.97.2.tgz 102533 SHA256 3f34a4c52ae9b2c3d493af8f794ba18cbf6732e9b76c3a4fa64549d95d914ce3 SHA512 e8303720be9a4ebcc454dbc8906a6843d63909c5101d66524a126ce0db3db7113d01edb7ed2f292bf9d08a6799579c4960f0ee4595019fbacda1601eba52a170 WHIRLPOOL 1f66eef8a583ce9cb851a6c301019ba76d104bf3a6322d504cd7c8d1eb073c48235efcff6fec2b2f49207aa696db1071c55c94a3943a01917b2a7aa7349b0b73
 DIST bonnie++-1.97.tgz 102604 SHA256 44f5a05937648a6526ba99354555d7d15f2dd392e55d3436f6746da6f6c35982 SHA512 985fd4d0ef643fda5363e61609a5d73206ecfdd1c27470cc7babeaf9b7d87136c6bf40f62366d3f3ea58c50a307fa62aea59dc5efa69854fff9c43d1c940d3ab WHIRLPOOL 23af9926691868a208fd69f7ec401fa0c2332835ccc63e4b0143497faabb02f21ddd56a41014b532287f4418e0ac92c712aff2bc0657ad2512961fa5aa3567b9
 EBUILD bonnie++-1.97-r1.ebuild 968 SHA256 c56b97c1d8cf27b76f6878f6b14a69ae36083a29bdf7a28a7cdf37fd6e0476b0 SHA512 cc9c96e43f267c701d8cfe7fe3e35ff9d149143ffe28690c22286718edebc7835b1beaac20fa3648d6370b25ce2709ff4d97556541e5389b290df9b76e803a9d WHIRLPOOL 0181d3f209f8eee258dd4dd189ebc849e374683671e383cd00c1154d43f075d00bf40a86c7bd0a8b9f8c0ca2174dcca13b24224f982ddb1f645be7dfa7a6b483
-EBUILD bonnie++-1.97.2.ebuild 980 SHA256 cb918c8bd19d4d36aacbb2f9bca31ba3a06552edd67665173c5927a019d514bb SHA512 03e1bdbe0c2a1e8b02b1d782042a7beef9c4e0c119f54f7fec3acca89684c13f2530d33cc433799e0d0d374e27e9a2c9ce9aa9abcd5ed23f7d91177cfda40a81 WHIRLPOOL c86b2d1e18636f1de35d574e37c575c4f9062dcbc5fe259f7febb3782699b28cc3ab05d8e3ffbd7403eb052e3fb8f9a30998edb5b5ea11622d7212d820cf9646
+EBUILD bonnie++-1.97.2.ebuild 978 SHA256 3be8256b63ba1e3dfe5d3665140d4042cb1546888ba3d9c885df74cd99a3241a SHA512 07b9c51f1ed591e8fb1b38f4301c036fbb66cbf4d13d18585cda6757e906169329b08c6c2142fc5a260591405b5aaf8141386cdaa4443af89081fe5371427ec4 WHIRLPOOL 903846c5b7e8110b07e8bbec89478b5f2b086074b5e50e3d5c790200bf5f0b277a4b84bcaf9703fa9561c436448a402587d4c94eff2362401befc02316951d3d
 MISC ChangeLog 6219 SHA256 41ad592e7d116226be01f0403f48189d31f87ec05c1de5d946d999d4486bb751 SHA512 02049d84691fc92247610d85c8b6b759fcd3a9ae2b3c59682a573485458a2b43cbda488f83d415dd6f145a70d6697d24c8021b7129cd60839206c6487c7960bb WHIRLPOOL 43ba359fe20064cb547e61c6a5d9ac417bb70b0cfaa6704c525bd61a954503e707ff939d8293cf5220ce8d17696b60e730994fb0a4eace37c109ad587e58e21b
 MISC ChangeLog-2015 6391 SHA256 3104a69df62423f66f37cd45aa8ce2828d774c3203372b07990eb5c463433aa9 SHA512 a589ebc39e14adbe8729ff33ac1612be6c63ccad132d290c5bc13f9b2a0992f058c3476f155a91d45b85c262b2dc065d56ddaf1baa78055c78c284d9c93e4927 WHIRLPOOL 4859d840cb4cf05c520cfba33bf2a31bfdd79fe3a074e971173aab6f3da535e6730ef226ee67663e4c1a60f67fc8a613e56e0090ca6fc006f89146a97dde4b7c
 MISC metadata.xml 610 SHA256 2f50dc1eff0c268e3d911156e41e22a799b6025465feb73e0d8cb220cff16bd9 SHA512 2914ce1d553546237acfec2ef0ba8689a81105fc9414f543cd9080f56090027107e698c1ac0f98f26e5b9658ea16ed27123f23b518fd91ddd0b4a858f6ac98bc WHIRLPOOL 5afaff884e68e762cbb29dbe3d15900d9000e4f33cba0011bbee8299d7fa92199cd985a50d712920affbdd31faaf5ba79355ebe79dab5744db9faedc3706645e
--- a/app-benchmarks/bonnie++/bonnie++-1.97.2.ebuild
+++ b/app-benchmarks/bonnie++/bonnie++-1.97.2.ebuild
@ -10,7 +10,7 @@ SRC_URI="http://www.coker.com.au/bonnie++/experimental/${P}.tgz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="debug"

 S="${WORKDIR}/${P}"
--- a/app-benchmarks/sysbench/Manifest
+++ b/app-benchmarks/sysbench/Manifest
@ -2,7 +2,7 @@ DIST sysbench-0.4.12.tar.gz 421932 SHA256 83fa7464193e012c91254e595a89894d8e35b4
 DIST sysbench-401c5a43aa40a0b89689747b278fae2adbc302db.tar.gz 283994 SHA256 d2ca2676b3417563d11eb071a0dbdbe3ec0bb0f43a0275f6505bc9682fa51523 SHA512 3764e6bea09fa52cc84bbd740b4da0d09fcbb9908a904ad983b66b64d739c0c051013095824b52799f738e1b863290b1b0cb1604add0d0500a95128ae49f4e47 WHIRLPOOL d6bc6115797a0a26426045c6d477488e807e319393eb71c9b5f5bf1248da2aaba9946fff6e977573d3bfb0a012635a1a0f1fafa61df509aa0b8c97fe86ce4a52
 DIST sysbench-48124f838b00ff83a044fbf046a9d8d0b1602d90.tar.gz 281484 SHA256 d3619b4399e6a77a679932571402cfae85c9fd17541050a77006184b3cad155a SHA512 2dd9bb78343df27894094829708dc133009d8ee65399beafbf38ea88d42be311180a18bf7b76cd41b22482606b7de13840cbdf5fc5841a0d2ed59dd65e34cebe WHIRLPOOL 67874d43c2a1d6cda45f64edfe0961018c9b8f5b13cc68b35dfbcebc1f5c75d2bc0ecfc1cffdcc62fc783fcc8a4cabd0e1bbccea5546bcd907d649b6f3b17c71
 EBUILD sysbench-0.4.12-r1.ebuild 872 SHA256 e6d303a4eb7697884952c9032ad58bba8aa62140b0bfe3c7152227b84017552d SHA512 10c0f07bd952d3a1d423910bae49484fc272cce4e1010d63cdc639df9cbfa5dd145ad438f785e0e167c73959485bbd256517e5d2e975dbd97910bb054fe96cd2 WHIRLPOOL 3493f4c42459c7dbb7021fbc25ae1c7f3275b1e83db773180f2b2e2e8792a33998ae2516f03629a784a24f35489dbae68129bc2f39f7653b758db9b97a02dd01
-EBUILD sysbench-1.0_pre20161017.ebuild 1173 SHA256 5ae59653890021158d8d6d6359d490e2a2590540d229826c2acf82b884ff937b SHA512 792ba6c92ce4634d8293b3af9a1deb2d0ff0adfa0f6afb520b15b6819bf5347eb801200f921c91d618c75b8a993905c865b824b36e5bb42aa311a2a9be89f6c5 WHIRLPOOL a4c974b49767689829803be05db9aff54590adfdae1caa4194d7d4a3b6bbb524b59a38bbf6f33cd35614bee530a39f8b3a9696a547ec6a7429df4dc41c8cfc05
+EBUILD sysbench-1.0_pre20161017.ebuild 1172 SHA256 fa5b9ccdc4046886da4f39cc041f64ab60e8515ca72307a84f9861e11ca17910 SHA512 32b7f276d43b7c189a709ac0ca6e1b62859266970936a4303d9b133df521ab6bda55e653f249a6e503f358eb74854722d8773db6c0664569593a0ffe97565be4 WHIRLPOOL 378d1ef124fc7b70467144659ed6fd136cbf1dbeaa37322a7e7a190a687f0f38057b3f24a66df95a185ba78a8f81a012b64e477b06c822be4e9859359048b2de
 EBUILD sysbench-1.0_pre20161223.ebuild 1174 SHA256 e4b16c9bf186f8d3024fcb7377b68f6cfda69336852421cbcf2c33250b163a3c SHA512 c0e3adb08590478253910feaba8e6a200a430aee639da1d45e3aa7475b5963ce68bfe0bc4617f3d02a53a04c162197e5c68a3da7b236ac2202d1b4e602ae4932 WHIRLPOOL d7ecc3ec03c77e873e06a8ab0240b9d02d211f232349cc54d50dbd6c76b2b40dbb17d23d6541f024a147db56b45012ad83b8c55ee15daf07074bde12bacc69a0
 EBUILD sysbench-9999.ebuild 1051 SHA256 51095ca9bba5f402d9c2b0000b201bdcf0a1b535a3eb6241a0a13386e099802d SHA512 868b8b21f47b2653604b0e560ac08408c0e06a3429ad4c6d1798489e5f65463d0d65553c4e959016064d5c85e93c91483c03eca63a3ddf7328bc2b987576bfaf WHIRLPOOL 13e6ca45103a171053d2dacf241602b70109680d65d8df409fe4571de637845bb8d02e42abdcbd52ac9954e170ea97b21b7c6d4e640ce1a04cb6849ae90bf56a
 MISC ChangeLog 3361 SHA256 26df65fd9802faf1013eace20d1ba4b461bd1bebd4f1eb8eb30d68e6d15ea9a4 SHA512 a1917f434e0ce17032ae6557527005c2b348d255298362600f47d232c01e164bf56a48320b1a044506390022504a0fdbdb5468f3fa0a71fb9e6592340c2e49d8 WHIRLPOOL 28ee551701e83293fbed58f3e9161fe8817e95cbba042e95b1370b007b98e11daa519c4c5d191646adcf4162aed507f95109d4e7ead034473f730ff87c8a02f1
--- a/app-benchmarks/sysbench/sysbench-1.0_pre20161017.ebuild
+++ b/app-benchmarks/sysbench/sysbench-1.0_pre20161017.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/akopytov/sysbench/archive/${GITHUB_REV}.tar.gz -> ${

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="aio lua mysql postgres test"

 RDEPEND="aio? ( dev-libs/libaio )
--- a/app-crypt/gpa/Manifest
+++ b/app-crypt/gpa/Manifest
@ -3,7 +3,7 @@ DIST gpa-0.9.4.tar.bz2 730440 SHA256 444de33735cec227f65549ea7bdca4526ead9f464e9
 DIST gpa-0.9.9.tar.bz2 737975 SHA256 6828d738b9e1d3cce96d2ec9831c09873c4cb2c87ba67a161ef54485192c4334 SHA512 2f239a655d56c95b63f5d9bd96bce19a1b5a41c4d849d7fc4f02b6e74bdc8b2738a9483c50cf28a8ff1c78cde994db45a2eee75585c62c7d0fd16e29e045c3d6 WHIRLPOOL 6aa009b915229c25df830e54551fb9474a413500de7a0a20d0c14567130859054a070b89db5573aa158fd8eda387f0f0a0918e786afb87356e2dc407b3e91f7c
 EBUILD gpa-0.9.10.ebuild 908 SHA256 d20c6f8438e5f94368f85583976e983c6dc1cfcfd23a27a94ef79c4e9be2d20f SHA512 e86051a97fe63801f4db84813ab1d7343d529663d9cb3e11d70b3cc9e167b3762daf43aaeb13bf6da8bcb1e000b071d12c6e4b996a76602fd486e45751cdad4b WHIRLPOOL f2db8d3c8ca3f6a95afbfe86f8d05fc0c865b3cfe4dd8410d178827491c43be6056cf5821bd091525cc283b22395cee7a04a09920413cf378a8927847589555f
 EBUILD gpa-0.9.4.ebuild 886 SHA256 a6f06566fc9c3e795237739851cce1f86207ff6429747974b3d8ca25392ba246 SHA512 578d58be191d6d4be4cafdd4fd0925007c604808a90f242cf91b6dfe3e2680308ad4235b38187c13c7425e4e14148f4c59bdb37bbd5addad2047a868cc7f6773 WHIRLPOOL 11c631736448c508149f6fc443bbd6f3f97572f46fe248a45364bdf33281ac0ca09304a3a5d22bac71da9ba9eaf00eae2fd1ebf2dfffde1dd935bc30f5e4510c
-EBUILD gpa-0.9.9.ebuild 890 SHA256 3794c68f947b60795597ccb7fcb89571b19d287e8c6641e8a6588a149ed3675d SHA512 cc611365e83b457ae403281b6cf303cb767f45f46afa856a5fe91f3ee439a2e94419d9f18e1671c8350bd33193213fb8da07b7dc4e1022f081a10fe9701010fb WHIRLPOOL ef4f184034f6c78f48099698f8a7cb7cf98aa553d604c13c529742321b71507c125e73c1d37e6259e114e687d85470ee3c79987b348fff64bf3a154308852730
+EBUILD gpa-0.9.9.ebuild 889 SHA256 97f4c948a5204af246ad3432c54c800c3e746ccf920721f5cc50d43bbbc96223 SHA512 cd4292ac2e6b2763a0d124e0b99a5ba92ea04818aba7197790d1aacdfcf5e7d3586613d2a16c69939ce99786f2777a108fec3f2a8ea0ce387b575c9a5cbbe436 WHIRLPOOL 92199fedea3109dd6cdfe9ba8175d0d989108593896c3ce9aaf360effeacdc153fdc821577fa9ccfa5dea56755acdc7386077d09377dcbf6eefcd66af6a53dd0
 MISC ChangeLog 3415 SHA256 6103951a3a384c26016087ed105d9ab3ecc38bf91cd50feacd649484d0ca2aa3 SHA512 851b1a83290f1a3267df1f37a4f6679ff6ee42ff6408ce0add6b477edb1d03824720e257bea2b700b5e82bdcdf46a2ea63538e1e0c3afe36ea889e9c7b188764 WHIRLPOOL dd27fe7f24311a457858f6dbfb5bede0e5e73da719391ff967d48f465b3640ac6a6ac90dd1006909d033e2e1092137895d7c547dc86a63581fcd4f5e2b935c5a
 MISC ChangeLog-2015 11815 SHA256 8f8a313a7bf2f30b9e4c19781afb1b4d3dc353d25b9bbbeec4f82ba91f7bbe42 SHA512 1e14005d295408a90501214fef7d66fae5e9dd657be28970da0204544442d3b21ec89210fdcc92c59b3eb1b2be50d0933b98a83e17b2276ebd2df9cd512e20b5 WHIRLPOOL 74c69f0f7743e20c855d6a4c5020d6f3b457b5d96050d3789dbfb6843ea6cd93a0ff79e6853bb98d4e23a7f3aa0713e8c000a14f1849731cd188a749833a6c8e
 MISC metadata.xml 236 SHA256 dd25b46c95b0c63da84b7ff5778479e31449a385df066e9ee14bf0d7d176f42f SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08 WHIRLPOOL b15a2dfb001c41c8de2895842148b2531b74949e89e93ff8c366519c35792996e344918eaf9144fb081fc240796e47890be356d2339bea60b1e1d41830447d31
--- a/app-crypt/gpa/gpa-0.9.9.ebuild
+++ b/app-crypt/gpa/gpa-0.9.9.ebuild
@ -10,7 +10,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE_LINGUAS=" ar cs de es fr ja nl pl pt_BR ru sv tr zh_TW"
 IUSE="nls ${IUSE_LINGUAS// / linguas_}"

--- a/app-editors/le/Manifest
+++ b/app-editors/le/Manifest
@ -3,7 +3,7 @@ DIST le-1.16.1.tar.gz 977143 SHA256 54b7382054f69f4af8a9098d196c6463508219f5d4ce
 DIST le-1.16.3.tar.gz 985541 SHA256 3e20346c18d6286925e930e9e7235ab8a5176f4e4f84bee4d17199d3f0f1a634 SHA512 b1ee5440fb71f4214170bc0a1654b68671bac5f08b38e62fdeeaeab2710365aff7cb7c3d13aecbc052b8596c95d7caadd6b3347f9bcb8cc5272a4639856ae46d WHIRLPOOL f749bda32bd683e4b8366e7a0ccf7df4f394aa6f6727aeef5806536e96dbb38398e662d15eb6008db296b8e26894741261de1790933b29f516100a5c5c6c6a74
 EBUILD le-1.14.3.ebuild 530 SHA256 ded8f25f9f7b245a5efebb8691eeed7e09efcb3c72f6c77995d4f8787f88e28b SHA512 4445d2dba347f85477781c706a2a061f10c97f3b751662b9c33e9238641539afe76b0ad104754f7fe717c027489c65cea8af93de5157e411ea85429875e4faeb WHIRLPOOL 6c99790f66dd553de3edb0b3910421236f107d6d21d2b06b9561a658a778a69e664202cebf4a8eba9356b6f37f478ed42e43d1c6d3691ebc1bb03fa32640c206
 EBUILD le-1.16.1.ebuild 489 SHA256 31f4bb3d8603233fab114285824b7ba9b781b67151c92a4b4fcd152da57c6425 SHA512 3ea3fd623a1903a92637c030bba98d35895efbb316c093a9c3a0f6a5bd641257018321e47502c8f10f6c65888fc4d7a027023a4c6bffcbff07ec6332b6294e90 WHIRLPOOL ef225eee462702628739bece5a158da1b877c928b989e2b570d25cc4ba527c21224cc3414abdd5745248bb5b4c3576e2bc20367f9bd9f7d10acef1d3869f6b37
-EBUILD le-1.16.3.ebuild 469 SHA256 c8643c5bd45b392219e5ca5310cbfe63434c89a8644568c71a235c857603f61c SHA512 884105a2070cad7f0f78ec425e79fb244848062e4f2ffd7fe1d5a7c3ab80d679fdbaf26b537b0ec2844044ce4159148bf9199a610771ede1597c495232ff8b91 WHIRLPOOL 2a85b0af8253e89aefd0cc6becba57fd66b29848eec10658fb85a778be01d41550a563d6cd38b9e362e2ce38ff7d896b9ed8dd0ef51a29db2b248974d067ed3a
+EBUILD le-1.16.3.ebuild 468 SHA256 0d574cfd3115d439bf7a5cafda75f082da3cba2d906064bda48462c44594ebf0 SHA512 cd0f792da5f78c1ddf8d4885d816f357255b42b37965ff2c07ce908484a260069340867564dc99b8f359bf1439a9e0267bdc1ea4bd8abee9162743fad48268b2 WHIRLPOOL 0f24cdaf7fc9d34a9a58c75750e0d422d776b8feae4c95593f2e93fad0ceb30d71a29f47528f85e66f0088625c10e331fff826b842a809241ffda712e47e8884
 MISC ChangeLog 3469 SHA256 10af6fe10d2902beb45e6a6313e5134c2da5d34be4290f15d8ed47cd0c926607 SHA512 37b828510fb0ea516ccd14007ea688c770fd4bf31e576ce63a860a1fce69a8d633ef6115a080c281f5d0817b79d4b60d14cc650c2ae9ccc408a19d1ca587b25f WHIRLPOOL 36dbd170482ba2e7ad5d071386cb436f349fc8b8903cdae1593289b701be8afc616aea3457f80724aa15c685be04422c0bc4373b9c65d37742762f71f82952e0
 MISC ChangeLog-2015 3397 SHA256 53a5bba03499f3abd9016aa862b2582abfa1a0aadc987bfa8abb8e8ec2ffb62e SHA512 bf8f4aa3c00e70c1c051d58ccdeae9dc26e260a4f07296e4a901228e7541b331a97ec2c5e9a20e6d157597aafcd1c9145582aa4c5d04b7b42bac9f730cb1c7b2 WHIRLPOOL bfda988ea77c492c5dc59e4d1aca28366338f6da1dd1ea3e5ebdeda247105ccef41d49f690ddf73abf24c48b32143e059ed3b8607b24a8e488ed04dfaeab8315
 MISC metadata.xml 439 SHA256 09c464cb999b20c91d282655a7e9e7e9c4dc4a96c672f02a5c5e5f6f33cff0c3 SHA512 935122ca8314a54d71f6566683f64dbc2be9ea9bc85bc75c6107b40d36dec8dc5e058eb410ef03fdf442a1dc4daf7ec6522a95b4513c907e07cef3921c5f786e WHIRLPOOL 83385845d14efee319d09b626344a8d8ccc8312e459383905015c5aaba64d12152a9a98d1aa900dd93aaa5474cb6fc8c0e2477e354752757c5901255ba6c75bd
--- a/app-editors/le/le-1.16.3.ebuild
+++ b/app-editors/le/le-1.16.3.ebuild
@ -10,7 +10,7 @@ SRC_URI="http://lav.yar.ru/download/le/le-${PV}.tar.gz"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"

 RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}"
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@ -2,7 +2,7 @@ DIST mg-20150323.tar.gz 142105 SHA256 d71b24d47d3e1426f162e446d92dfa457df96dd47c
 DIST mg-20160421.tar.gz 145187 SHA256 b5dd8fbecb8a0ff0f32588c448f22f25fafcbfb297857e76d2883598a3e63a9a SHA512 7a4fb9d8958952a1b430bda88cafa251aab74691073d103941bfc2cce495ad3831b2c722db044791d61ae2aee9a5a9acaedde0090964129822c94745d89469ed WHIRLPOOL 9a040a69c9d57232c411da3859e80c84f2f250f2fd78cd2799cfb82243fdd9d01d374edb23de44d6eb94b9ab86009458b3c7c4cf34b738c45d4622e6c67dc99b
 DIST mg-20161005.tar.gz 140797 SHA256 b7fcb5136a6783ca24c8463ab0852fc1f26bdb2bb1c24759b2c51ccfc46c5e61 SHA512 3ec2e10d0cd427f9543818690fdd469b64e6eb5d061a221eb7b18566dfb1965ee68cea7c83e4e4ae9b2d6027a0803aacfc815390571ac550bc0b7004b46972ae WHIRLPOOL 4cfb72313b8181acc40b1cd06269f2162198302d2e088a7b04263af4b127071adbe9725aed2ecdf6cd3854a9e9c9df9173a75bf7a83cf2492a644448df9d297d
 EBUILD mg-20150323.ebuild 1203 SHA256 579e7c9e92a9f979e010ce93d3ca2fd205e58dba16d0eea29fdfd5292eb9b1ae SHA512 3a5c9a717cc4230da1f740d8a6892200ecdce1d735223e3dc0dbb60c9aa18f50699eed371e308dddd580e7145a92d0ea6e0b1c1cdffa5a06b77c38153ec8078b WHIRLPOOL 41fa6386e0bfd9707618fd9072e0b234252cc79bc2a61c51a0f3bc0db73a66efd370f697a83bfa8a69b338fd5484b5ed5cb124d41aae2bbea69e673e9b81e652
-EBUILD mg-20160421.ebuild 1199 SHA256 691ec5d930095dbb408787e68cce6f3f4846498f19d67735a5c260decbd7b0cb SHA512 7b0770ee930ed1200d920b30cea25465ab39aa7744afb8b5c22c0aec5a946fe75740d40a23de7678deeb607b44f89ac4236e2651f86c14612499890953261ecd WHIRLPOOL 0cbae7f208f470f515102e4a74897ad77996a1e500dc21d71caed7b9b1fd712aadd34ffc4f6fcb64962608c8756ff7e9428d823056f66ca6d66f3afeb6842405
+EBUILD mg-20160421.ebuild 1198 SHA256 15239583cc4440e8f4d51af2f8405630d13c30105dfd93cc11d6cbafefe2f465 SHA512 1b967f96adf489ede14287023600f345f2ef588f6c01fd3fd3f792babb8bd168c47d7b4b3b5a6dcdde694625232ef54b225873fbf54b3af1386bab932f72d15e WHIRLPOOL e12ccee37ec576977e51b61fb67c6658d563d6a0b13ffeec9765da7b3cc80cfd2f9becdbf068250e31d3015f173311fafbcd2194ebeb222e9f1b824d888cf245
 EBUILD mg-20161005.ebuild 1059 SHA256 31e2947185254734a273c824ca252099c968fa338a816ae9632e0c26f47086ea SHA512 cceb4f126be2c3c75597691fe1980d87a535b657787e10076d50eaa187051b75e40b06e0c69c203b2d9c7df2a5aa7a01a4b91ad78135af6d8a22197e2221c6e0 WHIRLPOOL 1238e9fe4aefbbd578c228e540b4868e6e9b95109f42738d76b7a09abb1781c5332c350df01ec0cd068b7976f95378c474645c80e2d8afe3318c8b633206c264
 MISC ChangeLog 5076 SHA256 ae4dafbcb6e834d3d4e0c8954c3991b3fb7572d76c1a349436c65bdc7e56ef53 SHA512 60a6c18aa4a0b5d86362a917d4a866273c13349e8fb8f2e213403b3821771535a28d65f8bb65a51da860f889e283b375eea79d80b7a79e0dce5c25eae5db69cb WHIRLPOOL 1ece1c1f5714be68251471a7f86a48171e4b651ff57a288968851ef192f24dd230be70c8ef4b3dab417e676b32c7dfcb00fa365399675c8d7e42955320f46c53
 MISC ChangeLog-2015 13105 SHA256 cace27ac64a502179a77766381bf98b078859762af50daa67b9d131d2d75d4f7 SHA512 057a9507201db1602e4fd0df06332ea74582c318102efafcc8a2750aa6f17157ce82288cb0e03b5cb62c04f812dd55e0e5158598d7dce98c37e04d891385662e WHIRLPOOL dbb8b7881a97248ed45ac6ab4fcbf09df44bd5dd91ba630dd2b883ea82ec62614c2ce979cd5de329e8a76b7b1d6a52661b2f4a0583b11830984f41b5730f0b79
--- a/app-editors/mg/mg-20160421.ebuild
+++ b/app-editors/mg/mg-20160421.ebuild
@ -12,7 +12,7 @@ SRC_URI="http://homepage.boetes.org/software/mg/${P}.tar.gz"

 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="livecd"

 RDEPEND="sys-libs/ncurses:0
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@ -1,9 +1,10 @@
+AUX nano-2.7.3-tiny.patch 852 SHA256 6f958a62ee0da29d355c7332617bae839dd2ccff5473d99b5898735bf88000d6 SHA512 48d1aff680e669481e647f366f0592e2386928d4e5a6e53d6367b25cafd9e49cd656496cc669b3d3f00cfdf85d7b2da2bd80b2ee239b7a7159eedad7f54f5a99 WHIRLPOOL 413f213b00ca3f819622f74811e1d2e9d48cb087d016b4be62f74063c0bf9d53fcaad1c1cf70502fa025dea72ccf6f58cdeac2606f37ae61a2b76d54886f129f
 DIST nano-2.5.3.tar.gz 1967760 SHA256 b2b060129b9feff2d4870d803a441178c96531de9aed144ec0b83bd63ccb12ee SHA512 1d859f0bd88b9d907cfcaa84edc212bcaea4335c203922eb5b7378c2b45d88dffe1f3e4cb499a824d33781485834ef564997c58cf1fd92610d08f6ce8dcb67d5 WHIRLPOOL a2ca1c41d3cb26756cc9aba5b5fa0aeaea220626b98d0abfa1c5c4d4d57c3a5ef688d5edf00a6a00849ee25a67b2bbab93c4d454f6eb5a204b10fa01de3e298f
 DIST nano-2.6.3.tar.gz 2019354 SHA256 4f4054e12f2181c8e436163e931a0a565612242ff9e566c4d1adeda0f91fd503 SHA512 5079c0da976e3cfef9f3980e37c2501837bc66bb98fadd6fe7f02b061b83c99454678833fd43c74e6796cdc4ee9028ccba7a8a05e0f86e7a6517ba4d4c6bc95e WHIRLPOOL 94520ca9c7a11342133adfd3a1e9e9c77a6c07ab18b1b51bf39918b331abc6bd7ebeb937c2ec8ed3e59b8d0468e40f4e5811e66a8aecd469ad42c595c1b61fe4
 DIST nano-2.7.3.tar.gz 2048675 SHA256 3574d4594d051f3b572c47d63bfc3763fb1148c50b811ba7a016bacd94887a88 SHA512 cd159cf193f05b37f770ac79e532fe96be158688d241ab7090861016fe0da9dde2ab504d0703b8feea8043e1deded3f10f0ab4dd5cceba99fe4a1dfcf5062b0b WHIRLPOOL 19b042c29be4c8afca33870e85f0b893aa9f9d958be3043272dcef5ad8d775dc3b43fe1a418efee283c89a301be1503b04b825758666be1a8e25596f3a36b8be
 EBUILD nano-2.5.3.ebuild 2360 SHA256 7085ba0f70834ba0c13ed54839f99b96d9496053a3ebc20e488d9bdb8f6668f1 SHA512 cd691e9d9615c9c9ba3537faa191eacc82543b38d7d9a46feb52c964e6a348593c6800dab4d336d101cf43e4510f53d468db8a241e3d717ba2e9068c6a5f6acc WHIRLPOOL ba5bf1f74e5a63e27fab7380a6ed0f98f291541b168c2e2884e2eb977b8450487f549b1d859f974d0ae20b5a157b2f6975248ef77bf56f6da522c080d0ae9036
 EBUILD nano-2.6.3.ebuild 2351 SHA256 73dbf1d560da8d78988957656b04e8030fd45c8bf97f7d71daecb6164057ed3f SHA512 f3d868d8b39a9057b23cb3a15b10f9ee8795ef94b9df2e8dbace19136256d6f9e6653690861bc8daa9ff23672e72d3d574812e4c51f2cf5e7e66f6a7e8ea140e WHIRLPOOL 43cec6eaefd2f116d7fac6273be2dff9873dddfc7fa11c10879b92c649c633ec3eb48ec79ca8bde8b2482186448a02f9fd34244444ceb85f7a0496c9ca19b4bf
-EBUILD nano-2.7.3.ebuild 2364 SHA256 cddaca7d95a036f2de96114dc353e1cb63f06769e56ce13b210e07bf5b8e59ba SHA512 4239a3c8acc36b8f4196f9b43ec996a6b61d1789cbd485be7a399b16369190b3ef31414a74c67a34d4d4744c926786c5699f75d3e77394aa3de934852ad39811 WHIRLPOOL 9f3f2ca6f9db75394f7ef2a38ce723520eab45af81b238b4ad59c5afc5729d1f396eb581bb2bbac4b126461b6267662188d6d94807af38f17cc8734ded8df614
+EBUILD nano-2.7.3.ebuild 2410 SHA256 de5a72a137aaef991bef4d4c232e159aa8e2febca62baa5c333f4c53fbbfb31e SHA512 f3bc7381bd9d7874a1ca546c7141a68cefe393ef9de61a30fc968fe984fcb73cb6949386cf8b328f03b09980546e5ccbc4351dff5f59029a930cd9698eb2835d WHIRLPOOL bd55ab12bbe281026adf7299f686c2ce5279b8a6feda309558547a206e0ff9088a33941b9f56deaee60fb2e6cfd6f391c281a6f6486e0173673d19c752e1ea97
 EBUILD nano-9999.ebuild 2365 SHA256 ee9a83107fff68ce167d3e71b572c6085cae8b992052c98e74496ea0e04aa34d SHA512 b89397bbba6a7431da668cf1304dc2145a068dfdc3dcf60716b6c8473a580df1a0f778b0d6577519fbe3118623092386b04fbac5e8df1106d932611adf228fd8 WHIRLPOOL 2b7c9ad6c54df620935ba9c07ef1dcad8aa2946f73b7f146adf14e940c169a0c75eede57734ef0794360f026e7d8ac54d2b49ccf2ebd14a4324d762497c0a1f7
 MISC ChangeLog 9118 SHA256 2b695fd512e80590a25bbe7e113f537900b8bf3387e00c939aeaa03115b25c37 SHA512 5f108ff3320be5ef76383bdd9c584a15f594b283d262acbe14ade9d2b7b58e7e269087afdbcfcd9967d837f4207d4f2cefd1f983eecdab372b2d247deb8a22c7 WHIRLPOOL 6cad609527ef2b76ab9b188cdcaadc98120e7bc93f2a63b3f957b37e0bddd59d9292258d8668e1ba33b12d08c1b179fda64fe611f20b32d7b69ba824efda2e07
 MISC ChangeLog-2015 37891 SHA256 7fd955021db0b6548c869b8f117bc473462f8fcdab64cf6c4253d5afd20ff512 SHA512 22346fa0910dd7d55d5f2115c43b4695ace54de4631478708a14a2c2fc37aff79c313dbd273fee6b9fb238bad8f24493826e362383ab75d8077e7312feb48e80 WHIRLPOOL ebf9bcdc7746753a65a66346aa151b350ea7b58e087e9a6e1580256828748516b30919808a5a884d875ad65ee3aa73293bdd20ae3ca274f3c3dd4fb83e19ea6a
--- a/app-editors/nano/files/nano-2.7.3-tiny.patch
+++ b/app-editors/nano/files/nano-2.7.3-tiny.patch
@ -0,0 +1,29 @@
+From fc89ac11d25a5d052a63c01006c1fd767d9f5879 Mon Sep 17 00:00:00 2001
+From: Felix Janda <felix.janda@posteo.de>
+Date: Thu, 29 Dec 2016 13:43:06 -0500
+Subject: [PATCH] speller: fix build when tiny build is enabled
+
+URL: https://bugs.gentoo.org/604000
+---
+ src/text.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/text.c b/src/text.c
+index bd1737687e65..a8b34f2f6bba 100644
+--- a/src/text.c
+++ b/src/text.c
+@@ -3079,9 +3079,11 @@ const char *do_alt_speller(char *tempfile_name)
+     stat(tempfile_name, &spellfileinfo);
+     if (spellfileinfo.st_mtime != timestamp) {
+ 	set_modified();
+#ifndef NANO_TINY
+ 	/* Flush the undo stack, to avoid making a mess when the user
+ 	 * tries to undo things in spell-corrected lines. */
+ 	discard_until(NULL, openfile);
+#endif
+     }
+ #ifndef NANO_TINY
+     /* Unblock SIGWINCHes again. */
+-- 
+2.11.0
+
--- a/app-editors/nano/nano-2.7.3.ebuild
+++ b/app-editors/nano/nano-2.7.3.ebuild
@ -35,6 +35,7 @@ src_prepare() {
 	if [[ ${PV} == "9999" ]] ; then
 		eautoreconf
 	fi
+	epatch "${FILESDIR}"/${P}-tiny.patch #604000
 	epatch_user
 }

--- a/app-editors/padre/Manifest
+++ b/app-editors/padre/Manifest
@ -1,6 +1,6 @@
-DIST Padre-0.98.tar.gz 1968814 SHA256 847aa43a0f30ec7cc99a812e38f447f7c49959e62ce39614f9fba1d2d5694f87 SHA512 4f810a0447bc03751dd50ada08acacb3ad617c03dd628f11272750da5e0f9fd39951838161046ad1b17185b87b9bb0f10780adaffa4bdcec0928c181587afdaf WHIRLPOOL 98ec79b1b24096523e1f7da5dad5ebf7f7631f77974994f8d59f53dbff6937efecca5942c22fc7393581f18b423c9aef91ebdbd35bd0fd3a7e8f59270d034379
+AUX padre-1.0.0-DBD-Sqlite.patch 1139 SHA256 24441014884294a2cda7ab1cc9cd017689546fdc6e68942eec860b302179763f SHA512 a23818ef3bedf24a11e8e1cdf5aca8b0a3eb67123e796c0014116c51c2b2c7c55bbe50f04bc200650e3e4b34c519929478d4ff4b38b120a360d8d23438c36a4d WHIRLPOOL 57b224af8eb517d161d9aadccfada522750b9e433ba433cc991895c1b3d35175ac04a6eeced197869fb64a9c0ebd8efdaa9a2a7c249c3ac73015c8ad4b59aae0
 DIST Padre-1.00.tar.gz 1969274 SHA256 cb31404b048c12992eea142613bd560ce7a31199e3e09239fa1539f2fa02b96d SHA512 8a2630eb54944b85ec77eaf90595fe6bb482b88ae87622b9e54973fbc1cc5f7ccf83d7b2481a9a66886310db9678569d23b18de033f7759db71ac73fd3151856 WHIRLPOOL 512d1aeb9783a8c1b4dee2f3b60b77d7daf40eef1a33dc88b84e11403c70983633e1b4c54c40013d7b575e70221f5e95cfbd7db434544afa13b475215ee3377d
-EBUILD padre-0.980.0-r1.ebuild 2666 SHA256 64b0ba84e9bd7b9ba9afd750aa7ec51f91e49f27c9952c371d57808ed254a840 SHA512 f84bb7520105bcc24e40bf40a9833921cd0ec4d3651714e9af50554beb72459647646a58312c79a769f27441ff01c3730c669328e1c24f2856be7a10ec0a64c1 WHIRLPOOL 5e09d2e1736688e964bb8a6de60abacf7c147af8282df0bda9417866b28eae53efa00d550b262262a8b02993c90d6e9db4f591918f665fd3cbf27a557b01170d
+EBUILD padre-1.0.0-r1.ebuild 2649 SHA256 1695896f3b96fdf2730f8485119a7ccecd217b479243bad67f7884c5728cecce SHA512 92998a3a39d0f796fa99e03b5f125018ed9ceb5b46d58a380d102f1efa8ad7c4172fb5de2998f1fa38d600035ae4c1dc35f1855b4340eb2022e87d00e2649b4e WHIRLPOOL 56af3beab81a1ac7bd08edfd96475ac2e2ccaf37f7c181646f2f6757b384a12043c83b5534fec8327b86faf8194d65f5b494fb3749242d716f1f623c51a79a12
 EBUILD padre-1.0.0.ebuild 2666 SHA256 47275f7b5ea6e6b83759ed884c09919fb3add5adc00902d53a2a6be93ce653c7 SHA512 c8b6a082f9b7e7dee1147dfe6041a0de4689c65fd762e64b49e5b42adc0d4c4123eb9c21b8fa304f0bc5db9e4800f136a9f55ada26277342efbc703e190190c4 WHIRLPOOL 9166dd4e68303cec17942d8a4e3f4156dd03b3c1608c7a72cf235e7c7de6b8fcfc84e1ef7e817f5a82666b2fa52a2554230a84fda700ae7a2fbb8b43072c241a
 MISC ChangeLog 2654 SHA256 ab951ef6d0acd4916b60f2a2460a88e7e4dc1e5b9a46a47a2759d607d845ec12 SHA512 198a4475528d1d9d6a55536e23672f1811edd6587518f5310b89699e42b92e9d0fd2ccc982df6690888bf85d4de1288eb4670a386a823bb6839d608967fc6575 WHIRLPOOL 8aae6c8c4c6ca5bdc92a41fa8bf1fd0073f7ca671fb71271e65da259bee03fe9a0b1f1a822cb2b308eb773d6e0b3daaed3a38e743ff41d55a6f9b454b1ff3c6d
 MISC ChangeLog-2015 6953 SHA256 af7c93860bfbfa09f5df5aac85fb82675f5872bb519c4e480166a6618a61b6eb SHA512 526cbc83281ede6106c5fa35925fbd38c0b63a88c63c4c70ea6986b1f17e0202d7cf77dc251fb4f90450693829712a43db8169d649b79f35800622c8f332a49d WHIRLPOOL c7da747709d589b6c99d99b1c73786b644e6fa22340396014daa881d499f7cd9dc2c96955feea832e25dc051473d14b0c01b99c5cfe0bb686c21f67dbd454e75
--- a/app-editors/padre/files/padre-1.0.0-DBD-Sqlite.patch
+++ b/app-editors/padre/files/padre-1.0.0-DBD-Sqlite.patch
@ -0,0 +1,35 @@
+From a9fb73f6b0ba76370f60300edfaf03f50e8326e0 Mon Sep 17 00:00:00 2001
+From: Charlie Gonzalez <itcharlie@gmail.com>
+Date: Wed, 17 Feb 2016 00:36:08 -0500
+Subject: [PATCH] =?UTF-8?q?Applying=20Petr=20P=C3=ADsa=C5=99=20=20fix=20?=
+ =?UTF-8?q?=20for=20DBD::SQLite=20error?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This fix corrects test failures for DBD::SQLite  inside Padre.
+---
+ lib/Padre/Locker.pm | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lib/Padre/Locker.pm b/lib/Padre/Locker.pm
+index 7eaf919..e0db4e8 100644
+--- a/lib/Padre/Locker.pm
+++ b/lib/Padre/Locker.pm
+@@ -102,7 +102,7 @@ sub shutdown {
+ sub db_increment {
+ 	my $self = shift;
+ 	unless ( $self->{db_depth}++ ) {
+-		Padre::DB->begin;
+		
+ 
+ 		# Database operations we lock on are the most likely to
+ 		# involve writes. So opportunistically prevent blocking
+@@ -111,6 +111,7 @@ sub db_increment {
+ 		# corruption if (and only if) there is a power outage,
+ 		# operating system crash, or catastrophic hardware failure.
+ 		Padre::DB->pragma( synchronous => 0 );
+		Padre::DB->begin;
+ 	}
+ 	return;
+ }
--- a/app-editors/padre/padre-0.980.0-r1.ebuild
+++ b/app-editors/padre/padre-0.980.0-r1.ebuild
@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI=6

-MY_PN=Padre
-MODULE_AUTHOR=PLAVEN
-MODULE_VERSION=0.98
+DIST_NAME=Padre
+DIST_AUTHOR=PLAVEN
+DIST_VERSION=1.00
 inherit perl-module

 DESCRIPTION="Perl Application Development and Refactoring Environment"
@ -26,10 +26,8 @@ TDEPEND="
 	>=dev-perl/Test-Warn-0.240.0
 "

-# Depend on perl-5.10.1 but it only needs
-# a modern EU::MM
-#	>=virtual/perl-Pod-Perldoc-3.15
 RDEPEND="
+	dev-lang/perl[ithreads]
 	>=dev-lang/perl-5.10.1
 	>=dev-perl/Algorithm-Diff-1.190.0
 	>=dev-perl/Capture-Tiny-0.06
@ -99,7 +97,11 @@ DEPEND="${RDEPEND}"
 #	)
 #"

-#SRC_TEST=do
+DIST_TEST=skip
+
+PATCHES=(
+	"${FILESDIR}/${P}-DBD-Sqlite.patch"
+)

 src_configure() {
 	unset DISPLAY
--- a/app-emacs/howm/Manifest
+++ b/app-emacs/howm/Manifest
@ -1,8 +1,6 @@
 AUX 50howm-gentoo.el 73 SHA256 57dd76427874d721e25b7107f09e3bb3982ca31a1103665777fc81ee5aa8de75 SHA512 575a4638fa232ced8b377e30bd405dd78a8d10194cb38f40041ff30187482cec2cecf94c8f9da95031848e6c0379a2d845ed7b9eb159b63ed0a0737afa627a82 WHIRLPOOL 94b71161c59574f6643c1cc0f3b38a7492537e3d0093ed6dfa957fe1c36236ba50884be1aa555cc134c37b3b8e93989f1e7c08d4273bf81ec4708d2112a3f919
-DIST howm-1.3.9.2.tar.gz 462278 SHA256 baff5ce28580502a876600350b7eac5d5bf1cd32ba60c115cbb9edc2ac63d578 SHA512 34e867d35ac8a2092b29d24ec1673255fcce54369d3aa2e6497ea4c891d4ea7f038e80f6103ad1f6359d8390a5d9a57901019cd3d76cc24e439b44dba5cc27bf WHIRLPOOL eafd272caec4437f94b5594c9375f7d999db65b0f15535d291ce02ae1ce090ecbed09acef0de07b558e703b09791d8fb66dab79b73738b0bf56ee3b36979c050
 DIST howm-1.4.3.tar.gz 552747 SHA256 fb7336e0a52df3d5fe72e1bbf4ffb57f1139757f6af2964ee62cc94b4729dcab SHA512 da6eec498545dced3bad3c6968bb31a24b01b85220dd80c6e1ee312a0cf1a0b883dc77744f5052261e4bf0d536da057fbe05040fbb429b61a8580330750ce189 WHIRLPOOL e7ea2edd39a008b65e493de5728fd07ffd14b04e6b2e38eae6a68b6bdc670a11ac50fbe952890ef8563283de674230e3813125eb8e62d2afc0fd7bdfd72c8f3b
-EBUILD howm-1.3.9.2.ebuild 934 SHA256 4f4948990a4a2ea45cc800d711b65b51a8b8f6a85fa8b2222c2767ff0002fd03 SHA512 76c55d5e8df0a6a9767725c7e57c0d1377be7e958af58d39a9ff729d452f2535065509b44222594947ae87de21a9f3ee5af9422ac9d1ccb427fe3959335f19ba WHIRLPOOL 86b58c8acc629ab766fce2906036bcf9b3b767e4e61cc68666aa745480281784302fd677af1c373555c2dc3451d7ebb66a77b84ecf3ec73a963b21eb67823243
-EBUILD howm-1.4.3.ebuild 597 SHA256 4864d1ab11e08025176b37ecf8958f5008416cdca921694d913d6c609561cc05 SHA512 f16eeccfc586255bff2ce57656afb7798e3148e095177f43502715931a440a5d5f488fe2c1540641db352997c03135cbe1213c04c43c9ec65cf6e0012942a8ea WHIRLPOOL c6db4063e2190db9372a6a01ca51e492ae10de5aae6bde1fa6d2dabae3707658ca80d14152d1c5e03a1a2de15b16c653c7d4abc0458ef08b6e743eaf5909e009
+EBUILD howm-1.4.3.ebuild 595 SHA256 525de06b095e2e8fe4e7e12f498df198e29f2d16819bed8ac2d63e2a0fe4a671 SHA512 60c89672c9f4567dfab8d65dfb85826859e3690c6cf0e1b5710fe640d2a06ca6942526a98cf1afd6e9c99e742e734e80e08f6301f4b1be3b22405fd4f6acd842 WHIRLPOOL 34cd7e1c810db6a4a8dcfe22ca9bccd1c85785509fa72b802109a1447babc87531f1a93f75de340ca0025815374388e69a785735bb32b73813cf456acf2ff3c3
 MISC ChangeLog 3211 SHA256 60b768cf382d823642aef81773a8634faadfd278af4e9cdc7558af88cb660ea0 SHA512 79b1f5091222311f35104a5837e8f0b3bf0e57a2d6977db8fa7ef7cfb03027265f0c8b5e2234890c3ada7e4a9332168223a115671de92fdcd96de9d3f9683c46 WHIRLPOOL 6e127b7955d43776870ab6cef56140995a308dc0d83ada66e9d8fa9a00a2d3fb4e0c95cfc0d2b074b30146d6808cbd739b22ab47a00674bc01d99ec0a3018e63
 MISC ChangeLog-2015 5063 SHA256 b261e2ccba97f800e53d45a2753c585d43d693368fa9982789df320a2b7f1c3d SHA512 607295e7fad2752a026c74e7fc1b9a8914b411e0914b43dc5f52fc471233ee763ce933f3f03915e270c4e411300a7e325767664da7335dfbf0346d1462492c5a WHIRLPOOL ef70e47129da2f0b033f4e31d1014107d86bd555c746d53858345ce0a2b2784f11f8f26fd9e0494f27552d253d4444431e1be05fc55530a23721e3ff07ca05b2
 MISC metadata.xml 334 SHA256 ccfd6d8692933afd21782eb4606514922e734832106fdff71eb24ea69518d3b8 SHA512 13884dcbb36abe435d140a9479e9e7e926f7355330710d19b16c8edc453575ab0f99385b475678828eb9e9c69d8b2d23620aa2c6ee31afe814963f82b7b68cf4 WHIRLPOOL 6b70793f4b9d50d0a3ad907daa06c1e169006102eb53b746b0a536d8e724631e8fa87bce486a09ec36afa14e9e2573ad0db79e00fbe00b8bfdd182f306d5f51b
--- a/app-emacs/howm/howm-1.3.9.2.ebuild
+++ b/app-emacs/howm/howm-1.3.9.2.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="Note-taking tool on Emacs"
-HOMEPAGE="http://howm.sourceforge.jp/"
-SRC_URI="http://howm.sourceforge.jp/a/${P}.tar.gz"
-
-LICENSE="GPL-1+ GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_configure() {
-	econf --with-docdir="${EPREFIX}/usr/share/doc/${PF}"
-}
-
-src_compile() {
-	emake -j1 </dev/null
-}
-
-src_install() {
-	emake -j1 \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		LISPDIR="${EPREFIX}${SITELISP}/${PN}" \
-		install </dev/null
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	dodoc ChangeLog
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	elog "site-gentoo.el does no longer define global keybindings for howm."
-	elog "Add the following line to ~/.emacs for the previous behaviour:"
-	elog "  (require 'howm)"
-}
--- a/app-emacs/howm/howm-1.4.3.ebuild
+++ b/app-emacs/howm/howm-1.4.3.ebuild
@ -12,7 +12,7 @@ SRC_URI="http://howm.sourceforge.jp/a/${P}.tar.gz"

 LICENSE="GPL-1+ GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"

 SITEFILE="50${PN}-gentoo.el"

--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@ -3,7 +3,7 @@ DIST org-8.2.6.tar.gz 4221803 SHA256 a14a20f3d11855758ad8859e8ccdc50922c31bd64b4
 DIST org-8.3.2.tar.gz 4442361 SHA256 8ae811d19546f73306710f70eed8ee1a1ec9981e78b98af077fa224d5e8875b8 SHA512 3e1ff47c875a2db3239add8b060f555da357e465161ca62860c0ac2734c2e31c5387d2df4223ab7ea8ea60050f9a845d160b0bcb3afcf36f1d3cabcaa961e6a2 WHIRLPOOL 7ae9c53aa116d1e5cf7527959cdb58cdce63d99d0e487979ee02a12bbb21cbbd0b9a25de7dc86364a6e4affa89813557fc58efa8c1693bcfe1a975f836ef6c1c
 DIST org-9.0.1.tar.gz 4439964 SHA256 0b6087cf9a955bc507b69d620c6461a44976479bcd9c31405c1c033348b9b6f7 SHA512 c0a88372787c5b71ec1523fcf58b3cbf80678835c7b0bfe3b2406290da6fc88b977121ca3b35b47abf2c32ef40c0bfb6733170f225ea35ba24f2e801bb634afe WHIRLPOOL 2799373a3e027ba8822350fe389ecacd2e02fabf4ed99153472e7ff3314b717ff02042fe930f094382e0a059964c9abe9274ac4d66fdc889d2305808c89406c9
 EBUILD org-mode-8.2.6.ebuild 1493 SHA256 3a5e5acc6fe321d7ada43f6298f95092e22629d591aa7e06e94f249d0b576182 SHA512 7e5aa73596f37b671616edad8f75b025147b95ce1ab65a58965edae104a1d7dd52d84287ea00f4dbd88b5632141994a25a9be6ad96679827766417057ee24eed WHIRLPOOL 923591c921a64fb3a27a19d0f42202bffea02f6416b5495e2ab0465c897f5b41baf32a740ad80aea76bb6e3408f24bd4d43cd8958ad2437e7c8f54adab979045
-EBUILD org-mode-8.3.2-r1.ebuild 1785 SHA256 65e8478d4185f512cb5fee6aecaf6f06e707e7b14358121e5b2cb8e13311fbc3 SHA512 5b1df7d2bc0bc65808aa4eee06ea9dee98ba49df8e27c71920c2e1556ebefe41633d89b856cc6fd533e6f9a32c4cf2ad25a28522c0e0925bdb28a0775b45f2b4 WHIRLPOOL 4e087b0eef9680db2a086f721dd34aa1222414f3f23326600d10bdfd769117f2ca69d69ba7bc9c7a0000325a11c67d5f49782b6a75a1d195c037eb465c834711
+EBUILD org-mode-8.3.2-r1.ebuild 1783 SHA256 a75822361e7650f797b07acac0a13044605b07809a7173dff125c290a1dcc651 SHA512 ca7093cfe04951d2e7d61ec06d0bcd756c7e2b62741619abf324e63e419364c62049f2ab0c67a3d13ba56098eaa6267b41f1fcaa5b1000898b13d56cc694094c WHIRLPOOL a469b3ea19c86a82f824491a479b06ff922e37f49b0ad44890ab1357ec3b5e27cbcb5b0653223cd844862f71fe0779943939f1641f7b19b01505827a0c0df5b0
 EBUILD org-mode-9.0.1.ebuild 1770 SHA256 d4ac3535c4356adc462cc1f65972651a7327b590445f23b8f9c5d078d8edecd8 SHA512 1ec6567ec59ed77aa05b2933f89c774a5730a50dacdb752d7f2239b87a22051d9f891ad2139a9bcb4539aee3f892716b29b6039cfe809806db0aa62ace705592 WHIRLPOOL 0cb69ac8b0dfec15ddcc72d698c351e397d4c886049d6104d6b28d87e65aa1664e399d91098092b9b3a546908734c20c23cd62106507bd44999c73938c880414
 MISC ChangeLog 3964 SHA256 9c92b58e3705be0bb371936dc0f45ce58c15ca7ea757204a33083ae67ffa4739 SHA512 9096823c869dcfecbbe5726157f28253561c832bf98c0a149cbb06bcac3da22996cac59e8418dea6675c17a71ddaaa359635cea21f4b5625df29ed14002645ed WHIRLPOOL b061bd1cf07b6371d4e76420da49ce18a9fe988c829d5ff101fc16469b663ca07eaf61f59a686a9215676e666c2fb6a176ac9055031f712b7ea81c1853743bd9
 MISC ChangeLog-2015 24985 SHA256 4328d28b4093148148680bc5e18150d8af35ae5418dfebd388ee820aa9acb31c SHA512 daf4092cf27fc4f5fe094acd9917f5af703136e13cf5e14df43badfc03f4013003ba49a8762860f902569312ca15669eb2dce96e6d1b2d76615403732d1ad32e WHIRLPOOL ce17c9e117efc85d295ac2fa43fb4d6ac8b871ead16a6b094f556ae0707afdaef5353fbfa74e025879aa1522d2bd6af8d8d3e54dc944577a30e3aa91334dde11
--- a/app-emacs/org-mode/org-mode-8.3.2-r1.ebuild
+++ b/app-emacs/org-mode/org-mode-8.3.2-r1.ebuild
@ -12,7 +12,7 @@ SRC_URI="http://orgmode.org/org-${PV}.tar.gz"

 LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-macos"
 IUSE="contrib doc odt-schema"
 RESTRICT="test"

--- a/app-emacs/tuareg-mode/Manifest
+++ b/app-emacs/tuareg-mode/Manifest
@ -1,6 +1,8 @@
 AUX 50tuareg-mode-gentoo.el 343 SHA256 254de1abcd93c5f7054e8108308b1e4232ab50309a0e3ad50c310a64a875ca07 SHA512 41cdc5aa7c083afbe044c730b898e06817fb8c5d9799d0c88be9ad15501d4135e16597623b66ae65a40160d9a04358392a98e03646ba2207e0f981f33e28750d WHIRLPOOL e43a1cbe471138e76d62c3ac2165d312b7993a95cf9ee7ed886fb178420ec6dff12306cff2f13e4b548a99189bd1c85ce675daadeed98539f672e46ceb7c627f
 DIST tuareg-2.0.7.tar.gz 57999 SHA256 7ba8016cdd2195d37ccc1c0e300323f807b8bdc6d3ce9e622ae9a36355d3a9c9 SHA512 6cf290879dd9b7993a046dbebb9944a245fa82d1e7849b46f477b7217b46026ce5195e40e4d9b990e047a03680197827334e6d54d82610da6fc2e62386357d42 WHIRLPOOL 19b6c8fb7e7b6427499aa7aec0b22e0152ca35e93c042c2f3e4a760a76ba4c89c7951df25a128414a2f7df5aee7d76aea255c0b235065c9dcae4e62ed3c05c86
 DIST tuareg-2.0.8.tar.gz 57777 SHA256 13da95153d6d50ef697878c45d81302340f97a42ab14112c61b8c6b0e891512c SHA512 c9e268eb550fd36614e6632335b623a0916d64dd84a0259fd83c6f08e3138196d3871bc7664d6debe62732d4459130ef1e9271b24982138ff69d90442d031990 WHIRLPOOL 08e5f39111e8770ee1e4c8d0fe5104b20a3bcf89bb08a7acac0758d7933243cc55f6933e838c85aae2dadd1836301d3e9988fe38f7863fbe39410f879d17a67e
+DIST tuareg-mode-2.0.10.tar.gz 102576 SHA256 f83438208fa4f0e93e662620fb6c939e272041ba6b32cf28397618cd28ab5ae4 SHA512 53bdc3b2b78bcf7e6b075932b9319f9d08b02b4b3fd74fc9aa30b390b30e4069e19e09e0fbb03fb11877e6d89649b8e59c645cc8de196115c1bbdab308145743 WHIRLPOOL 1a48ec2ecc9ab7d4203860cbf1dc00d64b80082014d3053db686097ca1f7ef1d2cb311976b2b3a0bd58704ab5f8734b33ee781de3bf57ee2323ea54c2286318a
+EBUILD tuareg-mode-2.0.10.ebuild 468 SHA256 42ab54aaff3a6f35796c0ee56f031340f5be6dab4689b51923edb61368a2b336 SHA512 93e1572903c36937055c45fcb818bf7f4090448e8431029ea950806c3b59a8017459440541a51820ef344332c56d6579ecc0e97405f1bc121b3ca9beb79da3c3 WHIRLPOOL 76f2a95c6214439102a63d522a4c7c93648cc2104d3b67623488cab79ea9f6ca44678104014fd9ebd2640eca3c4b0c2546149e422ffdfc84bfa7e540d0dcb60d
 EBUILD tuareg-mode-2.0.7.ebuild 512 SHA256 ee1b5d0e10bc51f976e4e5b969b0db251b3c51c5725cb6fc7cfb1d4a382e15ed SHA512 56be60d7d6acab62ec7fe026ed3a484f1371cabb7899408bf1a16db1e76e86d121c20928b548766486a15c296d0735facd455bc511b21760f237d6339f4797e0 WHIRLPOOL 70fd973425bbeb8c3862a7e780730cba0b87b053ee407b740e752556d695bb6d6ff705d86918bf09920cbda28be11b796a4e3d457d353a458f58175e694a749f
 EBUILD tuareg-mode-2.0.8.ebuild 525 SHA256 33e11020e6bda9db3c0c1ec5cfd4962963b5873436707490b6258da93f0ec2c0 SHA512 1c8c4121d5144a26e0d02cc939c8cc22f0994ca7b5d220f8a461c05019dec663b2546951e63be7880d01a1d6ecb783486c5f6af56c6cdb35787eebc380b92fbc WHIRLPOOL 0cb751275d0642b3553eb0a49ab39fdf0cc5826df14f9ad0a1080a30e75008f7faa5ec100334c3656c97e809a28bae625a2871ef35e571772393d03ac94ab694
 MISC ChangeLog 2672 SHA256 72eb2a0c6405bc2f68de9d43170dcd5ba68661179f40d2d72f1711dee72983b3 SHA512 a6289a5d64b0eef347bc0f6d593dd74a7b080fb5e602af945301e21e3fd9453fad2ecfa3597cbff527b69c2630aed2a82c7fcd5f1063616a58f1308138697a2a WHIRLPOOL 32e527d0060443792ce03580f9dad10297c7bda0b7fd19977d91ed32b0670a7e5a249d54cd9242ed041b2781bc279d87ee85c1dbd2ff32652f263b4e6c6da95f
--- a/app-emacs/tuareg-mode/tuareg-mode-2.0.10.ebuild
+++ b/app-emacs/tuareg-mode/tuareg-mode-2.0.10.ebuild
@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="An Objective Caml/Camllight mode for Emacs"
+HOMEPAGE="http://forge.ocamlcore.org/projects/tuareg/"
+SRC_URI="https://github.com/ocaml/tuareg/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+S="${WORKDIR}/tuareg-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
--- a/app-emulation/aqemu/Manifest
+++ b/app-emulation/aqemu/Manifest
@ -10,4 +10,4 @@ EBUILD aqemu-0.8.2-r3.ebuild 925 SHA256 251a0a861306705969c2444da2a1f22a8886a6f3
 EBUILD aqemu-0.9.2.ebuild 820 SHA256 a6e1aaf8f89590b51cdc838134d4b242b4b98c11b9a962f29d439664c4bbd260 SHA512 64d0075b097b3785157b77a478886e882309d54e0eb94924539438df9e66e97d710b4eac61c7801798e25f838d92f4fcea32afb54b60dfb2fde864cbe521c2a5 WHIRLPOOL 47496f25cce543963a0f45e86b9d92c360e43c1f0522ba42b7de90eda388dbb901d4e4abe80f2d9201d1f46f90b0beb5b8c05c6af4213f0d4d3e90ab8be635a9
 MISC ChangeLog 3712 SHA256 d2e477ac86117bc2f33e50fb7c52ca29d84034dceba48637cbd36bbc8629eefc SHA512 9e9da79ff1488a1abde7bc9da3b577f32406df47c5c9ce9c15af39edc654cd07d523a48fe46aa9e5cca8b3d695fb3e4bfa48aed2029776eaaaf81e75d4ef8b31 WHIRLPOOL e4a1ef1ce6d9dbf7792bbe81052b53b6debd48506b4e4f87ad2b39ea8d885b81634db75c1e328435e6fe8da88cba2ab060256c3c187d9ac07660e4a7bbeb30e0
 MISC ChangeLog-2015 2964 SHA256 18c28fac689b5dc8e74295b7fc738724729a1b1e7d38dd937e15e3db8b17e88c SHA512 ad694586e8314ba36729f2aecdeb41ed97d080b127dd9b181f718b996c6892057b9c751c8a8d8d652f3cc4398ed92bc127cfd7bf9f18be3e57337a73c66e062c WHIRLPOOL 487c29c69743eb65ad53b51a0faadc74d4da4331caf9ce20ebe04b4c49d2c5a8b78c7e6e6dafbf43acc89fe9cd13ae96e92ab0de20148ffa00976532e9776552
-MISC metadata.xml 623 SHA256 97831d64483c0790bf318724a3ae1e17eddf7822a7dfce5854446d427abc5382 SHA512 25dede10a97358b3b6432a16b9263b090a57e6f5658cbd924d18f3d6b5645bf0342aa8b7da81896ffe32c07dda9d54b676194c032e441d4eddae6e301166cc9a WHIRLPOOL b9d5765bf59c23ce8ca885e2d1e41907a357d5da7afff0fac85eb0f6275170a3f17c504b3d96dfa5190227be952412535dbd998a414dcade935e57f25cc1fa7d
+MISC metadata.xml 295 SHA256 5a5e1b77e9a949af6bf0fc550bd7b1cf93e30a93992c725984b3aa629f9db5d9 SHA512 03e166788d99a655e34af32017bb06fef0198573fb4afe1c232ba35f5429e4966860ae6d84eda86505a0348999444280efc78a4b9d5f54005464207c9a531b44 WHIRLPOOL 651f2d0846641c0682007e9ae7461ae0b35eaa2841ea3aeef9a6cb157ef72ee5384886ae7e395371a38d81b3a82834207f46b2b8638822b4db9ae989fbcb1718
--- a/app-emulation/aqemu/metadata.xml
+++ b/app-emulation/aqemu/metadata.xml
@ -1,17 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>andreis.vinogradovs@gmail.com</email>
-		<description>Proxied maintainer (assign bugs)</description>
-	</maintainer>
 	<maintainer type="person">
 		<email>maksbotan@gentoo.org</email>
-		<description>Proxy maintainer (CC on bugs)</description>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">aqemu</remote-id>
--- a/app-emulation/libguestfs-appliance/Manifest
+++ b/app-emulation/libguestfs-appliance/Manifest
@ -6,4 +6,4 @@ EBUILD libguestfs-appliance-1.28.1-r1.ebuild 1069 SHA256 8ff41a685d5d70ac9f6678a
 EBUILD libguestfs-appliance-1.28.1.ebuild 954 SHA256 5e1d59d12a175642fd57000e0cfa07bc686e3c690336ed6dc8731ba15c03e658 SHA512 97b34cc2fa6c7d81058a6644b0089668a5279bb56bc0286d724b82297d6eeb966e108de2dcead070be9622d36c931764cddac716ddb198b69dd40aaeb8f9756d WHIRLPOOL 58b34cef23f27679ad70f26cb91b12e67f32cf822676005e975d54d081ee470d6725b7b045ddb33d86e9be9a55a6e5ba1f20a7569723a1db6ec0d914740b62dd
 MISC ChangeLog 2664 SHA256 668ea12577617a6ab717137e94006dd6b8a117c2c4db3c02580a25f4ccc5ff09 SHA512 53584f3596845f819671bc48842d2e7009ad7f823dc94dcc0a77c1408698247d760cfd6e6e77437c3db1525b9ffdcde20c3f02d536589948fd7eee58098da632 WHIRLPOOL 2a41ae7ed376d71c94d65128effec333bd1204d27b445b6137f5fafa396c93bbdf415f5eb6cbafb4ba71f68e1d2431cfae24ff0211847c30eac76226025deda5
 MISC ChangeLog-2015 1666 SHA256 db6178439e562c3508953b474c5f1be1c252329c5ef72869fd44bccbd0410204 SHA512 10178ba4b8adab296d22338a90b8f4fd3192f6b6607994b148fc4df7a63b59d97c626b709ab1f09987610c444803eb2d668ff20e853a85ff12e0c640dd886fcd WHIRLPOOL 2d4af9dea92a5b4377e4fcc9ee2d1ce1b5953e1c9e7d6233e74ab7bd49b4c71f9b39fcde763c494d5ef81b2484a6c1244b45f71d463d427ca6bbf415fe17cf83
-MISC metadata.xml 661 SHA256 60d55905542809d4c10f70a7cfd3e3b53129529958ad6d20b31b41096cec421b SHA512 25546980347856a710c9fad5fff41e480905b226b14ac2588f870886c749fd8f6637a891deed47d1e924a9884e5b9bccdf86d9b0fd68a6c0929ce0e63284b514 WHIRLPOOL 9fbf098f49bcf65e5ec7d0c84630b8b7ca320ee9166f2ce85acbd761abdd92fd28b8b451f4054fb4fa21d9d6ead400b328b6e86fb1a0280e392d9a32f6104519
+MISC metadata.xml 427 SHA256 fbda8113d9e27bac2cbb27f230427883291e7af3dccc22299ab629fbae1b12f6 SHA512 a092635a5738a6cdc8ae88d69016a34fa027a4037ac5b87165f04bdaaa9ae80af65f6cf0e5ae458c688d04f9acea8e9be745e44d62e6733ad8ed95f1d904f9b7 WHIRLPOOL 087ce10f907b60c286141c0eb1e83a57aa654f553a29c9a617127205125b79e0f39948526e26f696e2a18e66118edb49b42d6043710301bdc5b26c41f7fd7212
--- a/app-emulation/libguestfs-appliance/metadata.xml
+++ b/app-emulation/libguestfs-appliance/metadata.xml
@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>andreis.vinogradovs@gmail.com</email>
-	<name>Andreis Vinogradovs</name>
-</maintainer>
 <maintainer type="person">
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
@ -14,8 +10,4 @@
 	<name>Richard Jones</name>
 	<description>Upstream - please CC on bugs that concerns upstream</description>
 </maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
 </pkgmetadata>
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@ -24,4 +24,4 @@ EBUILD libguestfs-1.28.5-r2.ebuild 3981 SHA256 e52c89fb88065341a135048d2355bd2d6
 EBUILD libguestfs-1.28.5.ebuild 3793 SHA256 57f38af7871c8d09673326a0fd6d4bc65d977cf6862d52a7d3122915752b7fbf SHA512 f2a67936b462e42c180fd700b90673fac697705d4875642ac1515eefbfbc27f696098c96044056f2386232c5b84df8d2e9f0893f6c44eb7e8ce3b024e3b584ed WHIRLPOOL bce2ee713cef209d09908258a5e919ca4e9a4ffc52a2236473c1f03411dd34b104585bc6e1545986c4054cb2d8d43904a04fb5fa0ba5f662b979a81b8c98ee1a
 MISC ChangeLog 4771 SHA256 5690e969ce72aed21e43741e340ffcf703e5744cec4e4987932ac6f9153cbc27 SHA512 22e7e1a815a05cdd7f3c18467040540c845adb7dc7689761eee392455dcd9157240314ee663c88c0b51df2a1189f2525e3db15527602d7ee8b2c2ec64e1750d5 WHIRLPOOL b9e79fc82c2ecddd75e016a6ee240fda39a14dd8348c988af4084c61b9e9ab0ded1e0a35a27977c87397b60aee8d70237bd088aa51244d982c817b1618f99b66
 MISC ChangeLog-2015 19252 SHA256 fb27331cad753f36713e9c0a558192f34e52b5d07c674e010f37d74ef830de13 SHA512 de5d2ab5bf569d27d55b2c77e35208c429c2bcc61c1c60dce7774b9774bf93ca6ddd7161acd69778e20ebbeb4aa4c3717a28d409480440a11081437f23682800 WHIRLPOOL 1cc7d6dab1c3696e7a327284b52ad92045a3e1f4a20ee4c854d556527d1f2bb9b2165f7e3ac6798b25a6886026ff6349a2b350ed93d98b882e8f96a8f30b78a7
-MISC metadata.xml 1130 SHA256 e14664860b5ad6bc4e4f77a3d82fed54fa9c9076450776d5b19ad1d374ca775b SHA512 1a2b312dead2e3a95e01d44da53b109e286261f60bef3c8407192602f2bdea1032e9d8a0ca9476ed4c4c51308cc87fb82d1da9b48db5a3f1776bc48f1837642b WHIRLPOOL 3fa72e4020d152098ebf55de519ffddb37cb2e6bf5f9bf853da5e3cd59b12fef20f7881f66ca6d7c5ff47c189c3b6fa5ba90762232014f9bc11017336b96975a
+MISC metadata.xml 894 SHA256 2b195f1494f336f53cc8d2018077ea431e90d05b5ec0cd08ff851dac5d383738 SHA512 ec4e41f3143e4f8128e59188cbd0a105d22c5f28d8c388489bd71177d6c0084b798a2d127308cc1e04406a5fe9cfb143dd5aaf3308dd1422f82a561abeae13af WHIRLPOOL 3a98164903c0cb1670315bc2e522cc3bcea4583d10f45e6f785179e96b52730e78a5073ca699e82fc796d843e32f2e3a5e5e42941e0fae0a006cb9931b9e7f30
--- a/app-emulation/libguestfs/metadata.xml
+++ b/app-emulation/libguestfs/metadata.xml
@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>andreis.vinogradovs@gmail.com</email>
-	<name>Andreis Vinogradovs</name>
-</maintainer>
 <maintainer type="person">
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
@ -14,12 +10,6 @@
 	<name>Richard Jones</name>
 	<description>Upstream - please CC on bugs that concerns upstream</description>
 </maintainer>
-
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
-
 <longdescription>Libguestfs is a library and tool set for accessing and 
 modifying virtual machine (VM) disk images</longdescription>
 <use>
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@ -9,7 +9,7 @@ AUX qemu-2.7.0-CVE-2016-7157-1.patch 888 SHA256 7a1f6199b16c220df51002e1222763d1
 AUX qemu-2.7.0-CVE-2016-7157-2.patch 812 SHA256 1db3b565b4762abbc1096286c9887400591af76bf422a105e457c6bdcb887b59 SHA512 8d2177adc638d384302ec89de65a0acd4f4069580c40d6c50cb78501f25f4d171f3b92a36464711337e07dbf208f9ad93eb2f86a7361dde52026c1764341e10d WHIRLPOOL e815e165bb23cd42aaba2310e3fa48bba33b0344069e6f54c4b26dddad746516053221969fad855d6c827d42371494c609123b002e1e2a96c366d11131b3243a
 AUX qemu-2.7.0-CVE-2016-7170.patch 1527 SHA256 37d600b5a4ba143f1d6b26acbcf23357fa41a5f852774f68b6b6736a6ecec024 SHA512 c84494ec4ee9607cef7b230a25d10de444a29fecba57566df5394d40b88596ef91fbd5edfb51a58c5ecff7fa7ef39b7d32ba7976dbd011fb1b29a2e46e4e0080 WHIRLPOOL ddd3d94da447556b24257c11068bef360da6cf35e22257869b09057f42ba027636e605db96d9a66253f423f5667814a1f8c551f8eece733fd997b03d6ac81e2b
 AUX qemu-2.7.0-CVE-2016-7421.patch 1183 SHA256 f3996d9d4658fb32a04ce8ae3d3510e6a51a0aa39f64b003a636f68dacef19db SHA512 51d07015e27e4dfbde2c3ffa37d91134374b49c136735845c34155238767483ede8bbc7232ea93b4e4cbcc28195cbe1986d44ac0dd96e914ec29df3a1da9dfcc WHIRLPOOL a4e27d329591b2a3b94a7abed81df1f87509f5a38beb490d7a4ca7c14df2a864f4126c26fc044bb4357467b0f9ed0ca5811d5e85812e318adcb3236c30bef7a1
-AUX qemu-2.7.0-CVE-2016-7422.patch 1125 SHA256 7a3d31031b8ea70be29715e8d384f47ad8758e81b9cfc3768e59dd6c6a00cb2a SHA512 6a08f661cd2b00214297570c8035042544b0e707b2f20f6c59c251a73971f2b7e1920c7242ca09a4684ea58dcb177d11d087ee5e0523792e3c446e70239498ef WHIRLPOOL 82b38aa12e49695c1f0c67c303039afb05cc314d14e5bc8286bafebfbabd3eb3cddd41338d45f9510ea2f5074fd9028b39c251be0e5856e0221232a8b28797a9
+AUX qemu-2.7.0-CVE-2016-7422.patch 1343 SHA256 ddaef9e9bdcc8f92d76652b48ecebee8cc112b239598ead185ff61d5085963a3 SHA512 805189de49427a30043100354a1ed8f53d68c3a68553ea92afaf4bdabd0463468c00b8e9a46e21680ed9f2d473cd50a76de56ece2106fff186e072099c2430e0 WHIRLPOOL 5ed3610107067d67258ac8c0b6c688e979e9d379c769481da514dbda0cb2018963f6b02d58606a881b37743a8c7fc7f9239009ce1b146eedf59af58cde2571e9
 AUX qemu-2.7.0-CVE-2016-7423.patch 925 SHA256 2b9b1102c3c9c54ba2c311661c3222b1df246a519e9eef57d0793951c1249ae0 SHA512 e4401163d15f9ebd9057b8ddf4187f7a0a2f379cb8aea2bd92b20f132f7714a4e386733884be4568eddbd4067b6cad80275ccc101276897c4796117a9b20144f WHIRLPOOL 9bd9f5ed067604f065d3ac7447f8135dd72e178caa6f3c5a5ca7bc531a8008ec46620c4af33bea54a35dfe52e430d48dcf5b59145c4e1efc2a14cb789e38f5bd
 AUX qemu-2.7.0-CVE-2016-7466.patch 830 SHA256 5664c091038185766a54b93495029bbf6de116e8752c2334fa1c71b8387e89c3 SHA512 d158b1f66766f33b1df561956cc3c77d40e1422e44791cfc753d3def2f1851c2c9c0aeb299bcd1ae969dde8f4249f4489ed90776ebb497db4f626217710e4f48 WHIRLPOOL 13112769ecd6420e17d2a3c0e110a2bd479fc09d8a2086d27f0703a4d6c35ded07e003f28ff14579655c5468cd02c77fa514ba7ed6543f61deb60c6de604c99b
 AUX qemu-2.7.0-CVE-2016-7907.patch 1380 SHA256 58aa0af82a88de8967452c06ec229de381494e7ac222273ac5a7aa2c53dc5529 SHA512 5a311dea9554d7225d75fb2c680d2f7a2b151b46802176424f495e792ab4a9a101ad99099ccf2b6250230f23fc1ea804381129cd34eb0e4cd24c1e2442de9b51 WHIRLPOOL 69e7e01bc0b221581a8b1ef1af23eb59a6ad87acbfe821ccf8c23f349c9e31b84e4b8db83f48a849a4c5e9b6229f8d55e671da9f8485ecbc24855a8ab50b02ec
@ -21,7 +21,7 @@ AUX qemu-2.7.0-CVE-2016-8576.patch 2092 SHA256 dbe3ee6778cdd802fbd7d7cb2aa991cc7
 AUX qemu-2.7.0-CVE-2016-8577.patch 1020 SHA256 fbe7b6183f019ed6c8c6afeeed4854c23991d3f18501e8f3403df8812cefd420 SHA512 364434deb120856a114a94aaab2edbaf9e5f9246e6393f584949a6b706dbdc5b711f459a48e3825554e2fa9595a1aa78fee3711cfeba3b94219b4f47e269b2de WHIRLPOOL 561f7bd41f0ac439808070757cdff9f69f6a378fe6610269c32d600575ed60b22919f4d3ea08f621648dbf3e5e97290737005e9df5949bdeeba9319901cf427e
 AUX qemu-2.7.0-CVE-2016-8578.patch 2208 SHA256 9b0e7852aefeb3950de38babec7a30f3225342670a72160829baa5e50786bdef SHA512 326ec2112b1cbaa4b4ddcacc02f4accd5b73e78db07e93b229d891f4cbc8d5a2db82c727d920613abd1668402ffeb16a223d8271db569435966aaece271da875 WHIRLPOOL 88ca80aa1883813f1ec9c0802e830f719317130de6959df393188e4e82764125868baec038a1dac94eab33851706838d245b205edcbf8e1864ceb83257648b99
 AUX qemu-2.7.0-CVE-2016-8668.patch 1124 SHA256 26f16376a73bdf9052039d1bd90545b75cc8fb0a89e0bffbf5881b537319b759 SHA512 de4df82297d199cadafefd57bc895cdf21c5acb0e0a6223212272991b652c302475d8662fb013d6a3e949d2e57a14a0ac6d861f486de8b5130fd84d66957c899 WHIRLPOOL 3995164f25accfd5c837c85fbb590acd0b7effb08370a7d4c0cb03c042ee03b2b10ca9892bd50251d17a1ba2ffff1e7a04e918f4d4e1c85406df95a6802c03c2
-AUX qemu-2.7.0-CVE-2016-8669-1.patch 911 SHA256 ad841a34490a02123df31aef5a0b9d31912eec8465e0c5da7cf73dc880ffd8f4 SHA512 23a26716ea554d9af73afb08d3a3d1e668e23bc0710508196039454dfccbe3764feda63d901a9c053c52af92cd069f5a4f078efdc9924f6d3cfe6a21f9d287de WHIRLPOOL 412d7a4be19defa4a098fad6a66cadd7eca9cb5971828636dfd20a57b3eef09f3801660dbf507ac1ef0fa82f9f01583e9c5e2b1e45c016adb535cd951ff16eff
+AUX qemu-2.7.0-CVE-2016-8669-1.patch 1010 SHA256 3bc03869bede80013abb94ee029625a382c8059bc9474d9f6fd8e23840cff159 SHA512 53643363a470fba9b82c02b90f2573e45f59f5057993b2c15e1608916ece7f8582b4a84179e8ee70fcb8e3f3eb8a538a058401049ea38242bdb640c14ec54f7e WHIRLPOOL 873ed9b9784bb5757a07c1a494f70603cbe82751222d68a883327424e0d7e87d536400eca5fc7406080cbde2ab0a8fe0b3ee5c6dff81624db5d6d5964fec81be
 AUX qemu-2.7.0-CVE-2016-8669-2.patch 1037 SHA256 176a35f5191023ad665cb4019663618d48948b174b16888776245d1a001ec186 SHA512 82a71c9566f37aceffbbaa45547bc686c028353a1845bd63e49550e71201921bc2fb9793077fc1fc74d77417da84dae71e0862243acbb3d900db258a343b8ede WHIRLPOOL f489c52bf2ca6e434695a5ca12af64a83e6534536c07b02c54f82c72e59e3f026e6a9fd9cec5eb62e2cf8d009f878ac1015f58d9f5ba725a03e1e194c4abc96c
 AUX qemu-2.7.0-CVE-2016-8909.patch 980 SHA256 989210bfac97091e67fbe973be7a6d8aa0e6411069904a07f7c57c67e8539bb8 SHA512 23a1cfa4f257e598152d92e11d94e88c52b3702aa585fba3a71340ee16dfbd29234d6e5c81613ea71b64cead8dcdbb536246096b1c374290aa39871daacb25af WHIRLPOOL 9909ed14f5fa4a1d2ea0f8bb13f5a0e08e2f7888078e1f5b4cfaf381ccabeac22c998c9785efee6a307dbeed45801d8354650c18c6920bfb13da030127d9da7e
 AUX qemu-2.7.0-CVE-2016-8910.patch 848 SHA256 919e566e98434486f89ecfc3158ccee59c5bbdf3848b2a668136901871f5f1ab SHA512 1f695ebc2f10b2cda5a9b93c097adb49858af94817c14a406c7d26edd42353c776b0afc4779bc1c6f930dadcf450906924f8080ca5c87eb7c7e6b5694464dc7e WHIRLPOOL 574900ab3eca13429769c7e2b56fd4e4b1220800b2e5bc933eef502c633614eab22cba6af4fdd1fd55e3a7e70d3d5ead1cb1970f8211b5f4fc43e3d782865f1b
@ -32,7 +32,9 @@ AUX qemu-2.7.0-CVE-2016-9105.patch 610 SHA256 f4303796ece1e46f6e622e8cd0c9029daa
 AUX qemu-2.7.0-CVE-2016-9106.patch 835 SHA256 594213b4200ae109dfbc6ec8e536d275d798c756a25e130a86972c514730f541 SHA512 6a3249f47fecdbe28eec496eb1284296d04d9e75efab21ab226d6ef2d5254bd85a44aa08879b1922682b65b5bce2e699ccaafa3a2b8b6f60ccbc84432bc599cd WHIRLPOOL b80c2787cbe71f416a7ea2aa39e800922b0a8a410eacb038d0163dfbb91f6a41cc2ae5afb010a7395ef17207e6b1acda34cddd9ff9d1ab035330ade6334e8b8c
 AUX qemu-binfmt.initd-r1 7966 SHA256 5b4b432aa1e44f387c9eb789de0ec6322741fd36dd241f76520f17c6cd6ac49b SHA512 2ba0bff6eb2b6bac4ed440f793771ce9551cad48e38bddb6cf04f804faac2407e80879f66771910344ddcea45f0014095dcc8bfeb0aad5085ef048fd3612dbd8 WHIRLPOOL a2a1fb830a970757d1e203378c7d382b161b1040f3b8aaf0f22bb3b5e46467eff395474ff40d93c9f133bab307b345a6f75d63eae9f8dd8daf67324db41032f9
 DIST qemu-2.7.0.tar.bz2 26867760 SHA256 326e739506ba690daf69fc17bd3913a6c313d9928d743bd8eddb82f403f81e53 SHA512 654acaa7b3724a288e5d7e2a26ab780d9c9ed9f647fba00a906cbaffbe9d58fd666f2d962514aa2c5b391b4c53811ac3170d2eb51727f090bd19dfe45ca9a9db WHIRLPOOL dcb3e5f7da89dd8e14d636d7ebd476e076e0043880bb9ea3fb1c03cb4bcd4e5c7d3c4719da26c3ce521e3a3db5ae671e86f198ac1bc3474e774d75504fef8b8d
+DIST qemu-2.7.1.tar.bz2 26868403 SHA256 68636788eb69bcb0b44ba220b32b50495d6bd5712a934c282217831c4822958f SHA512 16a83946e9064733254c82c961749bf9c56a0a2a8ee46145b4a78e1452ac0e2548d888963d18c80e28f65202890fd643b0011951b5b1c66ef16234767ed91898 WHIRLPOOL ae3d3c2b2a3700613733659847de6187755631cb09e8c3548ea30cd994357c9ff128646edce88dfe4dce53e6c1c0f37f8de3688ee7e22262033b40f3fc706efa
 EBUILD qemu-2.7.0-r7.ebuild 22214 SHA256 a7f8b5889bfc48862dc7bf1868c3edaf71c1dc234dc8a42b95cb5b223b028151 SHA512 4314c6d3fc6c627e0cb2795f764f739eb353e9cbad709bf2be352d1c0022842cab18bed315169dc7fb6b95018087b173b930074345c5113bd7a012cda66f10cc WHIRLPOOL 14616e86ea4b102c30af58d3ecb5834586c051a1a58778e6cb5fc08f79d9b5fbde2579d6e49e7a464d4906b4e3019b518f405b21c4b413de0cff83ab5050be43
+EBUILD qemu-2.7.1.ebuild 21880 SHA256 fa8660de912a17f58aca9de85059185876846fe764a23972f872e34f0086ed0e SHA512 b51b855efa710b6b76e155496fd9af26f5baa12b17a4b28b24c73664026ddfb3b800b45bbc4a77e65621a79af63d2a68d2eaa2718a2f378556165e5027173021 WHIRLPOOL 5d4dbf616f74ec4fc473ecd0d8dd890c9f6e5a5e8114d97ceeb771b5310c5c251772c7caff1cecc8d45edf25d0dfca8f3a71adf08b0fb22fb058eba3451b8153
 EBUILD qemu-9999.ebuild 20472 SHA256 d6599d08d30b41f99580f0e265c437142b1aca9d5c7087807486bad35cc7643d SHA512 c68b74a1a222f8451b7fb6159542c61f65f268b3bf87b98fbe9c297ef07cff1c1517b54226d5121c106660c3c9cfb5c35159eb41e09bfeb7de50ad41f5b5557d WHIRLPOOL 219cb575cd27e90b2b295a1079d2f35718176b26a686d4442ae55a8a481e6002316c7c45fb29fb2c3dd7ac775e4ac9c5ca5b41d7a13063e85ce797c6649b9282
 MISC ChangeLog 34977 SHA256 48c9a111a9eac22d5aef983a5c98fd2ce37cbb2df943a32638287d3a7477c6da SHA512 4a97d97960ad4accde6b48764a380160484427db586ded5d1699327a89e412760d9e7ed81a185f6900afed171f0023dd4c34dfc2148d98ff222e0c24c2af1649 WHIRLPOOL 75bd0f8453a37ad223f11f28971f195a54e003e973b6e44aa48f4b9b2532bb3dd39f35655c239d7b3b7a6fc0c4ff719ae5abab652b92da6664cd8bee523ef047
 MISC ChangeLog-2015 58193 SHA256 60c1a4f4c85515520ab14da920bbbf4a6813491ce16b5357a0456ea588815a5c SHA512 ddfe8e75aabe59b731a4a8b31839d8c71fd516620306d2bc99d7641cc501652974e053104caafa7550c5ad33b6834295f6743a98b9419d292b8bf6f67918ccd3 WHIRLPOOL a6841f79c3ba1cbf76a8c7fde296a2912c46ddd251494dca3bf3bc13391c80595b6f80125c383823899942248008ede7065b0f5c8e43f9bc1d0464aa62cc187f
--- a/app-emulation/qemu/files/qemu-2.7.0-CVE-2016-7422.patch
+++ b/app-emulation/qemu/files/qemu-2.7.0-CVE-2016-7422.patch
@ -1,38 +1,37 @@
-From: Prasad J Pandit <address@hidden>
+From 973e7170dddefb491a48df5cba33b2ae151013a0 Mon Sep 17 00:00:00 2001
+From: Prasad J Pandit <pjp@fedoraproject.org>
+Date: Mon, 19 Sep 2016 23:55:45 +0530
+Subject: [PATCH] virtio: add check for descriptor's mapped address

 virtio back end uses set of buffers to facilitate I/O operations.
 If its size is too large, 'cpu_physical_memory_map' could return
-a null address. This would result in a null dereference
-while un-mapping descriptors. Add check to avoid it.
+a null address. This would result in a null dereference while
+un-mapping descriptors. Add check to avoid it.

-Reported-by: Qinghao Tang <address@hidden>
-Signed-off-by: Prasad J Pandit <address@hidden>
+Reported-by: Qinghao Tang <luodalongde@gmail.com>
+Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
+Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
+Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
+Reviewed-by: Laszlo Ersek <lersek@redhat.com>
 ---
- hw/virtio/virtio.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
+ hw/virtio/virtio.c | 5 +++++
+ 1 file changed, 5 insertions(+)

 diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
-index 15ee3a7..0a4c5b6 100644
+index fcf3358d6c0d..bb656b1ccff0 100644
 --- a/hw/virtio/virtio.c
 +++ b/hw/virtio/virtio.c
-@@ -472,12 +472,14 @@ static void virtqueue_map_desc(unsigned int *p_num_sg, hwaddr *addr, struct iove
+@@ -495,6 +495,11 @@ static void virtqueue_map_desc(unsigned int *p_num_sg, hwaddr *addr, struct iove
         }
 
         iov[num_sg].iov_base = cpu_physical_memory_map(pa, &len, is_write);
-        iov[num_sg].iov_len = len;
-        addr[num_sg] = pa;
-+        if (iov[num_sg].iov_base) {
-+            iov[num_sg].iov_len = len;
-+            addr[num_sg] = pa;
- 
-+            pa += len;
-+            num_sg++;
+        if (!iov[num_sg].iov_base) {
+            error_report("virtio: bogus descriptor or out of resources");
+            exit(1);
 +        }
-         sz -= len;
-        pa += len;
-        num_sg++;
-     }
-     *p_num_sg = num_sg;
- }
+
+         iov[num_sg].iov_len = len;
+         addr[num_sg] = pa;
+ 
 -- 
-2.5.5
+2.11.0
--- a/app-emulation/qemu/files/qemu-2.7.0-CVE-2016-8669-1.patch
+++ b/app-emulation/qemu/files/qemu-2.7.0-CVE-2016-8669-1.patch
@ -1,3 +1,6 @@
+http://bugs.gentoo.org/597108
+https://lists.gnu.org/archive/html/qemu-devel/2016-10/msg02577.html
+
 From: Prasad J Pandit <address@hidden>

 The JAZZ RC4030 chipset emulator has a periodic timer and
--- a/app-emulation/qemu/qemu-2.7.1.ebuild
+++ b/app-emulation/qemu/qemu-2.7.1.ebuild
@ -0,0 +1,699 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses,readline"
+
+PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
+
+inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
+	user udev fcaps readme.gentoo-r1 pax-utils l10n
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
+	inherit git-2
+	SRC_URI=""
+else
+	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+IUSE="accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt glusterfs \
+gnutls gtk gtk2 infiniband iscsi +jpeg \
+kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs
+png pulseaudio python \
+rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-softmmu
+static-user systemtap tci test +threads usb usbredir +uuid vde +vhost-net \
+virgl virtfs +vnc vte xattr xen xfs"
+
+COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips
+mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc sparc64 unicore32
+x86_64"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb tricore xtensa xtensaeb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus tilegx"
+
+use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
+
+# Allow no targets to be built so that people can get a tools-only build.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	gtk2? ( gtk )
+	qemu_softmmu_targets_arm? ( fdt )
+	qemu_softmmu_targets_microblaze? ( fdt )
+	qemu_softmmu_targets_ppc? ( fdt )
+	qemu_softmmu_targets_ppc64? ( fdt )
+	sdl2? ( sdl )
+	static? ( static-softmmu static-user )
+	static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk !gtk2 )
+	virtfs? ( xattr )
+	vte? ( gtk )"
+
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+#
+# The attr lib isn't always linked in (although the USE flag is always
+# respected).  This is because qemu supports using the C library's API
+# when available rather than always using the extranl library.
+#
+# Older versions of gnutls are supported, but it's simpler to just require
+# the latest versions.  This is also why we require nettle.
+#
+# TODO: Split out tools deps into another var.  e.g. bzip2 is only used by
+# system binaries and tools, not user binaries.
+COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
+	sys-libs/zlib[static-libs(+)]
+	bzip2? ( app-arch/bzip2[static-libs(+)] )
+	xattr? ( sys-apps/attr[static-libs(+)] )"
+SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
+	>=x11-libs/pixman-0.28.0[static-libs(+)]
+	accessibility? ( app-accessibility/brltty[static-libs(+)] )
+	aio? ( dev-libs/libaio[static-libs(+)] )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bluetooth? ( net-wireless/bluez )
+	caps? ( sys-libs/libcap-ng[static-libs(+)] )
+	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+	fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
+	gnutls? (
+		dev-libs/nettle:=[static-libs(+)]
+		>=net-libs/gnutls-3.0:=[static-libs(+)]
+	)
+	gtk? (
+		gtk2? (
+			x11-libs/gtk+:2
+			vte? ( x11-libs/vte:0 )
+		)
+		!gtk2? (
+			x11-libs/gtk+:3
+			vte? ( x11-libs/vte:2.91 )
+		)
+	)
+	infiniband? ( sys-fabric/librdmacm:=[static-libs(+)] )
+	iscsi? ( net-libs/libiscsi )
+	jpeg? ( virtual/jpeg:0=[static-libs(+)] )
+	lzo? ( dev-libs/lzo:2[static-libs(+)] )
+	ncurses? ( sys-libs/ncurses:0=[static-libs(+)] )
+	nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
+	numa? ( sys-process/numactl[static-libs(+)] )
+	opengl? (
+		virtual/opengl
+		media-libs/libepoxy[static-libs(+)]
+		media-libs/mesa[static-libs(+)]
+		media-libs/mesa[egl,gles2,gbm]
+	)
+	png? ( media-libs/libpng:0=[static-libs(+)] )
+	pulseaudio? ( media-sound/pulseaudio )
+	rbd? ( sys-cluster/ceph[static-libs(+)] )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+	sdl? (
+		!sdl2? (
+			media-libs/libsdl[X]
+			>=media-libs/libsdl-1.2.11[static-libs(+)]
+		)
+		sdl2? (
+			media-libs/libsdl2[X]
+			media-libs/libsdl2[static-libs(+)]
+		)
+	)
+	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
+	snappy? ( app-arch/snappy[static-libs(+)] )
+	spice? (
+		>=app-emulation/spice-protocol-0.12.3
+		>=app-emulation/spice-0.12.0[static-libs(+)]
+	)
+	ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
+	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
+	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
+	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
+	vde? ( net-misc/vde[static-libs(+)] )
+	virgl? ( media-libs/virglrenderer[static-libs(+)] )
+	virtfs? ( sys-libs/libcap )
+	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
+USER_LIB_DEPEND="${COMMON_LIB_DEPEND}"
+X86_FIRMWARE_DEPEND="
+	>=sys-firmware/ipxe-1.0.0_p20130624
+	pin-upstream-blobs? (
+		~sys-firmware/seabios-1.8.2
+		~sys-firmware/sgabios-0.1_pre8
+		~sys-firmware/vgabios-0.7a
+	)
+	!pin-upstream-blobs? (
+		sys-firmware/seabios
+		sys-firmware/sgabios
+		sys-firmware/vgabios
+	)"
+CDEPEND="
+	!static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} ) " ${use_softmmu_targets}) )
+	!static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND//\[static-libs(+)]} ) " ${use_user_targets}) )
+	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
+	python? ( ${PYTHON_DEPS} )
+	systemtap? ( dev-util/systemtap )
+	xen? ( app-emulation/xen-tools:= )"
+DEPEND="${CDEPEND}
+	dev-lang/perl
+	=dev-lang/python-2*
+	sys-apps/texinfo
+	virtual/pkgconfig
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+	gtk? ( nls? ( sys-devel/gettext ) )
+	static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND} ) " ${use_softmmu_targets}) )
+	static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND} ) " ${use_user_targets}) )
+	test? (
+		dev-libs/glib[utils]
+		sys-devel/bc
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-qemu )
+"
+
+STRIP_MASK="/usr/share/qemu/palcode-clipper"
+
+QA_PREBUILT="
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/palcode-clipper
+	usr/share/qemu/s390-ccw.img
+	usr/share/qemu/u-boot.e500
+"
+
+QA_WX_LOAD="usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-cris
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-microblazeel
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-or32
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-ppc64abi32
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus
+	usr/bin/qemu-s390x
+	usr/bin/qemu-unicore32"
+
+DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure
+you have the kernel module loaded before running kvm. The easiest way to
+ensure that the kernel module is loaded is to load it on boot.\n
+For AMD CPUs the module is called 'kvm-amd'.\n
+For Intel CPUs the module is called 'kvm-intel'.\n
+Please review /etc/conf.d/modules for how to load these.\n\n
+Make sure your user is in the 'kvm' group\n
+Just run 'gpasswd -a <USER> kvm', then have <USER> re-login.\n\n
+For brand new installs, the default permissions on /dev/kvm might not let you
+access it.  You can tell udev to reset ownership/perms:\n
+udevadm trigger -c add /dev/kvm"
+
+qemu_support_kvm() {
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
+		use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
+		use qemu_softmmu_targets_s390x; then
+		return 0
+	fi
+
+	return 1
+}
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 2 6 25; then
+		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use the"
+			ERROR_TUN+=" virtual network device if using -net tap."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
+			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+			ERROR_VHOST_NET+=" support"
+
+			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+				CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
+			fi
+
+			use python && CONFIG_CHECK+=" ~DEBUG_FS"
+			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
+
+	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
+		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
+		eerror "instances are still pointing to it.  Please update your"
+		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
+		eerror "and the right system binary (e.g. qemu-system-x86_64)."
+		die "update your virt configs to not use qemu-kvm"
+	fi
+}
+
+pkg_setup() {
+	enewgroup kvm 78
+}
+
+# Sanity check to make sure target lists are kept up-to-date.
+check_targets() {
+	local var=$1 mak=$2
+	local detected sorted
+
+	pushd "${S}"/default-configs >/dev/null || die
+
+	# Force C locale until glibc is updated. #564936
+	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
+	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "${var}: ${sorted}"
+		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
+		die "sync ${var} to the list of targets"
+	fi
+
+	popd >/dev/null
+}
+
+handle_locales() {
+	# Make sure locale list is kept up-to-date.
+	local detected sorted
+	detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u))
+	sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "PLOCALES: ${sorted}"
+		eerror " po/*.po: ${detected}"
+		die "sync PLOCALES"
+	fi
+
+	# Deal with selective install of locales.
+	if use nls ; then
+		# Delete locales the user does not want. #577814
+		rm_loc() { rm po/$1.po || die; }
+		l10n_for_each_disabled_locale_do rm_loc
+	else
+		# Cheap hack to disable gettext .mo generation.
+		rm -f po/*.po
+	fi
+}
+
+src_prepare() {
+	check_targets IUSE_SOFTMMU_TARGETS softmmu
+	check_targets IUSE_USER_TARGETS linux-user
+
+	# Alter target makefiles to accept CFLAGS set via flag-o
+	sed -i -r \
+		-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
+		Makefile Makefile.target || die
+
+	epatch "${FILESDIR}"/${PN}-2.5.0-cflags.patch
+	epatch "${FILESDIR}"/${PN}-2.5.0-sysmacros.patch
+	epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-6836.patch   #591242
+	epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-7156.patch   #593036
+	epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-7170.patch   #593284
+	epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-7422.patch   #593956
+	epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-7466.patch   #594520
+	epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-7907.patch   #596048
+	epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-7908.patch   #596049
+	epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-7909.patch   #596048
+	epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-7994-1.patch #596738
+	epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-7994-2.patch #596738
+	epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-8576.patch   #596752
+	epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-8577.patch   #596776
+	epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-8578.patch   #596774
+	epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-8668.patch   #597110
+	epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-8669-1.patch #597108
+	epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-8669-2.patch #597108
+	epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-8909.patch   #598044
+	epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-9102.patch   #598328
+	epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-9103.patch   #598328
+	epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-9104.patch   #598328
+	epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-9105.patch   #598328
+	epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-9106.patch   #598772
+
+	# Fix ld and objcopy being called directly
+	tc-export AR LD OBJCOPY
+
+	# Verbose builds
+	MAKEOPTS+=" V=1"
+
+	epatch_user
+
+	# Run after we've applied all patches.
+	handle_locales
+}
+
+##
+# configures qemu based on the build directory and the build type
+# we are using.
+#
+qemu_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local buildtype=$1
+	local builddir="${S}/${buildtype}-build"
+	local static_flag="static-${buildtype}"
+
+	mkdir "${builddir}"
+
+	local conf_opts=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--libdir=/usr/$(get_libdir)
+		--docdir=/usr/share/doc/${PF}/html
+		--disable-bsd-user
+		--disable-guest-agent
+		--disable-strip
+		--disable-werror
+		# We support gnutls/nettle for crypto operations.  It is possible
+		# to use gcrypt when gnutls/nettle are disabled (but not when they
+		# are enabled), but it's not really worth the hassle.  Disable it
+		# all the time to avoid automatically detecting it. #568856
+		--disable-gcrypt
+		--python="${PYTHON}"
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--host-cc="$(tc-getBUILD_CC)"
+		$(use_enable debug debug-info)
+		$(use_enable debug debug-tcg)
+		--enable-docs
+		$(use_enable tci tcg-interpreter)
+		$(use_enable xattr attr)
+	)
+
+	# Disable options not used by user targets as the default configure
+	# options will autoprobe and try to link in a bunch of unused junk.
+	conf_softmmu() {
+		if [[ ${buildtype} == "user" ]] ; then
+			echo "--disable-${2:-$1}"
+		else
+			use_enable "$@"
+		fi
+	}
+	conf_opts+=(
+		$(conf_softmmu accessibility brlapi)
+		$(conf_softmmu aio linux-aio)
+		$(conf_softmmu bzip2)
+		$(conf_softmmu bluetooth bluez)
+		$(conf_softmmu caps cap-ng)
+		$(conf_softmmu curl)
+		$(conf_softmmu fdt)
+		$(conf_softmmu glusterfs)
+		$(conf_softmmu gnutls)
+		$(conf_softmmu gnutls nettle)
+		$(conf_softmmu gtk)
+		$(conf_softmmu infiniband rdma)
+		$(conf_softmmu iscsi libiscsi)
+		$(conf_softmmu jpeg vnc-jpeg)
+		$(conf_softmmu kernel_linux kvm)
+		$(conf_softmmu lzo)
+		$(conf_softmmu ncurses curses)
+		$(conf_softmmu nfs libnfs)
+		$(conf_softmmu numa)
+		$(conf_softmmu opengl)
+		$(conf_softmmu png vnc-png)
+		$(conf_softmmu rbd)
+		$(conf_softmmu sasl vnc-sasl)
+		$(conf_softmmu sdl)
+		$(conf_softmmu seccomp)
+		$(conf_softmmu smartcard)
+		$(conf_softmmu snappy)
+		$(conf_softmmu spice)
+		$(conf_softmmu ssh libssh2)
+		$(conf_softmmu usb libusb)
+		$(conf_softmmu usbredir usb-redir)
+		$(conf_softmmu uuid)
+		$(conf_softmmu vde)
+		$(conf_softmmu vhost-net)
+		$(conf_softmmu virgl virglrenderer)
+		$(conf_softmmu virtfs)
+		$(conf_softmmu vnc)
+		$(conf_softmmu vte)
+		$(conf_softmmu xen)
+		$(conf_softmmu xen xen-pci-passthrough)
+		$(conf_softmmu xfs xfsctl)
+	)
+
+	case ${buildtype} in
+	user)
+		conf_opts+=(
+			--enable-linux-user
+			--disable-system
+			--disable-blobs
+			--disable-tools
+		)
+		;;
+	softmmu)
+		# audio options
+		local audio_opts="oss"
+		use alsa && audio_opts="alsa,${audio_opts}"
+		use sdl && audio_opts="sdl,${audio_opts}"
+		use pulseaudio && audio_opts="pa,${audio_opts}"
+
+		conf_opts+=(
+			--disable-linux-user
+			--enable-system
+			--with-system-pixman
+			--audio-drv-list="${audio_opts}"
+		)
+		use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) )
+		use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) )
+		;;
+	tools)
+		conf_opts+=(
+			--disable-linux-user
+			--disable-system
+			--disable-blobs
+			$(use_enable bzip2)
+		)
+		static_flag="static"
+		;;
+	esac
+
+	local targets="${buildtype}_targets"
+	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
+
+	# Add support for SystemTAP
+	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
+
+	# We always want to attempt to build with PIE support as it results
+	# in a more secure binary. But it doesn't work with static or if
+	# the current GCC doesn't have PIE support.
+	if use ${static_flag}; then
+		conf_opts+=( --static --disable-pie )
+	else
+		gcc-specs-pie && conf_opts+=( --enable-pie )
+	fi
+
+	echo "../configure ${conf_opts[*]}"
+	cd "${builddir}"
+	../configure "${conf_opts[@]}" || die "configure failed"
+
+	# FreeBSD's kernel does not support QEMU assigning/grabbing
+	# host USB devices yet
+	use kernel_FreeBSD && \
+		sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
+}
+
+src_configure() {
+	local target
+
+	python_setup
+
+	softmmu_targets= softmmu_bins=()
+	user_targets= user_bins=()
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		if use "qemu_softmmu_targets_${target}"; then
+			softmmu_targets+=",${target}-softmmu"
+			softmmu_bins+=( "qemu-system-${target}" )
+		fi
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		if use "qemu_user_targets_${target}"; then
+			user_targets+=",${target}-linux-user"
+			user_bins+=( "qemu-${target}" )
+		fi
+	done
+
+	softmmu_targets=${softmmu_targets#,}
+	user_targets=${user_targets#,}
+
+	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
+	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
+	[[ -z ${softmmu_targets}${user_targets} ]] && qemu_src_configure "tools"
+}
+
+src_compile() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		default
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		default
+	fi
+
+	if [[ -z ${softmmu_targets}${user_targets} ]]; then
+		cd "${S}/tools-build"
+		default
+	fi
+}
+
+src_test() {
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		pax-mark m */qemu-system-* #515550
+		emake -j1 check
+		emake -j1 check-report.html
+	fi
+}
+
+qemu_python_install() {
+	python_domodule "${S}/scripts/qmp/qmp.py"
+
+	python_doscript "${S}/scripts/kvm/vmxcap"
+	python_doscript "${S}/scripts/qmp/qmp-shell"
+	python_doscript "${S}/scripts/qmp/qemu-ga-client"
+}
+
+src_install() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		emake DESTDIR="${ED}" install
+
+		# Install binfmt handler init script for user targets
+		newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		emake DESTDIR="${ED}" install
+
+		# This might not exist if the test failed. #512010
+		[[ -e check-report.html ]] && dohtml check-report.html
+
+		if use kernel_linux; then
+			udev_dorules "${FILESDIR}"/65-kvm.rules
+		fi
+
+		if use python; then
+			python_foreach_impl qemu_python_install
+		fi
+	fi
+
+	if [[ -z ${softmmu_targets}${user_targets} ]]; then
+		cd "${S}/tools-build"
+		emake DESTDIR="${ED}" install
+	fi
+
+	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
+	pushd "${ED}"/usr/bin >/dev/null
+	pax-mark m "${softmmu_bins[@]}" "${user_bins[@]}"
+	popd >/dev/null
+
+	# Install config file example for qemu-bridge-helper
+	insinto "/etc/qemu"
+	doins "${FILESDIR}/bridge.conf"
+
+	# Remove the docdir placed qmp-commands.txt
+	mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/docs/" || die
+
+	cd "${S}"
+	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
+	dodoc docs/qmp-*.txt
+
+	if [[ -n ${softmmu_targets} ]]; then
+		# Remove SeaBIOS since we're using the SeaBIOS packaged one
+		rm "${ED}/usr/share/qemu/bios.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+		fi
+
+		# Remove vgabios since we're using the vgabios packaged one
+		rm "${ED}/usr/share/qemu/vgabios.bin"
+		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
+			dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+			dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+			dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+			dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+		fi
+
+		# Remove sgabios since we're using the sgabios packaged one
+		rm "${ED}/usr/share/qemu/sgabios.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+		fi
+
+		# Remove iPXE since we're using the iPXE packaged one
+		rm "${ED}"/usr/share/qemu/pxe-*.rom
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
+			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+		fi
+	fi
+
+	qemu_support_kvm && readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if qemu_support_kvm; then
+		readme.gentoo_print_elog
+	fi
+
+	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
+		udev_reload
+	fi
+
+	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
+}
+
+pkg_info() {
+	echo "Using:"
+	echo "  $(best_version app-emulation/spice-protocol)"
+	echo "  $(best_version sys-firmware/ipxe)"
+	echo "  $(best_version sys-firmware/seabios)"
+	if has_version 'sys-firmware/seabios[binary]'; then
+		echo "    USE=binary"
+	else
+		echo "    USE=''"
+	fi
+	echo "  $(best_version sys-firmware/vgabios)"
+}
--- a/app-i18n/enca/Manifest
+++ b/app-i18n/enca/Manifest
@ -7,7 +7,7 @@ DIST enca-1.19.tar.xz 465412 SHA256 3a487eca40b41021e2e4b7a6440b97d822e6532db546
 EBUILD enca-1.13-r3.ebuild 1418 SHA256 8fdbb387d71f3507d88d10c06cb57c244d1097bbd26b37c58e1f84bd3f04d4f6 SHA512 bd0b4bd475f8d364b4de7acdae28200257113ac85f69292bb1abcdd716c512d953204ba72b797e9ec56a3444087f011ca3ccb625c5d544e354142fd2dd9d810d WHIRLPOOL 80e6041d72e1c61e1d00dc32202d9d859c643aa29cb710081a69530c2378313e5ab357450c2420cbf77280fa224f8098fe4b402775589ddb2a39621a8db0deb6
 EBUILD enca-1.14-r1.ebuild 1752 SHA256 ce352c3f1f6ff0da2201afa37c57623f0fcb5f1fbab56fdcc1d109c2f1f831c1 SHA512 8d61f6005ea1186bc83cb047cf5452c44dc777d4ac27fe6517710f494d2da4c590976a0e49e9edd2b764e8b041d225c9d20162a0a24d30b6eb7ba430f1a0e795 WHIRLPOOL a21bded914586f3e152bdd0927ff80c8b2e5dd0c89ecd5eb527d6ac1450075c939345bbc54fbb0f54e2b3bc84ed02b14c43ca22ce2b18ca7dbcec70a2403a525
 EBUILD enca-1.14-r2.ebuild 1762 SHA256 79a1dbb440a4d780ba068dc99f751afb173c28068b22ed304b0492f93499cb5a SHA512 3a10b4c26796d2f2cf4e8aea7e4a64ea32f9256ee948cad5b640f4339f2eae6159794cb5fbc644ad342ee8a882e5701dcd01dd56a675e41c38d8b4f4fab2caab WHIRLPOOL 08fc2446cb757660bc51f4a0cb1c304f32af469bf732bfa7c3287648862cb1d2cf4d4067754b3f3ce70ece311f6f69f9b7e1b85a0bb7c7e52accfd22cc6934f0
-EBUILD enca-1.19-r1.ebuild 2143 SHA256 b3b1b84ea4d05a87fe82502683f2686e61f31f7fdaa254fc57a13dea7118e9ea SHA512 2127364866696e5d303890db0a621a62c383d348fdff5840a39a81721f34933605283e8ca56b4abf82fbd426ff601ac5446675173751dda96f3fddf0ee04c186 WHIRLPOOL 1741cecd6b9b7fc1f60b2f527e4d06603ea051ed755316b024c0408571f102005e0b668175b6a9b9262d18b7bcf733970bcb6f956e16240e3212434782d6ef2b
+EBUILD enca-1.19-r1.ebuild 2141 SHA256 2de1c1660b54b1c23cdfdc889d276a2aca69fbc9e317b619dcd474d1a1c220cb SHA512 a1b0d851d16ee3d5ea4997e0c18ba9175bd81762c7ecb6caf651badf80de2abd670cfee2407bfcd3f0909ec368145d629a9524866896fd813f7ca2655d86a759 WHIRLPOOL b1af081f8f22e9425ba355858ed8ed7ab2ddcb330db8d0059408cd3da7f57a9293ff42b7c57540bfb8732d9ba98ff01df9e609e511d2e7e1fa5340c4952a66d6
 MISC ChangeLog 5257 SHA256 3e0fbf9ab18ce2a4ffec1e0e63a8a2be5ddfd0e9a03deb0c87c67d6e9327742d SHA512 dc4e7bac41acb45a0300621f913ea744a5151e370cebaf0496d372276e84bd6563e12f948d222c13be4d9f4a1f9151d907a7eba2d7344067fcc24d235e624ad8 WHIRLPOOL d8cae2ab84af62f1a77317e42ddbc2d6720445a6631c338286c7c2bef12dc0aa3e6cf5a1145e178720e3ff3fa20f5effb35f251e87415581eee861732ab1b5ec
 MISC ChangeLog-2015 13061 SHA256 71cb843a906c4b9901a6b5e40d7eda4324c80054d73d21f1666e18f493ded43d SHA512 5696e2b25be0a7643494932a5cf680562d8133ebf05274447f58a116fb9b52728019598b8ad29b933ca2f2320864cbeda7d73741ed9a8cf9f0953423125dfaa0 WHIRLPOOL c5eee2fe66f5a249e309ee7eb2d11e3c066c9c43eb1cca040741037f84b3fd9a029077f0dcc7f314f232d47028af376dc165b1ed41408cb627adcfcef2f249c3
 MISC metadata.xml 551 SHA256 d4593911b0c1e6ecd09a28e36c1d65052acf6316e5e08450bccc7905b10a4494 SHA512 d49de3ee9ab0c0ec48e26b556ae86e22ca79198357971df5d30136bd0e60e7d9381a55982028d46b44548b786e78dd20abb074af6dd34c3d8ba1e1003c95b456 WHIRLPOOL ec871cd27e0ebd4fbf6186630f4be221d60d726583008860b4e56bd8f7fe7313e7af10bae54e36bdfb06d37a011d6ed80fcae18882c37ccd9c0ee924e69d5c12
--- a/app-i18n/enca/enca-1.19-r1.ebuild
+++ b/app-i18n/enca/enca-1.19-r1.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://dl.cihar.com/${PN}/${P}.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc +iconv recode static-libs"

 RDEPEND="
--- a/app-i18n/man-pages-ru/Manifest
+++ b/app-i18n/man-pages-ru/Manifest
@ -1,7 +1,7 @@
-DIST man-pages-ru_3.71-2209-1992-20140911.tar.bz2 1009646 SHA256 b6f599776a175c7fff8b8b37be8be0ab8ecd5df55c382b7a687dcf6bca8d478f SHA512 c6585323ef9cece674fe4144ff1e73e2d4d831e3f8766b5091f57b7e7c13d9c68c446323515f85f4c7fd956987e40d1d22a81c0cba21593133030e1f968fde12 WHIRLPOOL a41d141be4d6d9663829ccbced477bec11adad718cd95098c74e37e82b2317c38251dc399b7531454e48ce9d56604870c0a372f24eb8e6ab2b36a56dbf8b910f
 DIST man-pages-ru_3.81-2230-2080-20160117.tar.bz2 1119715 SHA256 225c2e4eeb1a9071ab995b446cecfec51b24b2034191133c2035ad8c540a921b SHA512 2d38d4aca0d247f6f23556e58f5538510e58596146d481e72b6d70c9282b8ec24f79da1c7525612f8b4e968cd7049f2ba51eb40804804ba6d9aeb39f4b4d12dc WHIRLPOOL 9fdef40b11119fff41dbe099c321fc7358d9df391e5a55a5d0ea1a8b2691fd5666755ed70e497501ef182ffa4b5e5c738386377f7feb29cc6f09001101ee88ed
-EBUILD man-pages-ru-3.71.2209.1992.20140911.ebuild 678 SHA256 779db3a4665aadea99334f91b87ce3f3852575daa3f7c8721239cffe04a6f657 SHA512 a8a5b87183747c85817c52a93d4852af27d34251d930b70e0bcd32e062d71a57d96d89ba74651e0cb97b2ef1d925e866af868b979ff5ad20f01508144496963f WHIRLPOOL 3e812bb74f8ba15605ada6326880c805cd08e6b878ed2c2409dc842f04ee35e2fa9faf91d200f398110770e512e846f466541efca193b730e19e50635b6b6a01
+DIST man-pages-ru_4.05-2306-2240-20161008.tar.bz2 1371026 SHA256 160637a9ab0dc0ad154a88574f97d39ec653e83c45627e9d55e7b4c90f850a21 SHA512 724c4a076ecbfc7dd8c1d14e5db326866bef0d1f61da529225ee981d855bbdf276097bc077e5b78ab6dcac14a54bcadcc37a408091a48d48a9471bb2d9c51b9b WHIRLPOOL 063a4959bf6e57e12b4b1b65053d01777af767d76563163f0dd9afeccb248a2895679467a07219d6a0f355c79635bc3f0bc4473803783766e63c854cc656c063
 EBUILD man-pages-ru-3.81.2230.2080.20160117.ebuild 678 SHA256 779db3a4665aadea99334f91b87ce3f3852575daa3f7c8721239cffe04a6f657 SHA512 a8a5b87183747c85817c52a93d4852af27d34251d930b70e0bcd32e062d71a57d96d89ba74651e0cb97b2ef1d925e866af868b979ff5ad20f01508144496963f WHIRLPOOL 3e812bb74f8ba15605ada6326880c805cd08e6b878ed2c2409dc842f04ee35e2fa9faf91d200f398110770e512e846f466541efca193b730e19e50635b6b6a01
+EBUILD man-pages-ru-4.05.2306.2240.20161008.ebuild 689 SHA256 746a8e488954badd78d87e73823f7002ed2dcd6ad36055f492c97e9a8d887440 SHA512 a004dfea10906e0413c06b13a3b5490724f9d25ce107a695b32752723c7b841165a817b3316de4692e51768aa7b3db798911cb31d85aa412aa15d331da214c3d WHIRLPOOL f18b59e0081d0cf81ed2f4f171c9126fcf1895f51f34d94a14b28641040e67339aca78dd594ab4141db56d57c80583d4925037ab7ef7cffb1d1284f642f0c918
 MISC ChangeLog 3314 SHA256 5afa4742cbc3b2e5f3a0c274fe62d3f30034f4713b3490fd498d215881953f6a SHA512 676f209db63869cf03264fe5a3299aeb6c8675f9ac775d0438fb56471efeeed83ce99521b6b3b720b74109b9e21531dcfca33dfecc52a42f0c6529f55355b5d8 WHIRLPOOL 5ddbff33c76f2769e10fa5469076f8fc97eda0b8ad6362127c6753d086c9bedf6a4e53a55ecb3ab16dcbd9e265e488d5d27d779d26cef1ab38bf65bd85466f6e
 MISC ChangeLog-2015 9483 SHA256 dc9570bce3c909acc5c8eeda7b7c5c12b9162dc7b6a758acad546b40a6b9b474 SHA512 1a90003bad33952756bc2a2ed7431b9a825d86c41f788b9c59c0828006bb2bca28cb53c18fb929cfe96ae514be00808153a9e3c1e7547dfc0d027ba3289de870 WHIRLPOOL c0982649fe5f8cf1481963a44b28140a113cef86157132d41bb0827b6e99faf53f303353650ca1360faf578fe525595dc051d66f17efa2d2fe5aa7d22f252126
 MISC metadata.xml 436 SHA256 2447ad7198fed13a143464a43513616b699eaec1ed257442492a18aa1203cb2d SHA512 1f7c55f697fe501f62c9cde15f0f82cedf7cf62251efba961c4e236ec99974fe7345fd77a48d92eee9472fe519e7c4ea040fda5df31d743f2eddf09644ae81a5 WHIRLPOOL cbc262c6b5477abed5988641a293114a5a91a35a3a0a01613ba5072efe791380163c4abe048ed4e4c54750a99a90ac900f731d02e06f29dfc6310df0e20c8e2f
--- a/app-i18n/man-pages-ru/man-pages-ru-4.05.2306.2240.20161008.ebuild
+++ b/app-i18n/man-pages-ru/man-pages-ru-4.05.2306.2240.20161008.ebuild
@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI="5"
+EAPI=6

 inherit versionator

@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${MY_PV}.tar.bz2"

 LICENSE="FDL-1.3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"

 DEPEND=""
 RDEPEND="virtual/man"
--- a/app-laptop/tp_smapi/Manifest
+++ b/app-laptop/tp_smapi/Manifest
@ -3,7 +3,7 @@ AUX tp_smapi-0.40-initd 1851 SHA256 3feb039b6aa7d4c8589e3d31919c0e465b1ae897cd0d
 DIST tp_smapi-0.41.tar.gz 38852 SHA256 6aef02b92d10360ac9be0db29ae390636be55017990063a092a285c70b54e666 SHA512 924a11cdf64bc151d069d4f61ca476cf006773291f363b21a80ce091f560a78c4828d2e522e646a5b133c58149a37cb5c2432a165e92e6980eb510b9488c728e WHIRLPOOL 10c74811148934a49b2d2b65cd65d366c58de03682c02d6b82694b4831634a25f2da9986b0493e28b372abf7ada692ee8ea85b2881b823b0cb7b35b73f348d6e
 DIST tp_smapi-0.42.tgz 39867 SHA256 7b8d9f488c3859805f1f292bf4d518cc5b32ebb69b0ebe96367d0852dd792d27 SHA512 1004b7ef961a9908c2144b26ea60b6dddabd83d60c11421a03e3b810f5b635415ef52656d6980915512d68f809f7bc3d662328f25d111537bd7e175d252cf83b WHIRLPOOL 7d03aaf2bb4de3aabbc38fba62f126e6f2976ea1964d85da2fffbbcd63bb4c3884a152851cae116438b859c13d59fd4e41be126683f660f9b8322d7fc40ddc28
 EBUILD tp_smapi-0.41.ebuild 1489 SHA256 311a41ef7a3f463982f4fc334bc18a416a14a36148945043224864357718eeb8 SHA512 d0c004097753750a93ed3fecc41d23b7eb394faeb39dd7191ee528a96dc45b514ff085ad35ed1114248283f30ba977d9eb08888972cdf5aa1360413eaa0ecc63 WHIRLPOOL 658d0ccc5a34324edf7167d141a3e8d62a6e5f7b653bd023974d4acb1f561302631a62c199d113981763c71602d0d400abd51dc5ad361b5ea78539d9853b6e94
-EBUILD tp_smapi-0.42-r1.ebuild 1955 SHA256 398d873c213c83ba6373369f1703ee2906f4cdd17fdea53ad9ebe79afbca6962 SHA512 1d3c08d3ffd4e8a5e3dde25531ce972a0b43351096ff045d005d3748d8023f8991265094563e0c36281a970dfe860084bf82bb563d29034314b9adb7f7b15560 WHIRLPOOL 98a787a05046fe0ddf8a51a010b8e14c9d30df85729dba383347aca41537a46f2498b97516b18238c5354df956d57b448160d1296eec92c22f7f139a1caa69af
+EBUILD tp_smapi-0.42-r1.ebuild 1954 SHA256 e7605a3def2563bd4e457dd8a0a0f7978f0d2ff70d7a6a5e08abcc0aa23c46a4 SHA512 035588eee557166b3582f086feb411d5ffbcaade1956d6cd156ad1fe215ac294fc80db5711f74ad0b1cc07eef68d1c5bd39576b36b42c4a99c0f98bca98a4a89 WHIRLPOOL c9d41a1c251f6467e499453a8f454d09dbc3fb65a106798d3a537ef54d33ce1037fb8ef5f1a18e04a4cf22c77db208f125603c12c6664ba69330e67e683b2ef9
 MISC ChangeLog 5140 SHA256 de26e7c672edc9ff7a963b4c725b4be6922212a6f86d4b14fcea3afc960567e5 SHA512 a303fac2b38fe12a22d20d0e5fbeaee8f60b701935a50c649ed7c9ca4a15d277c31f1ed0ebe9d37a040d1baf18ad55960297a4c422fa075c6e85d206bcb03ab9 WHIRLPOOL dad90eb58e2cff369d49867dd3f1a51564a5457960ece752730ec60bf5abaa5faf61dc10f3ee9e56e8dd97b38b05d611530d4ce5be5fbd4a7f781a36d8edd492
 MISC ChangeLog-2015 6791 SHA256 20bf113d3b2f121be58c4b075e8b2316587e2e812c7885c005fcc696de264250 SHA512 38956dab021c8ba903bd11ac9cb4a2edf94363f296b60e134b06cdf4a1edccc9c09d20a23dcde948be5b128bb0f8cebf9f34b5ea6eaa0c587f40d40cea947aa4 WHIRLPOOL ff26b6d6a2deb69cc378ff16fcc8b32592de6ba6589c927b3ffe7a46e48bf97e40f7b5eff0ece35838dac3da6e9617be63b57fae905b4f6156d975383d146b54
 MISC metadata.xml 473 SHA256 4ad788e24f6504854e58ba6efa562fd2235fee205213ddd57424e357e649d73d SHA512 21ce54c4cd204ddea9f1170f8e1b66e636bb2b541856ff541371bd572403519a09cf2367f5642a596684d66145bc9ab92396b102ef51086f2d22f96fc6c0b7af WHIRLPOOL 854979d7994ec70cdb0fe7aa186ba57201f3d0a9e9648f432d67c42515d900cebfe8f970e48bdad74a0f64c308f61e59cdbfae0c8d3ec56fb62c4a6b1de00446
--- a/app-laptop/tp_smapi/tp_smapi-0.42-r1.ebuild
+++ b/app-laptop/tp_smapi/tp_smapi-0.42-r1.ebuild
@ -12,7 +12,7 @@ SRC_URI="${HOMEPAGE}/releases/download/tp-smapi/${PV}/${P}.tgz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"

 IUSE="hdaps"

--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@ -4,7 +4,7 @@ AUX gramps-4.2.4-versioned_doc_dir.patch 1007 SHA256 d5dd677a6ab97e2425172115d82
 DIST gramps-3.4.5.tar.gz 10444188 SHA256 940b665a2e0dadf7ee310bdd1a1033c20816c856df8a7d6c4e0850a60471dbc7 SHA512 c9b517f58712d9f585dbddcb394d3605a5f823950a8c3c5a4ffd20d1a8523d6b75f9b6193271adabe76edc073dd6b4c20811de62582a2930b84d88922b4e52b3 WHIRLPOOL 4e30108881900883a4cb3c3ee4c9ef78e04d0850c3dbdaf97569f44cdfb2e56463f3f156f041b4dec6650c722f12cc0909689edc9591c97c5b02b1705860c228
 DIST gramps-4.2.4.tar.gz 18683901 SHA256 25190692f2f0d06e05f0761fef45173dd8d6693762572a62845b544a2c622efa SHA512 640b7b8affc29eee000232a3828f71c6e6e4ee568a4fce2ae8f9eaeabc87682e2dd9e2f1db1e8093e368d86583e80ce3c5261cf223f9cc6e210e7d6272781499 WHIRLPOOL ae118840749364b2904e5ed35f318019c54551305cf98d6e118bf9c539d1507dbce74b46fe66430e53c1115d09d3c73296a91f354ad0bb734e6d182a3ae148d0
 EBUILD gramps-3.4.5-r1.ebuild 1979 SHA256 2e191fca136f04aa0297ecef90ef774495b84d7ed2f791f0bb54f8be33c240d9 SHA512 4aa514d9e79ace56b22d9662418693c0045a13f84c43e84822b6cd1c58c767d51760a7b388b988d1f270f9059a996116ec37019e0ebac40b449697d24f87bf4e WHIRLPOOL f480186ecfe09d0a42d6e6ff49d258551153588ffccfe5f56921cc930e150cf2cabb74fc14d90e117ee06f634971730e022e78289931f0c64dc1a3b4713c1cfd
-EBUILD gramps-4.2.4-r1.ebuild 1098 SHA256 85faca3dc19a03a163cfc0eedde20d7f70a582e123db008acd45959da25e8086 SHA512 057d9906afa4667e01245970a6dcbe69b86b29fc8bb2555a7befbd3bdf88139a7b38099e7c81df127c1256b552d7d3593d1637d90d5b2563ed3468b7f955c3a1 WHIRLPOOL 4c0f57f4831b1fa861a0ad6833e774a9e04eb0e81b2348f83bcfa7f8f7f36f262c0bed6c8cdf8d5bdaeaf02e5dac9afbf9d66ae4335d4e1980de7934a465d6c6
+EBUILD gramps-4.2.4-r1.ebuild 1096 SHA256 220f8813ee70ef1e627b4b58d07ce385f6ae1554bef01424511574b3071aa72a SHA512 42fd08a8d9cf7707c30268c52dea7c4980e0c8be0fbfda445a26586b0a0eb5fd22ec579d57e9e68040239498890f5cfdfaddb455df02dfc99c6cee72416ed1be WHIRLPOOL aea5f04a40989c9918022f72c3d52b022f03756a3642a18ddc0a482d8603ec6ac2a6c49763a6d96381430bff7be290048b8d909cfbb87a4aa7de9f7fc456eb13
 EBUILD gramps-4.2.4-r2.ebuild 1148 SHA256 77d04110bc4f09bca00c573475778ea3de30ef99051eeb418eece94b7b734e73 SHA512 cf233bdf626dd86b7e6124738eba3efb957f7d277c9ad3040f1eaf1e5400bec8ca8ec576884b2d031a0de15c73a3202ad11f3695d6ff972cfad130ec468ab9d5 WHIRLPOOL a5152331d624a7ced8258844f0910ff1e0c31b53a6e558e606dc54f9be539299c7725e4e26e5a7c1383a4486a2ebdb7b386f6ec1dcca0630977048b91fa01a7f
 EBUILD gramps-4.2.4.ebuild 1002 SHA256 83ae05078ca5aebb6cdd978d5de858894710978922482d3fa9e907d2f858bd1b SHA512 f114b669ab26c652622e6eb4ea9675f7b8b15e79a19dd0b337ebbdca00e401fcf3dea930a70718d84a7f350b1a2b6e8ed92101664d48a9c1f78380b9c21f7db9 WHIRLPOOL 52ecc4e08f42467a24f6677254f3dd8f6c6e90de65abdb7f52605b7b12077367c2605221256f9fb147ae1e4e3d044a8aa8cf7cd50cd99676af656f5ada3677ae
 MISC ChangeLog 5110 SHA256 c75d3e74c824b7be0fc9d5a297e2c6c2d016bf60509f7cf0cb9b975d30525c94 SHA512 b41857c995bd1e9f50f4f010727733959f08e8d1e6119991f73e55baaf345b26234d17d680e5b9cae566b43063fc2ecef3e4f59719e2aa092fc593097225c862 WHIRLPOOL 3332ec86d21471593b9a125e328ed542cccea9f35ad030e11d34ff30ae301e4ef5322b6b99a7fb87bbb5f8ca95cabc6ef20720997e5bb58372dfe5b21733800a
--- a/app-misc/gramps/gramps-4.2.4-r1.ebuild
+++ b/app-misc/gramps/gramps-4.2.4-r1.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz -> ${P}.t

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+reports +exif spell"

 RDEPEND="
--- a/app-misc/hivex/Manifest
+++ b/app-misc/hivex/Manifest
@ -2,4 +2,4 @@ DIST hivex-1.3.11.tar.gz 1264487 SHA256 c63adf6c7ef9140acf20775d35bef35ab563c0d2
 EBUILD hivex-1.3.11-r1.ebuild 2149 SHA256 4e76c626a0704aa4e6b07576696e249ef2c15c72404b3dcaf548905959956ca3 SHA512 f7c2588da0d0c44e31a04d952950f1b3c583a5a7dc7ed7254db68cfd10f0a674629b219cb5a1e422aef6d942e38e38e9cbdf6caadd5574072cc5a4c93bc1e725 WHIRLPOOL fb8e484dff8c17b11238e6d857853bb2ec29057b8df7ae23b2345b3526012d11140aaf9e21f8269b42bf6adcc11d5b27b74e1e040153e15f45604fef859d3774
 MISC ChangeLog 3113 SHA256 4a6f61095d833c0e9e976de63b5f8cad44a56fe6bedf99a8d68c6f2a7da41513 SHA512 b837537ae1db284cfac2799283656aaff711cc13004568de09de82c93409a8265b69251c5dbb5deae4cbb108de9703514f00c135eea1582da56ebf792c2ca7f8 WHIRLPOOL 8ae04bcf550dd093d25042a704bb1ae0296cc09681c9399f3175c43f0f58887f243711b99ed096fd1d411ca1ade6d129829ee9ae9873811820c6979e13007993
 MISC ChangeLog-2015 7732 SHA256 1945c3b1efd2cf50a4d4cc86776eab6a1c751953a4c106827d22bb2c793022d5 SHA512 04baa5db624a7531b6f6dd48d0eb2a4c4103fdcb31238fd89cd094a2388de6ba5f109577537e0583681c7fad8242844a6d15defdef377be906e24a38326af48d WHIRLPOOL 3b8d0a8f894b73066a4eae0d6737b8e4a0fde96278148339ce63aba8c78fa4745cb10fc63179649f21a039b04bb9dc5eada28949849e5b0705793ac7326a0ff5
-MISC metadata.xml 479 SHA256 8c3001a4a0c1d2b77853aaac6ac92288711f0735990613fd132fb08f6dea5542 SHA512 7667cbbdcccb3eb42e912167d855e28f5d9227cf2d0a994b092ce5697fb3c959d0a40f75f9fd7c3738ab16558f6e9fa4afea0488687cadddd025bef704a2e5b7 WHIRLPOOL 57a63fb05e817c47ff7974fa8ea2010e2c2652048b10b4eb7be904d7b11eb7d618cafe700c34c820089c58bf5bd2f2866fb9870ae898ee028e24af393678c1b0
+MISC metadata.xml 245 SHA256 d8a2d603183590c960989695dbe8e1b40b18c4405314cc754b4a609ef266be7c SHA512 1c6cdb75d4cbbd8d3a5f2cc24950924c030db330e135cf2cacecdaaa99ee65117efd7abd9f8652bf5dfa8169d427f51ff84123aab11fa8ef82498a6834b0805a WHIRLPOOL 8d19cc9bf7a59c51d8a9e346f23576705184758bc5a732bafa587d4d51ce3ec01b77a6a1c06d6121b72342fe401a02f03935acf5d386cb48f7e5b14b197810d5
--- a/app-misc/hivex/metadata.xml
+++ b/app-misc/hivex/metadata.xml
@ -1,16 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>andreis.vinogradovs@gmail.com</email>
-	<name>Andreis Vinogradovs</name>
-</maintainer>
 <maintainer type="person">
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
 </maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
 </pkgmetadata>
--- a/app-misc/screenfetch/Manifest
+++ b/app-misc/screenfetch/Manifest
@ -5,7 +5,7 @@ DIST screenfetch-3.7.0.tar.gz 60223 SHA256 6711fe924833919d53c1dfbbb43f3777d33e2
 EBUILD screenfetch-2.7.7.ebuild 646 SHA256 bb3c9e746a2a09531d4932a0f00b8bafd8a8f37c93c0827683bc08ef8739b355 SHA512 cab6428ba1ae9e3aaa005d1f8a1273cd41d3eac3c9fc69983cc4cf47d9b29c6933d978c9fc3948513059edcb6b7493381affce48fa1dd0a614d258c8898755c9 WHIRLPOOL 39a4e683cb65371bba1540346651193a51d096b937a2861e6305eec5e7c51ede6050c5bd349438784974aa62866d9840c743736637c1014ccab28029aeb79a07
 EBUILD screenfetch-3.2.2.ebuild 686 SHA256 ed14cdb6163956b8a180fba8ba74f720064adfc73b258f71780f6298e0eafe5c SHA512 42364375f6a23f088ad3a8dc6e46973b18d3c6ef3a25f1b63bf05a031e8297e730dcdb1593d2f0878384a5e14e129f0b7cdc9a597b72aa4fb7fc4d5db1a9513b WHIRLPOOL f3388c3b8f79c8a4fcdf9b12c66cb6173a8014f7e177cdc4152abc38c7f65908ea7779b5e69d3db6da5d57c4d3059c5e6bd0de1d6de8f8c2d4c252010ef8e460
 EBUILD screenfetch-3.6.5.ebuild 686 SHA256 ced88862f481a7d55cda79c1df4916493fab4231094f6e8345dd5c5eb0a37c32 SHA512 00eb77e9b5e3333a2b8ff02d9924ab88ef5690db8abe87e9f4ed5e130834489854dc3a7d0f174a4a1365052af61af986f700585982ce766f9a01388d8a8a0533 WHIRLPOOL b221145894cb94d6dd6dadded6504f8b1e5c7e85a5aae4fdfde07596ce37f96600d840ff0ec8e45cea64cef237c2b29e0eb88928d1a13e294056c2dd217e22fe
-EBUILD screenfetch-3.7.0.ebuild 676 SHA256 f106cb434ae4f41ea8f4f2be17527e8348e0adb64655bb7d13962fe3294afa81 SHA512 d6a0a87e520be43a205bee80b66991048b81ac1a78ab9f45ab2321773e702650d89cb80bcb0be72b17e24171f31b9dbb187ece5cdcf125b040985ee1916e0ea3 WHIRLPOOL fe5a2c99ea7851a8b32d8a1cfd824df7688f2f1ae871fa69cece82f9247aec5b4e38eb3b4f052a36d75b38e718bb1ac94bd089f71939769c6d927cea4dd29dcf
+EBUILD screenfetch-3.7.0.ebuild 675 SHA256 15db20fb292afed9fb08ed8f39853e26559280dc403e43238b7f220f0bd00061 SHA512 f502d1c381dd3f60854f995adfc437fc65d2b5431c3c53bc11567ea90d9afb2e94b77cc9b04f23af2cdf1be0066f988f6c91074e1f9c6715d34402868738ac63 WHIRLPOOL 15da847c31c72e8185ff84581d502e965af2cd3854e2bd2b9ed11518441f38fb0c4c58f4a48e40b31f6d55d6da581b89ff9b50682d87b48d38135847c92f41b4
 EBUILD screenfetch-9999.ebuild 614 SHA256 3dbf3e84a725d09d1ae7f9ae9dc2a125502b05c46ff8567021ed7e5e4d4a91a8 SHA512 d60ff314059b20a4172fbd9b7f603ff484bf9d28ebf64e71014be39c0f5d847e8d2d0d05fae3c6ed3fad66a94b7ce314d745bf5f6f1072420f4331bd41311e86 WHIRLPOOL efdbdcf8ec1c88fa901f2bd888a43203485dbe7298ab56780ee79b49db41315c15e4fde8ee0f964d87b881e8054f71744753e304709b65682bd51f767f5cff29
 MISC ChangeLog 2787 SHA256 d608df5e9baf7f72ab49eb44072ef12b9e22d823a1b53afd601cf1661255a067 SHA512 f0f253a8cf604ba5c94da89a9dd69d88e0c5a91659e3b56494674bc982d6c6a484e60fca9897dd38e6c43f2687c0530b8dc7f4ac154cec8d2fc7663d5ee30b2e WHIRLPOOL 9486cb1a7c0f90e46d0fa1c79d1b0892862300893cb8791429dc0c9056756dbf56ea9c6e7b54a682880d5f851ca645e6f97ce8ff5fc78a0b92ca8df5a08d5c70
 MISC ChangeLog-2015 2466 SHA256 d1498c8d5a1118fb99dbeae2441ca14946e01e10979dfca09cc9ff630511d2ac SHA512 e3ecf461751d1e104b86c9f03413e1c828e3d422e01d3b224036479504bf6ce0301399ae0e5f8bd906c54ac89f6428348041a824f18a8dec4621c81f02979341 WHIRLPOOL a2f90405b8d191265e5585278fa81d2ebdd52dc1492945db676cfb7a19364f9e15eb062fb5b14ff41584921d3424bd1e21759e401a07a3fc08bffe89c7e434de
--- a/app-misc/screenfetch/screenfetch-3.7.0.ebuild
+++ b/app-misc/screenfetch/screenfetch-3.7.0.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/KittyKatt/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="X"

 S="${WORKDIR}/${MY_PN}-${PV}"
--- a/app-misc/scrub/Manifest
+++ b/app-misc/scrub/Manifest
@ -1,7 +1,7 @@
 DIST 2.5.2.tar.gz 192060 SHA256 92d688f994fb5b8d377bb41d46f077ebf5c41327d1b6af2824eb4d2bb2c7815e SHA512 1ae96c6f59d9039720642acc320a7e4498116594a3058ace86ea6346c58131283063c4337a8d6960a0fab5d4d592e471cb0652d7886def850d97a71e8dbce201 WHIRLPOOL dd5fb30d7df86f430a107aa25197cd3d5b1649635fd2e5f85c3495d8161fb96995086114e5d20ab85dfa26763ca319758463cf6251e3ff9c4c6c91f895baee8a
 DIST scrub-2.6.1.tar.gz 362536 SHA256 43d98d3795bc2de7920efe81ef2c5de4e9ed1f903c35c939a7d65adc416d6cb8 SHA512 6e434b9d81c5ac473188c37af790c808771204203b3f04a5ca316c6a890f872d1beb73ce4713546e14ae91287d7adaf2fbfa44a30af634c2b3af890e2a0e8640 WHIRLPOOL 443a790da1e2507984e8b5f55f566fcf8f850b7b81b4e01c4df5fa8d6b9045494af1defd4b36baaa44a91ae99fea18a9de2be41b8af52cea5f8fa103c92f4e21
 EBUILD scrub-2.5.2.ebuild 355 SHA256 ec9668e6df6e3aae125d7dc4aa8fb69b15e90e7246f3b03b96c57c768a621e75 SHA512 040d0d308f491effafbfe9228e68d93c5ec7256d0297f29fba5c27c0b1f0590438b3c6f97bc754857385bbbfd3e2e6fc045158169b6f789c633170decafdbcc1 WHIRLPOOL 72810fd39d69c61a93c4aedd5a0adbd2591d65036f645567e691a9e17797b1c603bd398e539a27eec4b5a4ef4f4016e039b817cf64e0039b1e2fb39f55a07b9c
-EBUILD scrub-2.6.1.ebuild 379 SHA256 fffdef3b62f044e157f61278fa3c264901a2b7ca88a0a5f5bb97b4b3ea334ff6 SHA512 99f5fbc5ac56597882b2bb96181ee382ec936012f7f3938e051210dc9493bb18122819fedbff4c7f0ad42b96144f02a0c03e7ae1997b250caf7a3a4e646cf181 WHIRLPOOL ed0ba23f6dffeaf4d03f22ee17d98c5c56f9ea941f16045bb8491f508fe5da2479df51938e3e90d24c27b4a82b20ab683503f23ec4328135d2bc1d43aaa4a6b6
+EBUILD scrub-2.6.1.ebuild 392 SHA256 ade659a00905122bc945f52f4e409fe835c486d4c2d99af864d2ae2129ca8902 SHA512 22c41bb3cbb82e697983691bbd1616b3d1e97fac36e22beb04cb14fcbd6695886b0463a948f291334a33d5b6a0a70450146ad10332c1bdd74e68d1113f9acd40 WHIRLPOOL 836bd6469cca0a0b8e875852f3a138ad26c05400bbea61631362b25d60d693d16532d9bae6e050ccbb443d28ac467f1f3eadd40cb9d211412c9e72cb265e92fb
 MISC ChangeLog 2704 SHA256 92f60fcee3d797435ca4e1ccbcb928b54414fde93f347bb7204695de53e48afd SHA512 675a7bbf8c552b7eb82d9fee4a333926e1352e1233a8351f3d8f1cab386f05170739e09d7d0bec4c5ae23bebe04fb4a5f9ffd1cf1ff92154fec148dae1f37e9f WHIRLPOOL 92843b8680a36f763fdaecf6d3ba26b61290bcdb68ddd2fbdea3e01aa102231e017552e3d6f8599b3f6e934567e2fdcd5bffbdd1059871c0338ba8839e643cf5
 MISC ChangeLog-2015 2140 SHA256 47418dd553f4d28a835010ca248bce246778aae1fefd72b938b986d2aebfbb90 SHA512 c5ddffa17aa1461fe6d16f658ede00d7ead4d2ce40d563577f51ba7cd9d220b12c19b5242a55163a056a126473c19cf108bf039dd0f7ee8eac6a918e92666428 WHIRLPOOL 7c2d5405df2882c41b28f38583e47f62163d6554340f3f784db0f0180a84ec9e31ab56777eb4e56ae6426d5fc225817d50f35eb948a985baa277f19f10257601
-MISC metadata.xml 336 SHA256 884c5c6b25978da9cd890479a37294798caadc39b4f61810ba27e9bf017beb76 SHA512 f154443fb7ef3b70f6cd0b3c338146e60fda1ce4ca25696ce07819cf257b0f5b6d9a1cf5dd7d287082500443cd0d741073f1f101835a1dc14655b6c0447616d8 WHIRLPOOL 0be95ca3b3da173c0c6071d1e83f9430f85960477ca0e2bbf48067637c4e37739e2052b91bd9a00c1a929f9c06bb5efca05cb0732898c5e5b2eb227744ec0f73
+MISC metadata.xml 510 SHA256 be83a45a4856529c3e04933da21855102c406c3fe5a3e8f433f50dc9a6a4f706 SHA512 765ffd0e734190ea3df782ae4842ed23a78857747b459865e41f017f995e7f364d2d04fab119d1d1f24d6a4fb7688a07e65e1c324189fef968f83a38ef2156ce WHIRLPOOL 74c1b360301e5450613a875dd120c03c1f5b9231ce0b26e185f4a6f5b628b65e5417c551ebba274d13198c55ac15a1f08f4ac0b9eac5e63a88fec634adc5ef64
--- a/app-misc/scrub/metadata.xml
+++ b/app-misc/scrub/metadata.xml
@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>dev-zero@gentoo.org</email>
-    <name>Tiziano Müller</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">chaos/scrub</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>dev-zero@gentoo.org</email>
+		<name>Tiziano Müller</name>
+	</maintainer>
+	<longdescription>Scrub overwrites hard disks, files, and other devices with repeating patterns intended to make recovering data from these devices more difficult.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">chaos/scrub</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-misc/scrub/scrub-2.6.1.ebuild
+++ b/app-misc/scrub/scrub-2.6.1.ebuild
@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI="5"
+EAPI="6"

-DESCRIPTION="Write patterns on disk/file"
+DESCRIPTION="Overwrite files with iterative patterns."
 HOMEPAGE="https://github.com/chaos/scrub"
 SRC_URI="https://github.com/chaos/${PN}/releases/download/${PV}/${P}.tar.gz"

--- a/app-misc/vzstats/Manifest
+++ b/app-misc/vzstats/Manifest
@ -6,4 +6,4 @@ EBUILD vzstats-0.4.ebuild 612 SHA256 f3185699ce6c25c462a45eb65e809837aa9673f7584
 EBUILD vzstats-0.5.1.ebuild 612 SHA256 f3185699ce6c25c462a45eb65e809837aa9673f7584908a3eaa5c6b2c64f9cfe SHA512 fe476bb4e26c4810f6ef719571611b4d3750191d835658bb8bb6da66cea83f4d66f9cd5548dbf7e278e930b5622b1f20982b2c4b296e1f94664d86b067db6f0d WHIRLPOOL 5299653c56fe3fba0fa13e8664ebe8ec35ebc2a030e5c4de5246b25f9272bf6c4d3e3732da180f518a5a209e9e9f8ebaae9edb9d5eeaf929c8bd16d7d6cbf21f
 MISC ChangeLog 2527 SHA256 e85f25ff2273ebb8351437b94d8379d626b5e510920d09d473cca36279ffdabd SHA512 5ef2b8614057e14552f4d74b485c341eac51ba495589d689fee0831fed87042c2bcc71ede2351e320eecb16d2515f1e7f2de17001d749a21da0d91e7a69423be WHIRLPOOL fb239425bedbe838af714f7ce6f364ee6fe02cf292fc17e5e9915df4c2093955d2d3bb5b8f597eada77d5310fc87d3121e3a21c8aa928d8d9f6a4fcacf9131df
 MISC ChangeLog-2015 913 SHA256 c7b5b249f36215329c43a05d2763777aedf467a34002d9774057981df9478e38 SHA512 5c0b64ed62978afc3a24b872872008e52115ef3cd8469500e83733b31ed625c189dae46fae157362ab6f3fb7733b3dd3c656e4eb6975c761cbf3b5d803bd394d WHIRLPOOL ada45d79655bb8dbddad8d66a0b55785e97705732ac3874918e5e288d4d6a0e4b3db897a33f17673f2749ba1cdb8787e0a2e80f45fd382bccb18c2d8024e415f
-MISC metadata.xml 1049 SHA256 c51c50c3321f41a3d4fe260cc6a91db7089bcb93e0291d27b04411b5329895ce SHA512 c35da1e1e4fec470e51574462f88237d90effccb2788abf27fcb30202928c1246496eac073bee53d0aec0422d92b803fdb72954710a58216adf2b8daf912eb48 WHIRLPOOL a406623fa949b3c87edfe345e6e5492082b4f929fc34a76602480c097bf3d65d322f62902a7fcb4843ecf29029d0a60682ed99e0d54685f130d90c6891199523
+MISC metadata.xml 767 SHA256 d896c93eac44006547b3ecd826a4ff048111a70e81a04c3b12d73dc11fd5aaaf SHA512 e186ed96257d933a92e02fbef6efd3d584015aaecb6efa07c3f37f4d684a270d8f395b2df0445b4b847013c254018da2252169b74f2ee2f0d5989579112343b7 WHIRLPOOL e5c41ff496987d631eeb456c8a6ebf96cbdf387a3ad3d070628291b443d5a175d9382d2a4f83bb28807194cb50e11e22f32a2348c8d52c32728f5daa70e2e763
--- a/app-misc/vzstats/metadata.xml
+++ b/app-misc/vzstats/metadata.xml
@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>andreis.vinogradovs@gmail.com</email>
-		<name>Andreis Vinogradovs</name>
-		<description>Primary maintainer, assign bugs to him</description>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer status="active">
 			<email>kir@openvz.org</email>
--- a/app-misc/ytree/Manifest
+++ b/app-misc/ytree/Manifest
@ -1,8 +1,6 @@
 AUX ytree-1.94-bindir.patch 433 SHA256 00aecc45bc46950448fecdab16348960a06633a94c9d1ad50957787aa4c294f7 SHA512 b10a4a6c0bc8b06817a859498dad4ba789393d41f3f87ef457ce58bb4a209623c299ab81de229a1c03866632a749fff56c2933e35859ca22c6c7becaaa67110a WHIRLPOOL 90c233fd64cd775f70d8f2261692e6b969ea31bbd3990e382d1f7d31f84776eafbe24a8c86f35ff47e9d6e6ccea795372cd0b8605b37b9a570c59aa4ffa528a0
-DIST ytree-1.98.tar.gz 122610 SHA256 e7264e1c112bf62aba1f6ed0078308930cd8f01317a157ed1718b8dac09195c5 SHA512 b75f3b04af72270e2b4db6dc7448435fdf2d197d98bd2f4fdf6d3131091c8c3a697f8b0cabc1625502c616cee4e27ae6aa6fa2bfc082beeae1b6ecad9921dbef WHIRLPOOL 292da20c8c918eb468ccab6d0a5e09ecef8c44dad990326e2366eac81f11c039d1461308b053b54d751a7fb883dac9dda28d6abe6d12f2682c4b58dc58390665
 DIST ytree-1.99pl1.tar.gz 122996 SHA256 763e8c2af528174cd738ed8f2eca62579e3edef57ccbd242be7cf181ae15d251 SHA512 3d2ffae5cccf973bb06ec64917dc8f5b69e0ab95910144c5058b166479334fc563807a813ef608678463a032a8d2234f1006b820baa04aa95e77b06888af81fc WHIRLPOOL a1541789d9ec4230db6ffc8d60d32849ade4e4af36e9be7124b05d3575fd59306e5ebfe8778245a32d5f036076a8c0a2d8114de773fd198d4bb23d47ad173c27
-EBUILD ytree-1.98-r1.ebuild 614 SHA256 cf30a42d2cf3862c854802fdac8b6f63ca69f8d7c00dc53862d058ebde051302 SHA512 79092576248bc55886b8116f054f554b5622006e7dc733b5296b692a82b98beeeeb1b6310ee47681476a411c4e18de5c65757d016be1f8e3d976b472cfa42641 WHIRLPOOL e4572d0c1c321f28a125d7b24ba8d645de802dc1e2af00ff925aa5d833dac41fc0136a0e5eb1ef09a327340ad88b653bf1c953d5521d3669e7fcfa8854241e43
-EBUILD ytree-1.99_p1.ebuild 656 SHA256 e82df0638b50f8ceb07677916941dcdcebddd918f24750f4b28238525b384ddb SHA512 f947cad0e200d8577d366b312f001f12124b2cecbab286f4a1177cf2414b7524c5a3d3d940e96ce86eb11df16ad599dbd6117f2389600e42167aa7ee4f05035d WHIRLPOOL c8695782fd0b2e1097e5d7eebbf8dc748022dd03ebd05832f09e620a687e0ef859c67631c38937a79b37200b6a9bd05c131bf63600c2955bcad41195fac581df
+EBUILD ytree-1.99_p1.ebuild 654 SHA256 383f373d37738bcc43b8c6051e8dd620d58366978116f1d23efbde2619294864 SHA512 a9c8ec100890c43925d3b1afd0ceb6e2177f44af5b9cdffd545734073b37079cddd60887e996eefd4946668385d0bec60b381d177f3544abb55b67f03e2b1dae WHIRLPOOL dc1081b47e8db033ec8d84c438ff536d727ef9c76da74a579289731e9c7b11372071a2b7b4e279ecb054ea95587b9a480a9b637a4e112944b6c7883f87768247
 MISC ChangeLog 3191 SHA256 53a7d123e4753fec58c5a6775303f6296aeb69f35161384b488a4444e5c81e2f SHA512 5e253ee2ea6e95f5023a48df6f53b3a92c5670485ff37eab0197ae58c5240e79a910c075b85449878046c4ed251e66ded1554f29db903aa52296364e8fd3e375 WHIRLPOOL 2d15bae3e6e5b8339b82f76564d96d17a20eedd6d67184db50eb5db7a8b85aa900f51750266d0588ec7d4373c471d5a273e36e07fdbee2dc7253b7989f2bab7a
 MISC ChangeLog-2015 2704 SHA256 7d1e43dd28900440cafb5af941ccf597cfa1dd84167bf39fd1d721c085c75aac SHA512 b31f1e7116c7a6e52c54a39f738fd83043dcac5ab609b2a61c49af0bb29f0bf351d89b87945880775a87b15959dea33cf8f1b7f0a91134f50bdc45d19129440c WHIRLPOOL ca8b6af6b6ae5018acbe42d3c65759f92acd3126fb17767ac6eb4035f151df4d520df039b32b9f738a642a417cd37efd11df4abd16baa2cb4cfeaf75277181d0
 MISC metadata.xml 221 SHA256 c73636a70f6ee6e176f71ac32048a002355627ef4f1181fb245c6c0eb39be8b8 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353 WHIRLPOOL 8e35f4dca402d63d64baae4aba21722f8daccb3a61861a0b453cb355305fb29dc8e9d1e1760eb2f13d264502aaaafc37d15258338e97dbb4aea15239944f25d6
--- a/app-misc/ytree/ytree-1.98-r1.ebuild
+++ b/app-misc/ytree/ytree-1.98-r1.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A curses-based file manager"
-HOMEPAGE="http://www.han.de/~werner/ytree.html"
-SRC_URI="http://www.han.de/~werner/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.94-bindir.patch )
-
-DOCS=( CHANGES README THANKS ytree.conf )
-
-pkg_setup() {
-	tc-export CC
-}
-
-src_install() {
-	emake DESTDIR="${D}usr" install
-	einstalldocs
-}
--- a/app-misc/ytree/ytree-1.99_p1.ebuild
+++ b/app-misc/ytree/ytree-1.99_p1.ebuild
@ -13,7 +13,7 @@ SRC_URI="http://www.han.de/~werner/${MY_P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""

 DEPEND="
--- a/app-mobilephone/obexftp/Manifest
+++ b/app-mobilephone/obexftp/Manifest
@ -10,7 +10,7 @@ AUX obexftp-0.24-python_sitedir.patch 544 SHA256 e5a0d4d6e68c699a80ca1f43ced72a4
 DIST obexftp-0.23.tar.bz2 402552 SHA256 44a74ff288d38c0f75354d6bc2efe7d6dec10112eaff2e7b10e292b0d2105b36 SHA512 026a2a641fa46dc41ff131b78e87c2aa5fce126d36aa2d8b1783c7fe134a786bbf9908f660018fe459e5d729c36303f5efb2f5b2af64001a2344dce8c322e513 WHIRLPOOL d8386862c25c420ffae7089bb33b517406a6a4eecac52ad6376f3d2c5b034549e8cf86651b4ad3231b21822049b02d01863dae8776b957eb8d538c426ba4431f
 DIST obexftp-0.24-Source.tar.gz 88154 SHA256 b907965608bf0e60c69bc45f074ce1a2ffeb809b4502a7082c6d95e3c73dfe6b SHA512 785449665f5e9269d7bfd15f379bd8fbad321780292e56341e2089d6894255b7301fc23bb27a80e4e6f6317a130b658dedd307b7ece0fd31ef8f1a109c6f21b9 WHIRLPOOL 9f6fd5df3fbc8fa161ecff091b02932ac73e60d6a6eb1e15a32d9b871e6668fd86d0c4d6027f13c724cc1e7a8b40e1e02f8c0c32f0ac43076193e2048ba751df
 EBUILD obexftp-0.23-r2.ebuild 2168 SHA256 5537a2b1df5c177e8c0b2c6927b88408ddb2c1cd0d9efff07c56806b198400e6 SHA512 75e802ecd4dc0025d0cc1cc2eb3ed92960cc172ef8cae978cfc2b16d6fe724a183602ef16dbad298977da284138dc5f7b07e391c13f8c0f686c8676ff91b65f4 WHIRLPOOL 0585d74a25e376690c7b4164cc3c6aac3b9fcf0615dcbc86d48be6899f537ceb2ba86736ae2a61edeec79069af1c145ea5a4c259c54dfed3858dfe6b480eacae
-EBUILD obexftp-0.24-r1.ebuild 1758 SHA256 bcb919525cfc3bb5775756cc5307c7e9aa6d2b11a46efb3178afc25b66242c9c SHA512 e33c6d0d3ad1feaf7d98e10c03c8707bcd016c5950c4bd7efc173137763f7a486701ab54ebfc56f1b82999d6e181fcefa6ac98687024f3955478e40daa5b6af2 WHIRLPOOL 0b4d2c63a5b3c59e48f0e483ab7ae38952a920f60039ffde027888be16f500f18f1ec9e7bb60c2d599322aefa247c7e311f4cdf41fca9660b28e69985e73ab4e
+EBUILD obexftp-0.24-r1.ebuild 1757 SHA256 766c3df90dd36ee28948fde80b60a656a843d85963b9cfe0ccc833e534fb93d5 SHA512 7b3c7f1aae74b53a1d0603d74bd68264eed25601a5f168d4455501b85ba3912847cbd906a94cd66fee64de612ddd70015989633bfde60373cb6244b41767f68a WHIRLPOOL 1c595e1366bb862f925d4e179315dc21638a0283288b1643fcb11b10daf1e099c28ab70627f1c6dc618ead71abbf2a42bc54c54151b242cc80662dfa7ed3507c
 MISC ChangeLog 3959 SHA256 af143454e7312f42e943cb5fe8c25fe0c70950cc2c7039b384c7cac1b5309090 SHA512 fa6e020a785554ea71b3a13ae1d11480d18a0abd961d5dcccf3569a1f884e9c48d84b7fac9fee7e4b4b0188636be4ec389dd24fcd053732d3fe0244863e153c1 WHIRLPOOL 67cbb8135a09c227906126ef8a3b3fd7e7f319dfc92832f4210d266480f4c5fca8ff23e25edeb5e42ef8692a2b98c23afdd8257437714b267982c20e01c4f946
 MISC ChangeLog-2015 16328 SHA256 ce167861471401317ff04ab7e8ea8e7d1d9428bc6ac5900bf2f668865d046d4f SHA512 985fbf4f50712fde55db017a71f46318256c8883efdc90681ed1953f388b993416faa5776e9326fe8aa214a289899ac10f3823d8cf8889716fd6ae388cbdef5b WHIRLPOOL 26b286483efe371b1392b43628370cd7bdb45020130b85a6b167d04da4976d17b66923ea36390b6354d8d260d6382a2ab12aaf523288bb8ee83391b0aab72a44
 MISC metadata.xml 245 SHA256 43e733f76537cc36ae7e851f608283a4273eaca40ff1afc83cd5645431f09f20 SHA512 f2f864248cda1ce42c75a7d993ea9d80592f4b5bf957ba7d10e3a26d55429720530c96974403e9d732e2ca67724645f7dfb8b880617a3cc6a3b9d36dd201f433 WHIRLPOOL a6a920218ea57d05f193af842047e1a3691fef3242519519b797d3ae965acec3f85fd5372dab22a3df49d080ff0a9e9e9d266ae93ec1bb99981b7af96165421c
--- a/app-mobilephone/obexftp/obexftp-0.24-r1.ebuild
+++ b/app-mobilephone/obexftp/obexftp-0.24-r1.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/openobex/${P}-Source.tar.gz"
 SLOT="0"

 LICENSE="GPL-2"
-KEYWORDS="amd64 hppa ~ppc ~x86"
+KEYWORDS="amd64 hppa ~ppc x86"

 # bluetooth support is not really optional, bug #529068
 IUSE="perl python ruby tcl" #bluetooth
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@ -11,7 +11,7 @@ DIST x86-bin-libreoffice-gnome-java-5.2.3.3.xd3 24987756 SHA256 94b69d87ed26a4ff
 DIST x86-bin-libreoffice-java-5.2.3.3.xd3 23825924 SHA256 970334a37e8d6d481fcc2eff338ee4abf93170c64507e2fb9d9061ea509e8bdb SHA512 cdab9b047442fb0884c8ab757caf66f3659bcea4a06b523ceefb54c00b758b1efc7ff9b1854970228d4aa8b6aef36b33bff3aeb70e58327f980f609126dbb16e WHIRLPOOL 64947efdcb33227f7152e746dcb2f54180a4a8a1e272909f663ce17df696b3bfbae3bf9b4adbfad2102daad7fb5db112200dcacadf0b89a3351912010580bbad
 DIST x86-bin-libreoffice-kde-5.2.3.3.xd3 5665444 SHA256 e937bd4d15f30aab1450c75da3d5df24976e547f35d10ba1a9d3ee1467d94d9d SHA512 bc6d99a1e88700ca006c9cfaf9eb40e02489ca27217679b52b6f4dbf716497e833688482e78eda5b737581d71b98085816e80d745be0e4995e3a824a70196721 WHIRLPOOL 68e6c12fdea9490b6910abffb2c59670ef699a21d7504e77e16225062d257ad9b447d07bb25c991acd2da94929b0f023c3bd4f5166bb14f8ff940ce1917f252c
 DIST x86-bin-libreoffice-kde-java-5.2.3.3.xd3 23897828 SHA256 dc8ce59e8b9bc7806788040995e7a099c8b9af01b328f97ac1314d328f7859a7 SHA512 88a40ddd8f63be5938233c583e58e5c95af6a7532208e146682fc1c9bab262a734637c44d196d7d8fd8e2b7125598251d0c61c427b419f4932220f7ec9d80a06 WHIRLPOOL 4235bc45f5e59b33520e985c2fb217ba7d07b78a0b9bf8c0a0ec6f0a9beed808e32169d8dda5fc314cba6478265a694857c3f04441c29a8192aa042d02af8c99
-EBUILD libreoffice-bin-5.2.3.3.ebuild 6173 SHA256 1e945d03bd6e0b82d41093d431648953e50372fc8fefa51be28f509df69a9315 SHA512 47746f340ea026c0befcb363476f52f92c4512918cd657a6f034b3707fa4b90d3f21166ad7d92ae2b2c3e447cf6b8419571d29514fc6fef6175e42e5e416bf57 WHIRLPOOL 9dc50916fb4dfe8e00a63954559427d7773f6755f7434519549d1364a97f30d04b32e0fc43089209b4c2de8937769320264118e9621c3a71c4f1dfaa25dc5f3c
+EBUILD libreoffice-bin-5.2.3.3.ebuild 6201 SHA256 6ea64212be7542e9d0c14059cefcbe818f2be5ca18edb65bf40001a427d34004 SHA512 6fdbeaf4e8f31c7989af4810e93a31cc194c501c618440a20677592b7c1d829943d2697eaaebd0a464138b001fd1028f7fd52734aa74c6e91890ef1d50877fb0 WHIRLPOOL 034dc1222209900b998c938ae8ec60a155cc796899e813028c1ad9ecb99064466ddb14f3f936e4c60bb11d0204c7363ec4591370f3406fac6c20ca94d96aa602
 MISC ChangeLog 8073 SHA256 9974e49704399671e366dddd54a6c297aa5a26b0b8c7c7717ba843f9ec1f70fe SHA512 6972e6b3a1c01911037b4e04833d9fe08e2c47ba3ccb395ff82ff8c1fd582c2e8f72369fbaf60be282fec75e64696edab56d000de2d06e2f7fa3a61a9a68769d WHIRLPOOL 88bec81ca4cf638bfda5d139eb4cb261b730e5a71f6c50d0eef99e8358a385ddcfea7a612d42fd4be6c3204052e79f7a2d298d9c49038170d874fe4e13f6075c
 MISC ChangeLog-2015 28493 SHA256 47bd0a9a0bb7a7585d1b45e6d1bf248a52af7845271a3c056aaaf08296edaeee SHA512 4fafb95bef5e19a454ffcd66515da7a9a458a216fd09f54956b370ae8f0f4a0039865f9f5fa5a74aa4250a1afc91db001b2351b23efc267f16949f0eac42d2d8 WHIRLPOOL 116b77eb65a81f6b7bc029c04e9b465b3e65776b02e25beb1b6d2be1891f53dc049b62794ef37160f711f95093727d5543c81d342363d1c32645c47f8f99812d
 MISC metadata.xml 510 SHA256 316608d4e938e7aec80c5ea8cc04031e4fbc9a3424fa83b50305ea5504cc42db SHA512 12331dfd1fe409ce5a65bcf1ce8bd2e23f2e789b7009216e987b861fde897b78b16487399338af0e94e9e40da70ba32624251d71de5aae7d5b23891f54a994f0 WHIRLPOOL 6c52f590ac283b86faec776ea6f679486908f0b53ced59be08ba397ddbe81b1b53ae68e260401d6e33921c8709e0e26961007defc9d4303efed887e1560804cb
--- a/app-office/libreoffice-bin/libreoffice-bin-5.2.3.3.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-5.2.3.3.ebuild
@ -64,7 +64,7 @@ BIN_COMMON_DEPEND="
 	dev-libs/boost:0/1.56.0
 	dev-libs/icu:0/58.1
 	>=media-gfx/graphite2-1.2.0
-	media-libs/glew:0/1.10
+	|| ( media-libs/glew:0/1.10 media-libs/glew:1.10 )
 	media-libs/harfbuzz:0/0.9.18[icu]
 	media-libs/libpng:0/16
 	>=sys-devel/gcc-4.9.3
--- a/app-portage/g-cpan/Manifest
+++ b/app-portage/g-cpan/Manifest
@ -5,7 +5,7 @@ DIST g-cpan-0.16.9.tar.gz 34463 SHA256 2d85b37905af8d2878b949438d61d80d530184605
 EBUILD g-cpan-0.16.5.ebuild 1067 SHA256 b01d71d7039ffc02d743ebcb917e3b34ed3a07eb6fdde1e325123ba316b1fec4 SHA512 12c5f05e150e82e7b761aa6bf0e5f0b5d2e1b5b3a84cb324a0ef0e94a0641d016f6c7e93c4269f5dcbfaa8687312e2279bf371284c894ee36d0d4a8f7b637303 WHIRLPOOL 771e01b1f668fbd97b8c247db1d73087e78a7850dde2252933e58c956c5e52d3745f2e7609c3f7edaafd97e7d1781f4b9b6851c173627abfb062b58e19acc012
 EBUILD g-cpan-0.16.6.ebuild 1157 SHA256 c9ca6fb2dec71e1967fa622a22f49b0488f27093458a2acf85a9bdd99c28ff36 SHA512 6093b9619fc930c6e8af193dc31bc21110676d3b36ec92e435d94f62981b581c83e40e61dea9192badf944ff4b59e80be1aa7006c3fb2cc749fea003b9ae6256 WHIRLPOOL 2b08172f813d2f5c61b58c0ab7b3b9869307561263ed0f9ae10d8db7fcd666aec52fd196ad8290a03d6e00fe7a5ee114ccd9bc42fd3ab72f68e8e17ce6dd2f2a
 EBUILD g-cpan-0.16.7.ebuild 1449 SHA256 afbb65be76a36d2734e77a09dbab421c5927496ca926de1cbfef92a0b110ef2e SHA512 35cb8b9badc58e29100d0eff91cc62b03b6c10d594a8f7d66bc108178338eb31843940d50f6839b7cfc5d0d10dbcf47ddbed0526e5c5ec0eb3bf5b468cf8a5fb WHIRLPOOL dd6059cbc60b1401c530c69851030ab24007cc607bd1a6e149c735de06bd7da04255060b9a181fdd56c52a2a12c6b10b1533ff7ced72a299c45dfd893a47e1e2
-EBUILD g-cpan-0.16.9.ebuild 1441 SHA256 8dd99be04f9a1e7364f39d9b8f66853d6a3c1b05ce3817c621198fcee4c76203 SHA512 f5472200274a10205f9fee742a0560d4b7d36ff0f19babe32fe4c99cbfc75ae5c55b48dadabca9b7c95003fe31ba50e565f1d39a3c266b0ab56f6c0441b46215 WHIRLPOOL 2e3b3b7bbdeef9bb7d51a0c321f3dbb2d8536435ad450d49dea81ced28a0c666a78d6132ea2558fde6c9ab6301fe7006b5bfe99ab2dbef519c4a2781f26e453a
+EBUILD g-cpan-0.16.9.ebuild 1440 SHA256 47f4af277bb33e19aaee1b7c8a49f6c128838b6f213ec9faf1917865d33ce54e SHA512 3048028566077ac1702d19570b9edbdff551d07945542923b13541e2ba342ccd43a55ed102442432d2ea8bc11051a9a6b3ef1e837beb1ed4b0bc3a9ecaeea5e9 WHIRLPOOL 50c1f030e14c36bee447713b43eea251be08c7f185688968af855b72c2b2f640772ade722b83215bf5d2a7abbbffdfb515af6526b65924eff06328552921f717
 EBUILD g-cpan-9999.ebuild 1485 SHA256 20aabc0d2ca825c00ba390fd644b975c9652b1014a8c7d4eef1cc89db8545bc7 SHA512 54ad20cb854d900118ee17e57c65cfb3dac106977912f164151ca7231df9c136324cf690d2c96e2077e5a64cfcd16ee72941a305025cfef579718e6ade5997eb WHIRLPOOL 28858b524e6d0d714609a7abd56daae3030bee3ce2b92868b8fdb876a66277b51891ae3ba0422f7318670107a88fd157a8785a1e2b54633002971c2bf11745fd
 MISC ChangeLog 4705 SHA256 9538b433bcc182cea5d9dadbc6612e03158ae11a6711d358254c2234c13b73bd SHA512 93ca19119348945b2a1da5618c4ab97a70686b513587141ffc4d45f09483e62114a7950cbb2ee949a2593dd3d0368e44aa5c62a12cf6c48fd4b7ab2ee00e1150 WHIRLPOOL 48f93b4bb4335c74712434ddd0ef30a80419524f8d02572942df866b7a5f48feaa154b5b179e39e870482f9280b2bc674f798aa78c5dab0591c671e18eab3f8e
 MISC ChangeLog-2015 14282 SHA256 7185407707847f495c548009d8f2fc11d2bb8bf4ca8f9b00dc91824bd1dfe9ac SHA512 17233489fbb5556b3bdfd34f18c31dc17a3d5af64c39204a01990fd0bbdfe2722ecd531c3aef809192a77ae49b79d08bfa28d846c5ce01c318fc65c65c73c587 WHIRLPOOL 80bd643b9783a5701011969e8fb96c45d81443f5a89cd3900a19492bf15034a488ec1e036238ca28be4638f94bdeec6c8f56ad5addb0d10d07f1a910cf8b9811
--- a/app-portage/g-cpan/g-cpan-0.16.9.ebuild
+++ b/app-portage/g-cpan/g-cpan-0.16.9.ebuild
@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
 else
 	SRC_URI="https://github.com/gentoo-perl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 fi

 DESCRIPTION="Autogenerate and install ebuilds for CPAN modules"
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@ -11,11 +11,13 @@ DIST gentoolkit-0.3.0.8.tar.gz 3192497 SHA256 0338dee7c295c32b60a84e529b764d2bc6
 DIST gentoolkit-0.3.0.9.tar.gz 3194703 SHA256 c660d150dfccbaea6f291fb7fc2659c8e0e38eaebe6e68f92dee728c8c7e320d SHA512 75b2d15b2b9ed08055840b56b239ed5d63838a10e8d31ec3ed8822cf1d3ef32841609763433736e17f93a5fdd293ccbda4a3dfa0f007241321aec3333bcde847 WHIRLPOOL 5e9dc038c161361eb2dd8f0cd17e8efaa41183a281d6fcf620c1631c6da661673d085c60572424cd48504222c29613473591f8dd276792ab96ba3cfda88f1fe1
 DIST gentoolkit-0.3.1.1.tar.gz 3198269 SHA256 e3743ac526a8b9dd78af8ebc88ccf26cf487f2c31483b283b0e5df36bab881ce SHA512 24736713761ead819da8f65148d7f8cae5e12414cbffafa1bcf0ce4f59587b6c589fed02edb48f054f24f015e4fe151333ebbba4ccfa9b1164a547717bee7a74 WHIRLPOOL c33a468ca8fb01e4e236cd104abc10a7a570fc6a3372314407ee341672202ed2cef70e2647743ba4301277f01201a5999e6251167d66f7b1ffae5eb0872a5375
 DIST gentoolkit-0.3.2.tar.gz 3198294 SHA256 f3bb38d663c1b153447556b5265df5a11b6ed78411e761335b692111c823d9dd SHA512 e174ac7f12d45703515876ea558a661e1d0c5d4cc71d2d64ee793786e2a2d3d2b309500b6e1891774e3415de74922efc77553c0103d695f5dda91def9a6ac637 WHIRLPOOL 67192702f72f437cc31aeeef8bf005c83a4a9322e9fa0de3c1e0d229bfb95d7363f14a8902da5ffbf49dee45cd587286899ea1ead017cd7d18d0f852cc7fd9fb
+DIST gentoolkit-0.3.3.tar.gz 3197037 SHA256 bb1fd78a6063efffd4e8402cd799f2c22ed2bbf440c26390aab68bfb6f4ee982 SHA512 ad142c2c66e7f7a2e4184c8f95e394ee783cd57808e6254e9f5df0f3f60ad842042f773716ca0fd6d7545bb8a2d11c1c167a4ec471eb3238c8ee3a519f70a691 WHIRLPOOL 81c2aa8cb36d9c6abef99729b07c9cc5402d66ccfd8523a4cee57ed99d2b4c2ab0db6c77dccdc90597bd11d60e11823130dd1136eeaba9b2a18383da3e9c5f25
 EBUILD gentoolkit-0.3.0.8-r2.ebuild 2624 SHA256 118bdedc108ec983aa62749b6be47c4a00b1ce312b6f6ffea8e3bfea4ff32637 SHA512 0476ddb4b56a6e9fada17170b014ea0e68e69b05e5e62a4450543fb3fa57c73e1a74c74de184db713cda199aeeecf7a56f6ee0aef385ce3185f4e61eb81dbc9b WHIRLPOOL 24fcbb75754ea22f8d1e42f522067b1b460d94bad7004623b0b5154f76faa27d0780c29b31b687f3c0ca718e629592408e4f99adc0a07b5b79c918efc55305f6
 EBUILD gentoolkit-0.3.0.9-r2.ebuild 2935 SHA256 c5446cab2b55a12290984f354ed8589467f8bb3b8c0252980f8a501a9add6769 SHA512 a81d2f109ae616c259e2ed4f133bec0ec57089a7c1552a09bc8c752ccb74c4bacce21164a738245bb284d33431895138246e17b45809c40357631d3bb6f6fd8d WHIRLPOOL 8f6a53ecf56966247877fbb9580d90c01be410edf19cb57fa7aa6f05090bed503ec750fa3a68ad9270fdb2e1530842cc6540d33fbf917cd5d23da40288864fb8
 EBUILD gentoolkit-0.3.1.1.ebuild 2257 SHA256 3f583d9830fdac9c279824e981d47d83fad52e2d95c0a8557efb9cac85b4c425 SHA512 991f287b52018b738f5963902f8b48f6c6d9a0347e2d72a23e6ede4d15a2c6d933fad81abedbbdb236b5e8d3286284c6bf2adc920589d506466ce9c1c62a5262 WHIRLPOOL 38ee7d8a638f28535da2e41c7db5f038bb7fa8eac8812dcb3773e138a8ad27ff1942b893a1aa371f63b0655dc6d529e22db6108e107fedecd64c5ca0fcac1138
 EBUILD gentoolkit-0.3.2-r1.ebuild 2303 SHA256 7735610bdaddcbfe662909b7860d81c6208ed2e09586ce0d5efe541579fd69d0 SHA512 4f6f4382d5c25c1022701799ea8b293998c7c3bf674785aa9c76547b01ec5fc0d76590dc6bd1810ced7267361e9204ddcb27558d91a1ed32b06f625e6079519a WHIRLPOOL 4752abe608f1b8a4f27698f590cfe9063831f904ff6e99ca414a492c960a935f84ec219a6ffeb6a2f141b4973f0b17f43b88c3e76c4767efef8a345016642709
 EBUILD gentoolkit-0.3.2.ebuild 2257 SHA256 6501dabe63f50440b82f80001b5d99ea625739e2bc262bbd657daaa8d7cce3fd SHA512 4e86a0a7c2e04589f1eebc8ad8717f1c1ee199dc16be30f016b7732d6cf99596f818103c54d92db24f7ae052b298b841d2f1fea98c3be3b176cbc9edf96edbfd WHIRLPOOL cf874b9a3fb28e9be17b6923b54908bbdb93ac33abed882ff51227870ae4744551ea620f60c39e2abbf5d0e3c1eac4372b5058f75673cf2bfbcd35d7ec07a260
+EBUILD gentoolkit-0.3.3.ebuild 2242 SHA256 8da27fdbdd0dfdc39c4a896fee981b17a0db7e009e93575030b2fd9ffb3528bd SHA512 ba590d1ed30278ecb7df697c58c45b964f59977067ab6aa579b250468e90be6ecd8fd6d219a91186b04871ae985d1d908f19fb7646ba05eb2ab3632d52e694d0 WHIRLPOOL c2b0e70c77d1f78e2ad5576fb3a9dd2d00fd217e7bf756d6860ab5770f4d128dacb0bac722acdd9a9b94251f9eb70e1b4cb0973bdcfe5980bfe29c1eadde92cf
 EBUILD gentoolkit-9999.ebuild 1987 SHA256 f712965e365f34cf7557d3278b53ce7c52875eeca6510d89ad0033b26bfabd86 SHA512 1739ba349f7e7db63c22effb70a8b4c415cbf2d0f47cb2e0158c0aaf0a0c7c6cca32fc408da6e56eadd3fc8bbf4dbf0141fa511de24049d03fb8d651c33720ec WHIRLPOOL 33609e79529e60d1b33986582c7f67726db3ae3571e48615ef3434b28b26fb65326b03716a6792ae671bdb0fb803fbe50d012ec2cf53e884f782652df6853dd5
 MISC ChangeLog 7216 SHA256 ecd70d2fd05932d6ba807c47f2f141c856d6fdbc60e7541c7a3f446916ba15ea SHA512 a9ab9e5e6eba30938c756ecf6a6af5671dab5a567384f6d7d124724d7e8eb5daba3975c31a736a1e31077456736a6b311188b1c3569ce8e1066cf2a9acdbbba1 WHIRLPOOL 44d726f589915c8b348775ff61f6fcad879b9853aabd7316f8a8483bd94f6fb68334feee9d1cdf17212f34d2c3b1931524e8fe65ccbe13aca062e41296e162b4
 MISC ChangeLog-2015 81145 SHA256 2be0115c31ea5a66f6ec2cab2d1280dd85d47c7fcb68dbd2ab81ae732b2adbf1 SHA512 a4a8f6cc06b49b8be331a0eeefa5bfa9c18ae4599025c0e6846497af0ba39cf627f4520082d50b818eb21716b65005bb155de466bf25a61f9c3f739119327b28 WHIRLPOOL ce50e41dbd48411c01c2390ab9c5eec9953c4a3c4128a4f104aca579c59b73d37910621d959049a8dac16c1e2cf2c39833f02666c683fcb50ca5ac7d7e396cfc
--- a/app-portage/gentoolkit/gentoolkit-0.3.3.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.3.ebuild
@ -0,0 +1,71 @@
+# 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_4,3_5} pypy)
+PYTHON_REQ_USE="xml(+),threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of administration scripts for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
+SRC_URI="http://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	!<=app-portage/gentoolkit-dev-0.2.7
+	sys-apps/gawk
+	sys-apps/gentoo-functions"
+
+python_prepare_all() {
+	python_setup
+	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# remove on Gentoo Prefix platforms where it's broken anyway
+	if use prefix; then
+		elog "The revdep-rebuild command is removed, the preserve-libs"
+		elog "feature of portage will handle issues."
+		rm "${ED}"/usr/bin/revdep-rebuild*
+		rm "${ED}"/usr/share/man/man1/revdep-rebuild.1
+		rm -rf "${ED}"/etc/revdep-rebuild
+		rm -rf "${ED}"/var
+	fi
+}
+
+pkg_postinst() {
+	# Create cache directory for revdep-rebuild
+	mkdir -p -m 0755 "${EROOT%/}"/var/cache
+	mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild
+
+	# Only show the elog information on a new install
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "For further information on gentoolkit, please read the gentoolkit"
+		elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
+		elog
+		elog "Another alternative to equery is app-portage/portage-utils"
+		elog
+		elog "Additional tools that may be of interest:"
+		elog
+		elog "    app-admin/eclean-kernel"
+		elog "    app-portage/diffmask"
+		elog "    app-portage/flaggie"
+		elog "    app-portage/install-mask"
+		elog "    app-portage/portpeek"
+		elog "    app-portage/smart-live-rebuild"
+	fi
+}
--- a/app-text/jabref-bin/Manifest
+++ b/app-text/jabref-bin/Manifest
@ -15,9 +15,9 @@ EBUILD jabref-bin-2.11.ebuild 835 SHA256 c7c4dde11a787f6eb013a99895de9232da7dc28
 EBUILD jabref-bin-3.1.ebuild 877 SHA256 e7791b9fb95f6008231b97e2ac8c8fc9cdceab144b274eccb0eb647e3a232f1c SHA512 742580c8728454669e2dac8a8d5d22d734c6f6bf038d9493872fca18aa94629c279316f2a0384dde097e47d2af39a7d671d85138d5bb5fb46d168a530b4cc7ad WHIRLPOOL 71d08ba16916dc9d0ccbf54602c17f0ea1fc659edcae809deb70d8a1f535302fbdb53ad8e867838858abe0fb3fb3691e7da1b0df96cf0fc781443278cb1ca42d
 EBUILD jabref-bin-3.2.ebuild 867 SHA256 66787e95b51f2c11d1be19945beee068661f5c247d6a32d31cc5222826d67002 SHA512 ee400ab165c78fa41d36404e45a8640318efeb8a5bc4b8fe9180e06d6c1453e12b796e72f26c2dbe6b58ea0c6ab1860de0fbcdb7745e22fffbe76c906e86a289 WHIRLPOOL 28a6fa467965c9224609384fb97b36f6ef8394e7fe13708cdfe2de961e7273811f0a1a6cee8ef4207f451abb451f7dc6e72feb77d419ab736f5ad478b44284de
 EBUILD jabref-bin-3.3.ebuild 869 SHA256 aeef06b40feafcb7dc4444bfb1ae8ca24ce11b964fb9a91c169fa74a593189ed SHA512 efb8ce71986e4aa5d9424c33be07405fa7b8374b75a058490ece87b47cc46dc900972d9d2c16eb38984df0aedccface156606ba37d87f32fc5db15055a6d7f44 WHIRLPOOL 7425470aecfbad7bb7abc82dd86bb6a082d80e128879f7fedc36ed3d5dda8fec260f37ca1bde4dacdab233ae669f458b13b2d93de94492989059974e0524a41e
-EBUILD jabref-bin-3.4.ebuild 872 SHA256 dcbab4efba73b933256c18cc8c2517cac017d5f8788fd2e244c6552be54d99bc SHA512 e836b68cb6aa46e73c4638a988f622a0e09d93a698f51b2ed62e8ab40e19f53bc71832e78168592070b294c542031ebc1f545ed5506c24e38740dc1b3dab2806 WHIRLPOOL ec9e945577a34777fded56c1b47c4286e2263b0b25c92431757d06ffc1d364e1cf18a0a171db94d4648f5ca3aa3ea8343e3f74f969ea71f46de931f7b135db45
+EBUILD jabref-bin-3.4.ebuild 871 SHA256 0a8469a13f1dbb1f60833b023a26401f9661ff451d8a8665db0e297ddf174803 SHA512 3f162151279a86ec19f838b22cabcf42d9e3979c2388c252503cabd3a4e263e1a4172043ddb6839b6095d2bb7bcba3991f03cc07b936df8f833836440c3f5209 WHIRLPOOL c9a3b1444bd6d4f96c7380b37a61d9c0d83c76e30b378241a502f6b9412cb5fa2ff21a69d271aeb0345036a79913162ab37da8c5da899f5929dbb50853be0b42
 EBUILD jabref-bin-3.6.ebuild 873 SHA256 e9ffa2d81f9ac13b500a8ec351a1c63f2a8c111ba2265ac3b674b0054d2d7a73 SHA512 a6875dcc81f8a37f2cacfb0eb3be7002bb0276087f4cf080de8756244744651e94448d8f16e819c9addfb417c800d22ee27debc7cd92360ba9ce556d056acd8d WHIRLPOOL 277bf8a5a5c58500c25cfe510ca0777fcbe888bc5b121de89ee00afd0a6ad0158a6656d26a835cfe8248f34065208da4c4b210e983189d1ab413859a5a0ca140
-EBUILD jabref-bin-3.7.ebuild 872 SHA256 2bb2d86c198a8fd6890708f074fc13cb9348b116c2e5627f6fe4219915de63c5 SHA512 6cf5287dbc2dca92289d5d964151eb52bc82a0d0f7ef4a4a3e6dc1580c4b11a02018d3c5707f35c932e71adcf55eb3ce44add2ce8e99a84666083c017244f215 WHIRLPOOL a8dc8a7454cb16c4aee51a0bb92623594127a89b153409c1469559b0489987074c1efce85020859bc72763c197be0d8659c162f7554bbd9951b54e2af62734f9
+EBUILD jabref-bin-3.7.ebuild 871 SHA256 f3ddf99b06f920b1a87b239554e8fadfbe0ecc6d01fd360b57b5d7ef810d7305 SHA512 94befb5c1856a29bb605232206cdb15a9ef5df98a34bfa5d0d831d233b58ac65df9c8a314ae022ee61a051e25bb89b3900149fed234c0f8473e9107dece0e61e WHIRLPOOL f71dc5c19ac9a6a3f35a08742f9bc5d7cbe673399a5c0b48f76e0f326351a862cf33906a2a0aea7f2af123e4784aefc442257debfbf9b858e47f1411498e636b
 EBUILD jabref-bin-3.8.1.ebuild 958 SHA256 7208ef1c688a20b9a3f154435b52ba4ac1be0a96e459acd306e1c19ee5b1d8b7 SHA512 85a579503c2ae4dd40ebfd42de2fa69368d3f7b2196e4b2714e0eb95b021f1eff0ec8d0b5b7abea5ac35f99ba381b0956389bcf202e372cbdca4498c2e6c4d00 WHIRLPOOL 8b9194259548a8c4ab7b9697f38069ae2ea07855a82f783734993efda73e0841ae99306b78c4b2cf50629a17733a8953a441d356e755e5dbc99fc07c74185617
 EBUILD jabref-bin-3.8.ebuild 963 SHA256 bb1a79a9ec947a6f50c700f2ff3052b1244a66fd720b829fa9dfb994acf12f0d SHA512 f77c7574054524c2549dd3ccf6c61d8a41be45a363836d894e673d94e35e439c16200f9b742afd35a8dae9264d8d05291319ea3e894f74713f9e3eabe2f8d072 WHIRLPOOL 93732c34785d8536df56b7e73d22e416552dd7ad3dbf59e34cb2581185ae162ef217b14fa2c85ad650108f0f60b1a81bf32700a1b22a3206dd422eb3931d80b3
 MISC ChangeLog 6179 SHA256 2ded29d71e74422e71644639b0552a2ad2b16e5f865b917bfbcb3e39f6e4b56a SHA512 0e72d7494e5cc56699ec4dc63b3ee40c4c2aa4fd0351828b99fe1b3003e0e8326c92313154863918c38f48b02b9abfab12cb659cadacdb0bd86b380501ede9f5 WHIRLPOOL 2ab3b0307abc8e378644dfedf72c5314b9a46ef05b30460459acff798c50903dc402ae62f1307298ded3fc2d54d858014a36183cb4af5466b6a241312af000b4
--- a/app-text/jabref-bin/jabref-bin-3.4.ebuild
+++ b/app-text/jabref-bin/jabref-bin-3.4.ebuild
@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/jabref/JabRef-${MY_PV}.jar"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"

 DEPEND="
 	app-arch/unzip
--- a/app-text/jabref-bin/jabref-bin-3.7.ebuild
+++ b/app-text/jabref-bin/jabref-bin-3.7.ebuild
@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/jabref/JabRef-${MY_PV}.jar"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"

 DEPEND="
 	app-arch/unzip
--- a/Show more
+++ b/Show more