20 files changed, 231 insertions, 93 deletions
diff --git a/app-misc/freemind/Manifest b/app-misc/freemind/Manifest
index 8638c639134f..7fe3939a4807 100644
--- a/app-misc/freemind/Manifest
+++ b/app-misc/freemind/Manifest
@@ -1,5 +1,5 @@
 DIST freemind-src-1.0.1.tar.gz 31617138 SHA256 018285126b27eae7392b8c3bfb513f25bd70b9907440e5eb8209f20b4fbd8619 SHA512 f3b7bd526da3075e883292fc88dd5b01f5b0112c58cfeae25a6be9c7dbf4a5444839821e3e2554303032d832b4520fa742894c09ded2705270f51aca98167fb5 WHIRLPOOL 5c3e1c795060bb92bced84fcf785c721c0ecf2ea8fcd8440cfe4935255bb4685c78dc4ad5991ee425a3c7d37589a8698ee9e1b3e4c63d362bc172edbe4e281da
-EBUILD freemind-1.0.1-r2.ebuild 3041 SHA256 4e8a390015f14ee5bbc5076ec1577affe4831eb9975ea23465fe84bf1fedfff2 SHA512 e5cfa780adc91cf4dda6aba410458711f3b9b5de0fd1f977a359ad406ca0ad9d1dd154fc3249ba34cafd11ef312f458065cd01151ef3cbf636b646a37432e412 WHIRLPOOL b9dff36f784cae4afbe763d652f3996fbc426e72e263a94d7a068b7e545711c87fb758e8f34cf6c8749f258a013c4288f1377c893e1a53d40dbd983406b400cd
+EBUILD freemind-1.0.1-r3.ebuild 3041 SHA256 65ec56738107578fbe6213d3cbeabbfead7fb052565d32974f07beadb4204e6c SHA512 5b637ec3cc9c36d0a9466d47b0bbc9f355d492d09bbc6457ab9fc0fb87c8665a17309f323f3711713c4b0b411257f371832a1afa1164b6126232cd95b76ac6e6 WHIRLPOOL 346f1f83061553425f0555619bc6d3325a45b333f21da05a8e02fd2fb94403f4631c148ec6c57bb406913282c4dd1c0b388cf94da925dd44ac7e939dc80be509
 MISC ChangeLog 2957 SHA256 9e704d407321b1de7d44ade1e9604594d1fbda3c3920528486ba70be8c80ff51 SHA512 2134d58eaccf7497506ad7a78b107112045c05abf15889f98bb4239b9882d3e82a1e8a3f8583157563e080ce36ca06346cb388ec3de20a107c44881eca660cc2 WHIRLPOOL 337ca02b5f6b09a542db66b07e5c6ee65b094aaae13144108becee7a8cd4cd4efa641e9b560e04c7ba5ce4b6094037efd52b24bec85d85fd59bd2213dde5c530
 MISC ChangeLog-2015 12051 SHA256 c3f7fbf2e1b8217042491cf3eda417093b041c0b0b9e48097825bbc80fdfd3bf SHA512 a2f278195afae2254eaa4d3d2af0d41292c20934facd55d34c9fd7258a952b1f7216610776b794647bd01c991f8cfa03d01dcd698075cc67a3d6e24fcdc228a0 WHIRLPOOL 6e29465592ddcc3ef11e5cdbaa7fac5fb3651e8d4b778d7817f777fae78e92133ce66130dfd31209ddc51f11979c71cd1453bf2814c640b72351a65ee698faa0
 MISC metadata.xml 643 SHA256 bb4552970de23143cb509d162bb941de0634e992e29ac9ed468e8afed4704ee1 SHA512 2075eb39f587784119d83827cd4614dab2146bac37440ed3b8430fcb29fb4b0a1f53470e72f64ba875908e0b64a894074627e7beb6aa5d29d1893afa47445788 WHIRLPOOL 8af0ec2f6029967e033c7d652b76e55a33510cb695cd0cc72b464611740c13b8ae462b10bed2af91fa16880c3b3ccda906e4ec9b577120e799cc47870be5dadc
diff --git a/app-misc/freemind/freemind-1.0.1-r2.ebuild b/app-misc/freemind/freemind-1.0.1-r3.ebuild
index 41a1ca8b39f9..6a412d2e8a82 100644
--- a/app-misc/freemind/freemind-1.0.1-r2.ebuild
+++ b/app-misc/freemind/freemind-1.0.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -25,11 +25,11 @@ CDEPEND="
 	groovy? ( dev-java/groovy )
 	latex? ( dev-java/hoteqn:0 )
 	pdf? (
-		dev-java/batik:1.8
+		dev-java/batik:1.9
 		dev-java/fop:0
 	)
 	svg? (
-		dev-java/batik:1.8
+		dev-java/batik:1.9
 		dev-java/fop:0
 	)"
 DEPEND="${CDEPEND}
