gentoo resync : 01.12.2017

19 files changed, 115 insertions, 325 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index e6e42189a282..d530c0b0a8c0 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index 37b49e922605..cd5767d1edaf 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -4,12 +4,12 @@ DIST ca-certificates_20170717.tar.xz 293028 SHA256 e487639b641fa75445174734dd6e9
 DIST nss-3.30.2.tar.gz 9499119 SHA256 0d4a77ff26bcee79fa8afe0125e0df6ae9e798b6b36782fa29e28febf7cfce24 SHA512 02f14bc000cbde42268c4b6f42df80680b010d1491643ef9b11e0bac31a286a2e7fa251c40cb4ac70b64883a1b90efc64440ef9d797357f8a47cd37195fc5500 WHIRLPOOL b1039f227a55ed9ab592b7e1ea0856c8cf91b8d298ef07d9d0f56d1956319b15c12224f023a100d106101c49dafb16e8231680667d2c7d0b8f8b2bbf6ad3ec8e
 DIST nss-3.30.tar.gz 9500552 SHA256 a8c0000dae5e992f6563972e26dbfefc50d006dd845c43b8ca24ea50169ff3a9 SHA512 c21e9b5e4b689ea8cbc6f4d7913df43e2a78c4435e0ce092f2ce00e46079ce2268e17ec8527b283ac69eff3d96ff0165a5b42b6579bfe0a720115ff2938260d3 WHIRLPOOL bc0a59484010a5771b515dde1440ccca8a63b167d3d8839b3606460fdf9d2dc3ab7d889173c88edb7d685d39ad3614c4cbc66284d0faced47cdcc01a69997d9a
 DIST nss-3.32.1.tar.gz 9494609 SHA256 4de59ca7f5bf4a56fbcfdbb4a054f254ba9f408f56476957404a091048624652 SHA512 b377aba822c2955d801022eba1636b71943a64f6e74d5611c2625910d230059383c4dbdedd65e70b356eaea33aeefdd24de3b31d7a4823d921ea475af3dd9da8 WHIRLPOOL 4c15b4ba85ce10787b9ee541d20a829a99aed5628b59f7e7e3045ec694d6d8a0a83bc730ae4d74148cf7c425f59debfd1574cb1b036c1407d1f9d4896647d9cf
-DIST nss-3.33.tar.gz 9578033 SHA256 98f0dabd36408e83dd3a11727336cc3cdfee4cbdd9aede2b2831eb2389c284e4 SHA512 82adc0b73805ba5e73b9bf350fffa383a8b4396c05f49edb360a53319b4ad26d928a135bee245f9da009d162129db4441a96ef05346dadac20922b21284468b0 WHIRLPOOL c11129bce97990a41a3118e62d79481fbd38cad51356a6b6c1b0af7efe2f27b3d5d51a8e987287c1cdff77ccee14a3e96d5bbb76e92f9a81b2f50988de250dea
-DIST nss-3.34.tar.gz 9586315 SHA256 0d45954181373023c7cfc33e77c8c636d394ec7e55b93e059149ed7888652af5 SHA512 72388b596151499850546a68d9a20d82434c59f159564fb7170980f110d43d7026f174f93660d3bb6da79b618fd7d4f1f16246fc80ba568aa555df99ebbaea21 WHIRLPOOL ae6784022aa74671c62141023e40e5dfce51bc90b49c6520ad46307eb3b84246c1557bbcc0b63554d6aef42940a2667f46cebfe57f9962342f176e79fe9384e0
+DIST nss-3.34.1.tar.gz 9562876 BLAKE2B 645fe06435dffa1a0dec688c7c10854dbd664e719889b36027dc2e52c4f585c2ce7bdcd947dcf5d938013246405c04e1b9dbd802b229e0acc96fc07f321bb51a SHA512 6cc4826df4202e865e903a2ed05b49f708a047347b7b4d58f9b83ed097115a128239c4596a033ddeb9ee3fbfe6345a024e11eacb6149bce2d71fbe82c0a41c63
+DIST nss-3.34.tar.gz 9586315 BLAKE2B d04fcd46a7bf318b4bab14f316ae53145f415b5abb637205eeedb72f5847d43b76ea5e77485c56e4eaa3d90b850ee4bb18b6d0e42422f94ea0a9f12559263e02 SHA512 72388b596151499850546a68d9a20d82434c59f159564fb7170980f110d43d7026f174f93660d3bb6da79b618fd7d4f1f16246fc80ba568aa555df99ebbaea21
 DIST nss-cacert-class1-class3.patch 22950 SHA256 6bba29cee34276e2ca6436dabedfeba2b61fb46668c5d5ceabf0c871574649bf SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0 WHIRLPOOL 1246223b01292604e5609bb9c580f092dc5937bf8c98f6891b099e8bab960e03612b6617e30a55d6ff8817d88f190e03812fe8f89f84f25c20970493dc2f7700
 EBUILD ca-certificates-20161130.3.30-r1.ebuild 5957 BLAKE2B 62d319e8e5a91e087692455ea9b0ae3428fe32cf68a3194112599adb2fe1782754950708f22463caf848bde08d8d5b535ac6e7ba306b1418cc47271a514569cd SHA512 9daed98f9c1b864f6fb5aaa9172820ca660f0c794b9a68a82dd90979630c7f0d66682fd27896d679fcdfcd0048fbac77ce25b133db65f0e03c73628276649477
 EBUILD ca-certificates-20161130.3.30.2.ebuild 6252 BLAKE2B 3e5d62119ca0abbea3c0995a7a4bc1209798f45d87317481850ce69b84180d712f52e2dad29a4d1f7d8e4903ef59e61d1bb59a24fd6c4b8c4ff309049d7b535a SHA512 103c83cbd4275f17581a8d85c53c907373d737ba5c86b389ae986b3692d8559f6da1cea9c47678164a0fed7ba20970c15c91db6c2277f5903066d29ed2aa9aca
 EBUILD ca-certificates-20170717.3.32.1.ebuild 6278 BLAKE2B 737296804f2fcbda2a4cdd54cefd52d04021a1c01be664803e7ad8d4d2e46e6dedebcde6819dfe3215f9111062a1890c29ee9322fbc5274603b66ab11fe33c40 SHA512 394207e7ac8970d6b0724ec1bb3d7c233724d4c2f9a05a8c7a475b2d40e08483e940ad185ca6eea023c5d6bff6868b0aa10c4f642eccb6238ffa71ef9505df94
