gentoo resync : 15.09.2018

13 files changed, 72 insertions, 19 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 2475a411ab15..4d79ee391623 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 5c7d6a7e476b..2d22e241744c 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -18,6 +18,6 @@ EBUILD emacs-24.5-r5.ebuild 11261 BLAKE2B cee3de84ec6fe6b9a7592d090be1e0902c49d4
 EBUILD emacs-24.5-r7.ebuild 11342 BLAKE2B e8b0d454aa4661e838037ac264e29422267ba914964725c07746e50ed69e8cb03036557ae0d71e6772886ed8bc6e3b0525c82dcd90ae2bd3f517bf11a680e87c SHA512 2f97aafd89d1c54f5f0b0a097ce301579a146bd8baa8ba6b05774cbcd4430ac94f8bd10e4ef7396857ba0c32206060019e996e326e38e44932455cf303bf1d89
 EBUILD emacs-25.3-r4.ebuild 11753 BLAKE2B ab01076daf8c815a4bd7de83d652c8293219d9e4fb25002897527c0aaa87ac00c11f36a0c8a10e4e474629007950c67792ab3cd8e243cb046791fcba1fea19ff SHA512 dbae997b01fa892ce34dc554d1566e8c2a530c3246805b6028ebaf45cffdfb878e1fd98d827c0f6f3e37be52ae38b2929223161b234a5ed9e2dbfda6d786c191
 EBUILD emacs-25.3-r6.ebuild 11642 BLAKE2B b7ce973860dc3709e6731652ec5b5f82d91ce4fb042b2129123ac641a2b0fb253d61051aaf67a63d4af1d23905a83c5e4f24244ea1fe8c22cc42ae73c9e2ab49 SHA512 8c5ec55d78af9881245b918fd548d335e0499540ee2591eac0c95c8c44577f8ae794b0cc387f0d19931fc38e6a19132c439b62c5d0ca221dd8e4466657fdd289
-EBUILD emacs-26.1-r1.ebuild 12178 BLAKE2B 67c352031d6c9b0500b545c6a64796cbfe866551579c0d215dd0ec8c246f92725556bec842e385eef8cc8c17b4c76992fe9063b1671fef13f50328c3a916b3d4 SHA512 aac23c132588fd8d022e8bc9390c3f69642a8cfc96ebe5d961d18f7fd783b416e54e4e096c1f291184e612c6ee0942b3c588665ea0aa1525c22b7be8aa2e5d6d
+EBUILD emacs-26.1-r1.ebuild 12177 BLAKE2B 8849e102d459b68740e5127372c3ccdd07b64368cf6d364acd27ffcee331347dd2ee48d38204215b839d4682becc0449b104f168a86c1982c0940c1ab4f5389f SHA512 77b4ce147e8e091979d01ee111539111b2854a09caf85f637dddf3d2bac27509224f7437a6ed8f5321566042e1689b3c13d1b1485fdccfba5ef375e82367bdad
 EBUILD emacs-26.1-r3.ebuild 12288 BLAKE2B 018250fd3949cd0651454731283d5dd451e86a5dc8067fab9c1aebb5e89654cf4e8988cfe953ed6c8d88a72fde12b7dbbe8cf082662ec630ed35f91822c7d5d4 SHA512 01ce42d36729559ffc3db8d1a2011716d109f97a18711cdb5faeb2f7a289ed05631d51d15df2de485482940916e936e2a1feb25b199ad75082307d5d166f4454
 MISC metadata.xml 2849 BLAKE2B 28cad6b703be952825ae288ee9218209a2f38992bc8381ef60a0f6b36f57971bd133ccff284f0bc20d03a15d89c71950c21a2c32b3f47bd80bb793f5e439e1e0 SHA512 0db4dc9edb2a6f9e917b4648b887ec12f016f77d3332e67bf8962a0ba592908e34108610083e76f4abe7cd2f52a07bb75e8b14089b1ca87c138e711c2d31ff9b
