gentoo resync : 08.07.2021

6 files changed, 122 insertions, 7 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index aace3fc8cd27..28b5a85e4a6c 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 6b6ff01b22b1..c323ba0dd2ce 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -8,7 +8,7 @@ DIST emacs-25.3-patches-2.tar.xz 2488 BLAKE2B 93c6a18e7f729a5b4d299974581c99835e
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 DIST emacs-27.1.tar.xz 43752012 BLAKE2B 433fbf234c711954269e7e10348abbd4a2bc4c357a59164c625a5ccee2de85a149636c70ad3fad3c09dbbd24900badfd2c0c645017bb33ab3e25d3decff72057 SHA512 dfb26531d2c19cf9fb56505f03d799654b45e5f9528e777900e8280ed2c1d21e04c52f510528e31e015977c471ae63164cedee6174b7439ebcf479a21fc18064
-DIST emacs-27.2-patches-1.tar.xz 1544 BLAKE2B a93348607338c1b9c0cda669669dc3421f1a172a5946142f7da8f8548e47bc83274ec42d1c47ffb07633a3a451611a0a94b863c0fc1ea19617b00217bcf85617 SHA512 a69d8000dc57de6399d97f0e512ebc7d46acec98d967c19c980d7f6e6f5708bd2b5f9999f25baea9d09e83a484085cdbbe12239cf518f28d333ddc76fa852a94
+DIST emacs-27.2-patches-2.tar.xz 7448 BLAKE2B 4335438a43ba88f6638082bf034c77331808f3fbfee9b746d82bfcb6de5c6b6563c358e92d0296357e3b76c67a58e2b748c3234770a6cbff60170bf91eb1b8af SHA512 b62498a8a26bf7b0939102d37508eb7ea0213f69a2e803cff3346dab70da03b3c63e1df2683cedd6fb85afb928bb1fb0072bfde8da326f4cabfd950457d2d368
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156 SHA512 0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9
 EBUILD emacs-18.59-r13.ebuild 4380 BLAKE2B 455969fb936c99bd04f5f5e85116e86edeb38b7bf29ba4765c6ef2333c756b612d57c57914b1571f9cf3222bb4d751e551c8e48d3ce2735799d0bcd30d8d9e4e SHA512 8f0c2e4ec5d73099619f78c734e6a048b9404b94a090ecb4babe7933caf55b92f632da7aa0f2b6ebf2862ce7a2d017b4cfd360be8c9b05617bc01ea2cdbcd2bc
 EBUILD emacs-23.4-r20.ebuild 11080 BLAKE2B 6306ed041c826846f116f40bb2b98f3be3d8f1ddfc1506083125ee2214ea8ceb3d5ed9d036c247f45ddd6e7326e6f9c5de93752890a05f272f67708d25291509 SHA512 679adade4cfe01cc2bf9936ed2bc657344019618109b74048575c53d135482afe4bcef637f85779a8bf92c152000e1e9432576704319f394c2281fcd83ad3d53
@@ -16,7 +16,7 @@ EBUILD emacs-24.5-r10.ebuild 10831 BLAKE2B 87325c00c3115e3b3c8c0c6722538382a5bb0
 EBUILD emacs-25.3-r9.ebuild 11142 BLAKE2B 2eb2fe9e84133d53d874e66b05fe8f98c5460fb47fca1f9aaae8a869742e1ce711cf0817fdfa03d9820b44ecbb2bf055cd23743acefeee6466a5c805fa01b53f SHA512 579a75ccbc660faf0ecfe2d28e339e50e1d24412ecb36b47c5d6196b66d615feecdf12557dd9973d8a79124681ca982ee248e17dce39836cd33bc15b6da520cd
 EBUILD emacs-26.3-r4.ebuild 11785 BLAKE2B 807bbd1eda823268087003da546d68b5837c4984736e85db519e8ab02924b366a34e8df9d08dcfc0da8b7996c2d4a82a0abe305ceab26eb3783c895e6894c8c7 SHA512 2fb3a6622224509586aaea43dfde63d07e1d568baaa4d808e4285b5466f369fd34a21c56519b0a15e131cfd48f6cd046010eb62cdc6c3ac8e238f3ba4c1a22c5
 EBUILD emacs-27.1-r4.ebuild 14334 BLAKE2B c524e15aa87eebb1eacb52368fc11b17c429a10c83509e883cea3fada349d7a63e7947b1f3c050641ed65fabfbad2ebe965ec19f96b062ddc62162d344bc044a SHA512 7238304e452cf3bae3930c25726fb92a8b76c35155c35793a69aae08b23b7066b34cbb1ae18bd385388ec07170da14008cd89397bd9483a9033f4feaf1632baa
