diff --git a/app-misc/far2l/Manifest b/app-misc/far2l/Manifest
index e073873f00..4dd08734a4 100644
--- a/app-misc/far2l/Manifest
+++ b/app-misc/far2l/Manifest
@@ -1 +1,2 @@
DIST far2l-2.3.20210426_alpha.tar.gz 5441382 BLAKE2B d6f1c2611d4c149755bf7bf7b25428030489f56b3ff5a0f8a5d4703b2229c45a4d35ec6ce3b7b90681690135028678b29cd3062be5fe74eb5a4494edfe3a2b93 SHA512 28a4e819c36815d8e754ea04b57631ee61d5c48ecfe32ce7d7a45564d8f3e08dd8cdcc5a34d3c8c4abc45b143d819c286ad95cbdc281c6b94e8599ff3acdcec3
+DIST far2l-2.3.20210630_alpha.tar.gz 5445927 BLAKE2B 15ab034c13221ea02d71e589dc93fce835256ade6238743f9d1becb2cc2cd73ca0271198cb9d47b56b59b938183a657816582b1ad3d61e05fe38d04344edd1c8 SHA512 b9eaf15ab9da1a7f0d3db56e06d52d7d8cc32ebd6ee6b5a5c7067b32fa71526979adfefb66f2a91eba3e5f0390b9e6bea9162c71bb681dfb8094447a709b2c9d
diff --git a/app-misc/far2l/far2l-2.3.20210630_alpha.ebuild b/app-misc/far2l/far2l-2.3.20210630_alpha.ebuild
new file mode 100644
index 0000000000..ea9fb33775
--- /dev/null
+++ b/app-misc/far2l/far2l-2.3.20210630_alpha.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit cmake xdg wxwidgets python-r1
+
+DESCRIPTION="Linux port of FAR Manager v2"
+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 sftp samba nfs webdav +archive +wxwidgets python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="sys-devel/m4"
+
+RDEPEND="dev-libs/xerces-c
+ dev-libs/spdlog
+ app-i18n/uchardet
+ wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
+ ssl? ( dev-libs/openssl )
+ 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_DEPS}
+ virtual/python-cffi
+ dev-python/debugpy
+ $(python_gen_any_dep 'dev-python/virtualenv[${PYTHON_USEDEP}]')
+ )"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+
+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 || die
+ sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_sudoapp)::" -i "${S}"/CMakeLists.txt || die
+ sed -e "s:execute_process(COMMAND rm -f \${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/objinfo/plug/objinfo.far-plug-mb)::" -i "${S}"/CMakeLists.txt || die
+ 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 || die
+ 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 || die
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DUSEWX="$(usex wxwidgets)"
+ -DPYTHON="$(usex python)"
+ -DBUILD_SHARED_LIBS=OFF
+ )
+
+ 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"
+}
diff --git a/app-text/kramdown-rfc2629/Manifest b/app-text/kramdown-rfc2629/Manifest
deleted file mode 100644
index 8412709307..0000000000
--- a/app-text/kramdown-rfc2629/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kramdown-rfc2629-1.4.18.gem 47104 BLAKE2B 692071c3182703848a6a6629454e06487919657ec0a0fdf33a7a4ef53421751fad81f67167c33fe0d9a5397bce270c660bf9091862739ecb42dc9adceefb6c50 SHA512 e1bc0537ef936f3519ecbebad055f3cbd136c117a62e84878fdb5a63ad224e2256dfe51285abc84345e6e7322dc3f131c9577d7cf3340c32d224451dec27b323
diff --git a/app-text/kramdown-rfc2629/kramdown-rfc2629-1.4.18.ebuild b/app-text/kramdown-rfc2629/kramdown-rfc2629-1.4.18.ebuild
deleted file mode 100644
index c3777b12f3..0000000000
--- a/app-text/kramdown-rfc2629/kramdown-rfc2629-1.4.18.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An RFC2629 (XML2RFC) backend for Thomas Leitner's kramdown markdown parser"
-HOMEPAGE="https://github.com/cabo/kramdown-rfc2629"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-ruby_add_rdepend "
- >=dev-ruby/kramdown-2.3.0
- >=dev-ruby/certified-1.0.0
- >=dev-ruby/json-2.0.0
-"
-
-all_ruby_prepare() {
- sed -i 's/json_pure/json/' ../metadata || die
-}
diff --git a/app-text/kramdown-rfc2629/metadata.xml b/app-text/kramdown-rfc2629/metadata.xml
deleted file mode 100644
index 109b200cf8..0000000000
--- a/app-text/kramdown-rfc2629/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- Florian Schmaus
- flow@gentoo.org
-
-
diff --git a/dev-ruby/certified/Manifest b/dev-ruby/certified/Manifest
deleted file mode 100644
index 74ec7ad302..0000000000
--- a/dev-ruby/certified/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST certified-1.0.0.gem 143360 BLAKE2B a7fcc8b2439dbf8926f45dd6fdca93acc67c22fc7dd27099e9f626f6cf065303ec5c3c0084a243699be583f7f244aff180a36ce487622d023b1fc4ae860844af SHA512 8a331bb88f68f32c765136fad3f5b130843c8d1d0f3f5988b7ac7e3258a2ae57fe203ffc74996114dd708d017594a033faefc8e6928e24f07cac176aecbbca68
diff --git a/dev-ruby/certified/certified-1.0.0.ebuild b/dev-ruby/certified/certified-1.0.0.ebuild
deleted file mode 100644
index 54d83dad11..0000000000
--- a/dev-ruby/certified/certified-1.0.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ensure using OpenSSL::SSL::VERIFY_PEER and provide certificate bundle if needed"
-HOMEPAGE="https://github.com/stevegraham/certified"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-ruby/certified/metadata.xml b/dev-ruby/certified/metadata.xml
deleted file mode 100644
index 109b200cf8..0000000000
--- a/dev-ruby/certified/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- Florian Schmaus
- flow@gentoo.org
-
-