diff --git a/app-editors/emacs/emacs-26.1-r1.ebuild b/app-editors/emacs/emacs-26.1-r1.ebuild
index 9358e0b74a16..739d4cf25e1f 100644
--- a/app-editors/emacs/emacs-26.1-r1.ebuild
+++ b/app-editors/emacs/emacs-26.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="26"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"
 
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 3dc2f960906b..035ecbf2380c 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,9 +1,10 @@
 AUX nano-2.8.7-minimal_compile_fix.patch 1206 BLAKE2B 72265b226a23282baf1d16fe62637a3a6123342da9ddf9fa205d7eaafea710aa62fcafad1188cc1c08bd537be3ddb98403afbfd035fdac5712d6bf24bf2fa40e SHA512 1ebf43ca322c0cd49b7a3ffaad33057d4ac899c7a930569df124e54f713b28ece7e01aa625db91ece0126a07228256d188154bce464bd4c1a97945d686d9f0f3
+AUX nano-3.0-misbinding.patch 1517 BLAKE2B 2feac73d587beaed77649b7d6c92e3eabd411203e38f8b55ae874dcedcd4813ee6abc6b4e54fb33236c380e263257ac7e58b1c027446a4bc6caf5ab067a50c47 SHA512 0ba212b5b076ddb81f8ca723cc9c8656cf00375a913afe35036c84b3a3de23b773d11661d92d389275b26cb090a20445825fd91648579fb8a340b6992930f6bc
 DIST nano-2.8.7.tar.gz 2822417 BLAKE2B 2559497b9aee4d4c3cfc86e8af6a54bc0af58588c7bd1142a0e97c6ce50aed66c3852745b83a457263659e97592f0775dcc94c44d818e20440b6524202bfe49a SHA512 511b57f8fe82872827829bca91f7a8666a6ee75924cf2c853332ddd0467abf281c6d3cbaa5dd208c579cbace5bef23d36bd7b62be116aa2175262ed1d15aaf79
-DIST nano-2.9.7.tar.gz 2913055 BLAKE2B 87e04c50a6485c961dddeb7e4fe4b3defda874eb91f373ae1357afdcafd4c207cdf789d72563fdfecb22eabb8dca29559d8fe8abdb0bd36ba1cae7fdf14b1447 SHA512 b62eda79d5d65e4d2020b22624aca06a891747e0e7eeb7b0698bfd9f90d7d1163240d123b7f727868aac09d815e9835f146f7f16e9cbdd5acd7f55311d4acbb7
 DIST nano-2.9.8.tar.gz 2905951 BLAKE2B 95b78c43a052be68956f5b9493c418c23a9db40b56f709b17217bce257333b69e78e8f8bec191b21df8aa408ce2d3c7d68bc82cf2f785df9b31929f4f41b4325 SHA512 dcc7b074b585135e34339648fc725f54964488813d49fac50cf88c11d7cfcb8514907dbc2631ce7664ab0241717e8c42833e3c037070c80c8e7bee68fc280a2d
+DIST nano-3.0.tar.xz 1508248 BLAKE2B 1af09a02b9a7c2aac5ce48e9df12d682d1b213885330e5e936c674602249ca6227fb190611a03d9253c93749e892c1ef5e9569c72bb7df749b6b0888da90fdcd SHA512 120b606d65672a905e9ef9f3b55381cc62b7929abeaf409ea4af6be9f51b3d038e6e68f082755cbb7e198f0fb5203e0f4796c6c96ebd054d9a2241b313fcdda1
 EBUILD nano-2.8.7.ebuild 2296 BLAKE2B 0136026fb72a5b1978057e7f9ae7348bd3fd32f47c64316a5b65eb8c74689f8effc4011ef6c1e058cb22f05df001a80e9c7607cd616d8f731ab9f052239389da SHA512 bef42b685a5afb428083378cb084b9c8a0ce679ce4aedf59056eefa4976543babeab6b411f3c002d878fbc50c78fba1e91ef24cd20ae9cb62efd40b36a770305