-EBUILD ca-certificates-20170717.3.33.ebuild 6278 BLAKE2B 737296804f2fcbda2a4cdd54cefd52d04021a1c01be664803e7ad8d4d2e46e6dedebcde6819dfe3215f9111062a1890c29ee9322fbc5274603b66ab11fe33c40 SHA512 394207e7ac8970d6b0724ec1bb3d7c233724d4c2f9a05a8c7a475b2d40e08483e940ad185ca6eea023c5d6bff6868b0aa10c4f642eccb6238ffa71ef9505df94
+EBUILD ca-certificates-20170717.3.34.1.ebuild 6278 BLAKE2B 737296804f2fcbda2a4cdd54cefd52d04021a1c01be664803e7ad8d4d2e46e6dedebcde6819dfe3215f9111062a1890c29ee9322fbc5274603b66ab11fe33c40 SHA512 394207e7ac8970d6b0724ec1bb3d7c233724d4c2f9a05a8c7a475b2d40e08483e940ad185ca6eea023c5d6bff6868b0aa10c4f642eccb6238ffa71ef9505df94
 EBUILD ca-certificates-20170717.3.34.ebuild 6278 BLAKE2B 737296804f2fcbda2a4cdd54cefd52d04021a1c01be664803e7ad8d4d2e46e6dedebcde6819dfe3215f9111062a1890c29ee9322fbc5274603b66ab11fe33c40 SHA512 394207e7ac8970d6b0724ec1bb3d7c233724d4c2f9a05a8c7a475b2d40e08483e940ad185ca6eea023c5d6bff6868b0aa10c4f642eccb6238ffa71ef9505df94
 MISC metadata.xml 538 BLAKE2B 20dd319e6f583b4b6b93fdfc7fb965c54c7b92426715cf287611ea58ed5040ffac4afa77df2e6464a387c120a8d80d508c6e997c820eae9395ba859b13c5702e SHA512 f2779da4ea4b24e196b64d6e4c94d47e426d431508db58355a08ca420498cbbe2f322c5f8dc6e132b612baf03ee6bb1561beade226bd2f71d6afa160064d7a7c
diff --git a/app-misc/ca-certificates/ca-certificates-20170717.3.33.ebuild b/app-misc/ca-certificates/ca-certificates-20170717.3.34.1.ebuild
index 7778372001e5..7778372001e5 100644
--- a/app-misc/ca-certificates/ca-certificates-20170717.3.33.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20170717.3.34.1.ebuild
diff --git a/app-misc/color/Manifest b/app-misc/color/Manifest
index d3bbb6adc705..ab49da40a325 100644
--- a/app-misc/color/Manifest
+++ b/app-misc/color/Manifest
@@ -1,5 +1,5 @@
 AUX 1.2-ldflags.patch 404 BLAKE2B e07b9c473e8b673d11c3837c6759c5beacc58fcf81ed1b9f0804d614fedc524983c237eb83be33182a384997f666842af554a950d26d8e7106f109ab5beee6b1 SHA512 44c774102cf9800b38d0831be640758a802cb2fdc2949036617ee23a47565944d514ecbee6532d2f426c766aef48814f362f7e0cb27ce8b280295af106426380
 DIST color-1.2.tar.gz 10040 SHA256 7862fffb3d948b47435803461732f7dea4af64c2714219df7f929e20cb818bd9 SHA512 58f7d379bca3352b2e39eab83d2fa5891df86c45722541eb810becce813c8e866f28b856ed244a75b173f0dab5dbdc84ceb91d96175dcd2484e29abb98ba87ac WHIRLPOOL 9fbde967107e278ef2a65418cce3011bf4c7ab78b6a2d620e83d2524362b1456edd45479c9dc4308a5a69c0721f90bb061842589086297afce0652250890b5ae
 EBUILD color-1.2-r1.ebuild 928 BLAKE2B 0eea3419323e7fd5ce411d681d385d9f45e1b73363b5620b31cc9a0ee63014ce68e998dcd61546c28f9e0cf25b01c8905b487de65c2690af1ed0f9e7100778b2 SHA512 7f0243170bcc20ee29f9cde198a2e8c77fb46b2a1b22f0e32bdfc0f1046671773ca8ebb87927f5ba1bce8688bee879e490a69de2dfeb58fa4586a630e688b403
-EBUILD color-1.2-r2.ebuild 904 BLAKE2B 5f7e4d062a7d0fb73713a30538da472402df9c55dab7fb7c8c76240d57741cc6a04ae9bb0a9d48ebc913285849323dbfc825bd1202b83574d888f71f685dd4ef SHA512 347e20ac710a05c48388e24793d609834b724306fc1987ee820b266a296fb6fb311e39cd67f5f4fd205658de7023b7e93d4b0e3bc40555865ed4c5e7ed55311a
+EBUILD color-1.2-r2.ebuild 902 BLAKE2B 99fae86473406f787455d81c437203d1c58af11b4607d9dbcdbb0f5153f75e7f2ea3e2a24f583335fc34fd65c0f03851b2431a5cac3a0e1ed9f1fe5b5a1f8501 SHA512 f57c80af2ac61574cba8ca07c92ac89340a3f55c41aba7d6afb26b78608edca8fa10f6979b09ae3a7a2eef6dbd94bf5c92395c50d3632af9c005178bccb87c95
 MISC metadata.xml 588 BLAKE2B a751663c366701d7dccc560ea5e3961c5a2c428d98c341b8b74267c5bb1369c200fcf8c8f5c9d88fcd17ef072c3d98994501be12ff35445cb2c9397a44ec901f SHA512 eb169977c0c6512fc4a6bdd31083a0175bc2c5688f6eafc36807dd82494e2bea9dd263f3c2982ac059f50589cbcfbaf03b1e49eff20f7fc99c1f1b76c5f0fae6