-EBUILD emacs-27.2-r1.ebuild 14431 BLAKE2B 0f64c54c40b31ede1fb79e704230d5ac939e3813f4e993056745638c5a8bafa4f95abebb1377fd7c931530677ab206b4d878e736aba1e1c2ba8769e555a231e5 SHA512 f48f7ff0c8f0ded2cf2dd8f34f292065d21fcb54c56fd2ab0c90d09c7ba978ba877b2937be78567308f8dc3d9b21c3a5231f968009864a74fe78a2c745ed6d3a
+EBUILD emacs-27.2-r2.ebuild 14431 BLAKE2B 037523522bc7036fdb4b612a6684ce37d213b16b8472b04ffe317d3f9d721d67a7bb7b7ed527f4d970b9030b0dae26b6f1c622238556522f71a9933dc7bd7399 SHA512 25c0edc1c7eee90126ca5b25e55542409ca727914613a1ee3c4aee4c6f28cd401a15f9606e6418afc507844df75f577701825255c8e216e5b4f3eb1514f160bc
 EBUILD emacs-27.2.9999.ebuild 14298 BLAKE2B 5649b3f948225639e73f6b4570f6facf9e81f57476354604c78a178be8f146d0e9325d98f3eb52689d2e02ba522ffe690e33e9c610b6e99584704a2f140b805e SHA512 e22fe0e2da09c9823bcedb148060a56d5b481826fe98f09a6112b3b27d65778e0db12a748e7ec42805345729a0ed0bc0ea46a7878e12588cf4cf999d69f6746b
 EBUILD emacs-28.0.9999.ebuild 14185 BLAKE2B 76d5f0f59a0cc1fd4399e7aad1544d26d5abc0473ee01e7541a633fa743b2be880c8a81212fc37845bad64292851fdda8ec67833760316d8d2c7980d0c7fd37e SHA512 8e3b7413a3d8224a3b8642546f2d47afd5bf3c0404caa60deb97c20d6c4178fec990785b51df5a1f6ba0d5d156161195cd818ba3df7fc8e92fa8802d32ca129d
 MISC metadata.xml 3129 BLAKE2B d0bfee8c1d5de0496d4b7bb5fff30f8b5c19911ccdf40d8bf34c990c57a61f6a6b68528e2a393174b190c59ffa1ff657c0d5dd6b9ff1d15e59641ae2b7da749c SHA512 1e37638584eefe022ffb08951adce160d6342aa90e92cfb0481689b662ff6a04a9327bb8c03fbc302315a17c4918d082ee076caadea34a2c461957f079da2279
diff --git a/app-editors/emacs/emacs-27.2-r1.ebuild b/app-editors/emacs/emacs-27.2-r2.ebuild
index b70bb5b2af17..c86c316c8f2d 100644
--- a/app-editors/emacs/emacs-27.2-r1.ebuild
+++ b/app-editors/emacs/emacs-27.2-r2.ebuild
@@ -32,7 +32,7 @@ else
 		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
 	fi
 	# Patchset from proj/emacs-patches.git