-EBUILD nano-2.9.7.ebuild 2288 BLAKE2B 3f927891c8ecaead7d7a5372cd03babc0b90ade7ba4fe961c93e667fd5d01aac46c4ffefc80f608a96e724179c69f155edea60004d498631fc074d16eafcc7eb SHA512 ca6d15c6f962aab6cc1a67c67cf75320bbdc68404a83b83a5d85e0e469130c6ac6ff6c2f2e25fa4995619e3e8df2a07b506be50739cf784d8752764d44a11f2d
-EBUILD nano-2.9.8.ebuild 2288 BLAKE2B 3f927891c8ecaead7d7a5372cd03babc0b90ade7ba4fe961c93e667fd5d01aac46c4ffefc80f608a96e724179c69f155edea60004d498631fc074d16eafcc7eb SHA512 ca6d15c6f962aab6cc1a67c67cf75320bbdc68404a83b83a5d85e0e469130c6ac6ff6c2f2e25fa4995619e3e8df2a07b506be50739cf784d8752764d44a11f2d
-EBUILD nano-9999.ebuild 2288 BLAKE2B 3f927891c8ecaead7d7a5372cd03babc0b90ade7ba4fe961c93e667fd5d01aac46c4ffefc80f608a96e724179c69f155edea60004d498631fc074d16eafcc7eb SHA512 ca6d15c6f962aab6cc1a67c67cf75320bbdc68404a83b83a5d85e0e469130c6ac6ff6c2f2e25fa4995619e3e8df2a07b506be50739cf784d8752764d44a11f2d
+EBUILD nano-2.9.8.ebuild 2286 BLAKE2B 0da2a2bba67859cc560133330db6ba5636ed810af14e6559fc0f8590d9d8b5bbcba122253724b36286ef75ce958da9d9d651b8fa28735e93dfd33742f20e5577 SHA512 528d69630d6fe08e104888fefa954019b14e52eeb8f1bb575c8d307a41ca699271d4f45d98c7926c0e3c6714f42db4befd5b5da6aa4baff184b17d1a875af4e8
+EBUILD nano-3.0-r1.ebuild 2329 BLAKE2B ba5b2dcd3e38887a4a1e21789fc2955bfdd9f5328a65edc159d728b97b93612bb4addb9b239cd7175a1a51346f77018597fed1e67bc4a55751570a2320c1079a SHA512 439aef7945a4dbb37a9132a922179440d011d7b172318cd875f065db8a20f92ed58c6c4c507d28dfd5df5eedad02bbbb199b3982378c6ee0fde8db216c5e990d
+EBUILD nano-9999.ebuild 2279 BLAKE2B 6a4a167d78038e7c982383f87a94d8ced33eab3beb9a7765ec4de6832ffcc21a8105e5f8d2799e9df25545de224cc687365110db0f80cc6ef1578bd0b52e80ca SHA512 b9e7bbb9924ce98ed642ec963dfa0a585fd8bdda095fe19029df3b61c98d769e88760afb535e2f5fd728d1e9df39bd9c29524c90b1b3779b6e5d374917652955
 MISC metadata.xml 1548 BLAKE2B 36d9d02603b824fd0af0f1a487fcdcd7ffe2266acc1459b137612efb7ff6af7b8dfd19d6deb0177dc5120eadb27e277e25ef01288c930c97bdab34cdc15b581b SHA512 97bce71ba1b5b906c48be48c5f0af78092acbef27c62bce92b515b773242e81a6e9b978970eda192df66e244e58832783147f0d35f0fab5350f1f9f0a0d83c82