diff --git a/app-misc/color/color-1.2-r2.ebuild b/app-misc/color/color-1.2-r2.ebuild
index 517b35761d3d..b3f616067c72 100644
--- a/app-misc/color/color-1.2-r2.ebuild
+++ b/app-misc/color/color-1.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://runslinux.net/projects/color/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/app-misc/colordiff/Manifest b/app-misc/colordiff/Manifest
index 577b123ea729..e37fcf4063e2 100644
--- a/app-misc/colordiff/Manifest
+++ b/app-misc/colordiff/Manifest
@@ -1,5 +1,3 @@
-DIST colordiff-1.0.16.tar.gz 21542 SHA256 eaf1cfe17dd0e820d38a0b24b0a402eba68b32e9bf9e7791ca2d1831029f138b SHA512 41b4eb0c90b19f358b6d9154158ece51fe5169fc24e2ea9a4c50ac98218a173fc054b76a69e3c63967f98a0e5d50b7eb29b706780bcfbb3f17a4f45cce1d6d4a WHIRLPOOL 26e9fd2e005a03053cc4c63aaa63f0bfae8d19efc834f77592e6b33d1490c1adf5c771637b2db74fbe5c66d323dd853ac06a1fa1dd6076a948cb1e7ad51df68e
 DIST colordiff-1.0.18.tar.gz 21695 SHA256 29cfecd8854d6e19c96182ee13706b84622d7b256077df19fbd6a5452c30d6e0 SHA512 53eb855b2554ca736146983adb522c8c06e4cfb9eb27bf9acb659c210b2af8101dba76ae392cf14db62fab61e3e5d3b664196c0f6432d47acdfa0846c799aa83 WHIRLPOOL 08aca61054644346a6bd0335a4f76c80a922a2ff92aa0d4a0be11b4b7905425788f52f0337a13e098a630b111365f2f105fa983490d69d1826e6660b4c5f606d