@@ -71,7 +71,7 @@ src_configure() {
 src_compile() {
 	local svg_deps svg_build_deps
 	if use pdf || use svg; then
-		svg_deps="batik-1.8,fop"
+		svg_deps="batik-1.9,fop"
 		svg_build_deps=":$(java-pkg_getjars --build-only avalon-framework-4.2)"
 	fi
 	EANT_GENTOO_CLASSPATH="
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index 7fa2be98dc02..8c260e80881b 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -12,4 +12,4 @@ EBUILD geneweb-6.07.ebuild 2093 SHA256 1499bed651e4c525e3b9be36ab13fbff0b78d0b11
 EBUILD geneweb-6.08-r1.ebuild 2001 SHA256 1169ce4466f218740fc7bfc13e9b311a9c20ad7bf9c633c0b5bbbabfc998227d SHA512 d7473dab32d1725b2f22faad0ca1997b11d41154fd1a7a336b0e84c4e1fd0a3c230dca334a2b7d771543665ba4748382c319654d3634b4f934a18470f713b0e0 WHIRLPOOL 82f7cc34e5802e995f9fa694a78df47f5ce56108fb9bb206a9dab9d1b2a28bc0b3618b3cf51ba66d03a2a40d5989644b2925366e2dca81401c73ae72156699ec
 MISC ChangeLog 2821 SHA256 6bdf3fdd7fe040346b33aeb3efef22d4f84c1a42e5ec1a1c50bf68221e6922b5 SHA512 5e8ef4e9c4e29ba975ac3045a107f20ab9e72ab5b5d4bb5b35fdcbfc89e68dd7ffedaa4da88b65e8c8767b4d12b3b44d7ee63abece1d6b67838d311a688a13ff WHIRLPOOL a13afe8931319f6cba92457a8aeb71c4d7cc880c6ccafdb25b4b17030eba020459ebe43f876d48e20cb21fcb7c207e782d5b95b79bc1e35c6efff5ed10eb87e3
 MISC ChangeLog-2015 5741 SHA256 cf2718ba12ba71ff6c4862701777ca5cc9aba3ab184c3a6bfe6abb81aa007387 SHA512 51cefbba16d9f642f0005a6535b48a559aa8b3b8f94f6be3c60efd5056a3d07592630aad6faeea718c7847ea3e1b519367d736aa84614320666c0874fa8c159f WHIRLPOOL 8a4f2c758fc6787e8dce029f5610e82168571c4d59cc5616ff5267fd9eb6a09c6aaff17b3cbafd12c772ab4ecf5781decb16c0f1cef9a5662c6fca2a1fdc0a27
-MISC metadata.xml 779 SHA256 a01308e9fcdbb5e38e481e4a31f6013f9cb39aace3119c3707a012aace13d411 SHA512 e58122b92b708659fa9da568bec289c2abfb4d76762e4cef948649651d3ae2c3509c8edbd4cfeb124ace65c483852a3c5df1c37b623be33d466afafb17b20737 WHIRLPOOL d0c968e44a7341f7e701000aaf326ec45a867e9f7b7886ddf31b497d6a9132e55860ff60419ddee60c1673f02e465fd53f940809f73269f55fe9aa67e336a1a9
+MISC metadata.xml 652 SHA256 be88df5403363f99df6f53b412ffee7053265eef1d896a927e6fa741eacab765 SHA512 7c94f8655959224e21113156e943d28dc9653f767fcd0cb6a9e7ec149abf3deabe850b404ba3b92384fd5bc919cce973c73b622746efc2a2862c86a62136d973 WHIRLPOOL 1daef6e83ec60128208cc9f9a9da4100ddb28c8eb31e31a58d3ecbcaba1d45245afe6d93b4da9fa9e8529793c8261e17e18054dc42ae0bed567db5a5243b293e
diff --git a/app-misc/geneweb/metadata.xml b/app-misc/geneweb/metadata.xml
index 58ced0f61ed4..4d7f59b58f9c 100644
--- a/app-misc/geneweb/metadata.xml
+++ b/app-misc/geneweb/metadata.xml
@@ -11,10 +11,6 @@ off-line or in a Web environment. It uses very efficient techniques of
 relationship and consanguinity computing, developed in collaboration with Didier
 Rémy, research Director at INRIA.
   </longdescription>
-  <use>
-    <flag name="ocamlopt">Enable ocamlopt support (<pkg>dev-lang/ocaml</pkg>
-    native code compiler)</flag>
-  </use>
   <upstream>
     <remote-id type="github">geneweb/geneweb</remote-id>
   </upstream>
diff --git a/app-misc/gourmet/Manifest b/app-misc/gourmet/Manifest
index 43fcb4174532..28b2101a62af 100644
--- a/app-misc/gourmet/Manifest
+++ b/app-misc/gourmet/Manifest
@@ -4,7 +4,7 @@ AUX no-docs-0.17.0.patch 338 SHA256 b6fb37e3ea0794e7024cc2ad04e5b8b10b2c10d04f37
 AUX tostring-to-tobytes.patch 988 SHA256 107b0cc16de64681702587d19964b5f21c3be665e3011c44854c89cfaa95e9b3 SHA512 72b12c9e775bea34ce82c53a8e808fd212eec523f03ca591735ee90121cc45ec6a6464168fe16d66c9889e92168accf8643b0486bc53ef8d144aa92070f3f94c WHIRLPOOL e8413d4e4ef967666671892970f6c2f934b8c43d023b45cf4eac621c8f38838d3c744134d97dc1cdde3c9a57e01d0f0ece4b5f6232b689caddc529c0f0115ed2
 DIST gourmet-0.17.4.tar.gz 8487830 SHA256 13edd3b9c3a3507d20b80cff0f88183ac7979b720e7577290815ffacca097fe3 SHA512 54010a5527f33e08b38d0fdf143cc4528e8ccc65ccad3253074135212751c3bc4385ba5f721327268f455bf85ff6f248e56ebfa1b98933a4ee061983eb9daa4e WHIRLPOOL 9f0f795ee405c0e72587451cbe5b6b72d5d35df2697f55325879c6841a39110773a4837f93b7823e4c0f64a48feb7b192a76cb6c7cc91f8bcd1bf40e9a065105
 EBUILD gourmet-0.17.4-r1.ebuild 2291 SHA256 08dd4a8b2222780166673f8ab1a5e8e0e522fed618ccf854d558fd039744ba55 SHA512 03b300cbfa5d4a1d9cd13301f33d817d9171fed26d21e329d523276294a562111b0db9b2cb04012879d782a6d871eb4117865569b6c769ad98a492f8bc8c2a35 WHIRLPOOL 00c53c330ea226caaa501879abaa94ca5ebca6bd0e6fe7ecbc35fd160dfed587340b191778a8a22ecde7d88e8a38422e873035d27e4e58fd17d4ac7fb1e12c7f
-EBUILD gourmet-0.17.4-r2.ebuild 2313 SHA256 0f3190e0bbf01ed51055cf582ae5ebd368d393748ea66f95c5669d35a2013875 SHA512 b1b383bb6e6c3805f2f1a521459ea01d2b3967405daa290d432dcf399bd3138f4f0829205a57a019b6601a549d2c6d9c1ec3f7c1fec56e86b034bce0986badd6 WHIRLPOOL 0546c64b9edb1f6f095671ed9d590d8abcab11ab3f3aab8c8cc70cba3b041d505764812ceea1e1fd08ecce56407d58a2453c86fb923d19557f4332b51b9d2143
+EBUILD gourmet-0.17.4-r2.ebuild 2312 SHA256 610f58aa96ab8fec8c269a74276a1c3694834a4c7235178546a7c9a1d497c612 SHA512 4163adbc0a8d7142a4779855d920f238f6870d2b94f3142b09b0f99bcf22108ebbd8c0161c808eaef6ad63d9d1ed858ed8a300d1b29a1b2a81b17ad91ff0a04c WHIRLPOOL 04367d6799caade424024aecf1f5636b62e73a953bf5c9795fbbd6ded739ac718e599e05ae63fa800e460679dceee4cbfa51c1467066fc62736742193ce923b3
 MISC ChangeLog 4043 SHA256 4d35bdb62214b893017d15f17f6d825cb2193ae3447425b54ae5cb6f42ec022a SHA512 0d3f109bff5b6b145714719eb7997908c06746ec4bfb07b6483ee107313fd4f79ce260c2969c025edb94c51ac435d63d19382c710c72b4457861423d5b3b57e0 WHIRLPOOL 59f7afd65d268274d2e60255a8b2abf2691ecc8bf9283854ec805fef1d21e93f1a4a4a656a04ecf73b8944290ba58d353c1a5b9606e7e5c8494d0fc35ade8d3e
 MISC ChangeLog-2015 8201 SHA256 b44e9b26ff4eb17d38233669702778e7d55cfa7741d4ed44d7213766765b0bd4 SHA512 04be873ec81e52ae74c1230b8b27774a37ffc80031bb997156c33d2412c1f189802eeb97999e6dd262cc85dd9e36f24bf863b57b94501be1d2f90ddbc2d433ee WHIRLPOOL 5e4cde6b304741352c3f598f2eefdf3e4fbc1c7743a04d4304059ae9b44d4564800822915b8d0e8f7077cfd63c94a90b4dac804624786c189ee5a27d1d30f7e9
 MISC metadata.xml 1559 SHA256 1e196f806b37e797b1fae33e4a5867c479d9c55cb7e43d5e4f86ae804e2f58b4 SHA512 67cb0b91052e1a2b0cd917839f796435cd45fe157e69d1ac8fbad7a3f4e09176db9f8d217edf0dd032cdc5b20a1e1c2ab3c56e57ddb8e291f55e5a1ff27764bf WHIRLPOOL 75a78af0c29da24788019851196cad3366063e9433dfacfee14ffdd5142b9070a8e28ec172864d5cff18cc80c937f1b1e3709aba4ecc76cad374ae00a9715e2c
diff --git a/app-misc/gourmet/gourmet-0.17.4-r2.ebuild b/app-misc/gourmet/gourmet-0.17.4-r2.ebuild
index 1e75e0170123..0e0dd28ffa97 100644
--- a/app-misc/gourmet/gourmet-0.17.4-r2.ebuild
+++ b/app-misc/gourmet/gourmet-0.17.4-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/thinkle/gourmet/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="-i18n -ipython pdf print spell sound web"
 
 RDEPEND=">=dev-python/pygtk-2.22.0:2[${PYTHON_USEDEP}]
diff --git a/app-misc/gtypist/Manifest b/app-misc/gtypist/Manifest
index 77f3f9cda01f..8c59f6b4ae3d 100644
--- a/app-misc/gtypist/Manifest
+++ b/app-misc/gtypist/Manifest
@@ -11,4 +11,4 @@ EBUILD gtypist-2.9.2.ebuild 1441 SHA256 decaaff0808bf824981abd28de470953faba582a
 EBUILD gtypist-2.9.5.ebuild 1425 SHA256 dc5c8134fc2e5ba458e3630a3ab47740e5162d37dbfc9f1bb368dc861bd5669d SHA512 6a38b76087e92c1b1fdb9d7010ce3838b166755f3dd390fa7c1eb78a56137af4750dc44e5d238ba87a01659570c23aa1f708fe0dd241dd1ca96464cd2280ed0c WHIRLPOOL 64c7b78543dec3c31b117c788e98ecbf9ccb0c1dd5abc0ed1882f4bab5a91bed919f8fa8283718453a49e86057ab008cbedba54f9feb0a6b59d3ed5869e62631
 MISC ChangeLog 2888 SHA256 b9b943fe82f2c3ae7786e8054a087da08d467a140d0a74cbd01161c7ca8f8f0e SHA512 0772538e98ad5a5527cf35335ca2e0cb470e90e0e03f3e47fd7bab5ca54752b3f9f1bae80d4aae8b15edad18e381a855527b654cc7e79ae44f2731c9935884a3 WHIRLPOOL ab7ba83087e88a926daf8ae12465f4823107d478b21c8d313000b2f45ee68e3a0720373e78a735823eb67fd23ecba23d9767167cc5eb4451816aed11cddb1845
 MISC ChangeLog-2015 4975 SHA256 9085cda2b8b2a39abbf4e976695f35e94c30a5385324bc82b2683d86460e9511 SHA512 5bb6d3271da09459e5cd3652d93ae8a1a480f2bd38a76f6481ce37d23b06e9f308540feec79fd76026587b5150fbe9c83033878319815fe277984099596be191 WHIRLPOOL 8ebaae4be92a9ff154613a106f93f855bedce5c0a9d1e62462520c74a06619c421dcd4a84e300d78e0ad8a518916cb97a97b30106bcfa2310acd3b9517aac118
-MISC metadata.xml 362 SHA256 93ff0c3bf6e1acd158d1571e1a16594ee9081790a80fb93e38a67499b0841531 SHA512 67c2ce82bd951afe3a435c846b6caba9baea19b1b172d4080383899cd669908c54c85c55aec7c8f10fafdcc64bc59d3fd8e60524bd0f78080fa9af48cc7fe3c3 WHIRLPOOL ecf7dbec17d5f9fe1ef07f019fa28f7e8b1d270caab9aa2a2405340e7f780051f13a3c0c92bdc4cc964dc8caf3cf1aa966b6fe433e90462a26cae984a2d28f1c
+MISC metadata.xml 246 SHA256 fe6ad7f4bc81b63c410d3c73cb81eb190019f04f11080a6a0c68c9950bc47aad SHA512 868f217ab39861a74e1e85a7920bb2c283cca35d231d4cd2c8e66a6d9ad81d5b03343701fd508ba13bc7c273e4d34678954005d2f58cbb147beb01ad3b7197ee WHIRLPOOL 9fdeba9d8354a401aa01d69c003f1e3b6ec9b76aa186c7d4e7cd5948e1fb7d0fd817478f8c43758aab3d485e5a26a272106f88956c2d68504b9986df973befff
diff --git a/app-misc/gtypist/metadata.xml b/app-misc/gtypist/metadata.xml
index cc9ea98bbd54..df96eb34a05f 100644
--- a/app-misc/gtypist/metadata.xml
+++ b/app-misc/gtypist/metadata.xml
@@ -5,8 +5,4 @@
 		<email>dabbott@gentoo.org</email>
 		<name>David Abbott</name>
 	</maintainer>
-<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/icdiff/Manifest b/app-misc/icdiff/Manifest
index d960b4273dcc..c8e570d49428 100644
--- a/app-misc/icdiff/Manifest
+++ b/app-misc/icdiff/Manifest
@@ -1,5 +1,7 @@
 AUX icdiff-1.7.3-dont-check-changelog.patch 546 SHA256 4e6d151fb694052ae91d62302a0dd2b78c86a8e06290297362b1c466d81ac8ad SHA512 e3cf4f6238b3d49b6f3b1ce42a340815c535bc7482af22e722d0f5afcb0e3bbb1771b9de4a76fa77f5abe47b7b2f7c4b27e933e9e6a27d48b020975e95a7abc0 WHIRLPOOL ea63db5fe58d33ed9feece4fa219e2ab1aad8ca148cef2fcfba0d1794480e3549a7f100f65efee4a4675eeeb60af9e7fc1de2271f7637f087afcdc7abc48d184
 DIST icdiff-1.7.3.tar.gz 20215 SHA256 5161265f72a7c9c1d2d7b0780a381743ef3d3127944a96786422802a6bc14ca5 SHA512 ae8ca394c3fdf820d4795282672bc44eb01f88f9614d6240f035c31f99130b188185a0e241c3c17974d76f604b85ef48aa8296835b5dfb46463a88cb1f68d305 WHIRLPOOL 994bbc53673db6559444908b9a08e71283060648fdbc86e607b5ee229a933d13627b4e02b7b41fc25bf41021b9d86bed4d9e1b9df978922102b724e7be0a4642
+DIST icdiff-1.9.1.tar.gz 24387 SHA256 18cf11866150eba1ecec1370611921246918310f4b5cb101045db523a05fb37d SHA512 f73108f6f3a4a2fc40e041bbe7b5934acd76684bb54a3fa544e9f146fd3c528528928378496f53ad92d649547ccc491a77296b6fa57e4534abb13d61c0df8d58 WHIRLPOOL 6599f4fb4bd399ca89510f7a1980d86cab9443e97850f9ba77f6431a74cb4cb363b2c32d6bf7e834b55bc8ac9698177c104484656c02df6ada2d3ba85ed7f8b3
 EBUILD icdiff-1.7.3.ebuild 623 SHA256 f07fea63b988ac68d911e8263a414c2266e0aacbbae004bfcb8d065c2ed2b496 SHA512 162251baecd2754230ea9d50793783c595e8f24cc07c20590f3daa789fda3a4252af69358a2197bdc9b385d61a2a5a01f02d6874d8c44a43bc0840219ab6e412 WHIRLPOOL eb86c8be41342595e52f1554a4086d2268279befbb511efd1e9d6d4f0f330f6239a5b850fab90b909dcad74f5c8c177abfd3802a9a3b3d6e677ecfd758695936
+EBUILD icdiff-1.9.1.ebuild 556 SHA256 bfac58f9f212c9ae3fb0fc983b45722fa2c6f529e970ed7b7906d5fd7833abd8 SHA512 f9dea5dbff160a7b185ef6cb40c917dda0d33d29e77f1c491090f25e38d99b24be9c663a424d5949113b00cbe8ff6e74adcb15bc0933eb3a4bdbba9045084a1b WHIRLPOOL 7677d6fcd204f58531772ad9ce9a2811278850a1f0312bbbcc4012a2098e85cd371f892975c14cffa8e8fb542b90ab4fc20edc636e9922548d4d29accd1c32fe
 MISC ChangeLog 355 SHA256 ff5dbe5983ee64401cc9f77dfa44f30961a46c056bf0d48a6c50efd910f548c2 SHA512 e4b10518c7f3e46865217b647884fc47de558f128b58fc0b91d086336e6fedd9b4cf8bb8c1e1036fd2525947d108ef2aded44ffa579e5ee9101687ea607ea6d2 WHIRLPOOL b3ec8c25e95914aaaf3bb6fe48db41871f84dc11919d8fd8d19ffcde7ab12dbdbe1ba97a960017af35e717f9b8a4b56cde54482ed7a04342a1d6fc51da8f2efb
 MISC metadata.xml 342 SHA256 fe27728b1552e91ea542b7eed023a58f23dc8e86d84a58fcd37162721869ae24 SHA512 a897866e5d709999db69d3b1a4c8d1d1b15328970b27015f7549cf7b4fc6be688063f94fe31b0144227318c252e80bfd189fdf9f34dfdbf4dbfe0412e0b818ed WHIRLPOOL bf714366e2e82d0018a654e4018c5811d493a7a115567f93403033ac5d26a1e944de08550c75a91d644d892d837bad0fb3290f63c75890d2f52254f4385a07eb
diff --git a/app-misc/icdiff/icdiff-1.9.1.ebuild b/app-misc/icdiff/icdiff-1.9.1.ebuild
new file mode 100644
index 000000000000..eda476f4a614
--- /dev/null
+++ b/app-misc/icdiff/icdiff-1.9.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python2_7 python3_4 python3_5)
+
+inherit distutils-r1
+
+DESCRIPTION="Colourized diff that supports side-by-side diffing"
+HOMEPAGE="http://www.jefftk.com/icdiff"
+SRC_URI="https://github.com/jeffkaufman/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DOCS=(README.md ChangeLog)
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+python_test() {
+	./test.sh "${EPYTHON%.*}" || die "Tests failed"
+}
diff --git a/app-misc/mvcase/Manifest b/app-misc/mvcase/Manifest
index 3558c14aac4f..4d9fe50664d7 100644
--- a/app-misc/mvcase/Manifest
+++ b/app-misc/mvcase/Manifest
@@ -2,6 +2,7 @@ AUX mvcase-0.1-flags.patch 531 SHA256 9bd38f4e347a3ae19f047b1ee8e2e949a626f5bf3f
 AUX mvcase-0.1-includes.patch 526 SHA256 8e0b504f110241e1ff82dcf8d3475831d7df5a83324d6ab1f89b9b39abf0c5ef SHA512 1860cf88e66a4bc219546a87e337056f66a344d6ec400c21bf37c7d7d5b34fdddf3cf2ac7c05274f2c6f313ee7fd530240e1d2089e598b5154c8eb2c4dffa30f WHIRLPOOL 684b0e912a6749a53bf62c78b045432414e778ec9054aa343a230f9aa42befa78664a1679a0ac247f5a8d659e320df63e6a588e05084b63e550c082d18ddd5c6
 DIST mvcase-0.1.tar.gz 9467 SHA256 87eb97918fde3a740f4c4968b7fb737909de124ea89774d34c0201bd107c93a2 SHA512 1b6030d51cd0da7bede43f1b528c2b2cc713b3c6ca0ccbb4931672185998957aad1b2e0e78a78148c412b6a36052076caca3606016ad1404e6028442dff8648c WHIRLPOOL c47c1bcb8839478c72577481936a68b1a805f4bb4cdd7ec5770adc9c30862ef766483470f1e0a5677a04fe4dded2b4236a7f16eb76ef78a3414737aca7c44cab
 EBUILD mvcase-0.1-r1.ebuild 676 SHA256 b36f247d64be462f1571af01d0328a109be8b4abe04d5b1c53f2f4fa48f9623e SHA512 4fc782129c08e4fe83e997dd26c5d3ca7d81cee74767f96dbb93d26130ee094d12a50e9979092e327500dff2eb2932dc51f7438294a614040090f792298c5db5 WHIRLPOOL 78edeebf63658d483dc3a93432259234dc5cf4e74ac3f3767f424e0ebb8137ae02cc4d41611c81d29ca80d71696755788a8a041c019eeafa2f44be97186dfab3
+EBUILD mvcase-0.1-r2.ebuild 641 SHA256 8acce5197a307d1f80900bc2df33a3d827c5b7c9e910e40955a5ce6c01454d5e SHA512 81cb0169264d89febd4af26629577945f827019d0d2fee28585d4218a7bc0b8ceb76fc2cbee1c5c3e619a897eef0a05f398a7c525e5d397546fb6dea2a6ecd45 WHIRLPOOL 621fb2cc6a23a57b77bf883223691b526f5cae1680b0e756969b1e39da4a963c2b183ae9a70e32839004e5f14232b59f7977e2f76f823836c2f523cbc9b83bf8
 MISC ChangeLog 2588 SHA256 4f56da41dfde6a9a7859e1faad0af92fb8b8bc0d1ff8971e7875d44156be9788 SHA512 0d1b1a31ff29eed00c9e2cb833cb4f492fd613286294f40799e1c489617f3c07162c165c52cf7166a703b9fda5d22a0bfe6b40156ffa78e11decee7459932dc6 WHIRLPOOL bb479f625db31c07e7f9644a1c5ee6858a6e61ef05e6bf5005b91beb5864e8a47b9444df27b3a955df6609b46e48848998c4a82bdad4bd82279a80d9339fd769
 MISC ChangeLog-2015 1738 SHA256 1f23af0ceb3eb60bdd097bfb13dd491d3b3e09404c2363b1dcc4db6224d9cfcd SHA512 51356805e2c735a2bf113bd3577326fc54e6ef1bf54265cc8990b2fc51da27d613efc761638c114b2b04189d11950ea2b79a6c9a6b818e74702ac4a073788114 WHIRLPOOL aaef277c7e49c6e42a525a5de2b1d46a6b5b1abef8822c39dadbaa875ceaa807a124cf17a5d2fe3ea3c0022ef23699b30695dccfef39e5018b8d6aaa79829542
 MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/app-misc/mvcase/mvcase-0.1-r2.ebuild b/app-misc/mvcase/mvcase-0.1-r2.ebuild
new file mode 100644
index 000000000000..568fed8c4a02
--- /dev/null
+++ b/app-misc/mvcase/mvcase-0.1-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A modified version of mv, used to convert filenames to lower/upper case"
+HOMEPAGE="http://www.ibiblio.org/pub/Linux/utils/file"
+SRC_URI="http://www.ibiblio.org/pub/Linux/utils/file/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="dev-libs/shhopt"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-includes.patch"
+	"${FILESDIR}/${P}-flags.patch"
+)
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
+
+src_install() {
+	dobin "${PN}"
+	doman "${PN}.1"
+	einstalldocs
+}
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index 9e3a2ab9cc37..da150f67e576 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -5,10 +5,12 @@ DIST screen-4.4.0.tar.gz 846010 SHA256 ef722a54759a3bf23aad272bbf33c414c1078cad6
 DIST screen-4.5.1.tar.gz 963153 SHA256 97db2114dd963b016cd4ded34831955dcbe3251e5eee45ac2606e67e9f097b2d SHA512 ca53477ad38264be38efb1d10a1337b647dd061127162c77533b17a30d046cd0caabe38e4a9e5389aac30d5dc62eb53e7877411e69adae36d0ca869bd0a82804 WHIRLPOOL db60013141e3f426107d3f1e518b48fc0bbf89fbf51b26b5ac7208b9940448397ec0009d389365289a1d06421b403982093c8b7ee8d891eea20c704d7ad376b1
 DIST screen-4.6.0.tar.gz 849062 SHA256 9433706b653e941cc4c745f28e252e57be2a141eded923e61cc2c4a09768fed4 SHA512 2ee7cc51c62a478e72eda0647f3f347e63f40384e19bc11b074158bd94cdb628c6425b1dd7a472496d56bff11a30a9dc58859c2e7e539fae2a8718ed9b0f96d7 WHIRLPOOL 62593811fed8dc2e92acefb80751a60ad7170429047f9acf0ec21718ab303add365ae469d11d3371524095a53c750216ae07e572a640439db26e1526c7ed12ee
 DIST screen-4.6.1.tar.gz 848979 SHA256 aba9af66cb626155d6abce4703f45cce0e30a5114a368bd6387c966cbbbb7c64 SHA512 e5d029400ed5b509ebddc1f55812c33536d6f5ce91119537c7d06e1fa7dee84939c43337df4638f61c818ce0412f4d08fe212202162a4483a9e84bbc4b3e4336 WHIRLPOOL aad842c61961d01712017da64a3d9fbc5bcb74ecb0310b5d371ea8aa5eacf694826a66dea00c0b1c24de9918aafe6bf5b770342ec2ac840fa68cfa1fb52785fe