diff --git a/app-editors/nano/files/nano-3.0-misbinding.patch b/app-editors/nano/files/nano-3.0-misbinding.patch
new file mode 100644
index 000000000000..2312edcff06c
--- /dev/null
+++ b/app-editors/nano/files/nano-3.0-misbinding.patch
@@ -0,0 +1,46 @@
+From 09ab2e3d0eeb33bc4d0702623404ba01b1f8fa9a Mon Sep 17 00:00:00 2001
+From: Benno Schulenberg <bensberg@telfort.nl>
+Date: Wed, 12 Sep 2018 13:18:17 +0200
+Subject: [PATCH] bindings: when Ctrl+Shift+Delete has no keycode, don't
+ use KEY_BSP
+
+When curses gives no code for Ctrl+Shift+Delete, do not fall back
+to KEY_BACKSPACE, because then ^H and/or <Backspace> get bound to
+'cutwordleft'.
+
+This fixes https://savannah.gnu.org/bugs/?54642.
+
+Bug was introduced with version 3.0, commit e6429e78.
+---
+ src/nano.c | 2 +-
+ src/nano.h | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/nano.c b/src/nano.c
+index c7e0ca2d..74e12439 100644
+--- a/src/nano.c
++++ b/src/nano.c
+@@ -2580,7 +2580,7 @@ int main(int argc, char **argv)
+ 	controlhome = get_keycode("kHOM5", CONTROL_HOME);
+ 	controlend = get_keycode("kEND5", CONTROL_END);
+ 	controldelete = get_keycode("kDC5", CONTROL_DELETE);
+-	controlshiftdelete = get_keycode("kDC6", KEY_BACKSPACE);
++	controlshiftdelete = get_keycode("kDC6", CONTROL_SHIFT_DELETE);
+ #ifndef NANO_TINY
+ 	/* Ask for the codes for Shift+Control+Left/Right/Up/Down. */
+ 	shiftcontrolleft = get_keycode("kLFT6", SHIFT_CONTROL_LEFT);
+diff --git a/src/nano.h b/src/nano.h
+index e1042759..7de34bf3 100644
+--- a/src/nano.h
++++ b/src/nano.h
+@@ -588,6 +588,7 @@ enum
+ #define SHIFT_CONTROL_DOWN 0x414
+ #define SHIFT_CONTROL_HOME 0x415
+ #define SHIFT_CONTROL_END 0x416
++#define CONTROL_SHIFT_DELETE 0x417
+ #define ALT_LEFT 0x421
+ #define ALT_RIGHT 0x422
+ #define ALT_UP 0x423
+-- 
+2.17.1
+
diff --git a/app-editors/nano/nano-2.9.8.ebuild b/app-editors/nano/nano-2.9.8.ebuild
index d19e8febb93e..e4692ff63dd4 100644
--- a/app-editors/nano/nano-2.9.8.ebuild
+++ b/app-editors/nano/nano-2.9.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/nano/nano-2.9.7.ebuild b/app-editors/nano/nano-3.0-r1.ebuild
index d19e8febb93e..44b716308be0 100644
--- a/app-editors/nano/nano-2.9.7.ebuild
+++ b/app-editors/nano/nano-3.0-r1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit eutils flag-o-matic
+inherit flag-o-matic
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
 	inherit git-r3 autotools
 else
 	MY_P="${PN}-${PV/_}"
