diff --git a/dev-python/pyinquirer/Manifest b/dev-python/pyinquirer/Manifest
new file mode 100644
index 0000000000..2792ab6eba
--- /dev/null
+++ b/dev-python/pyinquirer/Manifest
@@ -0,0 +1 @@
+DIST PyInquirer-1.0.3_p20200708.tar.gz 128841 BLAKE2B 45dcb13d0f500e808057d4bf8e671d24c67efe13fc5d61ec12d8ec1f8f829addd72d61e8fd6005b05f63ba6a02962ffb17603db73220755142eec2170ff7659f SHA512 37665164da9fd7ccfe2b43036afb8a771fd85871b89675c970cf20925e61277239e2a1bc6be3bba1daabdafe1fe7183e63d20dadaf6a0cc95d7bc491a54197b9
diff --git a/dev-python/pyinquirer/pyinquirer-1.0.3_p20200708.ebuild b/dev-python/pyinquirer/pyinquirer-1.0.3_p20200708.ebuild
new file mode 100644
index 0000000000..d28e1af05a
--- /dev/null
+++ b/dev-python/pyinquirer/pyinquirer-1.0.3_p20200708.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PN0="PyInquirer"
+P0="${PN0}-${PV}"
+COMMIT="7485a1fd5442332399d5f05c84e4fd74b63a5823"
+
+EGIT_REPO_URI="https://github.com/CITGuru/${PN0}"
+case "${PV}" in
+	9999)
+		inherit git-r3
+		;;
+	*)
+		SRC_URI="${EGIT_REPO_URI}/archive/${COMMIT}.tar.gz -> ${P0}.tar.gz"
+		KEYWORDS="~amd64"
+		S="${WORKDIR}/${PN0}-${COMMIT}"
+esac
+
+PYTHON_COMPAT=( python3_{7,8} )
+inherit distutils-r1
+# conf.py gone???
+#distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+DESCRIPTION="A Python module for common interactive command line UIs"
+HOMEPAGE="${EGIT_REPO_URI}"
+LICENSE="MIT"
+
+SLOT="0"
+
+# Tests are outdated, they fail for >dev-python/ptyprocess-0.5.1
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/prompt_toolkit-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.2.0[${PYTHON_USEDEP}]"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/testfixtures[${PYTHON_USEDEP}]
+		>=dev-python/pytest-html-1.10.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.15.0[${PYTHON_USEDEP}]
+		>=dev-python/ptyprocess-0.5.1[${PYTHON_USEDEP}]
+		>=dev-python/regex-2016.11.21[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+	default
+	sed -i -e 's/packages=find_packages(exclude=\[/\0"examples", /' setup.py ||
+		die "Failed to patch setup.py"
+}
diff --git a/media-gfx/memethesis-cli/memethesis-cli-3.2.1.ebuild b/media-gfx/memethesis-cli/memethesis-cli-3.2.1.ebuild
index 6b6fa0d24a..99b0204d26 100644
--- a/media-gfx/memethesis-cli/memethesis-cli-3.2.1.ebuild
+++ b/media-gfx/memethesis-cli/memethesis-cli-3.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ case "${PV}" in
 		SRC_URI="${EGIT_REPO_URI}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 		# pyinquirer's latest version is outdated, so memethesis depends
 		# on a live ebuild for pyinquirer at the moment
-		KEYWORDS=""
+		KEYWORDS="~amd64"
 esac
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
diff --git a/net-misc/gemserv/gemserv-0.4.4.ebuild b/net-misc/gemserv/gemserv-0.4.4.ebuild
index 993dbecaad..46419c3e4f 100644
--- a/net-misc/gemserv/gemserv-0.4.4.ebuild
+++ b/net-misc/gemserv/gemserv-0.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -114,7 +114,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 src_prepare() {
 	# Fix paths in systemd unit.
-	sed -i "s@/path/to/bin /path/to/config@${EPREFIX}/usr/bin/gemserv ${EPREFIX}/etc/gemserv/config.toml@" \
+	sed -i "s@/path/to/bin /path/to/config@"${EPREFIX}"/usr/bin/gemserv "${EPREFIX}"/etc/gemserv/config.toml@" \
 		init-scripts/gemserv.service || die
 
 	# Fix paths in config.
diff --git a/net-misc/gemserv/gemserv-0.4.5.ebuild b/net-misc/gemserv/gemserv-0.4.5.ebuild
index e385c2ba4a..9b2862c68f 100644
--- a/net-misc/gemserv/gemserv-0.4.5.ebuild
+++ b/net-misc/gemserv/gemserv-0.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -108,7 +108,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 src_prepare() {
 	# Fix paths in systemd unit.
-	sed -i "s@/path/to/bin /path/to/config@${EPREFIX}/usr/bin/gemserv ${EPREFIX}/etc/gemserv/config.toml@" \
+	sed -i "s@/path/to/bin /path/to/config@"${EPREFIX}"/usr/bin/gemserv "${EPREFIX}"/etc/gemserv/config.toml@" \
 		init-scripts/gemserv.service || die
 
 	# Fix paths in config.
diff --git a/sys-apps/0xFFFF/0xFFFF-0.8.ebuild b/sys-apps/0xFFFF/0xFFFF-0.8.ebuild
index f5ef101320..5c3f0ac56b 100644
--- a/sys-apps/0xFFFF/0xFFFF-0.8.ebuild
+++ b/sys-apps/0xFFFF/0xFFFF-0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2013-2020 Gentoo Authors
+# Copyright 2013-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="dev-libs/libusb-compat"
+DEPEND="virtual/libusb:0"
 RDEPEND="${DEPEND}"
 
 src_install() {