+DIST screen-4.6.2.tar.gz 845210 SHA256 1b6922520e6a0ce5e28768d620b0f640a6631397f95ccb043b70b91bb503fa3a SHA512 224bd16ad5ae501d1b8bb7d2ba9cc19e6a0743de5a5b320109c2f6bf3b1ca564cc7094ed9211be13733d9d769cde77d13fe236341d448cad0518038ab1e85c99 WHIRLPOOL e918461451b49d7c291911763ee617586d93088f777c41b378ea00d0192c7ab9787e7137baedf3cc8f4169ee0fd6aa65348bca543bbc0d10d00d31dbeb7826f7
 EBUILD screen-4.4.0.ebuild 3956 SHA256 d522def5c9aee5fa33e443e10f2d7bd1928c936fd3f2117aeaff670e33a75644 SHA512 e143bf0d0f01d1f505ec84b4c55f36ba70391b117cf78694373fdd7b892d5df4b208b27a3d711daac0a3edbf05debfd9aed03eaff961083bca791df504c07185 WHIRLPOOL a27b51d080154604fc072652e13caf86bf10d23dc5c49abac4cd94fb38cfadee4da5d529f8ab969e51877993ac1dd58871e2d1db86b84d6746f3375c266cc881
 EBUILD screen-4.5.1.ebuild 4139 SHA256 756e30ee1819c554bff6089ba5588d4f73a69733592bf84bbfc09b9c5f7cb7fe SHA512 11e9a7ad1a85dfa67dc6fb6a1e738529c74cb0b82ea96d6fa023b4e6b71cfa14046b318e42d742595e9bda33af1d7514d1a6b0efc48696975b5d939db177471e WHIRLPOOL 1e77bb5a8e36402b7d15df01d89f97c3e8b50e4f386616a63d64ed143e105f6b8de06d8736ed649e4953d82d70cd0a8c02d316a1f50710bc0176aba375964474
 EBUILD screen-4.6.0.ebuild 4087 SHA256 bea936ccf54b555f23e9c56a49d591ec27529a9046574eead4f42caa0832f4dd SHA512 6c9b164723d23fffff0cf5a4fc346e2da8edf53fb877755c36c6106ab59b60b191ce17996597458df11b2a423a4a26db14b78e6e13d1c247ff2fbe4db2742968 WHIRLPOOL 660b1e137ed3d73d03d0a5fc91cfd41ce0854309fab036a2ec740e8b10b22ede626300ab898a91343b9530aa1aaac8b899209cde07aa4c7d90b81fcf28a01a7f
 EBUILD screen-4.6.1.ebuild 4087 SHA256 bea936ccf54b555f23e9c56a49d591ec27529a9046574eead4f42caa0832f4dd SHA512 6c9b164723d23fffff0cf5a4fc346e2da8edf53fb877755c36c6106ab59b60b191ce17996597458df11b2a423a4a26db14b78e6e13d1c247ff2fbe4db2742968 WHIRLPOOL 660b1e137ed3d73d03d0a5fc91cfd41ce0854309fab036a2ec740e8b10b22ede626300ab898a91343b9530aa1aaac8b899209cde07aa4c7d90b81fcf28a01a7f
