gentoo resync : 02.03.2018

20 files changed, 92 insertions, 24 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 1b8969111197..7ffc7acedb8f 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 2af89be30056..837c4cc0e977 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,7 +1,7 @@
 DIST emacs-26.0.90.tar.xz 43908428 BLAKE2B 20858eb7b06b488451ebdffd7cedf28055f38cb45960c2b74c926204be1225cff297a8ce95a4cf535349fe73b24c9e5347fed3c3decf55492c82daca9fb470c2 SHA512 c263d1d1a12d8b21cc43ddcb46a28ce3a54d0ef09e240518f19bfdabf4c4ceebc3c2d1521aae9808cafdd3e731c93dd22b4f1e7e619e38076aa4ffdbaadea93b
 DIST emacs-26.0.91.tar.xz 43988932 BLAKE2B 05e5b9d51f92f2719ea22806f73b17903f5941c82a2e4e762b7664ed1b05f7324c0b020ded311dc4f22b7668684f59eaf3f3c2495f85977f3510698d7e0edd09 SHA512 4e20743299ed419c8ad7bea00c5389fb7c81f4e631165fe2b19c4bbd7c2b401416073282814f30bb96e5c3961724bfbb565781c50ee481a4f4c762ca6f480fba
-EBUILD emacs-vcs-26.0.90.ebuild 12914 BLAKE2B a0ae576a50ca15af22901f74331df340205511a453457dcd98843d3cfc6d73c7e34ca1b9dd6444b08b3c8c67abf43c2f2314acf9cd7dd9c8095ef14693b5603f SHA512 9ad62e7b78f0bab311662f537fb10195c06af1419bc73fbf3fd53cdf51a3b89b1f5d4de6510a10bd9b2dee037402e5ca04ba26c556a011c1633b1f43968deac8
-EBUILD emacs-vcs-26.0.91.ebuild 12914 BLAKE2B a0ae576a50ca15af22901f74331df340205511a453457dcd98843d3cfc6d73c7e34ca1b9dd6444b08b3c8c67abf43c2f2314acf9cd7dd9c8095ef14693b5603f SHA512 9ad62e7b78f0bab311662f537fb10195c06af1419bc73fbf3fd53cdf51a3b89b1f5d4de6510a10bd9b2dee037402e5ca04ba26c556a011c1633b1f43968deac8
-EBUILD emacs-vcs-26.0.9999-r1.ebuild 12914 BLAKE2B a0ae576a50ca15af22901f74331df340205511a453457dcd98843d3cfc6d73c7e34ca1b9dd6444b08b3c8c67abf43c2f2314acf9cd7dd9c8095ef14693b5603f SHA512 9ad62e7b78f0bab311662f537fb10195c06af1419bc73fbf3fd53cdf51a3b89b1f5d4de6510a10bd9b2dee037402e5ca04ba26c556a011c1633b1f43968deac8
-EBUILD emacs-vcs-27.0.9999.ebuild 12912 BLAKE2B c7fb96dba944729c174df10385eb70ecfc408cc5c784b17b8520f4b80a9b2aa4bd59296f4fe4a1fc10d0590ab5b8d7ebbc8a632723f28aa4119449fe07e16b72 SHA512 b2ea4b587dcfec377f9c717d04de35fcebc5f0fe6381e0a1424335c5975558289898f9978902bc4a8ff421130450491496f06a7f83cd914835d080946badd6a5
+EBUILD emacs-vcs-26.0.90.ebuild 12895 BLAKE2B e31ae6e642a2153c4dd6642489a8ca1700ddb18c2b15f3bdf0b74095b6d46a946b1d903a34e98914367b8d449e323faa6df0cfe2cbc46c6c535a62573c866fc0 SHA512 b7b055290dfe8a97690235197a993bb9808f2cc48991b53debb6b61ada24a12ace9a812d5d91fbc378fb33e0d96e8a48ca061efad975d7aa915cdaeb9421b107
+EBUILD emacs-vcs-26.0.91.ebuild 12895 BLAKE2B e31ae6e642a2153c4dd6642489a8ca1700ddb18c2b15f3bdf0b74095b6d46a946b1d903a34e98914367b8d449e323faa6df0cfe2cbc46c6c535a62573c866fc0 SHA512 b7b055290dfe8a97690235197a993bb9808f2cc48991b53debb6b61ada24a12ace9a812d5d91fbc378fb33e0d96e8a48ca061efad975d7aa915cdaeb9421b107
+EBUILD emacs-vcs-26.0.9999-r1.ebuild 12895 BLAKE2B e31ae6e642a2153c4dd6642489a8ca1700ddb18c2b15f3bdf0b74095b6d46a946b1d903a34e98914367b8d449e323faa6df0cfe2cbc46c6c535a62573c866fc0 SHA512 b7b055290dfe8a97690235197a993bb9808f2cc48991b53debb6b61ada24a12ace9a812d5d91fbc378fb33e0d96e8a48ca061efad975d7aa915cdaeb9421b107
+EBUILD emacs-vcs-27.0.9999.ebuild 12893 BLAKE2B ad8a94365c25d5b7a2a8fbff2fe8032f91c3fc48e1bf622aa6f6aaf4da0e5e89a04cbdf24c7d98fda5ce54326b56e824058a3355d42602a8572e4a948109e1b8 SHA512 6403458589a851d3aba4f92e6a2fddea16060a3794149e64db3fcc2e25f037d402411459ef1af54dd7ce3602f84a1dd2fac6c70189a640f285cded462d1e042f
 MISC metadata.xml 2949 BLAKE2B 06aca7f50e1e0a376363438665651ab1647b885f71fc258874a360f3309621283168b2b4f9d57f208c575af1681de899655893f16d691496c20929175b0684bb SHA512 8a349fcb7e9a915ceb37b766f9286ea701aac5aee65fca04357e7e734fd767b2f824525960fa6b860be9e52c2099396f05c2710ecebd020b5d42341849918a98
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild
index b77e6ec42e35..b9eb63f21227 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild
@@ -92,7 +92,6 @@ RDEPEND="sys-libs/ncurses:0=
 		!gtk? (
 			motif? (
 				>=x11-libs/motif-2.3:0
-				x11-libs/libXp
 				x11-libs/libXpm
 				x11-libs/libXmu
 				x11-libs/libXt
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild
index b77e6ec42e35..b9eb63f21227 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild
@@ -92,7 +92,6 @@ RDEPEND="sys-libs/ncurses:0=
 		!gtk? (
 			motif? (
 				>=x11-libs/motif-2.3:0
-				x11-libs/libXp
 				x11-libs/libXpm
 				x11-libs/libXmu
 				x11-libs/libXt
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.0.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.0.9999-r1.ebuild
index b77e6ec42e35..b9eb63f21227 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.0.9999-r1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.0.9999-r1.ebuild
@@ -92,7 +92,6 @@ RDEPEND="sys-libs/ncurses:0=
 		!gtk? (
 			motif? (
 				>=x11-libs/motif-2.3:0
-				x11-libs/libXp
 				x11-libs/libXpm
 				x11-libs/libXmu
 				x11-libs/libXt
diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
index 75f4324cd896..60efd6c274d0 100644
--- a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
@@ -92,7 +92,6 @@ RDEPEND="sys-libs/ncurses:0=
 		!gtk? (
 			motif? (
 				>=x11-libs/motif-2.3:0
-				x11-libs/libXp
 				x11-libs/libXpm
 				x11-libs/libXmu
 				x11-libs/libXt
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index dc1b0e131b6a..ab5ae2aa2e5c 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -7,8 +7,8 @@ DIST emacs-24.5-patches-4.tar.xz 13632 BLAKE2B 99e70f4ee32c1ba3a66b934de692437aa
 DIST emacs-24.5.tar.xz 39759804 BLAKE2B aec253528038686822d1f8ed9a52dff276789ef7744053fc9b6176fceba4d4d8684fe979cf97e756b3feaf734d2377baef81f5efaa5450930a4e94d9f3bca355 SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
 EBUILD emacs-18.59-r11.ebuild 4230 BLAKE2B fc6f41ecbacf7318de3db12189406d00a2a652c8c10f638a667ba83214f6d7ebf8b78e79c1bb1d04b5ea861001e57ef1d6dd29411f9f660528170c119c55e461 SHA512 686d67d281bc9e39087e2d804e9f9db578293ebb52f9730ac971fa3b938e1310923e78b488e4a97d0e6432d10ee7bcf4338ee7190763a1e03792c4105923beaf
-EBUILD emacs-23.4-r17.ebuild 11562 BLAKE2B c889f8c12adca89b89e2a65fbb79c52d637c69451d2d710e5e8e2723997ddf805012db34a0f4b7a9a310a65e52a926c9d22f41e02ead8856a2133bdf520b41eb SHA512 35913b26e026a5ffc4860f10c697c3d19aaf1b33a30bfab54b51541bcb260358a6d6cfebee823926d398e984bc329541c98ff4c0e4e25b21b39cdba929fd1f0f
-EBUILD emacs-24.5-r5.ebuild 11281 BLAKE2B 151edad95ee162f2e1d1889f4d8c16ba7fdac2259415cc5c6a29f079b43058c3bb8537f55c9ce2265a38465bfc6c142ebedbddecae14fcc0ee9e934483ca521e SHA512 67d33ee622436ac5685273bf4a1f00502ed4dc5446498bcab0962e7004fc44fa57e617aade8d159d9d1d2153bf13870a1b8fc7d5d831123e29c8282577b77e2c
-EBUILD emacs-25.3-r1.ebuild 11696 BLAKE2B f490a7b26a57fc01633a87188cbb80f50c0d0622e837796fcff2fa6b27d70df2ef5c0893f89a03d93806beea7bcf405bdabed8e7180f05553dfd14c1ce94fdda SHA512 8b11ae6a8ba18998f1ec413dc4bfb2c1090461a56be8cba5b56ac9e849df06a1b4b9cbc520ec2ffd0c62ec83320e8c3886f477e023c03aa5ce60d74e85f002be
-EBUILD emacs-25.3-r3.ebuild 11763 BLAKE2B 5fe2522876709ba716b3d0f4f8444c62ee54338f4635ae957e049a1b22d4f037e59479fddb3e7ca89948712234df584ca5144326eac1a3a674c1453f9d59f86f SHA512 34d61b9fc189d1bb015317daaa93a454356c9e9fba7e24a2fe15eb23560f264d4020b66c5d5ae5bf8b947af4cec427a36bd302b08bdfac7e47694f6f7dc2b2e0
+EBUILD emacs-23.4-r17.ebuild 11543 BLAKE2B 7d81a885b1e616e2ad999551f71b2b5a148343b12aae151737b5016ebf3907c14f742e5b5027c69d96ca30973005c9672ab2df4e6a1cb8937c5b3c9306e3d1ee SHA512 f918a9697111a0acf74a3a85ca1ddae9bf31ba67f3813d8ac935323dc8fab919d3780a144bdb81e763205c108ff023d3b05287b8c1558019769678d7572e4cbd
+EBUILD emacs-24.5-r5.ebuild 11262 BLAKE2B 43a9bfd9e8f3d8a9f455de0259be93190046125a07409bc207619a649571a6f3b73f65a0fe47a4924fade80e063b7a71540a27118af28ec434b9d0860c908e9c SHA512 9fbf4f3ba1440a96fe8965fb74ff225ff00286793cdfc47a707a22837068bbb92eafabe51224a805eec557546d45bd09320749b98fb6c087ad6b80c2fa506bb5
+EBUILD emacs-25.3-r1.ebuild 11677 BLAKE2B 49cf26e17c3d336a888f8bcd5eabe2723f4345784c4df836b4f62f056521cfd18e8d78340d892867810bef0ec61de468929f32d70f08d6f91984b2fce3eb294d SHA512 53d0b970fa78a1ae938d46d6e7af0ea28a4b46f66df50927aba7d2bf6b5c895c785fc917a016704a6dad8b481824481c76e99193d5a2ef3a02cd4d2d1011f052
+EBUILD emacs-25.3-r3.ebuild 11744 BLAKE2B 0ef049c966dfef9660f696d8420f30382f55111b602530e6da5bfba0be13a2d579e9e2b7c8216de6552af3a110a18682010a89322478c1bafd90f94fb48bb9d8 SHA512 6264fd89067ea2f99b6527b55911173211e7772f10e7d3af9e79bcedbf7e334a966bb5122277dc8e0a6d25432c35a8a3b3e5af9af123f3bc6f02cac16e9a953e
 MISC metadata.xml 2764 BLAKE2B 07a117a3c5b6b04f34c4e390de8af8dcda3d4068d5139607790282740bd71dc11f06138be0cfb2871b167f9dee4320b8bff6894c10ac40d5df8fc2a3cb2a4dcf SHA512 7e115d381271b2e3a6e8de9a0590f3f5c41318ae814c71b6c85be6a24f234179d691d7eb9e9f19c148716d1090d18abe2e874b8772d3987791f9612b0f2eeb59
diff --git a/app-editors/emacs/emacs-23.4-r17.ebuild b/app-editors/emacs/emacs-23.4-r17.ebuild
index 0a3267bc8243..92884cb78c16 100644
--- a/app-editors/emacs/emacs-23.4-r17.ebuild
+++ b/app-editors/emacs/emacs-23.4-r17.ebuild
@@ -52,7 +52,6 @@ RDEPEND="sys-libs/ncurses:0=
 		!gtk? (
 			motif? (
 				>=x11-libs/motif-2.3:0
-				x11-libs/libXp
 				x11-libs/libXpm
 				x11-libs/libXext
 				x11-libs/libXmu
diff --git a/app-editors/emacs/emacs-24.5-r5.ebuild b/app-editors/emacs/emacs-24.5-r5.ebuild
index 4244c1f2ee53..cc5f76a02d49 100644
--- a/app-editors/emacs/emacs-24.5-r5.ebuild
+++ b/app-editors/emacs/emacs-24.5-r5.ebuild
@@ -65,7 +65,6 @@ RDEPEND="sys-libs/ncurses:0=
 		!gtk? (
 			motif? (
 				>=x11-libs/motif-2.3:0
-				x11-libs/libXp
 				x11-libs/libXpm
 				x11-libs/libXmu
 				x11-libs/libXt
diff --git a/app-editors/emacs/emacs-25.3-r1.ebuild b/app-editors/emacs/emacs-25.3-r1.ebuild
index e7825108d036..c7a9b7fa2424 100644
--- a/app-editors/emacs/emacs-25.3-r1.ebuild
+++ b/app-editors/emacs/emacs-25.3-r1.ebuild
@@ -67,7 +67,6 @@ RDEPEND="sys-libs/ncurses:0=
 		!gtk? (
 			motif? (
 				>=x11-libs/motif-2.3:0
-				x11-libs/libXp
 				x11-libs/libXpm
 				x11-libs/libXmu
 				x11-libs/libXt
diff --git a/app-editors/emacs/emacs-25.3-r3.ebuild b/app-editors/emacs/emacs-25.3-r3.ebuild
index 8267aedfe4d4..a091afd0c967 100644
--- a/app-editors/emacs/emacs-25.3-r3.ebuild
+++ b/app-editors/emacs/emacs-25.3-r3.ebuild
@@ -67,7 +67,6 @@ RDEPEND="sys-libs/ncurses:0=
 		!gtk? (
 			motif? (
 				>=x11-libs/motif-2.3:0
-				x11-libs/libXp
 				x11-libs/libXpm
 				x11-libs/libXmu
 				x11-libs/libXt
diff --git a/app-editors/focuswriter/Manifest b/app-editors/focuswriter/Manifest
index 8cb96fe58730..65b94d0f1fad 100644
--- a/app-editors/focuswriter/Manifest
+++ b/app-editors/focuswriter/Manifest
@@ -1,7 +1,9 @@
 AUX focuswriter-1.6.0-unbundle-qtsingleapplication.patch 1108 BLAKE2B b17d04cfb5833d485a421244228ef36601320ddcdad1e744e4a83fee2633154c4bd642053e09bf97ee79aab2b11a82df4afcb4a70823cb5df24b5232c9b0a8d6 SHA512 5f272a4c65b1eb58cc87732fbe82f2c6b925562e77b2280a8b9a0a8b0a41716567051ebd4f6ed32caa8ce7f14edff4e20666f6ad4e464cc8d308640efa4a3c19
+DIST focuswriter-1.6.10-src.tar.bz2 10202594 BLAKE2B d7b59dc2c37d87ed0d1e58358906a9fef6f14a339e12a50980d17cdbed043f604bb355edca956af61b5fcaa78f68eb35b54ef85fc08dfa00dfa747893d6c1200 SHA512 8c12481af77fa4353840f22a6aa54c5264041afc141d9746e097e42171a9f274663940fc0c5e5e2c91ef677190c682a195cb775199d4b8cc2b1ad040542e2e61
 DIST focuswriter-1.6.7-src.tar.bz2 10196583 BLAKE2B 99c749271c785e69f07601575343669ed5be619e646be4ee38cc82242d353a84577842c1ff98f62b0adbbff1a733a0dce82593ac4ffa2eb61e611cea1b2657b5 SHA512 d33c66881b1065aa9812dae14a5fe2a2850ce1c50f4b38e028bcd3f5a4bb1fd489705b0272e3233f3db468b262daefbd906025126f792d04af41722cde2c7bf5
 DIST focuswriter-1.6.8-src.tar.bz2 10196595 BLAKE2B 1c726b948469960e1cc35dcf592acf48693035d2792449fdc336ac4bb03029d6d9eaac77c674347ac5e7a1a7ba7cd386de0d4034e7390dd80067b9522d85a08d SHA512 d10a559448f075110d9ba7fec487b9f125a4fcdce7dc1fcd2b21b94613a7d1126baa49623273bf0f56b1b7c2ef026a30c019653ba73e39b6fa78687c862e3402
 DIST focuswriter-1.6.9-src.tar.bz2 10202664 BLAKE2B 68525ca548513b9b88ca032c0f629681a592149672611891a1ddfe6a8574a233dfc7bcee64dfcae2255b3dce2cbd15907428f25a7ad27a4ebc5c535d3fb34d7b SHA512 dcebd2e1c16a9eb1d135befef58ba0a276dac8d84385d90db3a8c192f3ff05eb5b6ac11cef239c1c4b4998b396da908ad99d5c89c0eb1438d9eb654f2cc7afec
+EBUILD focuswriter-1.6.10.ebuild 1093 BLAKE2B 7ea0feb52027aa668d78ae5b01eb42ff682911251311f627ace120c22f889e8239f126db26c9d49a181110d3b0a4f3c230194bd99e9657b7224bb679797342df SHA512 207a2a1bf4876f782c17096c94dfe360ca8c76ad77891582f6fffc56ad493ab7ec6894f27d1e19d697b11a51bed5a2456929824a383b62f5de7e5ca12844db23
 EBUILD focuswriter-1.6.7.ebuild 1041 BLAKE2B 7e6a895ee6d4b04cdc9cc19086168a1c4f7f946b0550abd8a4d4fcf660f5f6e65c995f5a1861dfc589e8391cbbea353a7f462297b79c5e22f821a09802390da8 SHA512 71fe8650e73194be29014ea4bf881309f55a0f9bcffd70b016e52ea0d476e8008cfe7b71bf8bcfa016232e68d34c9ae41195d21b2b4459f4fabd4d39d01c0bc3
 EBUILD focuswriter-1.6.8.ebuild 1090 BLAKE2B 5668c59cc0fdd2db7330c8eb9f2c1fb78c234310cceb66d8cff9b85d5a0276813c6f8d69d4a11beff845b1131ac533bf880f6b5ebc2ea4b68a9e442b973fc1ab SHA512 931a967230ce054b9569d766ec3fc5650da7026b44000b7119c5ba72fb53dc3dec9f51f94eead1475844db57f31c90c253ef071c5c9207ae4970919eecd937a3
 EBUILD focuswriter-1.6.9-r1.ebuild 1093 BLAKE2B 7ea0feb52027aa668d78ae5b01eb42ff682911251311f627ace120c22f889e8239f126db26c9d49a181110d3b0a4f3c230194bd99e9657b7224bb679797342df SHA512 207a2a1bf4876f782c17096c94dfe360ca8c76ad77891582f6fffc56ad493ab7ec6894f27d1e19d697b11a51bed5a2456929824a383b62f5de7e5ca12844db23
diff --git a/app-editors/focuswriter/focuswriter-1.6.10.ebuild b/app-editors/focuswriter/focuswriter-1.6.10.ebuild
new file mode 100644
index 000000000000..f61c59e9ba31
--- /dev/null
+++ b/app-editors/focuswriter/focuswriter-1.6.10.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils qmake-utils xdg-utils
+
+DESCRIPTION="A fullscreen and distraction-free word processor"
+HOMEPAGE="https://gottcode.org/focuswriter/"
+SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
+
+LICENSE="LGPL-3 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# drop qtcore subslot when minimal Qt is 5.10
+RDEPEND="
+	app-text/hunspell:=
+	dev-qt/qtcore:5=
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsingleapplication[qt5(+),X]
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	dev-qt/qtconcurrent:5
+	virtual/pkgconfig
+"
+
+DOCS=( ChangeLog CREDITS NEWS README )
+
+PATCHES=( "${FILESDIR}/${PN}-1.6.0-unbundle-qtsingleapplication.patch" )
+
+src_configure() {
+	eqmake5 PREFIX="${EPREFIX}/usr"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index 44e00d997457..e165be57036a 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST gedit-plugins-3.22.0.tar.xz 1314512 BLAKE2B 2910a101da94112b4190d96111013675234c109bfc37e05ff98d53e87e0a4db8e5a4a6823017153d65a9d554cfb95fed000d56d9e721faebfeeb033fc7be2901 SHA512 5560b48c0b21b535de7247c39653c111439f9cb138025d7e3a600b94babbe060777c2095160b7e5ea39b8ba8be520ea3966b0ffc2ec15d17ea0bf814bf58748d
 EBUILD gedit-plugins-3.22.0.ebuild 2420 BLAKE2B aa28d57f50d4661d8de168fd8e14584edb71681198f7d2a0c41c25d799b8622a82d826b9bd0cce75c73d51b74a2f203005b79a90e45d391c7611092a88a64289 SHA512 684b5c910000888ca4a19e18c025be7e28a59f929c3c488662f8a98d5801e8c7d8d4c1d459ba83c8fade3c91707b269081ee4667b252c8de62568bafba16b06d
-MISC metadata.xml 643 BLAKE2B 3dce6018f30a981cda19bb3d61cc1f634d917824481f8955b7531dd33e64c255171e8fdf5fecf55364cfd718bb5ffb4535f20554a36829b16cb3adb9d6bbbf8d SHA512 e699d207fcc3d0c2f0fdeb6c3bb6d8db3f4afc4f17065d9ade43c257db59357a179ecd380cda15c46bf5342dd68fe80c6eba0707d912f04e469fd368ca1e40ef
+MISC metadata.xml 620 BLAKE2B fcc7cf7278df0cd01a6187d770743c3c084a0196bd643d72118ba522a11f008a3b66da8b96da5a66bd0815093a2d3aece695120f1fd5744b49c8202375a11a10 SHA512 6e5b4cc4bc422c280a3ab0122382f3de3aaaa4f248f765c5023b3970394ece595c101d2197dd57f24eee29ad3215dacc10c78fdfadbc8c0e7ab941a32af1a89f
diff --git a/app-editors/gedit-plugins/metadata.xml b/app-editors/gedit-plugins/metadata.xml
index ef0c87055091..ba0535e10d0d 100644
--- a/app-editors/gedit-plugins/metadata.xml
+++ b/app-editors/gedit-plugins/metadata.xml
@@ -11,6 +11,6 @@
 		them</flag>
 	<flag name="git">Shows document changes related to git's HEAD</flag>
 	<flag name="terminal">Embed a terminal in the bottom pane</flag>
-	<flag name="zeitgeist">Build the plugin to inject events to <pkg>gnome-extra/zeitgeist</pkg></flag>
+	<flag name="zeitgeist">Build the plugin to inject events to zeitgeist</flag>
 </use>
 </pkgmetadata>
diff --git a/app-editors/hteditor/Manifest b/app-editors/hteditor/Manifest
index fcfdde2c3c35..d35ebe1b54da 100644
--- a/app-editors/hteditor/Manifest
+++ b/app-editors/hteditor/Manifest
@@ -1,4 +1,5 @@
 AUX hteditor-2.1.0-gcc-7.patch 724 BLAKE2B 030fe4de475ce4b140f5dcee8cb0268bb0b6dc19f1e50b94cf0f3b8f0546d462025ca30a1a75acc16f7560c9318efaa8adeb6a29c33789c304c97512b31994c5 SHA512 afdc2fef1c05a225e9a8e8d4ccd25a8b1912ff6532dd09a320f6df031edb732d9b9b99fb77f39cd41ccc45fd9818fae1b802ca1831669a0e2825b59094094de9
+AUX hteditor-2.1.0-tinfo.patch 176 BLAKE2B 936f60f54424b9d69986b7b9564abd3c5de2a321611e66e386aac47ea504f7a40d3c6614f4430a70052b39dcdf68f4540cf1ae4a2dd0a4b237857cd611bbf8fe SHA512 1800a7010f0d94da473bd10e3ab36bea2b99c2d9b78b01f0c3ce7c35d2f9ee33eb3da9a2b091482f213136f23c97bc3afd9a10f59c7e56b36817cb5ba34f4c36
 DIST ht-2.1.0.tar.bz2 884139 BLAKE2B c979563cbfc4df7e14f587b250fbf099d9f4683afddb3afc88693284c378c45466dfa3c47555fc69e83e2972cfabab63f3cdd42fd85602842854372131e4063d SHA512 6b5fc5fcbc63b9b7c85721158e044e4578ebfdc38618c760c0e6de06a276bccd3a960ab8bed172de788934515ad94d86349c4abd3228da66b1601deaaa2ce410
-EBUILD hteditor-2.1.0.ebuild 1061 BLAKE2B 5c3e7803a9c7205258fa9bafa7a1643107384acae2d8d1c343e33d4374e38a7efa6aa213677bd42ed56ddb3da78c5f4127f89c32834c019a10907b68bc79021e SHA512 554fe11db69061e25e74c3bb623340fd0e77824416d2d431eab05e2e4e52f73d6605f8a7ab5ae0b4cb7f02836af88baa60b1b129fb6da2dc0fb60fafcf1e1f38
+EBUILD hteditor-2.1.0.ebuild 1147 BLAKE2B 9811ce42c624b4c0fb5ac6415b3c437013fad812befb981868ef7646cdd56f66c4f5e9a279dbf4079a8b8708b19f9a29c42a15cb31e9a573de75945707f5447f SHA512 bc89e1589e935e8dd11b67cb16b21542b5bd712dbd3fd85990f82e8630e32189ff3c66d1c83508632b71a022303d5da25d7c75b841b4af05d49f5b77333aaaf7
 MISC metadata.xml 460 BLAKE2B 517972433773ade8012213525db8c3395d6f6545d1e1499b18cb511df70a5c0f42bae14471d19f8a8e268f2149d4ed00b3a220a037cf7e57bb508d1239333295 SHA512 ff08b42c35979dbf9c165ae5895374779c53ab4d80e25edb9bf0d854ac44c89dd01bd817fc555d75036e687f007abbd717593af0554e6315dced60372bec4707
diff --git a/app-editors/hteditor/files/hteditor-2.1.0-tinfo.patch b/app-editors/hteditor/files/hteditor-2.1.0-tinfo.patch
new file mode 100644
index 000000000000..556cb93569d4
--- /dev/null
+++ b/app-editors/hteditor/files/hteditor-2.1.0-tinfo.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -198,6 +198,7 @@
+ 	fi
+ 	HT_LIBS="$HT_LIBS -l$CURSES_LIB"
+ fi    
++AC_SEARCH_LIBS(stdscr,tinfo)
+ 
+ dnl Makefile vars.
+ AC_SUBST(IO_DIR)
diff --git a/app-editors/hteditor/hteditor-2.1.0.ebuild b/app-editors/hteditor/hteditor-2.1.0.ebuild
index a38ef31072d0..5e5d0e083085 100644
--- a/app-editors/hteditor/hteditor-2.1.0.ebuild
+++ b/app-editors/hteditor/hteditor-2.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
 
 MY_P=${P/editor}
 
@@ -27,7 +27,15 @@ DOCS=( AUTHORS ChangeLog KNOWNBUGS README TODO )
 
 S=${WORKDIR}/${MY_P}
 
-PATCHES=("${FILESDIR}"/${P}-gcc-7.patch)
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc-7.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
 	econf \
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 623f2582ba9e..4846db156e3d 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -2,6 +2,6 @@ AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07f
 DIST neovim-0.2.0.tar.gz 7846467 BLAKE2B ee929122b3855ccab6247a0e8ab975b09d77e1034229ea324ed82ad705cacbd39f55d2fa96eea3f3677c7efe64c69ebecedd5fde09e508a6fd23acb6a1f5b489 SHA512 fc4be03c5bee1c9928376938679f9a900f3ee2e58df817d1cb9b5af51350dccca63a7638114b0326ec4565a047faaa4b50fecfc932c1d59ee92efa54625e22cd
 DIST neovim-0.2.2.tar.gz 8325879 BLAKE2B dbf43c5927b8c8719adae9a3f73c57429de47f1b7c7489a118b7467df2f0d32cd02df8e10889727b4dd77fe8b4fb4f95520c678d6775d5d908705770a47cec0c SHA512 5609defe86ac98356f1b9ae9adc6049bb4df920a9a2ae3104f761d52d4dd54cbc84d2596231595dd9b0aa97201fef2121e6c5c86a19267ab6b871dbf4b568209
 EBUILD neovim-0.2.0-r1.ebuild 1876 BLAKE2B 969233179105fd7dd23ffe4d4abf05db8276c8ff092651032731a6548778820805e8a4e4c0a2e40d463a11d1898e8c0e47ca76f38802df2119b70cf250932dba SHA512 3bd497e867430446993f46ad6eb038a57e0915703e8ce800040f76ae6b57e9c015241cdc8eff9a08d45f9ff71cbce2e99fc5bd7c91541e751817a54ad99498c5
-EBUILD neovim-0.2.2-r1.ebuild 1876 BLAKE2B 969233179105fd7dd23ffe4d4abf05db8276c8ff092651032731a6548778820805e8a4e4c0a2e40d463a11d1898e8c0e47ca76f38802df2119b70cf250932dba SHA512 3bd497e867430446993f46ad6eb038a57e0915703e8ce800040f76ae6b57e9c015241cdc8eff9a08d45f9ff71cbce2e99fc5bd7c91541e751817a54ad99498c5
+EBUILD neovim-0.2.2-r1.ebuild 1878 BLAKE2B 8f2ddcdb916fe4ce6e83626c1b86ddad10253e1cf5ebc5f41789fc52d2a002e7ed8f07cac17a5551aae1050fa6f5e3b3214436d8f9a63afd67cadb982f974db5 SHA512 095e7760a09f76e1940dfd06b02a786b29c7647d123232287da673677b27b613c320507dc206d74fe9ad6420e2bc3115b266488529d83719f1f0105d692afb20
 EBUILD neovim-9999.ebuild 1876 BLAKE2B 969233179105fd7dd23ffe4d4abf05db8276c8ff092651032731a6548778820805e8a4e4c0a2e40d463a11d1898e8c0e47ca76f38802df2119b70cf250932dba SHA512 3bd497e867430446993f46ad6eb038a57e0915703e8ce800040f76ae6b57e9c015241cdc8eff9a08d45f9ff71cbce2e99fc5bd7c91541e751817a54ad99498c5
 MISC metadata.xml 823 BLAKE2B 6aac695d8e1ceef11309dca9d529808f890b67665688450e683f1a980f09909d2e4c2ea165a2aeac623f6224bc00b7e67d9e67c27a623a13595710e60e7e49bf SHA512 b87aa5497b7c5e9b61647cfd3413e7c6d232698952b778d4ed3a39d4c2a39e6947a5b7e19ef803f4172dda0d2465651f19a127d4aa5b37004224e5c3ec86a94d
diff --git a/app-editors/neovim/neovim-0.2.2-r1.ebuild b/app-editors/neovim/neovim-0.2.2-r1.ebuild
index 12fbcafd7b64..1a1d6f4dfff4 100644
--- a/app-editors/neovim/neovim-0.2.2-r1.ebuild
+++ b/app-editors/neovim/neovim-0.2.2-r1.ebuild
@@ -27,7 +27,7 @@ CDEPEND=">=dev-libs/libuv-1.2.0
 	)
 	tui? (
 		>=dev-libs/libtermkey-0.19
-		>=dev-libs/unibilium-1.1.1
+		>=dev-libs/unibilium-1.1.1:=
 	)
 	dev-libs/libvterm
 	dev-lua/lpeg[luajit=]