gentoo resync : 11.02.2018

43 files changed, 416 insertions, 43 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 8321b359c1ff..7e2e09af2158 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/digitemp/Manifest b/app-misc/digitemp/Manifest
index 3a28715f6ad8..0e5d573dca36 100644
--- a/app-misc/digitemp/Manifest
+++ b/app-misc/digitemp/Manifest
@@ -2,4 +2,4 @@ DIST digitemp-3.5.0.tar.gz 267947 BLAKE2B bdd5cd84160d4826205ac74676897b9caa296c
 DIST digitemp-3.7.1.tar.gz 144870 BLAKE2B 5d00197ba0122772d96c3185f430119961d214f50dc07dcd5881e1aa1135283680ff38b4d92736827f5c7644b11930b9418b8467f276e832e40f4228d08d1774 SHA512 e5eaf576b544c61049a358dece7dc96d9793b751ef08645060f3b2c1a2006e2906c3aa3f97de3dab46818290d664d2e784a948b2495b538a200b6d71b03173d2
 EBUILD digitemp-3.5.0-r2.ebuild 1823 BLAKE2B 556ca583bb67c0edbadf30340f1d0c247899b8385d5936d3aa871e1a0574a4d1368fef7ad3f435291926dcf760e4f18750901997a52fe1eab07d073612e43736 SHA512 bc45b25d1e34dbc2a822c5bc2e16dbbdab79935a5c6e37c0b629e3f62a834f0a17c7840468a2eed2ab9956f274b3cf3e8b1527ebc59c8722826d70d4a8cc50c3
 EBUILD digitemp-3.7.1.ebuild 1843 BLAKE2B 8dd13cfdaa899c22cabc3526e1ccb8549a956a4135c7314ac6e96c996b6823e0755a271ea5c341154ccf2ec41c180b7976e69a655225891fa7baab15848d8a9a SHA512 1393cfc7cf65a4d694ec351e532e1414a0b58b71df6dda398a8abbb626735dfdc5575b36a2cfe09d3e21127e2809e9ea0d917872a842fd3cf9b71d6b6c0553c8
-MISC metadata.xml 1112 BLAKE2B 105bc00a553cea98769a134a7123ff7f95deec9dc6ea4514b17e2194bbb8401793db23acd4adc89f53fa2e38f507c3380d5a67d54a6e7e817cefbf849ec6bcf8 SHA512 6a56d338898a9eb1dccc73bcf8155352bd8214287126fe9d3b0d71212f3fa315056299e15072c807d9976160781dabdba5bcaedd5207bf3df7784e77a7f44ff9
+MISC metadata.xml 1064 BLAKE2B c846f4eb15942de9272d16fed022f75f1b1f50e4e67d507daa6714338a90c16d42cc623c99fc4540490519fc96b9ddfaa8541b54c7ba55e28ed1bb0b4af244e1 SHA512 bca72be4a38c9cdbc2a6dfbda09f2be34aa81c66738c2646c5542389a6291b20ac1439f741a0036f9a85d9dcccba52c786a6bf77ab91546c23ea0df3b428b4fc
diff --git a/app-misc/digitemp/metadata.xml b/app-misc/digitemp/metadata.xml
index b6ca52ee6bae..40363e3e4061 100644
--- a/app-misc/digitemp/metadata.xml
+++ b/app-misc/digitemp/metadata.xml
@@ -4,7 +4,6 @@
 	<maintainer type="person">
 		<email>wschlich@gentoo.org</email>
 		<name>Wolfram Schlich</name>
-		<description>Primary maintainer</description>
 	</maintainer>
 	<longdescription>
 DigiTemp is a simple to use program for reading values from 1-wire devices. Its
diff --git a/app-misc/irtrans-irclient/Manifest b/app-misc/irtrans-irclient/Manifest
index 1c5883aaa2f6..d354d93abc38 100644
--- a/app-misc/irtrans-irclient/Manifest
+++ b/app-misc/irtrans-irclient/Manifest
@@ -1,4 +1,4 @@
 DIST irclient-src-6.01.05.tar.gz 69814 BLAKE2B fb8d854fa9c00e57ff5f4002047c1733fb42e95d4055efb2c23bdbe381f901705973f54c155a65ddab1ca134d0c31b5e36eb90784a9e9986bbd5c8a2f4d4775d SHA512 47d76f66ce6422252624dd805fbff042bcd9443f04b656cb2b20267dbf42a57345a0ac5cda0204a44535088a06c1232d2dea6305ad3561c78a7330774c1e998e
 DIST irtrans-irclient-5.11.04-ip_assign-1.patch.bz2 5051 BLAKE2B 79b8fb9249c69e8a868771a288e5f0e7c4d6658d36f97ce1ac0c577dae5c810207780406bb7a87df3392eb795463b9c62c6ce7d99ef349111db99637ee8d2432 SHA512 9be72f7f6fcc24c9bda73cf5dd8a2c112c6cb82e2ef50d40c17b43d7dcb8f11bcf8bc0ebb914046b5429bce1b4936278ade936db6c916384fbd637a300f528cf
 EBUILD irtrans-irclient-6.01.05.ebuild 1647 BLAKE2B 15d5c9cd56c80697b178798212130e406ca19dcdf3e81c4251b885cffcff37eabe2295390997a916a5d663830bc100d242a57f05597d0cf970600340f7337c00 SHA512 a454497e39e36731065ec6d4d2b78fedfbae575357fefedcd21439267964bc2ae483048c80e59c7e7663e7510a9fd8e70e9ad857ee2525fa2d31212656efb447
-MISC metadata.xml 554 BLAKE2B fb32c6a0a88cdfed3f11c3ab0aa124907c2c3bc4a7d221609564caf257acd0b57e405e44b7c4d2f355834862042ef68f16c06b43c5b436ef36d014de9f62fe0b SHA512 cb72292d5ee42b46b1556bdf29717ab8a2ccb060cf091120f380fbdd26b3e2ebfe9b7dad815bcbbc403132e63400b3aa69133760772a593e584f02df4f80dd37
+MISC metadata.xml 460 BLAKE2B 8911eaf34bbdd8c9978c5d89582d1f0765ade9101da2102b02ab55f2f2c93384198c2fe79fcddb3ae8319bb32d0c8c973e69297a7830d7afafc454a7600dc145 SHA512 6067b6d98528ce0e9b0811ae31d949362173c43471d935197d2da5eeee5b4391cbd43b1bfbed8468c187d71c341f1eee247df0bfd3faf963104a67223501f75c
diff --git a/app-misc/irtrans-irclient/metadata.xml b/app-misc/irtrans-irclient/metadata.xml
index 85a9e4b6eb4b..8143f8cf4708 100644
--- a/app-misc/irtrans-irclient/metadata.xml
+++ b/app-misc/irtrans-irclient/metadata.xml
@@ -4,13 +4,10 @@
 <maintainer type="person">
 <email>mario.fetka@gmail.com</email>
 <name>Mario Fetka</name>
-<description>Proxied maintainer</description>
 </maintainer>
-
 <maintainer type="person">
 <email>hd_brummy@gentoo.org</email>
 <name>Joerg Bornkessel</name>
-<description>Proxying maintainer</description>
 </maintainer>
 <maintainer type="project">
 <email>proxy-maint@gentoo.org</email>
diff --git a/app-misc/irtrans-irserver/Manifest b/app-misc/irtrans-irserver/Manifest
index 3742aa56f009..cf8f38340a5d 100644
--- a/app-misc/irtrans-irserver/Manifest
+++ b/app-misc/irtrans-irserver/Manifest
@@ -3,4 +3,4 @@ AUX irtrans-server.initd 564 BLAKE2B 1ef6433ab6866ca5c3947737ec55a1a5bd129456aa3
 DIST irserver-6.09.04.tar.gz 665809 BLAKE2B 1f336e34a3a79490266a762520083c74f79d34b2b8603a9d4b8e29347346c658c1723608627590d39ebb66bebe9886a4052376ade81704db3b2c1cccf229b87e SHA512 d63f8bc79c2a5a8050c5ac21b086be3826f66102dc2f111bf8084b57756c6bcd84615d1675781b26520c34f7a3e08726dbc4ae94dd4f4afc446383597c433399
 DIST irserver-src-6.09.04.tar.gz 200481 BLAKE2B 7eaffd5bb335dfcbe6f0716af57aa898d2cce1a984a2f050081bd71a9c63d5d1e5949fdebdcbbbee05c337141d0efe5c6ebcb937726ff9506a766f69ed8d2f58 SHA512 09c38066e64404808856a89a8451e41a6eb8a51b98635b1515fc07050f25b4552b9cc912bd9612c6746ba67cd9b1bb45f3d4871dfa820c9e9bd810ede20f28d6
 EBUILD irtrans-irserver-6.09.04.ebuild 2006 BLAKE2B 0add7e689507a9288a13fd1e728635c202587a0d9e5c8a03396a338c32b7109d37e862da59afea77745856fdcd8933db4b7a5c4adb563c933d4045ef1134c3fb SHA512 8e9d565c322ef914c68f2dabbadfd7b4b3bc78f72e196e27a75b0d7b348602e2eaf93bcb343ccb7e35c1bd2ecff217eccb42dcb287e0c1ed69fe7350a7e7dcb3
-MISC metadata.xml 638 BLAKE2B 46ddfdacc2501bdb75a926cd7cc6ea6955425cbceb23d9fbf528f01b1bc8f3de46639e3197fb2e445cc4345b2e82429a5ff44f0390d197ca58489c9b17450f24 SHA512 fbc1694404c3e0b52d21ebece17686033cf5c175d746ba397b9b6e2c1af790eb866cfd32312165b442f96cc4b96c1e921f4c245f4e4d8e3014c83998060d19ca
+MISC metadata.xml 540 BLAKE2B 3355962a1d9d6d94c207254ee0f49639ac55cba6504a4ecae2470c0df4d09189c3d00f76c6dffc554d13ebaa6d154040152a3169da166232ef4f2308c968e160 SHA512 9c1297f57d16730eba72da496f870d67aae2cca6a4c49da99e2f6bd4721f13c9208599b2a1a50ed8409ebb26f772a9906c5f9969f6e2f1f262592b0af2fa4b58
diff --git a/app-misc/irtrans-irserver/metadata.xml b/app-misc/irtrans-irserver/metadata.xml
index 54f22d12e4b0..e8fda48bc222 100644
--- a/app-misc/irtrans-irserver/metadata.xml
+++ b/app-misc/irtrans-irserver/metadata.xml
@@ -4,13 +4,11 @@
 	<maintainer type="person">
 		<email>mario.fetka@gmail.com</email>
 		<name>Mario Fetka</name>