+EBUILD screen-4.6.2.ebuild 4087 SHA256 bea936ccf54b555f23e9c56a49d591ec27529a9046574eead4f42caa0832f4dd SHA512 6c9b164723d23fffff0cf5a4fc346e2da8edf53fb877755c36c6106ab59b60b191ce17996597458df11b2a423a4a26db14b78e6e13d1c247ff2fbe4db2742968 WHIRLPOOL 660b1e137ed3d73d03d0a5fc91cfd41ce0854309fab036a2ec740e8b10b22ede626300ab898a91343b9530aa1aaac8b899209cde07aa4c7d90b81fcf28a01a7f
 EBUILD screen-9999.ebuild 3680 SHA256 b4c700884e7deeb35b1ce18bbf602c3a10328492f28cec8b56b637eaa4e227ab SHA512 f27332b033f31450f6cd66ea8e9a39866470633e17eac7d6ea26bc093aaa62f85dc5001875478592c417889e298c2eb87f16954735e015405f4d4ba712cf09e5 WHIRLPOOL 3d0df4796c469378a550732fa23319c8101f60f2fe7a05e49cc470a134ee1f4781117e4a1518b44855f03bbfb5e54ce25eef6906931a12bc111f28ebcdc9741e
 MISC ChangeLog 8688 SHA256 5fb8c35b0b43b5d0c575c17e1d01089a3b0e153687e249e0b98bf9546077c3c5 SHA512 c0a284f5f073cb356fe05b62bd7c938aea0e1cf99139815568c934f3853e77420b081d2f2f606df37e9a11c8c461a7992f516b4fae470f4955e71277173f7f6f WHIRLPOOL 2f283c0cd3cb874ba334abe711f3ca2633c7ce895c1f240a0e03cd9d369b559e428094290fdd29dc265a2e82336666dd848a9d767c55513e7c66bf18c302991e
 MISC ChangeLog-2015 29858 SHA256 481ee48a0440100320f3ebf9d717d6aebb6f95ac4eff5ea793711b9e24f5324b SHA512 d3015d0c2ab3e7f019c414fc95542ff3408ee1ddccf1e805e5885646307141aa9c6d0a4aaf1bbe733b930da929e6eb1896c632cfcc2658ee4508a1c9fa830eac WHIRLPOOL 17a24afb34b439e9eff882ad54410af5117f41e92540854981e56671d5746b9caa15d6196d572a5d0421948763dea9a2f0953d0440792e1bafa593f00424e237