-EBUILD colordiff-1.0.16.ebuild 943 BLAKE2B 3043059de97d655319cc229153c46d924db7b542691f2a6549c0efb19979a39dcc2929caf5c4e2e7959cc6e3fbbc9e13d5aa70bb27b51cca34311e8bcb022570 SHA512 98e930c983abeaf8c4b279e6b0eb4283c09defa7ae4adf72e1b7f05b501faa2dd704d30e14921a1f91a91e0ea5d59dc5883d2cb7fded677a233049547938a9ce
-EBUILD colordiff-1.0.18.ebuild 962 BLAKE2B f1dd81dfb04d1a3d56374820508daee35859fa6fb2c23bd6f19b5fb01400844cf95bf95ac1fc89f76ef70ff34385ea03a885e622502ab1f757224e68c32d92c0 SHA512 82c884f074943ab4ad42c4b18cf69beb6f465144fc2eb91cda3827e12d1cd5e440be29d329777679199cbf831531d2399ef0151af315d57c28300085585f6f61
+EBUILD colordiff-1.0.18.ebuild 945 BLAKE2B 8d0c4b761db587cd21b3a13f0bc6752b14e8735717516b8efbec3d597303fa256f1a29332f8417b963e338a7b9e81d66c80d917bc2b925f2124be5e1ff618972 SHA512 4fb0ab76847d1e6808ade60e8441d9ed237c97b78b3d68c30ab7d827ae1d3d5f759b5a17e681231d5aec653754263afb535c44e018013cc69c991874fbea08cb
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/colordiff/colordiff-1.0.16.ebuild b/app-misc/colordiff/colordiff-1.0.16.ebuild
deleted file mode 100644
index c789f0c661b5..000000000000
--- a/app-misc/colordiff/colordiff-1.0.16.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit prefix
-
-DESCRIPTION="Colorizes output of diff"
-HOMEPAGE="http://www.colordiff.org/"
-SRC_URI="http://www.colordiff.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	dev-lang/perl
-	sys-apps/diffutils"
-
-src_prepare() {
-	# set proper etcdir for Gentoo Prefix
-	sed \
-		-e "s:'/etc:'@GENTOO_PORTAGE_EPREFIX@/etc:" \
-		-i "${S}/colordiff.pl" || die "sed etcdir failed"
-	eprefixify "${S}"/colordiff.pl
-}
-
-# This package has a makefile, but we don't want to run it
-src_compile() { :; }
-
-src_install() {
-	newbin ${PN}{.pl,}
-	dobin cdiff.sh
-	insinto /etc
-	doins colordiffrc{,-lightbg,-gitdiff}
-	dodoc BUGS CHANGES README
-	doman {cdiff,colordiff}.1
-}
diff --git a/app-misc/colordiff/colordiff-1.0.18.ebuild b/app-misc/colordiff/colordiff-1.0.18.ebuild
index 4088935eb660..3eecc9a04481 100644
--- a/app-misc/colordiff/colordiff-1.0.18.ebuild
+++ b/app-misc/colordiff/colordiff-1.0.18.ebuild
@@ -11,8 +11,7 @@ SRC_URI="http://www.colordiff.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/app-misc/khal/Manifest b/app-misc/khal/Manifest
index f97324929d83..86b857689bb2 100644
--- a/app-misc/khal/Manifest
+++ b/app-misc/khal/Manifest
@@ -1,15 +1,3 @@
-DIST khal-0.8.4.tar.gz 129251 SHA256 2e5c41eadf83c8f175dc05816571e747da921b025e4acc6b287c109b6e237e0f SHA512 8a1066f137db1b3a9c2cc246ea17baf6745efd3db9dadacb76b287546137da363bcd78a4ac2acd2c659fbf25f16b155cc993099067a736ef3b68b2e8512d7b83 WHIRLPOOL 094c9ec2a0343d557ba70956239d5fa719d9fd08c7038d542b173f18ebce30b11761ac2e09780381fb55a9942cb885fd63b46d6c32573c94ed52990f34841e7b
-DIST khal-0.9.0.tar.gz 158220 SHA256 b9aa992a8ed1a5d816eeeff79256ad7edea591acdf16ae30e65bfdc3adef0f8d SHA512 f457d6cbd323f65c2185776b8c8ed67268820ee4c06c845f3640dfc085a5528b19c855ada670d397a74d6c0785b7abeb90247528cbc826b39b51284917577acd WHIRLPOOL 4f003e39735917a7dec13f4aaffb851755e0d1f2c2d007111a4766622dfc900cece0c0dd38d5735d145ba36855639c08d1db3c3a7e5e9da5d428e23c469fc600
-DIST khal-0.9.3.tar.gz 165182 SHA256 d4d748ae09fd0069124bf28ca61db1b1fbc3e8e95e2f23e597e28e2e38336ac7 SHA512 38f9c059eb8ebaacd40d4d5e276f8e42ea0bcc5237b46647974601458fc8576ec8920873cc90c002a8e101b2383028d60a2e74dbfb601acd9c0770ada2c63b65 WHIRLPOOL 8461b39508fb3b5bd2a0532dd71507334852b71492688f0dabcf76b9d70cf8f29e831a36d38028340c1fa1853dda4c1eda706559e8ee6dfb9ecdc112363b5002
-DIST khal-0.9.4.tar.gz 169530 SHA256 21aa1ac464383a515be9f18d6b06413d17116ef9353d5349211c540c4bd7996e SHA512 a17643dc998b3414bb62d2fd2fd42a364dd5344eeb54be9cb310df8da952e06add41669d65d61b550385bc94bccff4382fca78e4cdcf71a202b8abe5c394d394 WHIRLPOOL 4ca55e0b5cdde8cde0b85d45b1b3936bd3f0b39bce127d9d59e2c442b37d93a520b83b523506579f4ebbccacd6bc26698ab4cd2de9330e872ed01c006f54d47a
-DIST khal-0.9.5.tar.gz 170011 SHA256 b945894cb4ededa6711989814bd4866815f322aa25dff581d808a7eae5047b3b SHA512 8dae0989a7351a4148e9f6e52e8b69d1b46c7e5465233d5e389db5a20c9da6349da11f0119df7536b01c620a30cb43805cfcedaa32d563a592a337b0faf56946 WHIRLPOOL c98a2a7e7c03654c3b2bac0ba80104b61b8ef1ae8db6e41c8662a75470b7044d9ccfe6a01c702e65b79db645583793deed4fa4f6e65297f0b9079477159d6eb8
-DIST khal-0.9.6.tar.gz 169539 SHA256 6ec7ce0202764839521f47805e10ac1f54e9adfae3f82e7c1e67ad88eefd6772 SHA512 3d8299d714fcf64d4790d270238acfc9250bfabce2182f49922e51004bce33509853ed6889e9eb694ee2f8f3357b1a175b2cec29ec135cf7fc8bacf237bbcc11 WHIRLPOOL 0bce1dca6f0a7fab0cd0399a9bbd020d8c77d30991181ba6856a46905295e6d68889149c171bfebd7c119a490a7154a3bc13820e072d754b7e0f65c83c523f75
 DIST khal-0.9.7.tar.gz 173401 SHA256 bbdacd99e725a21e35c5baf335261bf40528735bda6499c509ebbde39c303774 SHA512 24fd1ee472971f029f998b061da719a0dfe4ee9584a5ea237b6cf0c886b5c45d7a7ee4bf9c23c41eb0dd0c5eba0bcabed7a5f05ae486a890150429031e215180 WHIRLPOOL 7fa7125c169bc45ea4a9d638fd916698c9f4a7b792c8695020e7b82c593b8af3583546c11fb519cd3cd470caeaf21bda59ee9782e7d4bbb74e6710a7b0e63009