-		<description>Proxied maintainer</description>
 	</maintainer>
 	<maintainer type="person">
 		<email>hd_brummy@gentoo.org</email>
 		<name>Joerg Bornkessel</name>
-		<description>Proxying maintainer</description>
-		</maintainer>
+	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/app-misc/khard/Manifest b/app-misc/khard/Manifest
index a4e0cd630769..548f7552e314 100644
--- a/app-misc/khard/Manifest
+++ b/app-misc/khard/Manifest
@@ -1,3 +1,5 @@
 DIST khard-0.11.4.tar.gz 5060159 BLAKE2B 2c176c8bc9651dfd05f3792a66a242eae44b64f9114098916ec8c6e91643c5d57a19f916a0f6e0c559738e1a6c59f88596a54068ba048219a7e4a4d60447a0fe SHA512 f8dda3dd34e529e24276933f5f7354891b8259dfabb8818b4d3898174fb3d8b8a1f24cf81038901e521ef8aeeacec37b45b34c6e4c7eb0022b212a2f476cd9ab
+DIST khard-0.12.2.tar.gz 5064055 BLAKE2B 5dde8d4e535e5eecdbcd679e96db51e6d96cf4ad4c8266acd7fb1c02a89c74e3af8fc3537d7b3febbc1a16578a5208ec608396d36d3f3d4c380cfcc247fb08d4 SHA512 476a90b111e903669a34729bf48f28a4108612f65ed7b85a495d3246461f7b82f378e13e417aba2006cf1bf853245d5466d1bb5eba539b840c9e7b6abfb20c76
 EBUILD khard-0.11.4.ebuild 1046 BLAKE2B e4e57caf5ed87cf291f06b264a9479697fb6f875fb5345d7f294f6d41f095332da2ff77a46a4d811befdd30eb1847d306eec2a62c4119398c434ff8f09c0cf5f SHA512 280bee426b66aff557f7db2553ec6c39a4d9a31fea287ed1e80ec7ca2aaaec334f22fd54a06c080740c6fcc61753ae2115ea6d1bca079f18cb7c7b61b50f2923
+EBUILD khard-0.12.2.ebuild 1091 BLAKE2B 1ca26abe6df8231997245f32b64b4a47366eec81e0acacb7867a41d3e3ce477c10dda779c076ca9fe067a7be0bfd83c23f829224de46e8ad59a51ac6fa83d611 SHA512 d17264b2be3b752c6c25cd132695d364dc8a1ea606a103a2c49de1c9410501933a3dd18bdc1e096df155276330aabde9259be6cd0fa0055731482ed6d0e798e2
 MISC metadata.xml 343 BLAKE2B 1a688d33284f7637df291ff450cf9c22ed072b2c27b23ced515d0aefc17a82a85d7e6bfbaa35c8c80f676306f26abadd1505c782e9c091734cee17a0541ca464 SHA512 44a220e1d5235c955a516289b53ff2728982ac353a237be83b167373a5ea039ed69d275c16144a8a86059a189dbd74be357e0609bd55b97d820fd92b0731b054