diff --git a/app-misc/screen/screen-4.6.2.ebuild b/app-misc/screen/screen-4.6.2.ebuild
new file mode 100644
index 000000000000..01169b42901c
--- /dev/null
+++ b/app-misc/screen/screen-4.6.2.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SCM=""
+[[ "${PV}" = 9999 ]] && SCM="git-r3"
+inherit autotools eutils flag-o-matic pam toolchain-funcs user ${SCM}
+unset SCM
+
+DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
+HOMEPAGE="https://www.gnu.org/software/screen/"
+
+if [[ "${PV}" != 9999 ]] ; then
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+else
+	EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
+	S="${WORKDIR}"/${P}/src
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug nethack pam selinux multiuser"
+
+CDEPEND="
+	>=sys-libs/ncurses-5.2:0=
+	pam? ( virtual/pam )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-screen )"
+DEPEND="${CDEPEND}
+	sys-apps/texinfo"
+
+PATCHES=(
+	# Don't use utempter even if it is found on the system.
+	"${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
+)
+
+pkg_setup() {
+	# Make sure utmp group exists, as it's used later on.
+	enewgroup utmp 406
+}
+
+src_prepare() {
+	default
+
+	# sched.h is a system header and causes problems with some C libraries
+	mv sched.h _sched.h || die
+	sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
+
+	# Fix manpage.
+	sed -i \
+		-e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+		-e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
+		-e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+		-e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
+		-e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
+		doc/screen.1 \
+		|| die
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
+	fi
+
+	# reconfigure
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# enable msg_header by upping the feature standard compatible
+		# with c99 mode
+		append-cppflags -D_XOPEN_SOURCE=600
+	fi
+
+	use nethack || append-cppflags "-DNONETHACK"
+	use debug && append-cppflags "-DDEBUG"
+
+	econf \
+		--with-socket-dir="${EPREFIX}/tmp/screen" \
+		--with-sys-screenrc="${EPREFIX}/etc/screenrc" \
+		--with-pty-mode=0620 \
+		--with-pty-group=5 \
+		--enable-rxvt_osc \
+		--enable-telnet \
+		--enable-colors256 \
+		$(use_enable pam)
+}
+
+src_compile() {
+	LC_ALL=POSIX emake comm.h term.h
+	emake osdef.h
+
+	emake -C doc screen.info
+	default
+}
+
+src_install() {
+	local DOCS=(
+		README ChangeLog INSTALL TODO NEWS* patchlevel.h
+		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
+	)
+
+	default
+
+	local tmpfiles_perms tmpfiles_group
+
+	if use multiuser || use prefix
+	then
+		fperms 4755 /usr/bin/screen-${PV}
+		tmpfiles_perms="0755"
+		tmpfiles_group="root"
+	else
+		fowners root:utmp /usr/bin/screen-${PV}
+		fperms 2755 /usr/bin/screen-${PV}
+		tmpfiles_perms="0775"
+		tmpfiles_group="utmp"
+	fi
+
+	dodir /etc/tmpfiles.d
+	echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \
+		> "${ED}"/etc/tmpfiles.d/screen.conf
+
+	insinto /usr/share/screen
+	doins terminfo/{screencap,screeninfo.src}
+
+	insinto /etc
+	doins "${FILESDIR}"/screenrc
+
+	pamd_mimic_system screen auth
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]
+	then
+		elog "Some dangerous key bindings have been removed or changed to more safe values."
+		elog "We enable some xterm hacks in our default screenrc, which might break some"
+		elog "applications. Please check /etc/screenrc for information on these changes."
+	fi
+
+	# Add /tmp/screen in case it doesn't exist yet. This should solve
+	# problems like bug #508634 where tmpfiles.d isn't in effect.
+	local rundir="${EROOT%/}/tmp/screen"
+	if [[ ! -d ${rundir} ]] ; then
+		if use multiuser || use prefix ; then
+			tmpfiles_group="root"
+		else
+			tmpfiles_group="utmp"
+		fi
+		mkdir -m 0775 "${rundir}"
+		chgrp ${tmpfiles_group} "${rundir}"
+	fi
+
+	ewarn "This revision changes the screen socket location to ${rundir}"
+}
diff --git a/app-misc/spacenavd/Manifest b/app-misc/spacenavd/Manifest
index 7a270ddcd800..7e9f05f64783 100644
--- a/app-misc/spacenavd/Manifest
+++ b/app-misc/spacenavd/Manifest
@@ -10,7 +10,7 @@ DIST spacenavd-0.5.tar.gz 41746 SHA256 0eecc5b5ad47ee6376d1521f2bc7c8f8fc02904cf
 DIST spacenavd-0.6.tar.gz 54730 SHA256 c2d203bf96c5a959590146a43fe5d6e5e8c5c38a8b2f55aa199d967d0d88d0ab SHA512 ff039e169805365ce8c1df1258eda6d263a0724c087b22a9e78269629455580817027d936e6bb7014b7654f48aa23232e8059585175003034e4bd3e0d6ed8200 WHIRLPOOL 2f7ff91302c9970d54c7983e7e3ee75d2254d2a8640d701e1449f9a31dfab0937c811491acfdf15356ebfe4914462468031090954c28ffab59a30068a60f19cf
 EBUILD spacenavd-0.5-r5.ebuild 2319 SHA256 c2549ef92c5912df46075618b57aaf7d85ebe95a774884b19de88f3e4ce646a2 SHA512 4fca63971153edfb5a69ca8cf40e543edcfd3f8c97ec729fc3afb550d00027566097f409a46c15bc2585dfe833e63208f709e3d713e58cdef2e730cd58c95444 WHIRLPOOL ddc82f961a6d5ebda0c534bc74d7036c3fa4461c5f916d468361919dac8c1c0f1a3cbaddf6c44a5f66bf86b878eca284878c63990a6c2a9e938a1972befc38af
 EBUILD spacenavd-0.5-r6.ebuild 2303 SHA256 72fbdd2f1a299c4d8d67ab59e32b9f9d413ab433970a447e000267e592885460 SHA512 aeb2e1501a7a0c40f94c809994c29dc902a142362b5d5802d4a3354b62dd9c7880699eb2ba9c79a3f288cc301d453177e24ec9850c40b26758c2bfd82740d31b WHIRLPOOL 29cd0403bdf2a1ef19bb15d060ee717b6fc616d29b1bc6ac241500a022754652b302ac4b8416caf26b64e216ee36c43f6b74371d0f77b98328b89ff5e630b57a
