diff --git a/app-arch/libarchive-qt/libarchive-qt-2.0.2.ebuild b/app-arch/libarchive-qt/libarchive-qt-2.0.2.ebuild
index 244dca22f7..ad70f4d148 100644
--- a/app-arch/libarchive-qt/libarchive-qt-2.0.2.ebuild
+++ b/app-arch/libarchive-qt/libarchive-qt-2.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit multilib qmake-utils xdg
 
 DESCRIPTION="A Qt based archiving solution with libarchive backend"
 HOMEPAGE="https://gitlab.com/marcusbritanicus/libarchive-qt"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	app-arch/libarchive[lzma,bzip2,zlib]
@@ -29,9 +28,7 @@ DEPEND="
 	app-arch/lzop
 	dev-qt/qtgui:5
 "
-RDEPEND="
-	${DEPEND}
-"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local lib="$(get_libdir)"
@@ -41,6 +38,5 @@ src_configure() {
 
 src_install() {
 	einstalldocs
-
 	emake INSTALL_ROOT="${D}" install
 }
diff --git a/app-arch/libarchive-qt/libarchive-qt-9999.ebuild b/app-arch/libarchive-qt/libarchive-qt-9999.ebuild
index 244dca22f7..ad70f4d148 100644
--- a/app-arch/libarchive-qt/libarchive-qt-9999.ebuild
+++ b/app-arch/libarchive-qt/libarchive-qt-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit multilib qmake-utils xdg
 
 DESCRIPTION="A Qt based archiving solution with libarchive backend"
 HOMEPAGE="https://gitlab.com/marcusbritanicus/libarchive-qt"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	app-arch/libarchive[lzma,bzip2,zlib]
@@ -29,9 +28,7 @@ DEPEND="
 	app-arch/lzop
 	dev-qt/qtgui:5
 "
-RDEPEND="
-	${DEPEND}
-"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local lib="$(get_libdir)"
@@ -41,6 +38,5 @@ src_configure() {
 
 src_install() {
 	einstalldocs
-
 	emake INSTALL_ROOT="${D}" install
 }
diff --git a/dev-python/anyio/Manifest b/dev-python/anyio/Manifest
new file mode 100644
index 0000000000..0d009d2c2d
--- /dev/null
+++ b/dev-python/anyio/Manifest
@@ -0,0 +1 @@
+DIST anyio-2.0.2.tar.gz 91805 BLAKE2B 26a7bd16f3f7b9d59cec7b93e13a48a3bd09c459ed1e751d0189836218a8384979ec5778feb29b00dc6871640c2e67e1b4b3162d050253e195536e02902cb89a SHA512 5ce46e6cf167b2ee526e92642e65d1e715f443750b4c8b12d0c449ad460afd0280be920bcde0653f478eb52ab9db035a35ccb6908460bf425e85d7d0aa3f1799
diff --git a/dev-python/anyio/anyio-2.0.2.ebuild b/dev-python/anyio/anyio-2.0.2.ebuild
new file mode 100644
index 0000000000..9478c0af74
--- /dev/null
+++ b/dev-python/anyio/anyio-2.0.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_7 )
+
+DOCBUILDER="sphinx"
+DOCDIR="${S}/docs"
+DOCDEPEND="
+	dev-python/anyio
+	>=dev-python/sphinx-autodoc-typehints-1.2.0
+	dev-python/sphinx_rtd_theme
+"
+AUTODOC=1
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Compatibility layer for multiple asynchronous event loop implementations"
+HOMEPAGE="
+	https://github.com/agronholm/anyio
+	https://pypi.org/project/anyio
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/curio-1.4[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
+	>=dev-python/sniffio-1.1[${PYTHON_USEDEP}]
+	>=dev-python/trio-0.16[${PYTHON_USEDEP}]
+"
+#remember to add 
+#	$(python_gen_cond_dep 'dev-python/typing_extensions[${PYTHON_USEDEP}]' python3_7)
+DEPEND="
+	${RDEPEND}
+	test? (
+		>=dev-python/hypothesis-4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6.0[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		dev-python/uvloop[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv \
+			--deselect tests/test_sockets.py::test_getaddrinfo[asyncio] \
+			--deselect tests/test_sockets.py::test_getaddrinfo[asyncio+uvloop] \
+			--deselect tests/test_sockets.py::test_getaddrinfo[curio] \
+			--deselect tests/test_sockets.py::test_getaddrinfo[trio] \
+	|| die
+}
diff --git a/dev-python/anyio/metadata.xml b/dev-python/anyio/metadata.xml
new file mode 100644
index 0000000000..1dcac0ae81
--- /dev/null
+++ b/dev-python/anyio/metadata.xml
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>lssndrbarbieri@gmail.com</email>
+    <name>Alessandro Barbieri</name>
+  </maintainer>
+  <longdescription lang="en">
+AnyIO is a asynchronous compatibility API that allows applications and libraries written against it to run unmodified on asyncio, curio and trio.
+
+It bridges the following functionality:
+
+Task groups
+Cancellation
+Threads
+Signal handling
+Asynchronous file I/O
+Subprocesses
+Inter-task synchronization and communication (locks, conditions, events, semaphores, object streams)
+High level networking (TCP, UDP and UNIX sockets)
+You can even use it together with native libraries from your selected backend in applications. Doing this in libraries is not advisable however since it limits the usefulness of your library.
+
+AnyIO comes with its own pytest plugin which also supports asynchronous fixtures. It even works with the popular Hypothesis library.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">agronholm/anyio</remote-id>
+    <remote-id type="pypi">anyio</remote-id>
+    <maintainer status="unknown">
+      <email>alex.gronholm@nextday.fi</email>
+      <name>Alex Grönholm</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/bitbox02/Manifest b/dev-python/bitbox02/Manifest
index 8c5ad6a982..8f073a091d 100644
--- a/dev-python/bitbox02/Manifest
+++ b/dev-python/bitbox02/Manifest
@@ -1 +1 @@
-DIST bitbox02-5.0.0.tar.gz 51158 BLAKE2B 16d068e6c649bb89e4b3bb72e1c9b5efb7c6f777e5e3123b1194c99c83ea8fea7305e07254c01b124625a6271e63406cec84f4a972293bed912e50f2441c807e SHA512 02af9bb708f9cbf3dbd2bd91c8c62992b543563edc3e3c5a3968594626e10f5cded3c8d57cbcee6d5eb2600c208ee6c6fd1886532e11e735269329e874a0e7c1
+DIST bitbox02-5.1.0.tar.gz 51297 BLAKE2B 8450cbc4b040cc5b9d9923cff5c2f07e6819032a9fe1b54a108b6bc7a1571535c0930ec8f63a2c13c9abe098d7ba1c6c3f0e138caf1220ab484248cf164a18d4 SHA512 2088d8a93172a5d8a233c1dd0b73d08182d9828f7a799273cae3665b49751edd98660f305c3e8dad0df10300f2ebe38a1233498fe43ee40647a2b0a242bb2096
diff --git a/dev-python/bitbox02/bitbox02-5.0.0.ebuild b/dev-python/bitbox02/bitbox02-5.1.0.ebuild
similarity index 100%
rename from dev-python/bitbox02/bitbox02-5.0.0.ebuild
rename to dev-python/bitbox02/bitbox02-5.1.0.ebuild
diff --git a/games-util/minigalaxy/Manifest b/games-util/minigalaxy/Manifest
index d74f458d8c..4ccff651fd 100644
--- a/games-util/minigalaxy/Manifest
+++ b/games-util/minigalaxy/Manifest
@@ -1 +1 @@
-DIST minigalaxy-0.9.4.tar.gz 354650 BLAKE2B 7189b0e92b16be1bf7b2e8212fd1bfc8b8592c5ae00d39f17db7f53bd62af156df7a870c5e0b13541d93fbe3708dc0f7640c514d1cc43f1c8014ea5e3a36d93d SHA512 bf883a5b8a6c56cbf96545f1bbb52fda80e3774bb80408ac52434b3c06f0d1c46f6368fa7da88933f1538f8435f2ec4dc8780fcf3776ac58c4f49bff1967fcd8
+DIST minigalaxy-1.0.0.tar.gz 375108 BLAKE2B c846e7ecc9d1b23c509323dcd4c7646b4f98a3c095f0f7359689ce5b7781adb5a2efc82c1fd03491302aa5fc4f8e139e9088a715d2c68bf29c2a42c02fc8c9a4 SHA512 71643f35f7aeda78ed3bd4ff30f5e7198db61b482d38ea8526f9b8894bba708b1ab43094bb73ecdf4c31ccfa911a47e8bcdce47163f5db5a74968ad3ac9f8a79
diff --git a/games-util/minigalaxy/minigalaxy-0.9.4.ebuild b/games-util/minigalaxy/minigalaxy-1.0.0.ebuild
similarity index 100%
rename from games-util/minigalaxy/minigalaxy-0.9.4.ebuild
rename to games-util/minigalaxy/minigalaxy-1.0.0.ebuild
diff --git a/gui-apps/coreaction/coreaction-4.0.0.ebuild b/gui-apps/coreaction/coreaction-4.0.0.ebuild
index 319524d1bc..4c9b32e693 100644
--- a/gui-apps/coreaction/coreaction-4.0.0.ebuild
+++ b/gui-apps/coreaction/coreaction-4.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="A side bar for showing widgets for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/coreaction"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	dev-qt/qtsvg
diff --git a/gui-apps/coreaction/coreaction-9999.ebuild b/gui-apps/coreaction/coreaction-9999.ebuild
index 319524d1bc..4c9b32e693 100644
--- a/gui-apps/coreaction/coreaction-9999.ebuild
+++ b/gui-apps/coreaction/coreaction-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="A side bar for showing widgets for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/coreaction"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	dev-qt/qtsvg
diff --git a/gui-apps/corearchiver/corearchiver-4.0.0.ebuild b/gui-apps/corearchiver/corearchiver-4.0.0.ebuild
index 7a040c29a7..34e00c5971 100644
--- a/gui-apps/corearchiver/corearchiver-4.0.0.ebuild
+++ b/gui-apps/corearchiver/corearchiver-4.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="Archiver for C Suite, to create and extract archives"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/corearchiver"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	app-arch/libarchive-qt
diff --git a/gui-apps/corearchiver/corearchiver-9999.ebuild b/gui-apps/corearchiver/corearchiver-9999.ebuild
index 7a040c29a7..34e00c5971 100644
--- a/gui-apps/corearchiver/corearchiver-9999.ebuild
+++ b/gui-apps/corearchiver/corearchiver-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="Archiver for C Suite, to create and extract archives"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/corearchiver"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	app-arch/libarchive-qt
diff --git a/gui-apps/corefm/corefm-4.0.0-r1.ebuild b/gui-apps/corefm/corefm-4.0.0-r1.ebuild
index f3bc53f115..f1f67a4f6e 100644
--- a/gui-apps/corefm/corefm-4.0.0-r1.ebuild
+++ b/gui-apps/corefm/corefm-4.0.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="A lightweight file-manager for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/corefm"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	dev-qt/qtconcurrent:5=
diff --git a/gui-apps/corefm/corefm-9999.ebuild b/gui-apps/corefm/corefm-9999.ebuild
index d3c081cc10..a3a4a0229b 100644
--- a/gui-apps/corefm/corefm-9999.ebuild
+++ b/gui-apps/corefm/corefm-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="A lightweight file-manager for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/corefm"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	dev-qt/qtconcurrent:5=
diff --git a/gui-apps/coregarage/coregarage-4.0.0.ebuild b/gui-apps/coregarage/coregarage-4.0.0.ebuild
index 261dc8e39e..96ab64709e 100644
--- a/gui-apps/coregarage/coregarage-4.0.0.ebuild
+++ b/gui-apps/coregarage/coregarage-4.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="A settings manager for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/coregarage"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	app-arch/libarchive-qt
diff --git a/gui-apps/coregarage/coregarage-9999.ebuild b/gui-apps/coregarage/coregarage-9999.ebuild
index 261dc8e39e..96ab64709e 100644
--- a/gui-apps/coregarage/coregarage-9999.ebuild
+++ b/gui-apps/coregarage/coregarage-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="A settings manager for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/coregarage"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	app-arch/libarchive-qt
diff --git a/gui-apps/corehunt/corehunt-4.0.0.ebuild b/gui-apps/corehunt/corehunt-4.0.0.ebuild
index bc1481a1f0..5bbfcd5690 100644
--- a/gui-apps/corehunt/corehunt-4.0.0.ebuild
+++ b/gui-apps/corehunt/corehunt-4.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="A file finder utility for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/corehunt"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	dev-qt/qtconcurrent:5
diff --git a/gui-apps/corehunt/corehunt-9999.ebuild b/gui-apps/corehunt/corehunt-9999.ebuild
index bc1481a1f0..5bbfcd5690 100644
--- a/gui-apps/corehunt/corehunt-9999.ebuild
+++ b/gui-apps/corehunt/corehunt-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="A file finder utility for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/corehunt"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	dev-qt/qtconcurrent:5
diff --git a/gui-apps/coreimage/coreimage-4.0.0.ebuild b/gui-apps/coreimage/coreimage-4.0.0.ebuild
index 65eefe2f19..26deac10a1 100644
--- a/gui-apps/coreimage/coreimage-4.0.0.ebuild
+++ b/gui-apps/coreimage/coreimage-4.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="An image viewer for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/coreimage"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	dev-qt/qtconcurrent:5=
diff --git a/gui-apps/coreimage/coreimage-9999.ebuild b/gui-apps/coreimage/coreimage-9999.ebuild
index 65eefe2f19..26deac10a1 100644
--- a/gui-apps/coreimage/coreimage-9999.ebuild
+++ b/gui-apps/coreimage/coreimage-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="An image viewer for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/coreimage"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	dev-qt/qtconcurrent:5=
diff --git a/gui-apps/coreinfo/coreinfo-4.0.0.ebuild b/gui-apps/coreinfo/coreinfo-4.0.0.ebuild
index d2c0a9e9a7..d0f97f0528 100644
--- a/gui-apps/coreinfo/coreinfo-4.0.0.ebuild
+++ b/gui-apps/coreinfo/coreinfo-4.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="A file information tool for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/coreinfo"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	dev-qt/qtcore:5
diff --git a/gui-apps/coreinfo/coreinfo-9999.ebuild b/gui-apps/coreinfo/coreinfo-9999.ebuild
index d2c0a9e9a7..d0f97f0528 100644
--- a/gui-apps/coreinfo/coreinfo-9999.ebuild
+++ b/gui-apps/coreinfo/coreinfo-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="A file information tool for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/coreinfo"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	dev-qt/qtcore:5
diff --git a/gui-apps/corekeyboard/corekeyboard-4.0.0.ebuild b/gui-apps/corekeyboard/corekeyboard-4.0.0.ebuild
index 0dd88ece1a..580cd95426 100644
--- a/gui-apps/corekeyboard/corekeyboard-4.0.0.ebuild
+++ b/gui-apps/corekeyboard/corekeyboard-4.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="A x11 based virtual keyboard for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/corekeyboard"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	dev-qt/qtcore:5=
diff --git a/gui-apps/corekeyboard/corekeyboard-9999.ebuild b/gui-apps/corekeyboard/corekeyboard-9999.ebuild
index 0dd88ece1a..580cd95426 100644
--- a/gui-apps/corekeyboard/corekeyboard-9999.ebuild
+++ b/gui-apps/corekeyboard/corekeyboard-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="A x11 based virtual keyboard for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/corekeyboard"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	dev-qt/qtcore:5=
diff --git a/gui-apps/corepad/corepad-4.0.0.ebuild b/gui-apps/corepad/corepad-4.0.0.ebuild
index df9f3b4be5..eef143b85f 100644
--- a/gui-apps/corepad/corepad-4.0.0.ebuild
+++ b/gui-apps/corepad/corepad-4.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="A document editor for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/corepad"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	dev-qt/qtcore:5
diff --git a/gui-apps/corepad/corepad-9999.ebuild b/gui-apps/corepad/corepad-9999.ebuild
index df9f3b4be5..eef143b85f 100644
--- a/gui-apps/corepad/corepad-9999.ebuild
+++ b/gui-apps/corepad/corepad-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="A document editor for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/corepad"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	dev-qt/qtcore:5
diff --git a/gui-apps/corepaint/corepaint-4.0.0.ebuild b/gui-apps/corepaint/corepaint-4.0.0.ebuild
index 3b555abc33..cfd9a623d4 100644
--- a/gui-apps/corepaint/corepaint-4.0.0.ebuild
+++ b/gui-apps/corepaint/corepaint-4.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="A paint app for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/corepaint"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	dev-qt/qtcore:5
diff --git a/gui-apps/corepaint/corepaint-9999.ebuild b/gui-apps/corepaint/corepaint-9999.ebuild
index 3b555abc33..cfd9a623d4 100644
--- a/gui-apps/corepaint/corepaint-9999.ebuild
+++ b/gui-apps/corepaint/corepaint-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="A paint app for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/corepaint"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	dev-qt/qtcore:5
diff --git a/gui-apps/corepdf/corepdf-4.0.0.ebuild b/gui-apps/corepdf/corepdf-4.0.0.ebuild
index 2d2daddaaf..254b0c7eef 100644
--- a/gui-apps/corepdf/corepdf-4.0.0.ebuild
+++ b/gui-apps/corepdf/corepdf-4.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="A PDF viewer for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/corepdf"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	app-text/poppler[qt5]
diff --git a/gui-apps/corepdf/corepdf-9999.ebuild b/gui-apps/corepdf/corepdf-9999.ebuild
index 2d2daddaaf..254b0c7eef 100644
--- a/gui-apps/corepdf/corepdf-9999.ebuild
+++ b/gui-apps/corepdf/corepdf-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="A PDF viewer for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/corepdf"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	app-text/poppler[qt5]
diff --git a/gui-apps/corerenamer/corerenamer-4.0.0.ebuild b/gui-apps/corerenamer/corerenamer-4.0.0.ebuild
index f1a9b14795..b9c239e368 100644
--- a/gui-apps/corerenamer/corerenamer-4.0.0.ebuild
+++ b/gui-apps/corerenamer/corerenamer-4.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="A batch file renamer for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/corerenamer"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	dev-qt/qtcore:5
diff --git a/gui-apps/corerenamer/corerenamer-9999.ebuild b/gui-apps/corerenamer/corerenamer-9999.ebuild
index f1a9b14795..b9c239e368 100644
--- a/gui-apps/corerenamer/corerenamer-9999.ebuild
+++ b/gui-apps/corerenamer/corerenamer-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="A batch file renamer for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/corerenamer"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	dev-qt/qtcore:5
diff --git a/gui-apps/coreshot/coreshot-4.0.0.ebuild b/gui-apps/coreshot/coreshot-4.0.0.ebuild
index b1fa5d6ff4..71463c1dde 100644
--- a/gui-apps/coreshot/coreshot-4.0.0.ebuild
+++ b/gui-apps/coreshot/coreshot-4.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="A screen capture utility for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/coreshot"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	dev-qt/qtcore:5
diff --git a/gui-apps/coreshot/coreshot-9999.ebuild b/gui-apps/coreshot/coreshot-9999.ebuild
index b1fa5d6ff4..71463c1dde 100644
--- a/gui-apps/coreshot/coreshot-9999.ebuild
+++ b/gui-apps/coreshot/coreshot-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="A screen capture utility for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/coreshot"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	dev-qt/qtcore:5
diff --git a/gui-apps/corestats/corestats-4.0.0.ebuild b/gui-apps/corestats/corestats-4.0.0.ebuild
index 0353a368e1..09a30f9ff7 100644
--- a/gui-apps/corestats/corestats-4.0.0.ebuild
+++ b/gui-apps/corestats/corestats-4.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="A system resource viewer for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/corestats"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	dev-qt/qtcore:5
diff --git a/gui-apps/corestats/corestats-9999.ebuild b/gui-apps/corestats/corestats-9999.ebuild
index 0353a368e1..09a30f9ff7 100644
--- a/gui-apps/corestats/corestats-9999.ebuild
+++ b/gui-apps/corestats/corestats-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="A system resource viewer for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/corestats"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	dev-qt/qtcore:5
diff --git a/gui-apps/corestuff/corestuff-4.0.0.ebuild b/gui-apps/corestuff/corestuff-4.0.0.ebuild
index 9713878bc0..e468740661 100644
--- a/gui-apps/corestuff/corestuff-4.0.0.ebuild
+++ b/gui-apps/corestuff/corestuff-4.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="An activity viewer for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/corestuff"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	dev-qt/qtx11extras:5
diff --git a/gui-apps/corestuff/corestuff-9999.ebuild b/gui-apps/corestuff/corestuff-9999.ebuild
index 9713878bc0..e468740661 100644
--- a/gui-apps/corestuff/corestuff-9999.ebuild
+++ b/gui-apps/corestuff/corestuff-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="An activity viewer for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/corestuff"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	dev-qt/qtx11extras:5
diff --git a/gui-apps/coreterminal/coreterminal-4.0.0.ebuild b/gui-apps/coreterminal/coreterminal-4.0.0.ebuild
index 6c71bd5d22..5ae23ae75b 100644
--- a/gui-apps/coreterminal/coreterminal-4.0.0.ebuild
+++ b/gui-apps/coreterminal/coreterminal-4.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="A terminal emulator for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/coreterminal"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	dev-qt/qtcore:5=
diff --git a/gui-apps/coreterminal/coreterminal-9999.ebuild b/gui-apps/coreterminal/coreterminal-9999.ebuild
index 6c71bd5d22..5ae23ae75b 100644
--- a/gui-apps/coreterminal/coreterminal-9999.ebuild
+++ b/gui-apps/coreterminal/coreterminal-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="A terminal emulator for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/coreterminal"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	dev-qt/qtcore:5=
diff --git a/gui-apps/coretime/coretime-4.0.0.ebuild b/gui-apps/coretime/coretime-4.0.0.ebuild
index ebd5bc0bff..2eee360752 100644
--- a/gui-apps/coretime/coretime-4.0.0.ebuild
+++ b/gui-apps/coretime/coretime-4.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="A time related task manager for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/coretime"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	dev-qt/qtcore:5
diff --git a/gui-apps/coretime/coretime-9999.ebuild b/gui-apps/coretime/coretime-9999.ebuild
index 642a943882..cf61afc556 100644
--- a/gui-apps/coretime/coretime-9999.ebuild
+++ b/gui-apps/coretime/coretime-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="A time related task manager for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/coretime"
@@ -17,10 +17,9 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 DEPEND="
 	dev-qt/qtcore:5
diff --git a/gui-apps/coretoppings/coretoppings-4.0.0.ebuild b/gui-apps/coretoppings/coretoppings-4.0.0.ebuild
index afc005596e..8bee6114ac 100644
--- a/gui-apps/coretoppings/coretoppings-4.0.0.ebuild
+++ b/gui-apps/coretoppings/coretoppings-4.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="Additional features, plugins, widgets etc for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/coretoppings"
@@ -17,7 +17,7 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="location pulseaudio"
diff --git a/gui-libs/libcprime/libcprime-4.0.0.ebuild b/gui-libs/libcprime/libcprime-4.0.0.ebuild
index 1ff9415674..68c1234265 100644
--- a/gui-libs/libcprime/libcprime-4.0.0.ebuild
+++ b/gui-libs/libcprime/libcprime-4.0.0.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-QTV="5.15.1"
+QTMIN="5.15.1"
 
-inherit eutils multilib qmake-utils xdg
+inherit multilib qmake-utils xdg
 
 DESCRIPTION="Library for managing settings of CoreApps"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/libcprime"
@@ -19,19 +19,19 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
 
 DEPEND="
 	x11-libs/libnotify
-	~dev-qt/qtbluetooth-${QTV}:5=
-	~dev-qt/qtcore-${QTV}:5=
-	~dev-qt/qtdbus-${QTV}:5=
-	~dev-qt/qtgui-${QTV}:5=
-	~dev-qt/qtnetwork-${QTV}:5=
-	~dev-qt/qtwidgets-${QTV}:5=
+	>=dev-qt/qtbluetooth-${QTMIN}:5
+	>=dev-qt/qtcore-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
 "
 RDEPEND="
 	${DEPEND}
@@ -49,6 +49,5 @@ src_configure() {
 
 src_install() {
 	einstalldocs
-
 	emake INSTALL_ROOT="${D}" install
 }
diff --git a/gui-libs/libcsys/libcsys-4.0.0.ebuild b/gui-libs/libcsys/libcsys-4.0.0.ebuild
index 5a3595892d..548f49f00a 100644
--- a/gui-libs/libcsys/libcsys-4.0.0.ebuild
+++ b/gui-libs/libcsys/libcsys-4.0.0.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-QTV="5.15.1"
+QTMIN="5.15.1"
 
-inherit eutils qmake-utils
+inherit multilib qmake-utils
 
 DESCRIPTION="Library for managing the device"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/libcsys"
@@ -19,15 +19,15 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="udisks"
 
 DEPEND="
-	~dev-qt/qtcore-${QTV}:5=
-	~dev-qt/qtdbus-${QTV}:5=
-	~dev-qt/qtnetwork-${QTV}:5=
+	>=dev-qt/qtcore-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
 "
 RDEPEND="
 	${DEPEND}
@@ -48,6 +48,5 @@ src_configure() {
 
 src_install() {
 	einstalldocs
-
 	emake INSTALL_ROOT="${D}" install
 }
diff --git a/gui-libs/libcsys/libcsys-9999.ebuild b/gui-libs/libcsys/libcsys-9999.ebuild
index 5a3595892d..548f49f00a 100644
--- a/gui-libs/libcsys/libcsys-9999.ebuild
+++ b/gui-libs/libcsys/libcsys-9999.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-QTV="5.15.1"
+QTMIN="5.15.1"
 
-inherit eutils qmake-utils
+inherit multilib qmake-utils
 
 DESCRIPTION="Library for managing the device"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/libcsys"
@@ -19,15 +19,15 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="mirror"
+RESTRICT="mirror test"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="udisks"
 
 DEPEND="
-	~dev-qt/qtcore-${QTV}:5=
-	~dev-qt/qtdbus-${QTV}:5=
-	~dev-qt/qtnetwork-${QTV}:5=
+	>=dev-qt/qtcore-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
 "
 RDEPEND="
 	${DEPEND}
@@ -48,6 +48,5 @@ src_configure() {
 
 src_install() {
 	einstalldocs
-
 	emake INSTALL_ROOT="${D}" install
 }
diff --git a/x11-misc/screenkey/Manifest b/x11-misc/screenkey/Manifest
new file mode 100644
index 0000000000..692e577201
--- /dev/null
+++ b/x11-misc/screenkey/Manifest
@@ -0,0 +1 @@
+DIST screenkey-1.2.tar.gz 71803 BLAKE2B 3f3ece34f9a3ba2907411d96022c329e63bbc55924f97cb13472b25740051bdaacb745601dde3ff8e162f807057bfc6d11ba1dd4a828c597c5f3ea6185d9b7d2 SHA512 0a9454409f3615849380765ecf884ef02049b9e9e8d6af6ae58d565f879eccb5821845341410232a1c252f9da294a9528557792e713f81915a2433cd14babf8b
diff --git a/x11-misc/screenkey/metadata.xml b/x11-misc/screenkey/metadata.xml
new file mode 100644
index 0000000000..ee9380e8f9
--- /dev/null
+++ b/x11-misc/screenkey/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>xgqt@protonmail.com</email>
+        <name>Maciej Barć</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">screenkey/screenkey</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/x11-misc/screenkey/screenkey-1.2.ebuild b/x11-misc/screenkey/screenkey-1.2.ebuild
new file mode 100644
index 0000000000..686f292a06
--- /dev/null
+++ b/x11-misc/screenkey/screenkey-1.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1 xdg
+
+DESCRIPTION="A screencast tool to display your keys inspired by Screenflick"
+HOMEPAGE="https://www.thregr.org/~wavexx/software/screenkey/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/screenkey/${PN}.git"
+else
+	SRC_URI="https://gitlab.com/screenkey/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}"/"${PN}"-v"${PV}"
+fi
+
+RESTRICT="test"
+LICENSE="GPL-3"
+SLOT="0"
+
+BDEPEND="
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject[${PYTHON_USEDEP}]
+	sys-devel/gettext
+"
+
+src_prepare() {
+	xdg_environment_reset
+
+	# Change the doc install path
+	sed -i "s/share\/doc\/screenkey/share\/doc\/${P}/g" setup.py || die
+
+	default
+}
diff --git a/x11-misc/screenkey/screenkey-9999.ebuild b/x11-misc/screenkey/screenkey-9999.ebuild
new file mode 100644
index 0000000000..686f292a06
--- /dev/null
+++ b/x11-misc/screenkey/screenkey-9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1 xdg
+
+DESCRIPTION="A screencast tool to display your keys inspired by Screenflick"
+HOMEPAGE="https://www.thregr.org/~wavexx/software/screenkey/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/screenkey/${PN}.git"
+else
+	SRC_URI="https://gitlab.com/screenkey/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}"/"${PN}"-v"${PV}"
+fi
+
+RESTRICT="test"
+LICENSE="GPL-3"
+SLOT="0"
+
+BDEPEND="
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject[${PYTHON_USEDEP}]
+	sys-devel/gettext
+"
+
+src_prepare() {
+	xdg_environment_reset
+
+	# Change the doc install path
+	sed -i "s/share\/doc\/screenkey/share\/doc\/${P}/g" setup.py || die
+
+	default
+}