diff --git a/dev-python/asciimatics/Manifest b/dev-python/asciimatics/Manifest
new file mode 100644
index 0000000000..55539fd9c5
--- /dev/null
+++ b/dev-python/asciimatics/Manifest
@@ -0,0 +1 @@
+DIST asciimatics-1.11.0.tar.gz 1544889 BLAKE2B 98492a3bef25331daf085bfd93e17a244cd70939d06ead1c4e6dfa546411e268b7c278b7e05046c42d59faf35d85c6c584663aac3566ef82e682740f9fa67fa4 SHA512 7703e29955c984cb091a1cfda01abf31ad108da0488d0dd1c941593689cc4ebb899565471d5d4396b910a9770e640e0cba835c4dac203bd1c4a853ce7dcaacbc
diff --git a/dev-python/asciimatics/asciimatics-1.11.0.ebuild b/dev-python/asciimatics/asciimatics-1.11.0.ebuild
new file mode 100644
index 0000000000..771c5c647d
--- /dev/null
+++ b/dev-python/asciimatics/asciimatics-1.11.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Package for curses-like operations, text UIs and ASCII art animations"
+HOMEPAGE="https://pypi.org/project/asciimatics/ https://github.com/peterbrittain/asciimatics"
+
+if [[ "${PV}" == 9999 ]]
+then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/peterbrittain/asciimatics.git"
+else
+	SRC_URI="https://github.com/peterbrittain/asciimatics/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RESTRICT="mirror test"
+
+RDEPEND="
+	>=dev-python/pyfiglet-0.7.2[${PYTHON_USEDEP}]
+	>=dev-python/pillow-2.7.0[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	default
+	sed -i -e "s/use_scm_version={/\0'fallback_version': '${PV}',/" setup.py
+}
diff --git a/dev-python/asciimatics/asciimatics-9999.ebuild b/dev-python/asciimatics/asciimatics-9999.ebuild
new file mode 100644
index 0000000000..91f368b9fc
--- /dev/null
+++ b/dev-python/asciimatics/asciimatics-9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Package for curses-like operations, text UIs and ASCII art animations"
+HOMEPAGE="https://pypi.org/project/asciimatics/ https://github.com/peterbrittain/asciimatics"
+
+if [[ "${PV}" == 9999 ]]
+then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/peterbrittain/asciimatics.git"
+else
+	SRC_URI="https://github.com/peterbrittain/asciimatics/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RESTRICT="mirror"
+
+RDEPEND="
+	>=dev-python/pyfiglet-0.7.2[${PYTHON_USEDEP}]
+	>=dev-python/pillow-2.7.0[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock
+	)
+"
+
+distutils_enable_tests nose
diff --git a/dev-python/asciimatics/metadata.xml b/dev-python/asciimatics/metadata.xml
new file mode 100644
index 0000000000..e236e2c2f9
--- /dev/null
+++ b/dev-python/asciimatics/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>coppens.matthias.abc@gmail.com</email>
+        <name>Matthias Coppens</name>
+    </maintainer>
+    <upstream>
+        <doc>https://asciimatics.readthedocs.io/en/stable/</doc>
+        <remote-id type="github">peterbrittain/asciimatics</remote-id>
+        <bugs-to>https://github.com/peterbrittain/asciimatics/issues</bugs-to>
+    </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyfiglet/Manifest b/dev-python/pyfiglet/Manifest
new file mode 100644
index 0000000000..c8670c4050
--- /dev/null
+++ b/dev-python/pyfiglet/Manifest
@@ -0,0 +1 @@
+DIST pyfiglet-0.8.0.tar.gz 1412945 BLAKE2B 601d8edd22d1cd3bb1999a1000717ac5074024c1511068f613a22c21663b6f62fa3671bc329a99a7527444f8694c9c6342a34ff0bef52c64daa4f66d18f5dfec SHA512 47cbe6f539d2559fb7c545d42cb0a085c85d7a18729453f0b3f62a735f580026b5c9fe40eef896c038cfc9a5400b6bc6dc382e7014c6733d2797bb03c2a9dc49
diff --git a/dev-python/pyfiglet/metadata.xml b/dev-python/pyfiglet/metadata.xml
new file mode 100644
index 0000000000..ce41288f4b
--- /dev/null
+++ b/dev-python/pyfiglet/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>coppens.matthias.abc@gmail.com</email>
+        <name>Matthias Coppens</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">pwaller/pyfiglet</remote-id>
+        <bugs-to>https://github.com/pwaller/pyfiglet/issues</bugs-to>
+    </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyfiglet/pyfiglet-0.8.0.ebuild b/dev-python/pyfiglet/pyfiglet-0.8.0.ebuild
new file mode 100644
index 0000000000..7822410e7e
--- /dev/null
+++ b/dev-python/pyfiglet/pyfiglet-0.8.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Pure-python FIGlet implementation"
+HOMEPAGE="https://pypi.org/project/pyfiglet/ https://github.com/pwaller/pyfiglet"
+
+if [[ "${PV}" == 9999 ]]
+then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/pwaller/pyfiglet.git"
+else
+	SRC_URI="https://github.com/pwaller/pyfiglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RESTRICT="mirror test"
diff --git a/dev-python/pyfiglet/pyfiglet-9999.ebuild b/dev-python/pyfiglet/pyfiglet-9999.ebuild
new file mode 100644
index 0000000000..7822410e7e
--- /dev/null
+++ b/dev-python/pyfiglet/pyfiglet-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Pure-python FIGlet implementation"
+HOMEPAGE="https://pypi.org/project/pyfiglet/ https://github.com/pwaller/pyfiglet"
+
+if [[ "${PV}" == 9999 ]]
+then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/pwaller/pyfiglet.git"
+else
+	SRC_URI="https://github.com/pwaller/pyfiglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RESTRICT="mirror test"
diff --git a/www-apps/code-server-bin/code-server-bin-3.4.1.ebuild b/www-apps/code-server-bin/code-server-bin-3.4.1.ebuild
index 939c658bca..7446e32f40 100644
--- a/www-apps/code-server-bin/code-server-bin-3.4.1.ebuild
+++ b/www-apps/code-server-bin/code-server-bin-3.4.1.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 S="${WORKDIR}/${MY_PV}-linux-${ARCH}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-${PV}-node.patch"
+	"${FILESDIR}/${PN}-node.patch"
 )
 
 src_prepare() {
diff --git a/www-apps/code-server-bin/files/code-server-bin-3.4.1-node.patch b/www-apps/code-server-bin/files/code-server-bin-node.patch
similarity index 72%
rename from www-apps/code-server-bin/files/code-server-bin-3.4.1-node.patch
rename to www-apps/code-server-bin/files/code-server-bin-node.patch
index 8bcfe362cc..ee4ce6cd46 100644
--- a/www-apps/code-server-bin/files/code-server-bin-3.4.1-node.patch
+++ b/www-apps/code-server-bin/files/code-server-bin-node.patch
@@ -5,4 +5,4 @@
  
  ROOT="$(root)"
 -exec "$ROOT/lib/node" "$ROOT" "$@"
-+exec node "$ROOT" --disable-telemetry "$@"
++exec node "${ROOT}" --disable-telemetry "${@}"