-EBUILD spacenavd-0.6.ebuild 2232 SHA256 72e1226cc6c60245abf7c44079f54b08893e235c44b5ed5757f01908f33c61ed SHA512 c555cefdb0c7e09a3398e1897c4b0305d3697011aaa595a7a57ebb0e0581f5f1d0844166ccb3342132b4f98714f8528f9eaa7ffe5c6d55a59799edcb5de36a12 WHIRLPOOL b234281631edd49d65b8fb147deca3f296bf6c6bd282ee0d66b594e5009437ea5b356253d87bf4a5ba73ac20a39352aa94031829f50b448763c0f9ccd053a205
+EBUILD spacenavd-0.6.ebuild 2231 SHA256 c890e22d4a9ccfa73392f669e1667147b6fbc263998d72d2c1e60c4f0135d60e SHA512 6eabf8aedee3e6baca3a8760a821d3243f4dfac99fd529b6bc662a70284c5a0b925183e7b7894d77b8826da18371b3e0ac3911442a89ff7301e1922ae51e6dd1 WHIRLPOOL c9e9a89435ff8f7879fb439a00006bb700e45da42d5b20e0943d2ad3f3876c96c191150342b4318b8c0de9332404806054ea0313a3728f193575dcfafb3e8e3f
 MISC ChangeLog 2904 SHA256 f323bd3a37cc628339a4eee752d572fa1dc069b64ce0c23e29c7b3ce97bd4a86 SHA512 a98e326bf8aad4ceea1c579b0b4f753d73cb101598c687212d651c91e89c06caa9c5e71c50d6b37bbcdb8cc184886fc7b40a74d58536b4788380a537217642f8 WHIRLPOOL 711c759d384b73b48debc7e319b3934a02f9c5b75f6348e185cdd191c26b1f4dfdef612f4c8e4a7927812a5a99334e2f5a24eda44f53e73d8bb5eca77d6f5dae
 MISC ChangeLog-2015 3313 SHA256 446a7b9225df0b30e7113ed715d793e62c7c203c510ba38030e0912bfabf7802 SHA512 a493d152382f2450c123ccbdf1659fdb9cc98ebb01ef4b7d7dbf3838b4ef75c0e1e83572352d9a95728b6df7d2a29a5a975750cf937b54293a1e7e588532a19e WHIRLPOOL 9b7e5f74d3e70088227f5139f5947859ed4b8da888913cfb776e2c7853d21f9319eef702ebae053d25aa5907ff29ab58ac4f658064031a1c7342fe5dbef0f24d
 MISC metadata.xml 1044 SHA256 a02f67b861bcd108eec317743e01c4d00e7bb1fea24e498d79eb942859272730 SHA512 04b15a567deac4a6bc1a0b250c585d863d9bebdca0a5160a3b77e1830190abadf1b98371b33e60a8d67978de3f0db117d51d598a861782663cf7b35e74a5d859 WHIRLPOOL df6075690580d11e00a019fee67a61ee7b3baa933068329ff17b13ee7f0481d9ecdb2f7247d40f347ea24f9f6581859e49c202101021d68fd8e6b2417b26ca18