-EBUILD khal-0.8.4.ebuild 1151 BLAKE2B 2a1642fd946f58d0f4bc3feed2b6670d62ae071120c6c616faacb22ff71e614af5e4c5dad7e912c4b53820001c1e93bb147ed7c82c8586cda58276bcda9d1542 SHA512 a5d52e25b3ceb769d8b7a3a0ab288614d0a82233e952a74636dd4b0a070752e62349d544059c5d0a9d0aebfbd94bec39cd8d36281d7e826329c94d52e4f5d814
-EBUILD khal-0.9.0.ebuild 1153 BLAKE2B 7c9db1d85ef5a00974d0c8d490cb04ef442fd5d4f114f712799857ed5c2ae0a5eda10418f45382cd9190051fe70d7d9ac06783bd8d2728fc38c162880486d048 SHA512 91d0cfc7b312a591a14d376990cb110adcda9f147395bd7826699c8355acf0f4d537ce157e3d2f4f908cfb4413285145789e0a98b1d2fc8e385293d593e9facf
-EBUILD khal-0.9.3.ebuild 1157 BLAKE2B d63160fc56c3412907a1d6ae009a9739c8811bdb2ee4badbdf6bf7ff21635a5264e12137b570b8f1f783dd360d9389ccae6a8a5b7d4dddad8f121eeed7e5dd98 SHA512 f4d62e00c1e6af9d40684a5c979f8055b1519754092f7e7ac13b58b7dd12b5f53341b879b83ecc03557bd363640f905832c0bb921c3e98001c6340401487e2cd
-EBUILD khal-0.9.4.ebuild 1159 BLAKE2B ec566a44899ad3cbb4379922f53a8580af67101778805d4d2430ab04317a4e7789ab203d3c76417ad63022202451bfa670871910e2b73e3b993c48ba6afa9a40 SHA512 25edba1f75d1fc43065e23bcac10799dad769129575468097962cfaf24e1e4d2b7e72db4f8b0b2dc815736877ecae2dfb2a56391d1b1d337cf229506218c7f8d
-EBUILD khal-0.9.5.ebuild 1159 BLAKE2B ec566a44899ad3cbb4379922f53a8580af67101778805d4d2430ab04317a4e7789ab203d3c76417ad63022202451bfa670871910e2b73e3b993c48ba6afa9a40 SHA512 25edba1f75d1fc43065e23bcac10799dad769129575468097962cfaf24e1e4d2b7e72db4f8b0b2dc815736877ecae2dfb2a56391d1b1d337cf229506218c7f8d
-EBUILD khal-0.9.6.ebuild 1207 BLAKE2B d7cfe30f0bc7bddab804832f705d4e71ad800886a98a9dc0fc2b6db98bbda40cd49a150cce0081d40ff69ad270eafd9ffe29e4c9f1a3858c92baa2e6187dbf21 SHA512 d7ca15a1a4003b4da7ae77e8917c5746b55c35c4286bdf82dbd8acf14ed0c468151466d5f279d4a4b5b066a48d9f6b48ec5f53bc7f109bf825184e9e53b62166
 EBUILD khal-0.9.7.ebuild 1207 BLAKE2B d7cfe30f0bc7bddab804832f705d4e71ad800886a98a9dc0fc2b6db98bbda40cd49a150cce0081d40ff69ad270eafd9ffe29e4c9f1a3858c92baa2e6187dbf21 SHA512 d7ca15a1a4003b4da7ae77e8917c5746b55c35c4286bdf82dbd8acf14ed0c468151466d5f279d4a4b5b066a48d9f6b48ec5f53bc7f109bf825184e9e53b62166
 MISC metadata.xml 284 BLAKE2B 4707a8b6986fae8507e28c42ab61a8cad2b420743fccb5cbfa1bd28b1b4cd507903a3dc59e82411309ae03cf94f10a393a24e94627a15c9698ad26ead19d3db6 SHA512 f820693ee6476d881b86783e810e6be3ad1df41f35dc1c30d03f44551ae71b1e5a99a1aa5f8543ffa15a0a5a1e420193c57d6ef4b88fa98257bf0d4f2fab5934