-	SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-1.tar.xz"
+	SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-2.tar.xz"
 	PATCHES=("${WORKDIR}/patch")
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 8ed14144feb0..d1b8d4abb94d 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -3,6 +3,8 @@ AUX neovim-0.4.4-cmake-release-type.patch 627 BLAKE2B 87c6e6fd487b923ec4146f2cb3
 AUX neovim-0.4.4-cmake_lua_version.patch 419 BLAKE2B 73477d7fdc2705f2e93cd6dd355ea01fbfc232306e86a13097a1c069ea3248972be9d4da7b175c8c3c7e0fde7581d4ed9b431d73c119e9f8a63a7a15007aba31 SHA512 a1be27ebd18be34fede632f695bacf65699e9dd1a8b219120372b5e0c48691f595ba42725c4f795456b8018d668f471e3a042622a5f541af50c84a089d53c83c
 AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a
 DIST neovim-0.4.4.tar.gz 9558246 BLAKE2B b1d44898bb1e1ab40a7e1d7fb4448076c991ebe1a0956674548de82fe7a931d9eaffbf35ba03cf9c88466dcd628a55f1d7bf9e7a13f3dad74424d6d653ded60c SHA512 ca5c2fe1784ac7b0d2117948ba2e9ae5d94e36d22ff9e0967047e1e03e605537672d85543897af335103215ad462c86962f25267d352a77d61bc3d1cafb3c183
+DIST neovim-0.5.0.tar.gz 10337976 BLAKE2B e7630e96fdd1a159ca68c8f61ed473a7fa7d0c5ebf7485e42c47f314f1a3031ac3f63519f4789d7244b9677f9fa9b2aabbffa1e11d97456255c44348acb814d3 SHA512 f6649f804faabb4104d3b28283932e40358c23990961f4ca7b380089318da312e59242746cee06387f4d881dd6514abbfec79c4063482383adfb4106e9e7a3a4
 EBUILD neovim-0.4.4-r100.ebuild 2829 BLAKE2B 4240747e0040650db867b7e7752a588eadae4d5aba7146dda222e0e7ba6238da121d32d5c037a846d28f5485a9360f2d648a17442903c903e37aa77196d37cce SHA512 2bc0c0c595634cf481443696aaef782dc2d295d09f9e6d456adaff3b2bc9e324b4caec201f79a6d30f257626f0f3f64f1843ee426f85114baa9f5760a5cb49a9
-EBUILD neovim-9999.ebuild 2799 BLAKE2B dd528fa20828c83689b655cf416428d4d27e46b81f060199751dec78b3066d48ab2b31198d0d6c6d7a0e493474be54373621a1b17ca0a7006a800b9e96cab2e3 SHA512 d6d62476fc74ea77ee41b3a77ff9946fe3d47bebcaa0a6824f188ed5c0d7c1733c0e09926a7ecf54cf53cc08afd5a7333eb43fbb29a9b32f905d7d7c19d82561
+EBUILD neovim-0.5.0.ebuild 2885 BLAKE2B c1897e51862089f380d35a3d54cef1c7105661b7987d0b5f9423910ea81d1d6c29af312398e22f7765b1496ebb695c4f50461b4a437837785127139be988da39 SHA512 48de0cc9496fd2c4f589abddc0c19c161535b69d3900bfe528a36e746774f98dc28e32f6698671943540a37a9227b756be5fadd605d39f29bcbe654dedb6f56e
+EBUILD neovim-9999.ebuild 2885 BLAKE2B c1897e51862089f380d35a3d54cef1c7105661b7987d0b5f9423910ea81d1d6c29af312398e22f7765b1496ebb695c4f50461b4a437837785127139be988da39 SHA512 48de0cc9496fd2c4f589abddc0c19c161535b69d3900bfe528a36e746774f98dc28e32f6698671943540a37a9227b756be5fadd605d39f29bcbe654dedb6f56e
 MISC metadata.xml 535 BLAKE2B 7cebdc1b7adafafdcc2fe266f8696ad0dff927e8a9383ee34ac66e2c8910d3863d1f7603f2a82dec75f586ab22814d7268475ae3ce02fc3dca12a665e1e8ce5e SHA512 71fcf593a1b9587e6af0e30e851fb17e8552568a4e8bd38341c150ada7dbf72f962250f3306403c0be2d334932f63fe183850efe1c67d515ba79577cdf7aa561