diff --git a/app-misc/spacenavd/spacenavd-0.6.ebuild b/app-misc/spacenavd/spacenavd-0.6.ebuild
index df16c9432ab2..49ddec7b9ad1 100644
--- a/app-misc/spacenavd/spacenavd-0.6.ebuild
+++ b/app-misc/spacenavd/spacenavd-0.6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://spacenav.sourceforge.net/"
 SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}%20daemon/${PN}%20${PV}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ppc64 ~x86"
+KEYWORDS="~amd64 ppc64 x86"
 IUSE="X"
 
 RDEPEND="X? ( x11-apps/xdpyinfo )"
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index 8a145ad2494c..8db0648f2983 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -1,11 +1,9 @@
 AUX searchd.rc 656 SHA256 719ec5bed997d1040647ae9cccf2e164da5d9ea585d63cb79ea57034ca6b4db7 SHA512 0b24b6dfe10a99c9bb18b7acdaadf2f5d7e3fab2ea80a719bd65b9ea6f6dc83f249d4c2ecb52c48eed73e515f8e76bff294ff39b1ab6375a947a9a137211949c WHIRLPOOL 80e020e228062473dc23a1d0c0175119fc52d4dabdc3e91a86acd4784afdbe858490443a0dd05a8869fda881993610b7a4b186db53c0b0f7959261dc15dab6ad
 AUX sphinx-2.0.1_beta-darwin8.patch 538 SHA256 e7350f5c5fcd1a5a0925cdb9a775efd5747d5d790aa9eb3319717e98be82b683 SHA512 342d4ecd3e75c208e358a39de6e5cd2a2bd9dc627f53893869c2280ba5b50546c7edf8476c07cf681c8d1921eeadbeaf48c75337efba0349b951c7a4569f0c14 WHIRLPOOL 7b35a4081c03e821c10e17bb36b91d8a4f1438a64d1b29b979a2163a90419971b70ec6a8c2ee80bec34c4c505f0aa0d83a59bea9261bbb3a03960d2ba9d8f9e9
 DIST libstemmer_c-20091122.tgz 129207 SHA256 ad4e152379214480d599c86dd19421a36fce78cedd20fc324520c5bba0a512e7 SHA512 d1b2203dcc3d0f421526d3ec2f7e04889f93221222efe50501b4a1c7e74dfc51905141d4ada5a76feab5cec8dbc64f55dd55b53f6e89f658c67e72dc6667091d WHIRLPOOL 03baf5de80854a2726990d1f79e17a46342b0d8431a564805d78878bba1eba0c1aba6f4f53c64eb1a1946b50053632c32c9106305f0a53623068531f2b67b5c4
-DIST sphinx-0.9.9.tar.gz 1218359 SHA256 bf8f55ffc095ff6b628f0cbc7eb54761811140140679a1c869cc1b17c42803e4 SHA512 bf1f6b3429beac9336ed975137b9cc582541357df487ae97f407589458fa4cc4f3a797c868fd505c6b4e97a73b30a0f7f9c7ab6b3d8685ba173fde6d1d5383c2 WHIRLPOOL 70a7db079e35671c17f1c29d71569c4b643462475b10dbed6342a74ed20304ea740e442fb97af874fb3acc3cb9eb8a07ff43aa90dc90c9cf477fb1d651ced021
 DIST sphinx-2.0.10-release.tar.gz 2016687 SHA256 efc9e90d1edec4f159846c8d4ca8839e7dcf9ef88c117d0d369aaead75809f0a SHA512 d22a0ce261cd6decda2e9e91fc9806699c818bb45a9c9c5e11a0944a698d47b5862c577eb55e7b57dd208db982e7f8bfc7163af37aaedc1c537841aff1409952 WHIRLPOOL 46e17cc73225692e8ab73438547863ba78ef7c1be306bd46e393723220007b95d9a0ca62cbd8175423b62bf4599a68c4a4831ac6472d02249104ecdf0e3892ac
 DIST sphinx-2.1.9-release.tar.gz 2443797 SHA256 6289aa0ac3e1456a0c9181ce6bce2287778b5a163f685a1376e181fc87eb7c03 SHA512 7f4538011db5d68bd00c00978d476f780fc2d355113bd2819996bacbaef90b0de5b14c946a9aad83157b818d9b6b01ee0a26bc72862cfd151067ad9967c18f56 WHIRLPOOL fd9e6d31c8b9d88b8de7462ccd947aeb85d97ee4c23c64788653f732a5e47dad134c0f8cedc3b0ccc2d744eb0c4aaeb2d32fbdb02bae50be0d4ed8841a0683a1
 DIST sphinx-2.2.11-release.tar.gz 3061998 SHA256 6662039f093314f896950519fa781bc87610f926f64b3d349229002f06ac41a9 SHA512 cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689 WHIRLPOOL 34e4aeb41f1b8e352404792cb18149542e624fd739b5d11bee688f49c8be5067553414e9bf57b4352408ce3a6ffb16ece843af8bcf3625a75813a6adaf231e62
-EBUILD sphinx-0.9.9.ebuild 1459 SHA256 2ed66f6df94ede4a9509b58f9f47662650fdef2270f26b0f6644b43ac083e75c SHA512 f3dafc5cbd51133e8290a11082a018a8cbffd587209398cc10ba04b65f19ef80ab0abcc08cec24602274281b51625c5cf490a3055572c9e9ebd164e531a776a6 WHIRLPOOL a213d8431f8170d3512a9e9a9c7769e4c7acca711203db651ab3ca26584d1196ef4e72206810c0a0123e11ef2d55c5c4305536974cc36d3e86cb33f2a6dd3b86
 EBUILD sphinx-2.0.10.ebuild 2618 SHA256 33f8d877e50383c13f63dde90803c02172e0bb4fbd0f8000fd120d9a32437b7a SHA512 1fb0f297183c55d0aefcb32d2c5594e28e85c441c49f32a5e65bab3598c69362a39b2ae8c471b34751a759aa86024901fe92c53784adad1e8845c732a2a4cb03 WHIRLPOOL 1854126f8db31290e7539a3af974f146f9b0a2d485abda6899035eaa3442c1fd2e5d3c109393377aacd4467a0c87c6caa96359b71c8c89737ee3862de5d9f699
 EBUILD sphinx-2.1.9.ebuild 2353 SHA256 9750378bd3a2a42327814200760f6aee8e3060634232cbdb091421fa6687e98a SHA512 fadf1c6b4861f1ba4307a4c5a6e18177ea44ad6d2b1a35a4a043309e97680258519216de8772446cd43d2a5500defb79978284f33b1e17944746b4b13a02cfc0 WHIRLPOOL 7ff12c7f44771f529370ec168e804e1b1e5629eb1934580f064b740587bb0459b695d563a4aad924bc632fe1f9d743c8a6372249f9da654d2a860993537d5359
 EBUILD sphinx-2.2.11.ebuild 2379 SHA256 b234cff9fb9f4e0e1a8903f2542c13559790046ebfb43bb090f1e5c3d4c23fdd SHA512 658227af2ac8ce1a5e1d0ac852528d2097ff8019470e9a50ea4c9f76a930dfccd83cbb1b7f57567bb8924236092be8b584c15203e7362c51564b1189eb06cd38 WHIRLPOOL dd9dd06d2f40341832cc170501fb59c52e87c4e072ebe1477734825d14e4efbf3e1d739280d70c9e1e966221b091fe99e02e175831a3d8810f1c41006e25b213