diff --git a/app-misc/khal/khal-0.8.4.ebuild b/app-misc/khal/khal-0.8.4.ebuild
deleted file mode 100644
index 48d27253bc4b..000000000000
--- a/app-misc/khal/khal-0.8.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_4 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="A CalDAV based calendar"
-HOMEPAGE="http://lostpackets.de/khal/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="zsh-completion"
-
-RDEPEND=">=dev-python/click-3.2[${PYTHON_USEDEP}]
-	dev-python/icalendar[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/vdirsyncer[${PYTHON_USEDEP}]
-	dev-python/pkginfo[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/tzlocal-1.0[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	zsh-completion? ( app-shells/zsh )"
-
-DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.txt README.rst khal.conf.sample )
-
-src_install() {
-	distutils-r1_src_install
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins misc/__khal
-	fi
-}
diff --git a/app-misc/khal/khal-0.9.0.ebuild b/app-misc/khal/khal-0.9.0.ebuild
deleted file mode 100644
index 362f618a8b89..000000000000
--- a/app-misc/khal/khal-0.9.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_4 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="A CalDAV based calendar"
-HOMEPAGE="http://lostpackets.de/khal/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="zsh-completion"
-
-RDEPEND=">=dev-python/click-3.2[${PYTHON_USEDEP}]
-	dev-python/icalendar[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/tzlocal-1.0[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	zsh-completion? ( app-shells/zsh )"
-
-DEPEND=">dev-python/setuptools_scm-1.12.0[${PYTHON_USEDEP}]
-	dev-python/freezegun"
-
-DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.rst README.rst khal.conf.sample )
-
-src_install() {
-	distutils-r1_src_install
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins misc/__khal
-	fi
-}
diff --git a/app-misc/khal/khal-0.9.3.ebuild b/app-misc/khal/khal-0.9.3.ebuild
deleted file mode 100644
index b8b06ecf587f..000000000000
--- a/app-misc/khal/khal-0.9.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{4,6} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="A CalDAV based calendar"
-HOMEPAGE="http://lostpackets.de/khal/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="zsh-completion"
-
-RDEPEND=">=dev-python/click-3.2[${PYTHON_USEDEP}]
-	dev-python/icalendar[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/tzlocal-1.0[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	zsh-completion? ( app-shells/zsh )"
-
-DEPEND=">dev-python/setuptools_scm-1.12.0[${PYTHON_USEDEP}]
-	dev-python/freezegun"
-
-DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.rst README.rst khal.conf.sample )
-
-src_install() {
-	distutils-r1_src_install
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins misc/__khal
-	fi
-}
diff --git a/app-misc/khal/khal-0.9.4.ebuild b/app-misc/khal/khal-0.9.4.ebuild
deleted file mode 100644
index cb6d7212337f..000000000000
--- a/app-misc/khal/khal-0.9.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="A CalDAV based calendar"
-HOMEPAGE="http://lostpackets.de/khal/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="zsh-completion"
-
-RDEPEND=">=dev-python/click-3.2[${PYTHON_USEDEP}]
-	dev-python/icalendar[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/tzlocal-1.0[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	zsh-completion? ( app-shells/zsh )"
-
-DEPEND=">dev-python/setuptools_scm-1.12.0[${PYTHON_USEDEP}]
-	dev-python/freezegun"
-
-DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.rst README.rst khal.conf.sample )
-
-src_install() {
-	distutils-r1_src_install
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins misc/__khal
-	fi
-}
diff --git a/app-misc/khal/khal-0.9.5.ebuild b/app-misc/khal/khal-0.9.5.ebuild
deleted file mode 100644
index cb6d7212337f..000000000000
--- a/app-misc/khal/khal-0.9.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="A CalDAV based calendar"
-HOMEPAGE="http://lostpackets.de/khal/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="zsh-completion"
-
-RDEPEND=">=dev-python/click-3.2[${PYTHON_USEDEP}]
-	dev-python/icalendar[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/tzlocal-1.0[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	zsh-completion? ( app-shells/zsh )"
-
-DEPEND=">dev-python/setuptools_scm-1.12.0[${PYTHON_USEDEP}]
-	dev-python/freezegun"
-
-DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.rst README.rst khal.conf.sample )
-
-src_install() {
-	distutils-r1_src_install
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins misc/__khal
-	fi
-}
diff --git a/app-misc/khal/khal-0.9.6.ebuild b/app-misc/khal/khal-0.9.6.ebuild
deleted file mode 100644
index 794c616f1a86..000000000000
--- a/app-misc/khal/khal-0.9.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="A CalDAV based calendar"
-HOMEPAGE="http://lostpackets.de/khal/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="zsh-completion"
-
-RDEPEND=">=dev-python/click-3.2[${PYTHON_USEDEP}]
-	>=dev-python/click-log-0.1.3[${PYTHON_USEDEP}]
-	dev-python/icalendar[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/tzlocal-1.0[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	zsh-completion? ( app-shells/zsh )"
-
-DEPEND=">dev-python/setuptools_scm-1.12.0[${PYTHON_USEDEP}]
-	dev-python/freezegun"
-
-DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.rst README.rst khal.conf.sample )
-
-src_install() {
-	distutils-r1_src_install
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins misc/__khal
-	fi
-}
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 8cf6263c71ac..0e896bd88aed 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,11 +1,13 @@
 AUX mc-4.8.13-tinfo.patch 1742 BLAKE2B d9428200e62bbffd0cf056bd25b3cec9a3c4b83638f4e72379f8756e62376c61ef3375c9ede50deb52619ead78a39d49280f9a654e0d8877158b6ef4b8117556 SHA512 7714d42ece73fe6f044f5cc0f59ab5c23bedb820122291d1af581f5f7dd94d4410072868205e94419be459ed9769c8ed75dfb8ad5b945c8df820901f756e7c3c
 AUX mc-4.8.16-makedev.patch 901 BLAKE2B 5980e0bc05ce34c6e33ade84bd0dd32816298d34c108cb6b603cb84c5a458f7d50f05c61a584bdda3991a4ae9274068f954ec4ea5a768f51600a32c0e9123f3f SHA512 dcc77b50bb6a23ca7c1ef3f4fd0dec4defd3b46b120d38cbb9737e9a1464cda4e7c972b6d74a50ae41fc6df845feaad6b865f3aecfc1195f6413baff157504a5
 AUX mc-4.8.18-html.patch 969 BLAKE2B dca7823453e5c85471ca2e2f7020920b4da2bc992f5fe238a0f86dd51d7a6486b368ba7cd28da866107631f8e542a70d1ac4dba53ceca836335c328fac638bcd SHA512 d3e97e0d5e5260cf1dfce8700aaf44c2f6998bbc37defe38f4fd18b5a28160d61b51fa8185e5cde257655d088b7b474604e4a7cd570c6982b3e7af5ef95f8cde
-DIST mc-4.8.15.tar.xz 2304812 SHA256 cf4e8f5dfe419830d56ca7e5f2495898e37ebcd05da1e47ff7041446c87fba16 SHA512 b8e05e1bcadcb766a43269a4724e36b77221b004d53783718fe455167693ff029e3e54cde47740d0c0ecd5adacfb3960a8ecce76eeaea234bbbcfd54db3b1760 WHIRLPOOL 6ddf2f5b88825584653a7027d515bfc84caba003408df31b4b8257a3f8c81a179e39a7bb7cc8571976537983f5dac7d6c06ddfbd6142ef0b31639a914f56c0f1
-DIST mc-4.8.18.tar.xz 2462080 SHA256 f7636815c987c1719c4f5de2dcd156a0e7d097b1d10e4466d2bdead343d5bece SHA512 edd81f6ab50ca7bb3582064f6722e490d33ae9dfbef3835e26206089d3898420968da394780c594083fa17c01a85cda9068d9931199b8319bf6361f90e900eb8 WHIRLPOOL dd0c1cdfe93468ebc399b270d693751bc7c0665cb49040d9409c3a336c953be0d304c463b8c8a0a26e42c720c116a4b4bd9b930caa2f2101298e01c4ac5c6237
-DIST mc-4.8.19.tar.xz 2521808 SHA256 eb9e56bbb5b2893601d100d0e0293983049b302c5ab61bfb544ad0ee2cc1f2df SHA512 aec49f0da1fc69099ce9b0f71926d1e9ee6df0be12f53da94a8f5f4266612515031cd02f328a458bf78260c5efb1c8ca2c34c89e20a77567c8b987e43d446531 WHIRLPOOL 21c57a2717c58488cc7aa5ba5159b9231e09181059662f392a5212a17aa5475493793d49b99e73ebe74d9594201a84cfc63c3a460654579b7399cc563594ab7a
+DIST mc-4.8.15.tar.xz 2304812 BLAKE2B 33d8055316b4ae9d8b2385c3a439339fa635e3f145c9599ce937c596c6ae18225451568a2387074af8d9afc702a0ec8528e07b00b7805dd86af459612d7fd187 SHA512 b8e05e1bcadcb766a43269a4724e36b77221b004d53783718fe455167693ff029e3e54cde47740d0c0ecd5adacfb3960a8ecce76eeaea234bbbcfd54db3b1760
+DIST mc-4.8.18.tar.xz 2462080 BLAKE2B 10cd93cea439290922c0dc19e85b6c9456ce4266f35eeecbf2f40d99e3aae64465d9c427fa01d7d2c542e8bae9d2926e8ce42766c4c1656373905c3d871d71c0 SHA512 edd81f6ab50ca7bb3582064f6722e490d33ae9dfbef3835e26206089d3898420968da394780c594083fa17c01a85cda9068d9931199b8319bf6361f90e900eb8
+DIST mc-4.8.19.tar.xz 2521808 BLAKE2B b4712d833e8562b0f760b4558533ac338cf8875dc9034cbec2160444bbe3e9f4dc7fcec16835cabdd5cde6b02a7020162b3cd1693863775ee3494c9b4659a7aa SHA512 aec49f0da1fc69099ce9b0f71926d1e9ee6df0be12f53da94a8f5f4266612515031cd02f328a458bf78260c5efb1c8ca2c34c89e20a77567c8b987e43d446531
+DIST mc-4.8.20.tar.xz 2529580 BLAKE2B 14e575b650d28e0dcaa8ef0dc0b8e9bbf3e840ddc3d34d20518d28a6b253a8769c041c29ef7136c5fb72bd6130b0fc6c367dab8e44e040ef6dfd5406c364b86c SHA512 c2460561ae94bed75b1ed12f5c8039c9f8ace4c06987c57d07b8399c4e01c5a6c57851fddb3e918a4541ade089c89e8526078572a09580ccd0ae95344e3c1138
 EBUILD mc-4.8.15.ebuild 2602 BLAKE2B 3b279bf633a0299e11a4ff247c02e4293fb6a221c2009e149136ecda8b03cd1d9433ea8dcd1a3194e61e5380c81b905072f7c3e1688920e4dc57ceb3c270d41f SHA512 906e1842f664cff03939a0fed27aaa447abf92553916bedcdbe7c23aa65f704c2538ca5be666086dbe2ce3204bbdfc87854346f3894293ccef8ef5d8a2ae6e7f
 EBUILD mc-4.8.18-r1.ebuild 2466 BLAKE2B 97822d672464a1956119a1f44c9fb9bfebf39573ff944c70d0a3ce053efa7965fe00418b90352fa9937fafc228f3854eae09fbac27f3e8561be379583c3abeaf SHA512 3bea1c8e2c8aa1e882ccfde6619dff042939290de9075ed111360925a78d6e631bfde6cc47d60bb6e1b287826fe6cc0483201ee317a3698894c3a900fd6af505
 EBUILD mc-4.8.19.ebuild 2722 BLAKE2B fb279a01c7d86133d64f50fe330d7e94e321b9aabbac51583412d49fe2fbe6b5f826bbb2381f1212760e846c05fae2eeccc0e56928491143e0680fa996fce597 SHA512 8c88c706cbed51a95ef9c2577b7dad338c187db961c7365616d4085b856d3b45035251efa86746c48232f02ed83ffe9c8fa24a629463968dd26847e1c019f353
+EBUILD mc-4.8.20.ebuild 2443 BLAKE2B 501f3dbc62c1240f96ab39fd8888d50b6b1d28fe92f7714c059ef00024c9aaeb6ff99d3779e34fdc06e22f32e1c9a33354a224803063d8bf9fc972a09d43c785 SHA512 543f234ea9221f28063fc88677e2035de99661605c78aab88ba60bcd175930529dce4191f52e2edcb9fba56aaedc59ecc1322572fa546e4ba222f3ea3bc25e09
 EBUILD mc-9999.ebuild 2585 BLAKE2B c226f71fd8a9ea6abfa2c0b3cf9c731f1271e64d257d34797635738cf634b9159c693ef312cfcbda43f0aa2207b79bbb0d2071f41c3393372da44c547c6fcdd3 SHA512 bab03c4a246785495ff69deaba2c97268ec95449b5887a941dbc54513d0f00d193fec63c26a69f1d95c45612a81c5c8818f12dcf0b0ede5f4e7afa81595d6d91
 MISC metadata.xml 994 BLAKE2B 59d3e1c9bc8bcaf74ef8f646f1067a07127a70825bb2651e7bee1628e93131769caf1c7251b6aecd4ed35707984b95c928fcf5563b3e2ba6997c090ea08ea0b4 SHA512 8e36834754b8335c133eb3693d17d02a0c6c3c7d25263857558cf290922b8e7508bf90c609e09ebbfaed54eecc2179936ded60c2b723cc0abc6722db180cc3ed
diff --git a/app-misc/mc/mc-4.8.20.ebuild b/app-misc/mc/mc-4.8.20.ebuild
new file mode 100644
index 000000000000..cb720f326c5f
--- /dev/null
+++ b/app-misc/mc/mc-4.8.20.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic
+
+MY_P=${P/_/-}
+
+DESCRIPTION="GNU Midnight Commander is a text based file manager"
+HOMEPAGE="https://www.midnight-commander.org"
+SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
+
+REQUIRED_USE="spell? ( edit )"
+
+RDEPEND=">=dev-libs/glib-2.26.0:2
+	gpm? ( sys-libs/gpm )
+	kernel_linux? ( sys-fs/e2fsprogs )
+	samba? ( net-fs/samba )
+	sftp? ( net-libs/libssh2 )
+	slang? ( >=sys-libs/slang-2 )
+	!slang? ( sys-libs/ncurses:0= )
+	spell? ( app-text/aspell )
+	X? ( x11-libs/libX11
+		x11-libs/libICE
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( dev-libs/check )
+	"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.8.13-tinfo.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	[[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myscreen=ncurses
+	use slang && myscreen=slang
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
+
+	local homedir=".mc"
+	use xdg && homedir="XDG"
+
+	econf \
+		--disable-silent-rules \
+		--disable-dependency-tracking \
+		$(use_enable nls) \
+		--enable-vfs \
+		$(use_enable kernel_linux vfs-undelfs) \
+		--enable-charset \
+		$(use_with X x) \
+		$(use_enable samba vfs-smb) \
+		$(use_enable sftp vfs-sftp) \
+		$(use_enable spell aspell) \
+		$(use_with gpm gpm-mouse) \
+		--with-screen=${myscreen} \
+		$(use_with edit internal-edit) \
+		$(use_enable mclib) \
+		$(use_enable test tests) \
+		--with-homedir=${homedir}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS README NEWS
+
+	# fix bug #334383
+	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
+		fowners root:tty /usr/libexec/mc/cons.saver
+		fperms g+s /usr/libexec/mc/cons.saver
+	fi
+
+	if ! use xdg ; then
+		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
+			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
+	fi
+}
+
+pkg_postinst() {
+	elog "To enable exiting to latest working directory,"
+	elog "put this into your ~/.bashrc:"
+	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
+}
diff --git a/app-misc/recoll/Manifest b/app-misc/recoll/Manifest
index 5e6c7f6404db..b1d60a8400aa 100644
--- a/app-misc/recoll/Manifest
+++ b/app-misc/recoll/Manifest
@@ -3,5 +3,5 @@ DIST recoll-1.23.2.tar.gz 2546793 SHA256 0e93e6be0dc2225b03a4850887bd29da47a61e0
 DIST recoll-1.23.3.tar.gz 2590148 SHA256 15125871424ef32ac584eb1c3e4fdd4ac7ff32894db60a3ebff32fa7a45d2eb6 SHA512 bfad118dd9561c8d18e194b11d8014e2f9ea74f6aaf50f91704087775e6f72d5f3574a3eafe470dab7658cb4a7233817a672af939f21b3e69c719e599bc5cd06 WHIRLPOOL fe006f4bf53a83375c146cd0f162e030bcd59bbf8b931c428f9a697cb4d6af1ac873ecfd8d596b2b5e00d2374c4431dea7c1169091457a616894ce4417ac87cb
 EBUILD recoll-1.22.4.ebuild 3717 BLAKE2B 8acbaf174f41c67127452cfc12258fce94be6e1fc3c431ccf8d122cfbb073071d19da7c11749d0a9d6dfde89ebb2d64b5e7ffd44e14ed8d1d7240b0037466f4c SHA512 9984c5feec2ab7110d32804ed5dcf7af5fd2b26e5589fd934a86628b46d155ca74b6c75e8ab82823d18ab0c9e3b82d13a187322043aa7ff5d9cc5e09731aadb0
 EBUILD recoll-1.23.2.ebuild 3700 BLAKE2B 547512bb096eba4cc5a088fa08502238485c6eea3b7811ce68702a268601b719ff78703f948c4e82027cabbe8df7a9770b2fbab9599c7bce5e916e3ad7eec325 SHA512 1f2c012f168607cfc18cafc6230b2ed291ff3fa814d458592b0c32360e52577223e73f0e17be329bce7f44743d26100b9ab61217072de24bd9edf077b28a22f4
-EBUILD recoll-1.23.3.ebuild 3532 BLAKE2B 8fa87d11e34800c32cdeab87089b21d341f27dbe726defdb1b4a83592ffe659e70d5c4266dd52efaddc0e9f165b678f390b6719a85cdd5b020abe72bec049b87 SHA512 d28a2d1d5450b76c4aae35a7170a3b57fa7989e018ff2bcbafac6286dd7687dee3fdb31aad719e523bfbc43898198d5d860c022852e8059c91b9d11b2c866e71
+EBUILD recoll-1.23.3.ebuild 3531 BLAKE2B 520eff7fcf0bc437d6b07dccd9effacbf63fea36de66e81b5228c8adf183fd8ddbbc5cb63007c64818b4406e98e011f3967b13a49b5556875d49036db9fc931f SHA512 809c442e9b173e55d00a5e81a951fb0bba15ae64000e6cfe5901cc98c9338314dcbf9f3cb137a0d6d4b6da211ea9cf43ed78774c908066a0760ade70e8560d9a
 MISC metadata.xml 1204 BLAKE2B a27afe4b6f800a38fa63956a750e4ddcd8ac2e9a785df910f660fce03357a77b37752e405be6d76fad74ce6f90d8564912499f397eb819535859ddc259cbc7a3 SHA512 581c483f1d64131cb7a83e9a899b5286f03cbacc3f011c5fcdb3236b56e2b22e1a0fa880b34bb107874fe03fde7f82767805bb7e2d0aa46367e8d5dca0037ea5
diff --git a/app-misc/recoll/recoll-1.23.3.ebuild b/app-misc/recoll/recoll-1.23.3.ebuild
index 46cc6b8c55e3..2405a51ae16f 100644
--- a/app-misc/recoll/recoll-1.23.3.ebuild
+++ b/app-misc/recoll/recoll-1.23.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.lesbonscomptes.com/recoll/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 IUSE="camelcase doc +inotify qt5 session +spell"
 REQUIRED_USE="session? ( inotify ) ${PYTHON_REQUIRED_USE}"