diff --git a/app-misc/khard/khard-0.12.2.ebuild b/app-misc/khard/khard-0.12.2.ebuild
new file mode 100644
index 000000000000..16e47a8553ee
--- /dev/null
+++ b/app-misc/khard/khard-0.12.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit distutils-r1
+DESCRIPTION="Console CardDAV client"
+HOMEPAGE="https://github.com/scheibler/khard"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="zsh-completion"
+
+if [ "${PV}" == "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/scheibler/khard"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/atomicwrites[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	>dev-python/vobject-0.9.3[${PYTHON_USEDEP}]
+"
+# vobject-0.9.3 breaks khard, see
+# https://github.com/scheibler/khard/issues/87
+# https://github.com/eventable/vobject/issues/39
+
+DOCS=( AUTHORS CHANGES README.md misc/khard/khard.conf.example )
+
+src_install() {
+	distutils-r1_src_install
+
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		doins misc/zsh/_khard
+	fi
+}
diff --git a/app-misc/linux-logo/Manifest b/app-misc/linux-logo/Manifest
index 992f9cdc619b..cc687ad12173 100644
--- a/app-misc/linux-logo/Manifest
+++ b/app-misc/linux-logo/Manifest
@@ -8,5 +8,5 @@ AUX linux_logo_creator 604 BLAKE2B f2956ddd3cf79488495262040b1756ffbbab5608a4895
 AUX logo-config 195 BLAKE2B 7ed5aa9a16ebcf27c73672bfc2e9256034c3c1b14c1d0d3d172b0292e658850a10c0cc8835e6fce224fd1664a85e6804f6d69c8fda5dffca257e0403eaa1557e SHA512 d58c60821d60d511f637d9abfd996b1420662df3bc5df8ce3ee2b3bd97974b4996a4a57ac18f8fdf5305cca3221244088d28e6d9ae5ee10d6df49f6247806469
 DIST linux_logo-5.11.tar.gz 103623 BLAKE2B 5790bae07a9496a690e0ef2d6426a68365c4ab91df058a31a5bffed38b8f3caac01b80ce49d52583f77632cc5e3061a20a5530437ca3508e823eeb88eb2e94cb SHA512 3c11d59eeb1ea613eb66d3ea5ef2d7c9ef906cb12430b9350570a6a1937ec174bdd974e6227358339c3fd2e0647a5066a0bea22289c4aa9bc8b03afb0033f114
 EBUILD linux-logo-5.11-r3.ebuild 2185 BLAKE2B 3e1bcd4fbacf8b1a3aa2248748c6711aeaf94858fb33f594e74df8f3afb1c9a70279a20e234b9ab56d1556fd66469421594ef2fe41a820aa8b2a93f980ba904a SHA512 6f0250d887fbe33372d34ab32966dcb08ae7fba7c4dfd3d80055b5c5f676c7dcef03b9f604d17d5da3e227a39b613d4d0f191bd5cc05b8ca1831d5382bcbbd76
-EBUILD linux-logo-5.11-r4.ebuild 2265 BLAKE2B 391f663a53b1ecb154a094262952f1442278964d3b6ba970ce341bd5700739c7fe959a6c356e8261a10321cf67cc4b2f86cb7812fe732ceaeaa3fb7fa0c31a11 SHA512 880d1acfedf80af82dcec3a35b1ab2a304a6b37c94a562941bc75fb432ed6dfbac78ea470ff285b48420946ace19d70792ad06d7be906eac2d70384f89117e02
+EBUILD linux-logo-5.11-r4.ebuild 2262 BLAKE2B 5bd9fb9e2f49e1a93dfd7abc82eb335a38997333d9b5405ada909d0779b0de7cacd68bfb05f737db0ea430e13eb449189e5a572b535074b3c05a1468c1590f53 SHA512 8d627e314dc3efd3493fe7b597e5f8cc155820164598040d247c5b0a2c5496576c00fc5af878d23c00f35db5c0cca2e74e31870bcd480c4d98ccd6aa857c7122
 MISC metadata.xml 487 BLAKE2B 25ad355aac4b4da399514cf9045159f13a93b47ddf26fc8bf6a75aa6f4ab5a300b0a11d50df5458b7be57a735005de2ce82292807163c71c448d2a3e092322dc SHA512 bbc83554665f6466c688c8e2fc432c30e26cab8193f70c0cd47965a9f603a2284b0e9c147dd486ead65207133655d31fb4919eecd6bb72079290e46a677a6c5e
diff --git a/app-misc/linux-logo/linux-logo-5.11-r4.ebuild b/app-misc/linux-logo/linux-logo-5.11-r4.ebuild
index 22aa370e8017..41b2d773b41e 100644
--- a/app-misc/linux-logo/linux-logo-5.11-r4.ebuild
+++ b/app-misc/linux-logo/linux-logo-5.11-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index acc1f3b726f4..a113d38e0ab9 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -3,4 +3,4 @@ AUX mosquitto-1.4.10-conditional-tests.patch 1142 BLAKE2B 66be5988681be543a1c9d6
 AUX mosquitto.service 261 BLAKE2B 6ea8059914acf8730f2e7d04bfd5f79c59a335b65ddecb4773bb4418260c6ed6d0120eaa2e3f7ba4842fc7014e5b51d1ba376cf1db2009b7a55a53a4e6747221 SHA512 3552618733fc106705375c5a1126db72e356694705312072f27f18e21c142cd75ae3ff1f17854ce54cdee092ff9e01fd75c1a8a12d68f75ead8a3697c69623e9
 DIST mosquitto-1.4.14.tar.gz 365596 BLAKE2B 92bcb1fd9e67711d6ce8db5e767be31a1321866205cf4cad684d8b77a8b14a2eaf5e4367a74d5dd8f814f0d229dc77ce878879632c0c34c6a23f7975bf6ae8c7 SHA512 dc75a971354f87deeb79f32435acfae9bc561a1a24a75ee4940a35176ff91758071930d2105d8dee2a090e07527dbfaa5692bece67e03cc87e8b4b8b46f846c2
 EBUILD mosquitto-1.4.14.ebuild 2453 BLAKE2B e8785e9f2dcd4d8d1a627dff29a895b0ff1f149b0a63454371b31ff241a42e7bbb7288c7a5becf3175cafe29c4da11e5fd656f8bb311cb892909929e62e93034 SHA512 a7ce7e5f393cf6508415c044a51518891f7a953ecdaa680f952cfbfdb8905561a017b0a7dad5281d9fee41c909331b26712c0466a33e345a232d538ffafb2a7f
-MISC metadata.xml 647 BLAKE2B d2e0b205e47502494853348c0be807596baede13c52624bd9aaea5690000d849159aee4b10f6237597670b3c0fa37893f08ac9024f519a33f30b48c4e84a9f76 SHA512 1694124e09b1d2cd3f8410a42d5514fd3d8434f0fc3163bb3f6fe5b369df7ab9e9365d1439421b4985830c6278f322a86599d33d2469f464fb089bcd89839c9a
+MISC metadata.xml 450 BLAKE2B 84dde075b0191289f092fb86400867c2cf347b66019350fbcd9b07ef5f0831a4f60e1a794135aad9c2215d99e08ded2d07f79473f36e4c1d7bdbc557d734dbbe SHA512 2abbb3c943e8f18b9a2da9d7761de88c8eff032877013b680c48e516f551ea3dd395d3945c7c7c2fca8c518f19d96978fe823d3fa7534b6cd7f72f27cef24707
diff --git a/app-misc/mosquitto/metadata.xml b/app-misc/mosquitto/metadata.xml
index 53e88eadda1c..16890c32f16c 100644
--- a/app-misc/mosquitto/metadata.xml
+++ b/app-misc/mosquitto/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>neil@digimed.co.uk</email>
-		<name>Neil Bothwick</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="bridge">Enable bridge support in the MQTT broker.</flag>
 		<flag name="persistence">Store messages and subscriptions to a file.</flag>
diff --git a/app-misc/mswinurl_launcher/Manifest b/app-misc/mswinurl_launcher/Manifest
index 406b71eddf82..f45ac62df47c 100644
--- a/app-misc/mswinurl_launcher/Manifest
+++ b/app-misc/mswinurl_launcher/Manifest
@@ -1,3 +1,3 @@
 DIST mswinurl_launcher-1.0.tar.gz 1289 BLAKE2B b705fac43259c6b80d1d1182dd82165fccb2e41c01874021712db09d50f26d1bdfd65e9854a8d184dae7a25d778880f66825f5b4df3596954d1481c42675216d SHA512 60435b78dc88ff3e6f780ef42a975eaedc2f515168ba1c6c3fc8b38f87ea5ad4d70d975825877233bae1c5f9c6a521d1c12d301683c9e3e705d18c6c26ce4f86
 EBUILD mswinurl_launcher-1.0.ebuild 1262 BLAKE2B fac9adc2187c8ae38de8c6e8357a358dc3fba424d30683226baa3e422006e14a02a8b0fad1291c23c3ef827cc0e1a0a2f9c8c816f4e064e0fb5cf2a4c818d67e SHA512 c02406dd4dda8e19de8fa8eeec5788aff4b225197be20333a011347ef4fcae305ceddb0cef91892c769fd36126ac6a93f54d91138f4fb49561adbf2221317466
-MISC metadata.xml 471 BLAKE2B 8464527d1014fdbfea809ac0e48e7ff25b77aae26df505ae667c8376adb66473d5dc317d1a0b2f6db38a668edd9cafe8fa9fd1edc416f6c6c92c0d850b251ed2 SHA512 b652b77215d654a98929762ac6d5780cd9ffc74a47b4dab349913228652a380ed876ce451558588533906f02ec06bb48ede0a937decb942b124933c1a1cfce34
+MISC metadata.xml 424 BLAKE2B 9e50878d39a0109d5094ed04786e7033053f4ae58717052baba00d2de6a1a0091be92609283896414b61be3c05419507be804f839674cde5588cba9c4317ee55 SHA512 1b140f4cee7cea8c31036eb2232f1c8a859b1ee6e783b47be1c091ff0b5a8c8498470e691e977abb6eebaebf61def9dd4a8836686a573be42608101e07983f18
diff --git a/app-misc/mswinurl_launcher/metadata.xml b/app-misc/mswinurl_launcher/metadata.xml
index 6fa1cc244d22..c57658328f07 100644
--- a/app-misc/mswinurl_launcher/metadata.xml
+++ b/app-misc/mswinurl_launcher/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 <maintainer type="person">
 	<email>axs@gentoo.org</email>
-	<description>Primary maintainer</description>
 </maintainer>
 <longdescription>
 This is a simple launcher script and .desktop entry to associate MS Windows *.URL (text/x-uri) 
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 2dd5bebbf4cc..10edc3b67186 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -4,5 +4,5 @@ AUX pax-utils-1.2.2-solaris.patch 5673 BLAKE2B af1fe089d469029922b09be19fe2e9d92
 DIST pax-utils-1.1.7.tar.xz 648376 BLAKE2B 676551b2391b2ba27281d26fba61da7d0d277f3b562c9d8365ea5a6b5bfa4327bad66cf1f62cb626f8b6ec3ae693cab713683b81142dd71920f3b6300951f6d2 SHA512 cec176cf5863b15acc058cbd99639f5f456346136d0551ce5875cb66c28dd0f6e7f5077b0c06751a3a68984b5c4386c232d3db8b76aa4f4b326b0b692835fdeb
 DIST pax-utils-1.2.2.tar.xz 655964 BLAKE2B 5e43b52648f1f0cc1f46616ebd9a554cf2e5909292337c84f9ee0e2eceb4879a5f16ca20700e5a16267b38ffea529814949817ea6054cd1b2ea38e267455de00 SHA512 6bafe93f3b84d4595b6adfa09b46a3dd249f309fe836d90115e9aa5fcc7da37b03f743e80719dfe6bcdb739ce6ec3843170a5513e196c348721f850e19d3e38c
 EBUILD pax-utils-1.1.7.ebuild 1472 BLAKE2B ac8f899442a870fe81f1d5c80bd3ccf24082ecb029de9520bd45cf1efccf6e0ced8685af3c16ae25c9d57733a3e2bf57bb5d0e543e7f1e43244867807b35bd2a SHA512 7e166188a86da296040f1407377526f444af689e2aeead564f28089b996b5f34d658b3197b881ef84b3aa7600309f71d54cbbd86fdc61ce71706a64f8bb12368
-EBUILD pax-utils-1.2.2-r2.ebuild 1636 BLAKE2B 7b05c360540f6fd8fd5a68b68ef7ba36b56f197843207e04e3fdfa1072a5be0e07c2d785b3b4369c3dd70530953a73307df501d1fd3ef8c133d2eab64f4e1ac7 SHA512 337ae7b58544298da664ae3fd85f0bff9512d9199db314443b6f70c887644bdd7669332b00c7788558a780249028e1cf8e7e121dc757482de5155898fea1d251
+EBUILD pax-utils-1.2.2-r2.ebuild 1631 BLAKE2B 93325fab783633b6ad3c677febc206754fe12fa58b0f4b193bf3ef9575ed29473c4da569c1b35a25d5ea5fa42b299293adc33066434faa5eb0fa4ad6878543b7 SHA512 9eee026d4e51a66c33ea0126fb47b90cdb1b2a469a3a97e982351e387d7f3b05c7dcab70578d1e15ad9225501f6b1dbbebf435973295c8a11c300c8f3ec8911d
 MISC metadata.xml 489 BLAKE2B 2fcc27d5145a496d5bec7bf953b4007760a85471f66027b6a842ac5907e063522189ca5c107e8080e8b43aa9acceebc228f796d96d9b3b35c7424148f60dbcb7 SHA512 ada40ae17d53809394f87a89876b52df9c1c88ac231282cb9cf9f27e9314d3facc65f95c20ea03b3e994e19dbaae8fa5dcd20684b52812aaece02da76f089bc6
diff --git a/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild b/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild
index 996e0595efa6..c04fad8a2291 100644
--- a/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug python seccomp"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
diff --git a/app-misc/pet/Manifest b/app-misc/pet/Manifest
index 513aad20b5ac..244b5f78094c 100644
--- a/app-misc/pet/Manifest
+++ b/app-misc/pet/Manifest
@@ -13,6 +13,8 @@ DIST github.com-nsf-termbox-go-b6acae516ace002cb8105a89024544a1480655a5.tar.gz 3
 DIST github.com-spf13-cobra-63121c8814fc0b99184dbc1c8b7ef4fddae437c3.tar.gz 74684 BLAKE2B 7c3809f3040dbf8872c6081afecb072ca198f8a22c89860edb452e55807a18dd41e2887911be4557448cd571d3db42493c7a5af2796bb8b9494ebd10822c00a6 SHA512 8919acb161f6f98e22f866726f3f85b4d5071782debe7117ad55c28508e469b73a2975d4660998a9df7a86472e8f65f2f103cf71c42d913d79a1bab6e86d94db
 DIST github.com-spf13-pflag-2300d0f8576fe575f71aaa5b9bbe4e1b0dc2eb51.tar.gz 39235 BLAKE2B 743ad732b19efa4450b4a8a8512d51e03694592f9803233dfd946e7eaa513c8edf0e4b2763f458bae2e6af58a26a4d9559c54a35a0da6af9909d6b2b9b0a9624 SHA512 6bb7e34efe274e9a77fe95771ce8831a73537c5745f58ae62ec75a3744010752e1b4f3d1c35c689a41e1b0488a090224aaa3276f0981febd0838cf1a889be202
 DIST pet-0.2.3.tar.gz 2733693 BLAKE2B 92024983e2418c5c47f3a18ea664073fe847e2ef9be58ceb2d8e610cf8b9ac75a95d26a2512d26334c1cf989ad570fad83fe58ac7cd828740371c7276fd6855a SHA512 5207773b71ce773c974187cd86b8ddc7d1191f1baf615e035e290254d49d8c0ac4372b3ac004c0883a3fe7167447cab21e5b0711a78ce8ba57fcace975ef80a3
+DIST pet-0.2.4.tar.gz 2734689 BLAKE2B 2f6a4b0814cd69ec7b58f7a0892d955e8b4bc402c526c32b2b3240d7a883515b86b3f7d99a76bf58592eaa2eaf8f230889f0dd5ade6500506c217db68e6928cd SHA512 59b4c8f660fbcd208742e4c90a90c9eb4736d99631e14def5e8bdc1c75add2a6a67c358d2ec59ca816f6485d3d824bc6dc1592949889bace1734a5f2c3023e3d
 EBUILD pet-0.2.3-r1.ebuild 2012 BLAKE2B 592a7253976aa5efbecc118306943712cd505c111bd2b573b1c6d0b939e283e7bd304694b3ff11d073eeb9867af7b7cb34fce3d1e2ec49b7c7e47c49f03fd885 SHA512 cfc5aabf28f43fbda06e8316e67b3522eeeb4a6c5caa8b78bc8e095e86a7f64e51577e30f9d8d174858dda1cb47c4a22b448c97bfe212e9dd3b59b5ce704e313
 EBUILD pet-0.2.3.ebuild 1988 BLAKE2B 4a8b7687f9f5009ca16fd4ef3673ee608da3f038f95684d3d90ec772843d1362d4b5146312538a139bd651bc199e3b06bf193a3b8bcbada66e9c5631ce3927f1 SHA512 5360ab9e5213cd89a2114617950c610a51e1d7002a0621e3431d50da1f5bb0f2b4dfae3e3a9d088883161880c78479b327a22df98215ad1e87f10906fb37e053
+EBUILD pet-0.2.4.ebuild 1998 BLAKE2B 317dfc8a59b15199cbddea040f1ac8c87bdc1d2b75ee8991c6aa447d0f80ceff70ca1ca9bc98dad3932d56a3bffce68f944bb9deacaeaef5c2d193748577a019 SHA512 2a7e813468571e3366402567eac5909568e2187cecc6b3baefb3189e9d7014ba436f563945d3dc12c784dcb306548d6e87c8552ed215451819951d30a679b6ed
 MISC metadata.xml 769 BLAKE2B 299b0963eaefbf40ffeb93e18f23089ebabdfe4249d085dff54069d2defd6478311164dfdc700f043f16a4e18f3017cb335a070380d424933a2422a9f190071c SHA512 5b9ba002b1ce80e106f9cb79c5210616daec3718c9c02502d4e5adbb7144df4a1c18795e5a44ec08927cf3a2135470cc3c505afb8a2a53498e4d37bf8ad91e64
diff --git a/app-misc/pet/pet-0.2.4.ebuild b/app-misc/pet/pet-0.2.4.ebuild
new file mode 100644
index 000000000000..baa71dab3843
--- /dev/null
+++ b/app-misc/pet/pet-0.2.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=( "github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0"
+	"github.com/chzyer/readline 41eea22f717c616615e1e59aa06cf831f9901f35"
+	"github.com/fatih/color 9131ab34cf20d2f6d83fdc67168a5430d1c7dc23"
+	"github.com/google/go-github 2966f2579cd93bc62410f55ba6830b3925e7629d"
+	"github.com/google/go-querystring 53e6ce116135b80d037921a7fdd5138cf32d7a8a"
+	"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+	"github.com/jroimartin/gocui ba396278de0a3c63658bbaba13d2d2fa392edb11"
+	"github.com/mattn/go-colorable 5411d3eea5978e6cdc258b30de592b60df6aba96"
+	"github.com/mattn/go-isatty 57fdcb988a5c543893cc61bce354a6e24ab70022"
+	"github.com/mattn/go-runewidth 9e777a8366cce605130a531d2cd6363d07ad7317"
+	"github.com/nsf/termbox-go b6acae516ace002cb8105a89024544a1480655a5"
+	"github.com/spf13/cobra 63121c8814fc0b99184dbc1c8b7ef4fddae437c3"
+	"github.com/spf13/pflag 2300d0f8576fe575f71aaa5b9bbe4e1b0dc2eb51"
+	"google.golang.org/appengine 170382fa85b10b94728989dfcf6cc818b335c952 github.com/golang/appengine" )
+
+EGO_PN="github.com/knqyf263/${PN}"
+
+inherit golang-build golang-vcs-snapshot
+
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+DESCRIPTION="Simple command-line snippet manager"
+HOMEPAGE="https://github.com/knqyf263/pet"
+SRC_URI="${ARCHIVE_URI}
+	${EGO_VENDOR_URI}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="zsh-completion"
+
+# dev-go/toml doesn't provide sources
+DEPEND="dev-go/go-crypto
+	dev-go/go-net
+	dev-go/go-oauth2
+	dev-go/go-protobuf
+	dev-go/go-sys"
+RDEPEND="${DEPEND}
+	zsh-completion? ( app-shells/zsh-completions )"
+
+src_install() {
+	dobin pet
+
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		doins src/github.com/knqyf263/pet/misc/completions/zsh/_${PN}
+	fi
+}
+
+pkg_postinstall() {
+	einfo "You should consider to install app-shells/peco to be able to use selector command"
+}
diff --git a/app-misc/pwsafe/Manifest b/app-misc/pwsafe/Manifest
index 26ca30db957e..a397e25836a8 100644
--- a/app-misc/pwsafe/Manifest
+++ b/app-misc/pwsafe/Manifest
@@ -5,4 +5,4 @@ AUX pwsafe-0.2.0-man-page-option-syntax.patch 848 BLAKE2B d05bca68e0d8d224c059b4
 AUX pwsafe-0.2.0-printf.patch 1868 BLAKE2B 85ca5b70068dc50f6f650d766cf381dd2013640b45db0628df7137c5694a18783932e0effcb86f60b27a84aaedb77c25c86c281f4d05b357cea72961340a64be SHA512 7567e666f7dfb9c798aa2e6368ea1abf72f749c953da42bff7ef1b61aea6bf2faca96ef702ef9f7a9ceeece90999c066763006e549c5f2ec365cbf9358547449
 DIST pwsafe-0.2.0.tar.gz 127433 BLAKE2B abfcf36e3fc685100302b4dc7862cc8d8335e5dade40943cb0b7ef17b83dd2b75c36e3069d6bf759ba907e46adf20f3712af5223a8d8a586ae57e98ff6c0a3db SHA512 e8d3684f523f83def6317ef5561a02d1493685cfbda18707644bf335b7f45b1a548aae17a735838d9f6df345ddb17934607162a6e99348df625b34a9ad5f4cf3
 EBUILD pwsafe-0.2.0-r4.ebuild 1017 BLAKE2B 8ab2711772f5f83105c7456a19f829a2cec02d077a9fe890df142d580ebc9ad9dfc914b9fc0cd40c4e1803fa8ae55aa1d9899d2d163f68c28dc5be60b37bc840 SHA512 3a58950a8f72c0696cdee221c63b75536bde0f5095b609dd260442ef204675ee7f673ce4d7e2d94a40c1094ef34039d141126f402c952274a36672e28acd657f
-MISC metadata.xml 927 BLAKE2B efa027650173b892665efc0df987839e1fffc0a4ad10eb8b36403b234a4b461b22859dd3941ffbeb54166ce66f809ad80c2d532a0ed2cc34d6cf607065891942 SHA512 8b56fe041a508fd011153047e051bb4c1b8ee408bee65800c8a7f1447619d70f13baf3089c0c08d83372523ffe01c95c00393b73609b466a81da1c7cac0a73c0
+MISC metadata.xml 868 BLAKE2B 4d255755c7ef0e69a916ec6bcac744805885da500e04cbc25822967abe5737379d5c4d46877fbdbfd4c0c166618a2c9a0237c3d7e8e595d1fc9b86e6a3a91bba SHA512 65c7ff9d5db3d2b16f5430344f944e042b27401be87183d7c6b761d95adefc5dee11dbf2d734675686cba48172276c3c70c7fd1f2c7d7d54303bc838a0817577
diff --git a/app-misc/pwsafe/metadata.xml b/app-misc/pwsafe/metadata.xml
index 752f2eca5541..7eaa453dfe23 100644
--- a/app-misc/pwsafe/metadata.xml
+++ b/app-misc/pwsafe/metadata.xml
@@ -4,7 +4,6 @@
 	<maintainer type="person">
 		<email>chead@chead.ca</email>
 		<name>Christopher Head</name>
-		<description>Proxy maintainer, assign bugs</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/app-misc/rl/Manifest b/app-misc/rl/Manifest
index a4abf23f1eba..2ae2bbf8efc4 100644
--- a/app-misc/rl/Manifest
+++ b/app-misc/rl/Manifest
@@ -1,3 +1,3 @@
 DIST rl-0.2.7.tar.gz 131028 BLAKE2B 06db6d6e9c2dd88bce3145d0436544b5f5b848bc2e985db64ccc2146cf61be1b76b02bfe071169f6e346ad4f5ff9b9089c940ecf02e3c68efcfa2f74a9fe131a SHA512 c9db8564832494148ed8e60df844a2a383e52b9d293564cf46b393e57a88f773b7307a1dd749d4e5e2daef1632b5350de00ab2585478ff3c18bffa1c5c573f8d
 EBUILD rl-0.2.7-r1.ebuild 666 BLAKE2B cfe8238579d0a0c46cd1f6c72874a6f82e8e2df4a76d747a1d2353f8effa0e01bfbcd99d35523658b394c24bf0fac7827053a9627adeba7ea4a7c3f825f7ffb0 SHA512 7e817cf83f7d270d4d4be46c7a5affe080069b97daba97cf98b2de92ea12865dd24e7326719be9c41789ac75b4e098de4003081f741a71f7f1a1d20c7f31b3a9
-MISC metadata.xml 516 BLAKE2B 2d786d68943ad204e06e46ebae794fbbc3b145adba11bdad08a57fa18b63c6aef331b190ab5645ec690671fa977d50fdb4865cc71206b0e6422bfbb16d49553f SHA512 7f7e565aa5a90fabf857fc8e5c78bb98000677c2a8e2cf1a0b4bcc5af5b3bb80f4849b1f6d6f7a2e7d15ea84930e79017865c6b2fa8230e032654b0fff4ca2e4
+MISC metadata.xml 468 BLAKE2B 4c1af622a68e3143bd38cf066917ea736fb59716aedb6d43e23579eed67d2f0180f7b3eb0565f7bd98c546e223cae59454aad21aa803c2898d6147d4fb4ec7e1 SHA512 0cffb46412913a382016065cf31b162d6043e94a4dc05f1f7b979e057717365ffd9702518330b0582218b792c8ac307184b22902c978e49b5e3de5471b1c959c
diff --git a/app-misc/rl/metadata.xml b/app-misc/rl/metadata.xml
index a945f0affb78..b78a944212a5 100644
--- a/app-misc/rl/metadata.xml
+++ b/app-misc/rl/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>swegener@gentoo.org</email>
-		<description>primary maintainer</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>shell-tools@gentoo.org</email>
diff --git a/app-misc/rox-filer/Manifest b/app-misc/rox-filer/Manifest
index d54b534a9ef9..bd3e64764ee7 100644
--- a/app-misc/rox-filer/Manifest
+++ b/app-misc/rox-filer/Manifest
@@ -2,4 +2,4 @@ AUX rox-filer-2.11-in-source-build.patch 429 BLAKE2B fdbc342e0f6a7abaf01fe0a2f54
 AUX rox.desktop 157 BLAKE2B e13b788f78bb5f3af73e6f9c0e5cc9729b7221cf37a7b1952d78ed9d1f3ba8ada67d523ae08d7280d5152e3e5f0cafbf55e65bbb75d558d4c77b14095ac7fffd SHA512 968b930f97a25c58a0aeee0789161b98b0bfa93978beb0d7e57e40affe45b65940f67b612df93ac64c0c5244de7dbf913b1083cf7aa4a357e929a7f9f4ab366a
 DIST rox-filer-2.11.tar.bz2 1907026 BLAKE2B b1afd0e2df7152bd1160632c0e7eee71c1d3e9140d453f0fafb2d8049b593513db7ca051282ecef2ce06831883d2f057774e3d37175a64d4bd5a8158e4bbb4bd SHA512 2ef5e7a5d6f4bbb825d6f01725ad4149b9cabfb6fe82c33631bb145f5a3c84e345c372b7698170c1ef78b30ffbc4665495cc266da4828cc8b4b256b592b2c50b
 EBUILD rox-filer-2.11.ebuild 2368 BLAKE2B a0ae8b22e3269fe8c528877f9585751185715c018de5a03f70c9c7f98a653b926fe8917b0612b6b320f9fc73c56848e9924da204f16c3bc15eb2dd464b7980cd SHA512 44feeda938ad145cfacd7f74106c619e4dcf7eeca856fbc12aff921fca5e53052a6f11772d44976f388dbfb24cf979328ccc99b364f58b42ea533bada138fe8f
-MISC metadata.xml 1186 BLAKE2B f2d41f669ca4b15d81aa4f2df423df26594362b40f37f9b451df6fab05c9f6c736b36583dc0e4917237196d02337cd62467a521227567be5247206f6fafc09bc SHA512 2125db81d2e05514947e4a1cdd0460a48a879df69746f32d7643dfa8a448791a16bb1f4df67f2422df667e93fecae7fa65137e531a888d12889324762df302db
+MISC metadata.xml 1128 BLAKE2B 16ca555c11ddd1a0de2ac5381be54c415f16329fdf10e6523ab078db320c57f6c35e1656fb1d026ce0615da9eb4bcf08b9f565a5aea34e8a1ac3fbd0b20e2bae SHA512 23fe490bc592c9d4288966aaf41bff4a68605c15ae9778dc1a89f89e5b2fea2c4e0e9c9e12b8080c744d79a5b7d4b7abb534ce02744dc517aaf7af679764b453
diff --git a/app-misc/rox-filer/metadata.xml b/app-misc/rox-filer/metadata.xml
index 0e209964cbb1..65dec56d6380 100644
--- a/app-misc/rox-filer/metadata.xml
+++ b/app-misc/rox-filer/metadata.xml
@@ -4,7 +4,6 @@
 <maintainer type="person">
 	<email>ppurka@gmail.com</email>
 	<name>Punarbasu 'ppurka' Purkayastha</name>
-	<description>Proxy maintainer, Assign bugs</description>
 </maintainer>
 <maintainer type="project">
 	<email>proxy-maint@gentoo.org</email>
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index 9c7cfc6455ec..8ac325f44b1e 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -14,4 +14,4 @@ EBUILD screen-4.6.0.ebuild 4075 BLAKE2B 88b85d6cb3413354b8411c2f71fb3b17a7b8fe9b
 EBUILD screen-4.6.1.ebuild 4075 BLAKE2B 88b85d6cb3413354b8411c2f71fb3b17a7b8fe9b7989e06e823faad8d3328612b74c6e0846184ebd60aeaf2d94e6bdbb8e631170d3f339459a9a589e4362228e SHA512 ba1626a43f9cbb92e5abe099ed8f17524d9fcef21381fbdaf645830873bc06dbdf4e04326ae5af6f662e709393b1e3b48c4859f4136e90f02f57bd07c4eba431
 EBUILD screen-4.6.2.ebuild 4111 BLAKE2B cc6b4b3eeb615f3e313f6ed779aba160058e5d31c1b05342945bba687d3ea6f73d8f71f08fefb5d7d0e2130c6f4370b5f798e1b4529318defb67fc72172fdd67 SHA512 bf1ab9c61d9d1c8087c08315aa732fcd1922913b446bfa3729219d52f7628f9aa8fb7c1001743bd4a77eae4936117fc4f108b8aacbd29e33d4efaf4e8adf4ce1
 EBUILD screen-9999.ebuild 3680 BLAKE2B 2a30c6e1703a49390dd01132f03865a3fb355014f18e9f2bdf488ff58610d0d2e38bc397afb83804b6d69dc2bf32715c0b9c31e694c791def50096f91d051cd8 SHA512 f27332b033f31450f6cd66ea8e9a39866470633e17eac7d6ea26bc093aaa62f85dc5001875478592c417889e298c2eb87f16954735e015405f4d4ba712cf09e5
-MISC metadata.xml 1886 BLAKE2B 7e3e98299946589016013172efe577871d7dd1f364fde617842650bf262d5e3c49623fab5cd6640560a50f65ed0be875802dbdcd9cbe3450da01e8177da0678a SHA512 2fe77ff502ba653cf53a4a03159f085339881e23ce48b30f1bfc8638c3d0e33a4230dc82819464fd9566e42e8546e5a4011811902adfb2ed5e96938a8cfe5785
+MISC metadata.xml 1836 BLAKE2B c91b439cb8e6301a8e7ac000f58616a6a383180671dc721b3ab74d74c826a85ec9f3e5d0d70a450a3a46430b47eb6dfff329a0d2489f4dee861ea1575f08e9c5 SHA512 39618ae8527cf9744132eb2a0aefe5f0b4a400784288661e74b670b149bf729001c950408b765a6cec0330c0517063732c7e4b15270a2a2a5d971d2e0475f21d
diff --git a/app-misc/screen/metadata.xml b/app-misc/screen/metadata.xml
index ac31438add70..85dc556e636e 100644
--- a/app-misc/screen/metadata.xml
+++ b/app-misc/screen/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
   <maintainer type="person">
     <email>swegener@gentoo.org</email>
-    <description>Primary Maintainer</description>
   </maintainer>
   <maintainer type="project">
     <email>shell-tools@gentoo.org</email>
diff --git a/app-misc/screenie/Manifest b/app-misc/screenie/Manifest
index 6c7c182b38ea..9a70e82dbdcb 100644
--- a/app-misc/screenie/Manifest
+++ b/app-misc/screenie/Manifest
@@ -1,4 +1,4 @@
 AUX screenie-CVE-2008-5371.patch 636 BLAKE2B bf756636c9a7258fff968aaf5d8eba093ea4f41efc16fe9dd16c56ffb779f10ba097f52015c4acf0b82b68daca7e7b8a3243a230b8bb24928e8e9add323f2285 SHA512 64fb52e614d281e8302b6a664d28692b88c5f56301fec1f5f9be546eb71a17aaf462b9a96ea1f0ad1176583613edea292cfd08e10f4a144c12f67c575696a084
 DIST screenie-1.30.0.tar.bz2 10068 BLAKE2B 49bbb8f81141c2b0707aab04e8a43f27e5ccd5c4241cf0e0e7ee3a7bd7944dc61c11f3a9ac5ae3040fecae1947a4271561e9b164b64512043916e3b39f25901c SHA512 8068421aaa461df32bccbe72e23474b20ef3f761e78a3e520c1f9f19a383d9ad9fd0377e2cdf1c4f023ca570b172a40ebff63d3cb538b96d1e1706fe83d03fdd
 EBUILD screenie-1.30.0-r1.ebuild 627 BLAKE2B 6c1256af9a337e15da4aa437eb0101d3cf71db101afeefc336671ab2c070e999f17104688f901b8a967d8891e67c31a3b1b31ffb426828cd2ff53d45492c882a SHA512 4a0f2754a1e720a939d77947793b7dcb5f4ef29063bddeccb766c82b4585182fd9dcfc31da0095a2f0cb36bf4df69e0fa3c111e4b3f144f7e9f67d41f16126df
-MISC metadata.xml 931 BLAKE2B c7d8d62676317aba8b739e62aa2caada386f06b1d4479fbc793297cc40a1ee2553103fee048b73b98ed51b799169db969ad4e151a067d24cc03716a677676296 SHA512 e6ea535ec882be9b8a70c0982caf002b20f8226c61276577bddf85adf0b71032a56aaacf2b8460e5f6e730ffdb0b23e1735b961e9c662e1a4cb8e4279e9e7db6
+MISC metadata.xml 871 BLAKE2B 3cf071210cf3bfc338d2fde113d2772ef7e5dc78eb10c02c54a5db40167a7eece309bb7fca7392d8db8ae73cd3a9fc1da76e725ef769bed449d1517ea42527f3 SHA512 83ad049486ff6a1906c114b90eaa757b7da5f1f365b7fd76a38e4896ab92e42141841ef084aa6237ffdaaa8e2fc0090fe52bef71f9a9479730174ec282f2a023
diff --git a/app-misc/screenie/metadata.xml b/app-misc/screenie/metadata.xml
index e7b2676fce0f..3fcb159a037e 100644
--- a/app-misc/screenie/metadata.xml
+++ b/app-misc/screenie/metadata.xml
@@ -8,7 +8,6 @@
   <maintainer type="person">
     <email>rgkmg25@gmail.com</email>
     <name>Robert Kowalski</name>
-    <description>Proxy Maintainer. CC on bugs</description>
   </maintainer>
   <longdescription lang="en">
     Screenie is a small and lightweight GNU screen(1) frontend that is
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 09251f980f46..1c811dfdd26a 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -15,6 +15,6 @@ EBUILD tmux-2.3-r1.ebuild 2234 BLAKE2B 3bb0de689495b69f479ad605480a0c93a13cbdbd5
 EBUILD tmux-2.3-r2.ebuild 2242 BLAKE2B 75da9813dc3ab1ecb854a15c8c06e84b88feb51bf21f876eaf385040ef07071be1dff7f34c6f9b62402a85f042f0088c4da088b1b882fbafbe292c4d7ec01d1f SHA512 ac9454dafba18b5f76c0f77a620ece677b8d195cb6f50fc57116bea4985e7c01e692d758ac42eb3a20d7c2c18f73c8bfcc2460f9535fc2c80180d3efb1462e6e
 EBUILD tmux-2.5-r2.ebuild 2073 BLAKE2B 1c3ee0f7eb1e2a26f5c7a0bc73442dcdd160d1bdd9a7bdad62a2397854b8ad08b4c055b985df9d8ba3d1bcf49033c30ff28443f8f7abbae55b54a622035c13d0 SHA512 fa557f19858c312918d6190cbd029dcbfec05a494236027e3be78bd8be8843823f5112150387986709881577b0bb3fc66bba42a4001729456136dd89739844d5
 EBUILD tmux-2.5.ebuild 2263 BLAKE2B f03e993159487bd92fe3e328d5f79d7bb3bc6b75ab3ecabae51dc64b156db260c7e2242a173e77a32a16dc14ab6276feec77cf7d94f2145c98d6209e9a8fed4d SHA512 d5abbfd108431a47bab4195e9397d0b2748fd59c0036c0c71caa34b741069eb0a5a3d14fe98d0874d312e740a5831a7df3aecc0de2eb3163842663a94638a389
-EBUILD tmux-2.6.ebuild 2148 BLAKE2B cb0d599dc13da996d17024010625bed7a90234246a3b14cc47600e2bf584763cb024536c962f7d2c37901c763e58ca99e6ce71fa728fded3d8aa6d2ded016b58 SHA512 46b4fc09f9ca6c65cf50c3940ade441e0adbadc72fd3a06d617af996d1f6ee3017b04c89682dd69eeb6091d4ad614b53723f7b71ba16bfac4e4d5be374a1c9c3
+EBUILD tmux-2.6.ebuild 2145 BLAKE2B bd4b10f4f4d56043d3aac25e312ac2e51978526b3854853a27c35c81d48908c948abeeb2d85bac018963a1969595ff581d1ee9ed4fc784922d2f6273e9d45222 SHA512 8e9d295be0447556596e157135c58a02463a3763b8f8814775b930830c2f81fdb495527507f9e4a4ba408aaa14689121ea58338f88870dc94bfa3a7e614b7a69
 EBUILD tmux-9999.ebuild 2349 BLAKE2B e4f633dc28e278873941f66efb8adfff9735fd04ad98e505b474dfa657303033ba8cf1cc22f64f7e66ef248c2621858461bf133b2aaad9ee817ae80eba4de847 SHA512 0fd75b67ac3e782f9c6aec6e36bafd69f025555c493961da7945994b0cb3dc1d8991d5a41ad68f85bd176564427e0b5f21ffc53ee9a4db41d50caa043ac0dec2
 MISC metadata.xml 708 BLAKE2B f89d9daf3de56b07d231b4fa3dec0179d8e32579a76142085b96611fd08db4c26af40d1ac92684f9d1e378ce624647bab26ddf877aceb86af4987aa4e555e045 SHA512 2d676e2d9a5427a287d7dbe0d73e6ea96b2eba3328c8380a503e814e263a5c6ea5b4bf33aef7c9e0840f37d75b40e5e4a4feca5cc07c38de50b35e9da497f8ce
diff --git a/app-misc/tmux/tmux-2.6.ebuild b/app-misc/tmux/tmux-2.6.ebuild
index 5dd2b5a13db3..78905b54e38c 100644
--- a/app-misc/tmux/tmux-2.6.ebuild
+++ b/app-misc/tmux/tmux-2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_*}/${P/_/-}.tar.
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
 
 CDEPEND="
diff --git a/app-misc/trash-cli/Manifest b/app-misc/trash-cli/Manifest
index 211d9397de8b..31d97e220a43 100644
--- a/app-misc/trash-cli/Manifest
+++ b/app-misc/trash-cli/Manifest
@@ -4,4 +4,4 @@ DIST trash-cli-0.17.1.14.tar.gz 69141 BLAKE2B 028274ea2753eb3ff4bfec5929dafcf090
 EBUILD trash-cli-0.12.9.14-r2.ebuild 493 BLAKE2B 4be74b3dfab9cfc1e1c7a79ce37c2135f3cb448e735b7b8814dd213a0618bd0848df2cf7f57a34d83ebce1d7c2d0e761df6c3b8c430c3775c6fbd863a3701698 SHA512 1b918474fda9c92b81bc734f7d01f15fa31f5f8db9153a4aff4b330bb76ec64bb00eb3b3f4799ca2a3defb978fd2a39a952171f17007ca17b0b5502b2b1e10ec
 EBUILD trash-cli-0.16.12.29.ebuild 494 BLAKE2B 106963754651c7a7f4a7de148cd7e915a689acb1b098cbd0f61837291ee8a358c6b9ac41a20660f8bde03a8b35828ae27bf551c54939c0e44c6cb4b36a96e469 SHA512 40718d5e6b630a88fa1f98cb4ed9ed5723307e7d9166e0997cd4a68b198f83dffecc0e1a64072c752aa5b9f11e4ad5873052759fde43a2ea709fbeaa425db401
 EBUILD trash-cli-0.17.1.14.ebuild 493 BLAKE2B d476b75c962c9d0ad6d4669d6e33e1cac49c9c0f07bf312056c95904680c8283dff32447b46124373cea281fe5a16705e7f9bdd6633078ff560e3eb4deece57b SHA512 3dadfbdf10c4754158f42f303c71ce8e0e8e42d2067d2f5c1fb6c091dda4a34a5c09fa5a7159541ff15c64050e5b2dd3619b95517ea271047bd70b732e983b00
-MISC metadata.xml 1103 BLAKE2B 1a141d8f6dd64a2d2c638756d416dda9a9bc6e113538160c79fa69ac001b40f7bb7506561adc4802d08a3ee6e500869c6092ea380ab166a824563cf440d17967 SHA512 643e41ef1256d074d2374988b6395671af905bb0fe2a0c716fb292c726d2561f33ae12d78ed0ac268cedda2332c1e91ca9cb51f0724ac335f28644170e2b6a1d
+MISC metadata.xml 1055 BLAKE2B c7e57fbc12a894309c39b66e7abab9eea69c884d30aad28d064510c1e50b015482f68cbbcdecbd03fda171966a279e283e5cdcbe7c1c182d3f5b65c6a3d51ba0 SHA512 47b92ad1a6799b37f2e4317f7fdd7ec4d597f07d4d77a4fa67eb5d48791eab30f1ca81da3610602fb5e15d9518deca19886493d8c29ec16ba003ea5af48e304a
diff --git a/app-misc/trash-cli/metadata.xml b/app-misc/trash-cli/metadata.xml
index 7aebb5e7ab09..123a854abc78 100644
--- a/app-misc/trash-cli/metadata.xml
+++ b/app-misc/trash-cli/metadata.xml
@@ -4,7 +4,6 @@
 	<maintainer type="person">
 		<email>alex_y_xu@yahoo.ca</email>
 		<name>Alex Xu</name>
-		<description>Proxied maintainer</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/app-misc/utimer/Manifest b/app-misc/utimer/Manifest
index e9a12a4108b0..0e742677c76d 100644
--- a/app-misc/utimer/Manifest
+++ b/app-misc/utimer/Manifest
@@ -1,4 +1,4 @@
 DIST utimer-0.4.tar.gz 144408 BLAKE2B c23178e8501034c491d5350ef5d6ec4c251dac982f453f0b99cf6b4aeca81132acaa6abd40981ae9f8054f00c27c8f05404d0e2cd806cafc130f0a8d3c23f814 SHA512 f1a375de4b4b5b0f478e208e055badb12a49524137cbd9626238bc5fc35cf3576e7a7c66759dd00a061d12dc7a0ad3ee6974abc8213f5f6f8e22c50eb2901032
 EBUILD utimer-0.4-r1.ebuild 667 BLAKE2B 8211030152e3d2da3387584340bb33288c2c1d682bd4b0b21969a4df13ab0ccd3d7e6829b695d2868eb9c5e15482f38cd18ca844adba9ee6cc6b8510000ba647 SHA512 207b5da0de9d9007d5e9701007cc0144d8469fdc55adabf3e79c32924aa3eb4731c14ad62aec7d32ae642c002ebae1a340c140e7655d6e7f0a4c8e3f8ee4527a
 EBUILD utimer-0.4.ebuild 729 BLAKE2B f18c8bdacdde799cc1d52bdc80bbce8158a3dc48b55186247f29fb861a1bb7d6868057f557fd9e72b838b4a6bf173979a9193f2a7217bf26536233f92ffb9353 SHA512 191bac43e0e2487b459c5249116e1c8c7b50120e68c1068465481db646869536c9118c00246d649e6395ef2d4a687c18125f792af1bebc1f227d315bec6784e4
-MISC metadata.xml 572 BLAKE2B 9fcdc22624bbd6c711dea74af9b9bf0fdbcb2fae0548ba4ece27eb2a546d975f44db55b3522cec22d1e6ccd341b20ed33028c394ab9eb94cad9a65c1ff7fbdae SHA512 68d162051df75a0bef331b36af7d1115502a2f176a3ad9215d13709a6ba5ff14945a21a479e5fea6129bffbc909374a4cd57f915515a8c269f4bda9c23475a94
+MISC metadata.xml 454 BLAKE2B 466406ecad60f09bb43e8bf07c58b6f04194f5241c29ba16afc59ffb08b03c5db848bf53162df6131a07d0c366d614cc4f069c532174f32fc9bd85248c9a3c26 SHA512 18656dd0b9eccf673087a5b3fd055453e4c28bbb407b19f275a654527e5a8f2d75f5fbf4f44b1575579c5809b2acf0e99a170946d91374c74125390e813c3751
diff --git a/app-misc/utimer/metadata.xml b/app-misc/utimer/metadata.xml
index 3a1e9599ee61..e6007f541a76 100644
--- a/app-misc/utimer/metadata.xml
+++ b/app-misc/utimer/metadata.xml
@@ -4,12 +4,10 @@
 <maintainer type="person">
 <email>lavi.kfir@gmail.com</email>
 <name>Kfir Lavi</name>
-<description>Maintainer. Assign bugs to him</description>
 </maintainer>
 <maintainer type="person">
 <email>hwoarang@gentoo.org</email>
 <name>Markos Chandras</name>
-<description>Proxy maintainer. CC him on bugs</description>
 </maintainer>
 <maintainer type="project">
 <email>proxy-maint@gentoo.org</email>
diff --git a/app-misc/vcontrold/Manifest b/app-misc/vcontrold/Manifest
new file mode 100644
index 000000000000..ced57c0e75bf
--- /dev/null
+++ b/app-misc/vcontrold/Manifest
@@ -0,0 +1,4 @@
+AUX vcontrold 157 BLAKE2B c8d08ae44343850d95e9b99626690a2f79403bb9bafef9ea6125376623c617c4fc1523beb4be4d3cfa50d67c3a7ef84e4b3042afcaf8211ea0276d4e519cd713 SHA512 10583cff05a3099d06ec13cd35711c93dece72de1ba05a2026d85b31cb6279136cbbffa00bcc162cba841232d2f8fe2babda463bdadb6b4f3e1f39ce95562401
+DIST vcontrold-0.98.5.tar.gz 86684 BLAKE2B 07ed2c932b9f1c03410cbd6c23cfbfb7bf1aeaff027f597fb6f05a6b61c647f229a75b5a87d893a66c6b8e917595083d193c5da8585c6b9546d12c5867ca1a1b SHA512 b94dbb09ffe274e0a0a0ac4948365ed3213f221dbc00ed2b2adec2ac5a632e293686d62a07575454b3d11b1b8e4e058625a067461996dd720c2f84066d57e60e
+EBUILD vcontrold-0.98.5.ebuild 906 BLAKE2B ede2a31302a852636266f97069eae207937bc630fa16db5f982ff676c453b1c2da0dfbf8d023197ebd4132f4a55ed16b8fa5bc6659d0cfe0ee7b9898416028f9 SHA512 cb627f085e3d3b9d0cce3c48a4e5e2f1e115c699414da293ff81783689fb7111e0f13d145901616cdd98526d7610a67fab72e0e9a051e07879e4b8371d77bd47
+MISC metadata.xml 910 BLAKE2B eb06d0c4ca09ba13dc5ec335afc9da950429c650c05289608c90f91e0b7d550f97f6833752a8e71101fad25d2600dd24c522f9747ddad20c958b31c790769d36 SHA512 9eeeb42e54cff821d986407940d3a8e434ba3126708eef45f3234bbd8519dc7fd564f5bd6767d249370a796e7ed13d934b52b309305b4bcc03401c63a68a3d64
diff --git a/app-misc/vcontrold/files/vcontrold b/app-misc/vcontrold/files/vcontrold
new file mode 100644
index 000000000000..369dc6d8e642
--- /dev/null
+++ b/app-misc/vcontrold/files/vcontrold
@@ -0,0 +1,5 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/vcontrold"
diff --git a/app-misc/vcontrold/metadata.xml b/app-misc/vcontrold/metadata.xml
new file mode 100644
index 000000000000..b718f1673eb4
--- /dev/null
+++ b/app-misc/vcontrold/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>tobias.leupold@gmx.de</email>
+	<name>Tobias Leupold</name>
+</maintainer>
+<maintainer type="project">
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
+<longdescription lang="en">
+	Vcontrold can be used for communication with Viessmann Vito heatings
+	through	their Optolink interface using an optical communication device
+	(which can be built quite cheap and easily, cf. the homepage of the
+	"OpenV" project).
+</longdescription>
+<use>
+	<flag name="man">Build the manpages</flag>
+	<flag name="vclient">
+		Build the vclient helper program to talk to vcontrold
+	</flag>
+	<flag name="vsim">
+		Build the vsim helper program (simulates the heating's answers, for
+		development and debugging)
+	</flag>
+</use>
+</pkgmetadata>
diff --git a/app-misc/vcontrold/vcontrold-0.98.5.ebuild b/app-misc/vcontrold/vcontrold-0.98.5.ebuild
new file mode 100644
index 000000000000..e5b4f78672d4
--- /dev/null
+++ b/app-misc/vcontrold/vcontrold-0.98.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Daemon for communication with Viessmann Vito heatings"
+HOMEPAGE="https://github.com/openv/vcontrold/"
+SRC_URI="https://github.com/openv/vcontrold/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+man +vclient vsim"
+
+RDEPEND="dev-libs/libxml2"
+DEPEND="${RDEPEND}
+	man? ( dev-python/docutils )"
+
+src_prepare() {
+	sed "s/@VERSION@/${PV}/" "src/version.h.in" \
+		> "src/version.h" || die "Setting version failed"
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DMANPAGES="$(usex man)"
+		-DVCLIENT="$(usex vclient)"
+		-DVSIM="$(usex vsim)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	doinitd "${FILESDIR}/vcontrold"
+	insinto /etc/vcontrold/
+	doins -r xml
+}
diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest
index e1a42d3997c9..fec9ef415b1c 100644
--- a/app-misc/vifm/Manifest
+++ b/app-misc/vifm/Manifest
@@ -1,7 +1,9 @@
 DIST vifm-0.7.2.tar.bz2 468086 BLAKE2B a83b1f43eb3f6e47afd5a7c810741468857c602b80cad5c91d2033eea9e1f1efb09e19ca7b02f39e93f8f7186b4cb6fb0627f98a30c054a0d7d71d1b454698d8 SHA512 24a5ad44cecd01f489b95008f0b98ad6cd63656bc7fe4a888101f369f9b258cb87b8025efac30237fbaebc7aff14d173d02118839312017276f3f6b62ea4a3b9
 DIST vifm-0.9.1-beta.tar.bz2 1002371 BLAKE2B 435b50294a623e1e0bc1f98b2f4687bb9e85934178c540fda89a8e0d8ff32e9ea1a944cc7fb39190ca741d57e4c5abbd5a46e776d0115cf3892452bff565bb15 SHA512 c8516acf069fb88f8cfc0db663623ab37caf34277b7fd4d07759deb026c11ac70a7d438e419fc8f5d545e2e25b8e9cc40f8220c3b415c97a8e7e8b9d132bdb0c
+DIST vifm-0.9.1.tar.bz2 1002758 BLAKE2B 8eb9cc4c299877485bb4a44d95fe2412e196686399a6246bc1b5036dbc34ecbcf1cd43d1d55bdacdcc099a65e03f589f360d39ee38da4e12bff0a4bfcbdd180b SHA512 a30457329bf9501efd7e9e0853107b5ecd653ab70e7081764677d035bd0f61876bc96b35bea5258153d68b7be075091168331be79d7398f94353f73bbf78933d
 DIST vifm-0.9.tar.bz2 971539 BLAKE2B 5d6dd8c399e38886ab3e2d548b93492bf31b464e5661c6f6d54504701bf1eab8338155a9ddc9b220c4cb2a67417d5622094e9ffb717ddf594984fe475214af60 SHA512 5ae2b03e672bd9a7f95a5c59141dabac8bc7946a4e307d6a3df70bdb52e1f7665b960a3d20709c811cbfbcf76f7836d23b5edb191968e5277fb705a291ab3a9a
 EBUILD vifm-0.7.2.ebuild 1471 BLAKE2B 0172539787d0e577b30b4ebfcf260012c3861a2ea0e27821671e981b785ccb0dbc9817e06d8f72164606566efdbcce8082a75627c7a8132f74256abe4dc432e6 SHA512 97f60228c3d17c96913abc074e02f3a67687e82b2b6b961bee0d82d3bebf5079115ebca7cc3bb9d901c0291aeeb91e722f083aac8947fc86947d6259966f18f0
+EBUILD vifm-0.9.1.ebuild 2118 BLAKE2B 84175b7297d3c40ff1cba09b8313b5ababd4de00e2a1359e2c7585ec4d22c9554a2d3fe2c0cf36d7707e02a831798bd34cee0a739f9e166fb21f15486f1c40bd SHA512 7db7685b9d5cad5183c5f62d9bf7370e186ce9c2ec5544e77ef9cdbfee7e840923d7b19c4d91a4474182b8c560af705270592880ae78982469277e5ef263c62b
 EBUILD vifm-0.9.1_beta.ebuild 2118 BLAKE2B 84175b7297d3c40ff1cba09b8313b5ababd4de00e2a1359e2c7585ec4d22c9554a2d3fe2c0cf36d7707e02a831798bd34cee0a739f9e166fb21f15486f1c40bd SHA512 7db7685b9d5cad5183c5f62d9bf7370e186ce9c2ec5544e77ef9cdbfee7e840923d7b19c4d91a4474182b8c560af705270592880ae78982469277e5ef263c62b
 EBUILD vifm-0.9.ebuild 1974 BLAKE2B eb32205afdb5c4dfb84934a6875764549495b38341b719ca01b7cf86c8e7ccbab0b1fd5854e5509e88ba3cb3789d281c887e57fbce4545aa5088b9d5a6551ebf SHA512 7469278aeafedd5ae109fc4062a449c074f8750b23dfc99ffee47a7279e2258825214ba5f67c60ead14e87c49e547ed406e24650acd9962ff0724e2db415c5a0
 MISC metadata.xml 1457 BLAKE2B 0728b3f566cb00a2e3e48d84eff80de83629d026de506863a34a283de41cc80b99021da88b81e4332682b79176526cf65378d6b18142ec026c0dfe23447ecec1 SHA512 ea9d05e36d616a6d9588549317307e28acfe19f66493c870dca9767027124ba1ff45369e5f413dcac5697895f854baf148ef0afc687a801157bba40ce1be5f9a
diff --git a/app-misc/vifm/vifm-0.9.1.ebuild b/app-misc/vifm/vifm-0.9.1.ebuild
new file mode 100644
index 000000000000..283cc2139c34
--- /dev/null
+++ b/app-misc/vifm/vifm-0.9.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools vim-doc versionator xdg-utils
+
+MY_P=$(replace_version_separator 4 '-' ${PF})
+
+DESCRIPTION="Console file manager with vi(m)-like keybindings"
+HOMEPAGE="http://vifm.info/"
+SRC_URI="mirror://sourceforge/vifm/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X developer +extended-keys gtk +magic vim vim-syntax"
+
+DEPEND="
+	>=sys-libs/ncurses-5.9-r3:0
+	magic? ( sys-apps/file )
+	gtk? ( x11-libs/gtk+:2 )
+	X? ( x11-libs/libX11 )
+"
+RDEPEND="
+	${DEPEND}
+	vim? ( || ( app-editors/vim app-editors/gvim ) )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+DOCS="AUTHORS FAQ NEWS README TODO"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -i -e '/stat.h/a#include <sys/sysmacros.h>' "${S}/src/modes/file_info.c" \
+		|| die
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable developer) \
+		$(use_enable extended-keys) \
+		$(use_with magic libmagic) \
+		$(use_with gtk) \
+		$(use_with X X11)
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ${DOCS}
+
+	if use vim; then
+		local t
+		for t in app plugin; do
+			insinto /usr/share/vim/vimfiles/"${t}"
+			doins "${S}"/data/vim/doc/"${t}"/"${PN}"*
+		done
+	fi
+
+	if use vim-syntax; then
+		local t
+		for t in ftdetect ftplugin syntax; do
+			insinto /usr/share/vim/vimfiles/"${t}"
+			doins "${S}"/data/vim/"${t}"/"${PN}".vim
+		done
+	fi
+}
+
+src_test() {
+	emake check
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	if use vim; then
+		update_vim_helptags
+
+		if [[ -n ${REPLACING_VERSIONS} ]]; then
+			elog
+			elog "You don't need to copy or link any files for"
+			elog "  the vim plugin and documentation to work anymore."
+			elog "If you copied any vifm files to ~/.vim/ manually"
+			elog "  in earlier vifm versions, please delete them."
+		fi
+		elog
+		elog "To use vim in vifm to view the documentation"
+		elog "  edit ~/.vifm/vifmrc and set vimhelp instead of novimhelp"
+		elog
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	use vim && update_vim_helptags
+}
diff --git a/app-misc/workrave/Manifest b/app-misc/workrave/Manifest
index e8a991ff9cd6..c26ff60ae904 100644
--- a/app-misc/workrave/Manifest
+++ b/app-misc/workrave/Manifest
@@ -1,4 +1,6 @@
 AUX workrave-1.10.6-automagic-gstreamer.patch 881 BLAKE2B 9d74d1d51d1f351659b6ce237eb174b193e0dd8f4c1387cc8e5e2e787bc329c86249cd8d06e85c7a101c7edb8c51ae3e94c2dcc3ad565fb0c5699350981138f0 SHA512 87b9ee4847a8d3ed7afd479b0eb67864f328991c76c3525837e8fb31df299dfc5be43ab35c884a75a40f756d1a3b929c6a415448f88cbe726a2088e8cafeb290
 DIST workrave-1.10.16.tar.gz 6375438 BLAKE2B 35d78a133b275e1c0adc8c21ceb91412f38667b9dde2ed9e08a8b01cde7b4d35780d317057d000bfa39ae0d5da4639f2e2252b1812acd66a3b81f7c1d1995dfb SHA512 f768c46a5b7dfbaca2984fabff92e64d5fd14f3b4e4d018f5a1cf46a87fbf7ec7fbaec9b660e899f7064a93338224d159b75052ed8e532ecaf507d2f249732f2