diff --git a/app-misc/sphinx/sphinx-0.9.9.ebuild b/app-misc/sphinx/sphinx-0.9.9.ebuild
deleted file mode 100644
index 462fd8723520..000000000000
--- a/app-misc/sphinx/sphinx-0.9.9.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils autotools
-
-WANT_AUTOMAKE="1.11"
-
-MY_P=${P/_/-}
-
-# This has been added by Gentoo, to explicitly version libstemmer.
-# It is the date that http://snowball.tartarus.org/dist/libstemmer_c.tgz was
-# fetched.
-STEMMER_PV="20091122"
-DESCRIPTION="Full-text search engine with support for MySQL and PostgreSQL"
-HOMEPAGE="http://www.sphinxsearch.com/"
-SRC_URI="http://sphinxsearch.com/downloads/${MY_P}.tar.gz
-	stemmer? ( mirror://gentoo/libstemmer_c-${STEMMER_PV}.tgz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug id64 mysql postgres stemmer test"
-
-RDEPEND="mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )"
-DEPEND="${RDEPEND}
-	test? ( dev-lang/php )"
-
-# Tests require a live database.
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	if use stemmer; then
-		cd "${S}"
-		unpack libstemmer_c-${STEMMER_PV}.tgz
-	fi
-}
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir="/etc/${PN}" \
-		$(use_enable id64) \
-		$(use_with debug) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with stemmer libstemmer)
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc doc/*
-
-	dodir /var/lib/sphinx
-	dodir /var/log/sphinx
-	dodir /var/run/sphinx
-
-	newinitd "${FILESDIR}"/searchd.rc searchd
-}
diff --git a/app-misc/ttyrec/Manifest b/app-misc/ttyrec/Manifest
index 7e4c66a0864e..90d87746e844 100644
--- a/app-misc/ttyrec/Manifest
+++ b/app-misc/ttyrec/Manifest
@@ -1,6 +1,6 @@
 AUX ttyrec-1.0.8-flags.patch 591 SHA256 a7500040b86a41c7dbac7b5a84fb6d45877dfd3f75adf0c8fd6b35d4cf3fae95 SHA512 245a5e34611869d4b612a25922cde034ad3e54a3b7579850f2ddce3e0200726ed3707a518464c176044c9a9ab5f60737ded7941f1882d560d963c59e6221861c WHIRLPOOL 948911ee3ba4b50449f91138c2b4f12b5b8c105a9da2cd7291a00fb770999ce85eeed77afd4dea4d55731dafd305170ead59e30ccd594972c9217e8620401b8c
 DIST ttyrec-1.0.8.tar.gz 8528 SHA256 ef5e9bf276b65bb831f9c2554cd8784bd5b4ee65353808f82b7e2aef851587ec SHA512 b7f6f4c78c5148dacc7058534d89f13fcf333ee9e099d4475135e9c15a99a8aed72bf4bd5954652a6bb044d11ad35b4cb8d07208a5349c79c811f68fde7e8611 WHIRLPOOL d8f51ea4c88082b0f272170fec7aed0fa14d153b145f17958dc6101b5e383bbf7dfc4c5ed9cdbac23c08cef6baf25f4b65f3db13f7575bae65bf9ca3f58d48e3
-EBUILD ttyrec-1.0.8-r2.ebuild 693 SHA256 c704c90c465eb86fca5ca57d68c2cee66a6f05ebe6bf7746383835a4465b2b68 SHA512 09943ab49cc9d1f969f851cefd87931a3ea1603a0396052319d7af2273838d02a894f5c834296c467581007d026d26832b18cc3df878ccb1e01543c7c3436ca0 WHIRLPOOL 0a799de7948bd054b8fba61973454a1dc279a8ef1c29d8a30b283b265b3616c4ff330b15918b5f73b0fc2729eb8c45dfc5374aa988d8b931ce28b5df48fcc549
+EBUILD ttyrec-1.0.8-r2.ebuild 692 SHA256 94abd28adfa2300d9d8569497890b947449b7ea443db5dc64762084176e58632 SHA512 f3c65b0fe210ef0f5703ca1499eda212e38b293ae6cc0c8445c38e419ccdd0581a546390341e54a53e34f1f389214f822939e29a782b12d14e24ae8f9dd7be08 WHIRLPOOL f2f3636774b7f208a3249cc2615541613e12aaf8598e766b7a3ab82f3e99ddf52fe7ba96bc43b397400c007006298798bbc534a8f6e0489336bdedbc96999a4a
 MISC ChangeLog 2560 SHA256 04eda61f241c162d03859e38bc8815f72f8ef12f62e15f5d688074948b337f05 SHA512 c6e2ad1150421b6dfe44200e9920304e7531c0bcf2ae48d4db0f6432f6be716771cfd4375a52c90015dd4070b82887424f71c93b725241a9de8db0f3a4ba0cfc WHIRLPOOL 29e0e105acb674ad79912b4c5f737d08e704348c2e3ae169b66dad4d47db5c367139655c90abf5e329ff38500d5d09c4994402da9e064d55d85eed5a0ef9dfdb
 MISC ChangeLog-2015 3181 SHA256 556555b8b3f9eeb9e89672e9b602bd12cd7fb13e844f7558b3ebb7c0e9d1959c SHA512 efccd026856a7bd9b93e0436f893e771b8bb272404ffd3cda853b3b93ca425487cf6023679d626eab769d28d68ed5bf80c77a12770ed210594031edab510df91 WHIRLPOOL 4b88e585f7b8be8d28ed0892ff4d521697edaf53b13ce8e4d297187c85326acecb03e37cf68b5d3ca0f7965d42d0c213732b20f0085d04daaa04c9b57ed20030
 MISC metadata.xml 575 SHA256 43d494a91bc668699a2f6fa128e1fd2971668d92f2e136765c359891589776a4 SHA512 57adba15d5ac7ae8f49445e81c7aefd99a840721b8636505908493e3e76ed12c24eb5ae87970de701395415c096ca360ad81fe27139fb4db79cfc3da1b7784fa WHIRLPOOL da0fa028a2e557e1a440ff090f2f7610dcd470887c414b3289469de23b5ec6ee3d1dd47920872ef05362dcaca889be5a9c4043515f462860401c05fc1e1b1d48
diff --git a/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild b/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild
index 6affc3cba9b4..98e3a621aa51 100644
--- a/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild
+++ b/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://0xcc.net/ttyrec/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 PATCHES=( "${FILESDIR}/${P}-flags.patch" )
 
 src_compile() {