diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 6bb8362fe403..c2e3aa91fccd 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1 +1 @@
-DIST calamares-2.2.tar.gz 4728472 SHA256 b75d1462a8a7bd2bdc57ec38bd3b2e0485be573d8af13d05f44df2fc7a7dcaa4 SHA512 1b612f10cba059f8991d4e0afc06a742495929ae20daf8e57d4bca94b5836cd7cd3f3db1cbf08850c8ed55a7dd5f28f42198b6e40392b3f8cc36e8da55b95ffc WHIRLPOOL b1aeb6ff5df865c679d080f6482c50c85a6aa75768729c2194a775182f98d8b78627c66e8b49063c8f60bdec1c2f56a1fd627528fbc2a13fe8117d6c933bb212
+DIST calamares-2.2.1.tar.gz 4733060 SHA256 1775444f286b37994a6970e878db09bf48dfa687c57435eed05c27d3064f34fa SHA512 f6864277857cef616598526936ee91b01245aac8c4fa67cbb69bf365523177d0042c46846af4116496974d74672582a7b6b6b925a9da0aa7819ad6b238ec7980 WHIRLPOOL 0ddc38a2c8ac06892e0dbee2117e100479c28548fed792c9be9ccc547fb49247cc4c69fd88e5d503786ba93d1a1f28ef84979c2a32a97c5fb94a3952f29e9535
diff --git a/app-admin/calamares/calamares-2.2.ebuild b/app-admin/calamares/calamares-2.2.1.ebuild
similarity index 100%
rename from app-admin/calamares/calamares-2.2.ebuild
rename to app-admin/calamares/calamares-2.2.1.ebuild
diff --git a/app-crypt/libsecret/metadata.xml b/app-crypt/libsecret/metadata.xml
index 25f333c316c4..996e7cacd217 100644
--- a/app-crypt/libsecret/metadata.xml
+++ b/app-crypt/libsecret/metadata.xml
@@ -5,7 +5,4 @@
gnome@gentoo.org
Gentoo GNOME Desktop
-
diff --git a/app-editors/atom/atom-1.6.2.ebuild b/app-editors/atom/atom-1.6.2.ebuild
index 9bb57d1c33ca..1524177b0aae 100644
--- a/app-editors/atom/atom-1.6.2.ebuild
+++ b/app-editors/atom/atom-1.6.2.ebuild
@@ -81,6 +81,6 @@ src_install(){
fperms +x "/usr/share/${PN}/resources/app/apm/bin/node"
fperms +x "/usr/share/${PN}/resources/app/apm/node_modules/npm/bin/node-gyp-bin/node-gyp"
# Symlinking to /usr/bin
- dosym "/usr/share/${PN}/resources/app/atom.sh /usr/bin/atom"
- dosym "/usr/share/${PN}/resources/app/apm/bin/apm /usr/bin/apm"
+ dosym "/usr/share/${PN}/resources/app/atom.sh" /usr/bin/atom
+ dosym "/usr/share/${PN}/resources/app/apm/bin/apm" /usr/bin/apm
}
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 9c962eec965c..462f8662accc 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -1,3 +1,4 @@
DIST neovim-0.1.0.tar.gz 7644722 SHA256 e8659558103b8f5a65aac84007a12e3581b32736321778028017fd07365cfff8 SHA512 b91e5ce5561155ecb3554f56fd4371219612ed3bc35dfeb60a225eb1dbe1473fce5f573eb996bdb01fd9569f764da86493108665c98dc7555fc44f410befb00a WHIRLPOOL 33d7b88588c214ddc670a7b3cffcfd855699e90b15c5e327ac0c17972fddb73bd519b1a8eb609f8454d6c463f18764f17bc1314b6b27448c5ac4607cdbce1551
DIST neovim-0.1.1.tar.gz 7584560 SHA256 f39bcab23457c66ce0d67dcf8029743703f860413db0070f75d4f0ffad27c6c1 SHA512 7098bef9b81862f009789cff49a063d56d52d2f5c74e2fe68ad65c952c61c07eabeb6be150b369a5a179957f20187de3051caaa30b1e0cb4ec1e9e49b4e77333 WHIRLPOOL 9df0d6d59bdda2def2d8a393eec579f341256aff18c485cbb08c96637c597ee4df73a68a09105e776605194412274df2c82b78f7ca0e0bc1e20d4780fcdfa57f
DIST neovim-0.1.2.tar.gz 7610804 SHA256 549881465eff82454660ae92d857d6ffa22383d45c94c46f3753fd1b0e699247 SHA512 dc03d92ff296f3ff55225d514479f1ac201a5a65eb8a6c02e71935ca44feb8ab15897b26a2ea46e53771f902c57b027d07e02f95673268ee060c6b77c4aa90e4 WHIRLPOOL ef1253249120c89c6efc15520263c889a9972df0c11e9353dedeee112c46ee9b92355fa3dabdf2d15cb7d0416681d1c8b55a9c02266048154f3afe104fdf4ff9
+DIST neovim-0.1.3.tar.gz 7636777 SHA256 7a86892d941b8829537ad46864b9a363d009ba56aeefdef2ee15ffa3eee5f92b SHA512 70c979fa06784cae4ded43c7fef7906c743729ed43a50003deec1d2ab7a800bfeab81c394893796a06d0f37811867062b2f766936c2a871f7d968b350729d4c8 WHIRLPOOL 1b3ccb589b3b2ee6d0e6bb1e2139c6ae508859637a0b075a6ccef5168386737713549abab37c7148d9d44d19be54a75587253144aaa1b4c5315408838cdaa4c5
diff --git a/app-editors/neovim/neovim-0.1.3.ebuild b/app-editors/neovim/neovim-0.1.3.ebuild
new file mode 100644
index 000000000000..53e1168ee546
--- /dev/null
+++ b/app-editors/neovim/neovim-0.1.3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="Vim-fork focused on extensibility and agility."
+HOMEPAGE="https://neovim.io"
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://github.com/neovim/neovim.git"
+else
+ SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0 vim"
+SLOT="0"
+IUSE="+nvimpager perl python +jemalloc"
+
+CDEPEND="dev-lang/luajit:2
+ >=dev-libs/libtermkey-0.17
+ >=dev-libs/libuv-1.2.0
+ >=dev-libs/msgpack-1.0.0
+ >=dev-libs/unibilium-1.1.1
+ dev-libs/libvterm
+ dev-lua/lpeg
+ dev-lua/messagepack
+ jemalloc? ( dev-libs/jemalloc )
+"
+DEPEND="${CDEPEND}
+ virtual/libiconv
+ virtual/libintl"
+RDEPEND="${CDEPEND}
+ perl? ( dev-lang/perl )
+ python? ( dev-python/neovim-python-client )"
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+src_prepare() {
+ # use our system vim dir
+ sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
+ -i src/nvim/globals.h || die
+
+ # add eclass to bash filetypes
+ sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ export USE_BUNDLED_DEPS=OFF
+ append-cflags "-Wno-error"
+ local mycmakeargs=(
+ $(cmake-utils_use_enable jemalloc JEMALLOC)
+ -DLIBUNIBILIUM_USE_STATIC=OFF
+ -DLIBTERMKEY_USE_STATIC=OFF
+ -DLIBVTERM_USE_STATIC=OFF
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # install a default configuration file
+ insinto /etc/vim
+ doins "${FILESDIR}"/sysinit.vim
+
+ # conditionally install a symlink for nvimpager
+ if use nvimpager; then
+ dosym /usr/share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
+ fi
+}
diff --git a/app-emacs/dash/dash-2.12.1.ebuild b/app-emacs/dash/dash-2.12.1.ebuild
index 2c28e3d766b4..329b30522688 100644
--- a/app-emacs/dash/dash-2.12.1.ebuild
+++ b/app-emacs/dash/dash-2.12.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/magnars/dash.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
S="${WORKDIR}/${PN}.el-${PV}"
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/magit/magit-2.6.0.ebuild b/app-emacs/magit/magit-2.6.0.ebuild
index cf776f7a1f49..90e43f10315c 100644
--- a/app-emacs/magit/magit-2.6.0.ebuild
+++ b/app-emacs/magit/magit-2.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/magit/magit/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
S="${WORKDIR}/${P}/lisp"
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/with-editor/with-editor-2.5.0-r2.ebuild b/app-emacs/with-editor/with-editor-2.5.0-r2.ebuild
index c52af4ced54d..fde71ea86639 100644
--- a/app-emacs/with-editor/with-editor-2.5.0-r2.ebuild
+++ b/app-emacs/with-editor/with-editor-2.5.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
SITEFILE="50${PN}-gentoo.el"
ELISP_TEXINFO="*.texi"
diff --git a/app-emulation/libguestfs/metadata.xml b/app-emulation/libguestfs/metadata.xml
index 122b2529d057..16ffb5e0119b 100644
--- a/app-emulation/libguestfs/metadata.xml
+++ b/app-emulation/libguestfs/metadata.xml
@@ -24,7 +24,6 @@
modifying virtual machine (VM) disk images