+DIST workrave-1.10.20.tar.gz 6377941 BLAKE2B 00f573c05ddacd61d50d80a4079d161b18e7e52606cf502f359cf51c4b64407c978fa944e79314146baea62fe77212fa623d54706c62e23fd1ca17cbf25db409 SHA512 fc8d98aa560946f00ee30be0c28648245a425cd3fddeba8fbdd61fb89d107cc8085d5c4d8a326c739b394e6baada2b28cf98ce9ccaf85dca6bfaa1ae78d4ce56
 EBUILD workrave-1.10.16.ebuild 2788 BLAKE2B ec945fe3e90ef1e8d99ff5dd52533ee33b4f2d01c33444ece2fbafc1a1b6cb225bd22c5c8f1f17aa0eabd7a654e7372a6aef42691ee531d4d88279c42d628e93 SHA512 783fd8d7cb0291d0339931c1c9c8227fe681bca4702b77f1f95d34fb4810eedc0c28f76ae1c00267227a9d4fd6b642ecae009b9284257f1b81e01487630f4358
+EBUILD workrave-1.10.20.ebuild 2791 BLAKE2B 2611855f90ca9c0bca255165df386f0f3f4250f71cf1ab325f33ba0d10c0a31706a6e5df511215c4d43ed688349513af1a81b1456fb256542b41d6751fa7a1b2 SHA512 2f84f8f077e8b91a1024f518269c270000d1a2300e3f941008d7b087137262bc53ccfb86fc1ba3b7816d26294c19c45809aecbf462910c3e4e5998370c1158aa
 MISC metadata.xml 766 BLAKE2B 7fdc6a41af2c9048875b633ed213337c255b0449474d9c3052615655a904406ee35e226b652ca5519d3c12be63550da344eeabad3656604a8c5cb8df0b25fc18 SHA512 980b66185f9d02d4c0cfd2fe24700a4bb325741097ecf63e7bcd7e47c183e4693c22a6486c70dfce2b7d80837de7ab7c9c908f3be12ba5d16bba1de5d61f6858