diff --git a/app-editors/neovim/neovim-0.5.0.ebuild b/app-editors/neovim/neovim-0.5.0.ebuild
new file mode 100644
index 000000000000..99aa8bbbb72f
--- /dev/null
+++ b/app-editors/neovim/neovim-0.5.0.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} luajit )
+
+inherit cmake lua-single optfeature xdg
+
+DESCRIPTION="Vim-fork focused on extensibility and agility."
+HOMEPAGE="https://neovim.io"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
+else
+	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+fi
+
+LICENSE="Apache-2.0 vim"
+SLOT="0"
+IUSE="+lto +nvimpager +tui"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+# Upstream say the test library needs LuaJIT
+# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377
+#REQUIRED_USE="test? ( lua_single_target_luajit )"
+#RESTRICT="!test? ( test )"
+
+# Upstream build scripts invoke the Lua interpreter
+BDEPEND="${LUA_DEPS}
+	dev-util/gperf
+	virtual/libiconv
+	virtual/libintl
+	virtual/pkgconfig
+"
+# TODO: add tests, dev-lua/busted has now got luajit support.
+# bug #584694
+DEPEND="${LUA_DEPS}
+	dev-lua/luv[${LUA_SINGLE_USEDEP}]
+	$(lua_gen_cond_dep '
+		dev-lua/lpeg[${LUA_USEDEP}]
+		dev-lua/mpack[${LUA_USEDEP}]
+	')
+	$(lua_gen_cond_dep '
+		dev-lua/LuaBitOp[${LUA_USEDEP}]
+	' lua5-{1,2})
+	dev-libs/libuv:0=
+	>=dev-libs/libvterm-0.1.2
+	dev-libs/msgpack:0=
+	dev-libs/tree-sitter:=
+	tui? (
+		dev-libs/libtermkey
+		>=dev-libs/unibilium-2.0.0:0=
+	)
+"
+RDEPEND="
+	${DEPEND}
+	app-eselect/eselect-vi
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch"
+	"${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch"
+	"${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch"
+)
+
+src_prepare() {
+	# use our system vim dir
+	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
+		-i src/nvim/globals.h || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Upstream default to LTO on non-debug builds
+	# Let's expose it as a USE flag because upstream
+	# have preferences for how we should use LTO
+	# if we want it on (not just -flto)
+	# ... but allow turning it off.
+	# TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now
+	local mycmakeargs=(
+		-DENABLE_LTO=$(usex lto)
+		-DFEAT_TUI=$(usex tui)
+		-DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)")
+		-DLUA_PRG="${ELUA}"
+		-DMIN_LOG_LEVEL=3
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_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 ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard
+	optfeature "Python plugin support" dev-python/pynvim
+	optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client
+	optfeature "remote/nvr support" dev-python/neovim-remote
+}
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index d8873b59f067..99aa8bbbb72f 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
 else
 	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
 fi
 
 LICENSE="Apache-2.0 vim"
@@ -46,12 +46,10 @@ DEPEND="${LUA_DEPS}
 	$(lua_gen_cond_dep '
 		dev-lua/LuaBitOp[${LUA_USEDEP}]
 	' lua5-{1,2})
-	dev-libs/libutf8proc:=
 	dev-libs/libuv:0=
 	>=dev-libs/libvterm-0.1.2
 	dev-libs/msgpack:0=
 	dev-libs/tree-sitter:=
-	net-libs/libnsl
 	tui? (
 		dev-libs/libtermkey
 		>=dev-libs/unibilium-2.0.0:0=
@@ -65,6 +63,7 @@ RDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch"
 	"${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch"
+	"${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch"
 )
 
 src_prepare() {
@@ -81,6 +80,7 @@ src_configure() {
 	# have preferences for how we should use LTO
 	# if we want it on (not just -flto)
 	# ... but allow turning it off.
+	# TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now
 	local mycmakeargs=(
 		-DENABLE_LTO=$(usex lto)
 		-DFEAT_TUI=$(usex tui)