diff --git a/app-misc/far2l/Manifest b/app-misc/far2l/Manifest
new file mode 100644
index 0000000000..dd24253db0
--- /dev/null
+++ b/app-misc/far2l/Manifest
@@ -0,0 +1 @@
+DIST far2l-2.3.20210419_alpha.tar.gz 5441978 BLAKE2B d8878704d5928d5240e1cdcf32dc3e2bd298c3a283811ae29a9cff36c20d1ae8b655ea5355f7c41660eb91b6e53b6c26cf66e93f7d4fc59e12ad3ee1e2cac4b0 SHA512 99b98f5946ce93ddbd93a9d26ce4db22ee687e7c9cbaab53b0087896a9a8247041064614b489d5e6e0a0d4ead72057db5bcbdbf6b060e36b9eb4f61aa30dec38
diff --git a/app-misc/far2l/far2l-2.3.20210419_alpha.ebuild b/app-misc/far2l/far2l-2.3.20210419_alpha.ebuild
new file mode 100644
index 0000000000..92570f24a5
--- /dev/null
+++ b/app-misc/far2l/far2l-2.3.20210419_alpha.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_BUILD_TYPE="Release"
+WX_GTK_VER="3.0-gtk3"
+
+inherit eutils cmake xdg-utils wxwidgets python-any-r1
+
+DESCRIPTION="Linux port of Far Manager"
+HOMEPAGE="https://github.com/elfmz/far2l"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/elfmz/far2l"
+	EGIT_BRANCH="master"
+else
+	MY_PV="${PV:4:4}-${PV:8:2}-${PV:10:8}"
+	MY_P="${PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/elfmz/far2l/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+ssl libressl sftp samba nfs webdav +archive +wxwidgets python +static-libs"
+
+BDEPEND=">=dev-util/cmake-3.2.2
+	sys-devel/m4"
+
+RDEPEND="sys-apps/gawk
+	dev-libs/xerces-c
+	dev-libs/spdlog
+	app-i18n/uchardet
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
+	ssl? (
+		!libressl? ( dev-libs/openssl )
+		libressl? ( dev-libs/libressl )
+	)
+	sftp? ( net-libs/libssh[sftp] )
+	samba? ( net-fs/samba )
+	nfs? ( net-fs/libnfs )
+	webdav? ( net-libs/neon )
+	archive? (
+		dev-libs/libpcre2
+		app-arch/libarchive )
+	python? ( $(python_gen_any_dep 'dev-python/virtualenv[${PYTHON_USEDEP}]') )"
+
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if use wxwidgets; then
+		setup-wxwidgets
+	fi
+}
+
+src_prepare() {
+	sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_askpass)::" -i "${S}"/CMakeLists.txt
+	sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_sudoapp)::" -i "${S}"/CMakeLists.txt
+	sed -e "s:execute_process(COMMAND rm -f \${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/objinfo/plug/objinfo.far-plug-mb)::" -i "${S}"/CMakeLists.txt
+	sed -e "s:execute_process(COMMAND rm -f \${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/farftp/plug/farftp.far-plug-mb && echo Removed existing farftp plugin)::" -i "${S}"/CMakeLists.txt
+	sed -e "s:execute_process(COMMAND rm -f \${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/python/plug/python.far-plug-wide && echo Removed existing python plugin)::" -i "${S}"/CMakeLists.txt
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSEWX="$(usex wxwidgets)"
+		-DPYTHON="$(usex python)"
+		-DBUILD_SHARED_LIBS="$(usex static-libs "no" "yes")"
+	)
+
+	cmake_src_configure
+}
+
+src_install(){
+	cmake_src_install
+	einstalldocs
+	dosym "../../bin/far2l" "usr/lib/far2l/far2l_askpass"
+	dosym "../../bin/far2l" "usr/lib/far2l/far2l_sudoapp"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
\ No newline at end of file
diff --git a/app-misc/far2l/far2l-9999.ebuild b/app-misc/far2l/far2l-9999.ebuild
new file mode 100644
index 0000000000..92570f24a5
--- /dev/null
+++ b/app-misc/far2l/far2l-9999.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_BUILD_TYPE="Release"
+WX_GTK_VER="3.0-gtk3"
+
+inherit eutils cmake xdg-utils wxwidgets python-any-r1
+
+DESCRIPTION="Linux port of Far Manager"
+HOMEPAGE="https://github.com/elfmz/far2l"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/elfmz/far2l"
+	EGIT_BRANCH="master"
+else
+	MY_PV="${PV:4:4}-${PV:8:2}-${PV:10:8}"
+	MY_P="${PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/elfmz/far2l/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+ssl libressl sftp samba nfs webdav +archive +wxwidgets python +static-libs"
+
+BDEPEND=">=dev-util/cmake-3.2.2
+	sys-devel/m4"
+
+RDEPEND="sys-apps/gawk
+	dev-libs/xerces-c
+	dev-libs/spdlog
+	app-i18n/uchardet
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
+	ssl? (
+		!libressl? ( dev-libs/openssl )
+		libressl? ( dev-libs/libressl )
+	)
+	sftp? ( net-libs/libssh[sftp] )
+	samba? ( net-fs/samba )
+	nfs? ( net-fs/libnfs )
+	webdav? ( net-libs/neon )
+	archive? (
+		dev-libs/libpcre2
+		app-arch/libarchive )
+	python? ( $(python_gen_any_dep 'dev-python/virtualenv[${PYTHON_USEDEP}]') )"
+
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if use wxwidgets; then
+		setup-wxwidgets
+	fi
+}
+
+src_prepare() {
+	sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_askpass)::" -i "${S}"/CMakeLists.txt
+	sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_sudoapp)::" -i "${S}"/CMakeLists.txt
+	sed -e "s:execute_process(COMMAND rm -f \${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/objinfo/plug/objinfo.far-plug-mb)::" -i "${S}"/CMakeLists.txt
+	sed -e "s:execute_process(COMMAND rm -f \${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/farftp/plug/farftp.far-plug-mb && echo Removed existing farftp plugin)::" -i "${S}"/CMakeLists.txt
+	sed -e "s:execute_process(COMMAND rm -f \${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/python/plug/python.far-plug-wide && echo Removed existing python plugin)::" -i "${S}"/CMakeLists.txt
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSEWX="$(usex wxwidgets)"
+		-DPYTHON="$(usex python)"
+		-DBUILD_SHARED_LIBS="$(usex static-libs "no" "yes")"
+	)
+
+	cmake_src_configure
+}
+
+src_install(){
+	cmake_src_install
+	einstalldocs
+	dosym "../../bin/far2l" "usr/lib/far2l/far2l_askpass"
+	dosym "../../bin/far2l" "usr/lib/far2l/far2l_sudoapp"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
\ No newline at end of file
diff --git a/app-misc/far2l/metadata.xml b/app-misc/far2l/metadata.xml
new file mode 100644
index 0000000000..fd703baf5f
--- /dev/null
+++ b/app-misc/far2l/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<use>
+		<flag name="archive">Multiarc extended archives support</flag>
+		<flag name="nfs">NFS support in NetRocks</flag>
+		<flag name="samba">SMB support in NetRocks</flag>
+		<flag name="sftp">SFTP support in NetRocks</flag>
+		<flag name="ssl">FTPS support in NetRocks</flag>
+		<flag name="webdav">WebDav support in NetRocks</flag>
+	</use>
+</pkgmetadata>
diff --git a/x11-misc/i3lock-fancy-rapid/i3lock-fancy-rapid-0.0.0_pre20201109.ebuild b/x11-misc/i3lock-fancy-rapid/i3lock-fancy-rapid-0.0.0_pre20201109-r1.ebuild
similarity index 91%
rename from x11-misc/i3lock-fancy-rapid/i3lock-fancy-rapid-0.0.0_pre20201109.ebuild
rename to x11-misc/i3lock-fancy-rapid/i3lock-fancy-rapid-0.0.0_pre20201109-r1.ebuild
index ce7191db10..d7e35a48ba 100644
--- a/x11-misc/i3lock-fancy-rapid/i3lock-fancy-rapid-0.0.0_pre20201109.ebuild
+++ b/x11-misc/i3lock-fancy-rapid/i3lock-fancy-rapid-0.0.0_pre20201109-r1.ebuild
@@ -28,6 +28,7 @@ src_prepare() {
 	default
 	sed -e "s/gcc/$(tc-getCC)/" \
 		-e "/CFLAGS=/d" \
+		-e 's/$(CC) $^ $(CFLAGS) -o $@/$(CC) $^ $(CFLAGS) $(LDFLAGS) -o $@/' \
 		-i Makefile || die
 }