-	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
+	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
@@ -31,6 +31,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	static? ( ${LIB_DEPEND} )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-misbinding.patch
+)
+
 src_prepare() {
 	default
 	if [[ ${PV} == "9999" ]] ; then
diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild
index d19e8febb93e..f4eec8c7c12a 100644
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit eutils flag-o-matic
+inherit flag-o-matic
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
 	inherit git-r3 autotools
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 6a084d8c17d9..1a05f398b56e 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -5,7 +5,7 @@ DIST neovim-0.3.0.tar.gz 8903630 BLAKE2B 44936f0042be1771725a42168865d65f9afe048
 DIST neovim-0.3.1.tar.gz 8937900 BLAKE2B 05de31d194a69b9cecd34210ecfe7460968f4255c850b9bb93b8ab8f5721463c434dd9249a43153c6e65584192bbe0a2720a474c5d8b3b73776148179d18943b SHA512 42c541608509dc0335203ee1c008045f0eaeebce8e18dffc554ab22a029da700bba9b8c721bd9d68337ddb4a56f8cf034fad2a3eb88d36baf8295e6648fce506
 EBUILD neovim-0.2.0-r1.ebuild 1876 BLAKE2B 969233179105fd7dd23ffe4d4abf05db8276c8ff092651032731a6548778820805e8a4e4c0a2e40d463a11d1898e8c0e47ca76f38802df2119b70cf250932dba SHA512 3bd497e867430446993f46ad6eb038a57e0915703e8ce800040f76ae6b57e9c015241cdc8eff9a08d45f9ff71cbce2e99fc5bd7c91541e751817a54ad99498c5
 EBUILD neovim-0.2.2-r1.ebuild 1878 BLAKE2B 8f2ddcdb916fe4ce6e83626c1b86ddad10253e1cf5ebc5f41789fc52d2a002e7ed8f07cac17a5551aae1050fa6f5e3b3214436d8f9a63afd67cadb982f974db5 SHA512 095e7760a09f76e1940dfd06b02a786b29c7647d123232287da673677b27b613c320507dc206d74fe9ad6420e2bc3115b266488529d83719f1f0105d692afb20
-EBUILD neovim-0.3.0.ebuild 1984 BLAKE2B ed5d735cff11aa8bdaaea8768aa31d1852d0c050875aade4096eb4ecad0e2cd1be767b24c25aa2c6002cc788d8958803554218a185173a9203bcbe7094581b56 SHA512 17be8075a4ebdf97ef12b23eee2e383b7014bbc1a860715eca9f0de6f979d517d156765cf0038fdba86251b3a59a4271cd7670817cb25c995f720d279e9e3fb5
-EBUILD neovim-0.3.1.ebuild 1955 BLAKE2B 2889089c9cec2be306b2598c3c5ef51958d3f11f5b36c80f4adaeee35988a2bf1b36c05babe706cb74463ea4353d803cb1e2fcc7be06b66631c5d8bd04a3f6cc SHA512 6301a4a50a8916c5f2f4e8770e8e6c6e44d08b8dabd295b256d1faae37dc6af0f6fcdc4a35e056afa65de32ae0de33567a99c01355ce02ecab51d88cbd3e2b66
+EBUILD neovim-0.3.0.ebuild 2001 BLAKE2B cfd33059aafd48996a178d0955f0311b0cc85e4e902de22866b8e3e0bded37f0b33ceb7a52db869267d4f9cb8117b80474fe088f2e5a425eed847b0687b3890e SHA512 4096e62bfebfc2e23a89d569e4c841039515aeb451ba3620e8bc860befb710c061b31b2f3ae2be69ee8db404e08ca2a2959604eb806c57c9a609cef2ba29ea25
+EBUILD neovim-0.3.1.ebuild 1972 BLAKE2B 8510f3a3fc8bda84eae188e6b1e8286ccd646703a1f1a85dd7e3ccecd5d0203c35e24221b94cbfebfc4bcbf8eb069a7d22bd581f94b3f179c9952fd54198fbac SHA512 9315a6c2d61b554f8638bbbe5ddc4e4307123965b8b18d3c7de1da07d5cc1baf32855f68bd85db9ce30253da7ee4584dbbe12a1cd3aa4cfd5175548ef27ed169
 EBUILD neovim-9999.ebuild 1876 BLAKE2B 969233179105fd7dd23ffe4d4abf05db8276c8ff092651032731a6548778820805e8a4e4c0a2e40d463a11d1898e8c0e47ca76f38802df2119b70cf250932dba SHA512 3bd497e867430446993f46ad6eb038a57e0915703e8ce800040f76ae6b57e9c015241cdc8eff9a08d45f9ff71cbce2e99fc5bd7c91541e751817a54ad99498c5
 MISC metadata.xml 720 BLAKE2B fda1bb6780b08bc3eeef497f01932dde422aa9ef5bdf3e713248c5d1234b1511b6c534ec761b2979861526a1eac54d63b36543bf2b36d0a6a0a2edc9cc58caea SHA512 8ac4d9b779ee3b6c13c16a7071c0f3a67ce867ac9538f3e89a420e16d2a8d2671f901fad4df6e4709141e5af10290543dfb5e79150a0bffb994456150c4fc77f
diff --git a/app-editors/neovim/neovim-0.3.0.ebuild b/app-editors/neovim/neovim-0.3.0.ebuild
index b25617fdef50..fe0d6bceeaf0 100644
--- a/app-editors/neovim/neovim-0.3.0.ebuild
+++ b/app-editors/neovim/neovim-0.3.0.ebuild
@@ -32,7 +32,8 @@ CDEPEND=">=dev-libs/libuv-1.2.0
 	dev-libs/libvterm
 	dev-lua/lpeg[luajit=]
 	dev-lua/mpack[luajit=]
-	jemalloc? ( dev-libs/jemalloc )"
+	jemalloc? ( dev-libs/jemalloc )
+	net-libs/libnsl"
 
 DEPEND="
 	${CDEPEND}
diff --git a/app-editors/neovim/neovim-0.3.1.ebuild b/app-editors/neovim/neovim-0.3.1.ebuild
index 09b68d654924..5732835e41d8 100644
--- a/app-editors/neovim/neovim-0.3.1.ebuild
+++ b/app-editors/neovim/neovim-0.3.1.ebuild
@@ -35,7 +35,8 @@ CDEPEND="
 	dev-libs/libvterm
 	dev-lua/lpeg[luajit=]
 	dev-lua/mpack[luajit=]
-	jemalloc? ( dev-libs/jemalloc )"
+	jemalloc? ( dev-libs/jemalloc )
+	net-libs/libnsl"
 
 DEPEND="
 	${CDEPEND}
diff --git a/app-editors/pluma/Manifest b/app-editors/pluma/Manifest
index ba91b956655e..4c4a31f09aeb 100644
--- a/app-editors/pluma/Manifest
+++ b/app-editors/pluma/Manifest
@@ -5,5 +5,5 @@ DIST pluma-1.18.3.tar.xz 3355188 BLAKE2B d53f381aa9c74cad0df82ccc73aaab9f87347cb
 EBUILD pluma-1.12.2-r1.ebuild 1957 BLAKE2B 439ee1e569e161b2227abc7dffcb3815582f4f2a597b4d1769f1d0d1d2308361156cbaba558bd8e760499f129dade20a987e66dc94a7caf3cf530f3ead64a997 SHA512 fc460f11527c2a5cdced694b8c59ede5931f2ecf452e7a862791fe93fa18b2c260a51d8f6fca17c58445a59357efe48a6431d5824c8c045fd719ebaca5730860
 EBUILD pluma-1.14.1.ebuild 1999 BLAKE2B 179b831656292280771e6d4244ff24f8a4cf3285e82ba021ec73a32e6047cc9db2ce3ee9da226fb70d674e9b183c07ed55fe6cdb151b891b9b00a4199e4c4ac9 SHA512 095ec46f710d2ad58819291e28a560a4fadcab2790142604d025c69bfd1842ae78f7dca3ff5098062b2bf63f2448b5e96d66a64504edee21e9ba43a84a4e4c7e
 EBUILD pluma-1.16.2.ebuild 1999 BLAKE2B e301396e062768616a2c775d8fe644340eaaa4b085f2e8faf697f0aade4494b86cb4d5b3ad7218caec0677458f43ff27d80aa1f64cc5c40b07296127f8479ca9 SHA512 3394730f3248e8eaae6703aa472a4916e68e3aa96cc01dbe77df11786a48b95ba8a6936948fd3e2d6b921d8465f3ad05e98226802bdc8a198fee1a9aa66b31b6
-EBUILD pluma-1.18.3.ebuild 1764 BLAKE2B bad2f6fada432458399f17e3de3c467ad99662c7ecfcf06217e19e39349f1e283b88f31955ebff44fb243d4ca24de6a0f4c9e5b9b15237a3ab9b2cbd920cfd46 SHA512 edfcedeebe9b8a8ac20531ed4a6ebda38d9cc2b93873de10c535de146c0ffb5a7004d0a79cb8de2031090c638f24c64042bcb9321adcf9a80c0fba48ca655c4d
+EBUILD pluma-1.18.3.ebuild 1762 BLAKE2B 5308bc86e3b681a3dd36fff0205dc4f45e4bbb1a490d135e975b38e1a66c400da7d3ee7014e34586d10ee5942e9366402a440d9cda2599e2dcbf256b524c1158 SHA512 8446e2f3c119ea9c1ed81b85265fc012c6d1990c5b12b56c9d3086e683c3b16b91e6e631c00f664b9027d60dfff1953b444e8135c9dc2af0da98eba6f0452b69
 MISC metadata.xml 410 BLAKE2B b9e15ebb574ba3482e7317f89fd1bd599a0ba5d42a27e0c0da34f86ed64830819f23fca50865cdba6081daea8313b82a58cf98fa46e3ccc61eb389222cd1bfd4 SHA512 0e79ae54838d841d9e4d65b82af5042223e07585808bcdbf9c26ae7b59cfc7b66d1bb24b39e1835ca75dd724d34854fd12d881b7edb20850fa434cf1db2b2e14
diff --git a/app-editors/pluma/pluma-1.18.3.ebuild b/app-editors/pluma/pluma-1.18.3.ebuild
index 07b75492fa3b..3e8abed509f2 100644
--- a/app-editors/pluma/pluma-1.18.3.ebuild
+++ b/app-editors/pluma/pluma-1.18.3.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
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit mate multilib python-single-r1 virtualx
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Pluma text editor for the MATE desktop"