diff --git a/app-misc/workrave/workrave-1.10.20.ebuild b/app-misc/workrave/workrave-1.10.20.ebuild
new file mode 100644
index 000000000000..0d3fce130b04
--- /dev/null
+++ b/app-misc/workrave/workrave-1.10.20.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools gnome2 python-single-r1 versionator vcs-snapshot
+
+DESCRIPTION="Helpful utility to attack Repetitive Strain Injury (RSI)"
+HOMEPAGE="http://www.workrave.org/"
+MY_PV=$(replace_all_version_separators '_')
+SRC_URI="https://github.com/rcaelers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+# dbus support looks to be used only for trying to use panel applets on gnome3!
+IUSE="ayatana doc gnome gstreamer introspection mate nls pulseaudio test xfce"
+REQUIRED_USE="ayatana? ( introspection ) ${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	>=dev-libs/glib-2.28.0:2
+	>=x11-libs/gtk+-3.0:3[introspection?,X]
+	>=dev-cpp/gtkmm-3.18.0:3.0
+	>=dev-cpp/glibmm-2.28.0:2
+	>=dev-libs/libsigc++-2.2.4.2:2
+	ayatana? (
+		>=dev-libs/libdbusmenu-0.4[gtk3,introspection]
+		>=dev-libs/libindicator-0.4:3 )
+	gnome? ( >=gnome-base/gnome-shell-3.6.2 )
+	gstreamer? (
+		media-libs/gstreamer:1.0[introspection?]
+		media-libs/gst-plugins-base:1.0[introspection?]
+		media-plugins/gst-plugins-meta:1.0 )
+	introspection? ( dev-libs/gobject-introspection:= )
+	mate? ( mate-base/mate-applets )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
+	xfce? (
+		>=x11-libs/gtk+-2.6.0:2[introspection?]
+		>=xfce-base/xfce4-panel-4.4 )
+	x11-libs/libXScrnSaver
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-libs/libXt
+	x11-libs/libXmu
+	${PYTHON_DEPS}
+"
+#        dbus? (
+#                >=sys-apps/dbus-1.2
+#                dev-libs/dbus-glib )
+
+DEPEND="${RDEPEND}
+	dev-python/cheetah
+	>=dev-util/intltool-0.40.0
+	sys-devel/autoconf-archive
+	x11-proto/xproto
+	x11-proto/inputproto
+	x11-proto/recordproto
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-sgml-utils
+		app-text/xmlto )
+	nls? ( >=sys-devel/gettext-0.17 )
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	vcs-snapshot_src_unpack
+}
+
+src_prepare() {
+	# Fix gstreamer slot automagic dependency, bug #563584
+	# http://issues.workrave.org/show_bug.cgi?id=1179
+	eapply "${FILESDIR}"/${PN}-1.10.6-automagic-gstreamer.patch
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# gnet ("distribution") is dead for ages and other distributions stopped
+	# relying on it for such time too.
+	gnome2_src_configure \
+		--disable-dbus \
+		--disable-distribution \
+		--enable-exercises \
+		--disable-experimental \
+		--disable-gnome2 \
+		--disable-static \
+		--disable-xml \
+		$(use_enable ayatana indicator) \
+		$(use_enable doc manual) \
+		$(use_enable gnome gnome3) \
+		$(use_enable gstreamer) \
+		$(use_enable introspection) \
+		$(use_enable mate) \
+		$(use_enable nls) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable test tests) \
+		$(use_enable xfce)
+}