diff --git a/app-emulation/amitools/Manifest b/app-emulation/amitools/Manifest
new file mode 100644
index 0000000..16e9c08
--- /dev/null
+++ b/app-emulation/amitools/Manifest
@@ -0,0 +1 @@
+EBUILD amitools-9999.ebuild 572 BLAKE2B 370f2b0d4ee04efc498f535a2b848590709c15f65b6ca8fd44d80bdc453ee7a6516f1791e7ebff47a60dd4ce37da912872e67b52990a9b57a3e6fae4cfbdfba1 SHA512 e6fc6913b111369535069a0d3ec0368c3bb55b110249cefafa0cd589a09c3c293fce264bc51d6f6e8c1615dc0e709b8c215f6979801a523329a7379c73235c35
diff --git a/app-emulation/amitools/amitools-9999.ebuild b/app-emulation/amitools/amitools-9999.ebuild
new file mode 100644
index 0000000..e6acba1
--- /dev/null
+++ b/app-emulation/amitools/amitools-9999.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_9 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="Various tools for using AmigaOS programs on other platforms"
+HOMEPAGE="https://github.com/cnvogelg/amitools"
+EGIT_REPO_URI="https://github.com/cnvogelg/amitools.git"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/cython[${PYTHON_USEDEP}]
+ dev-python/pytest-runner[${PYTHON_USEDEP}]
+"
+RDEPEND=""
diff --git a/dev-lang/vbcc-bin/Manifest b/dev-lang/vbcc-bin/Manifest
new file mode 100644
index 0000000..e9e29c9
--- /dev/null
+++ b/dev-lang/vbcc-bin/Manifest
@@ -0,0 +1,2 @@
+DIST vbcc-0.9h_pre1.tar 27384269 BLAKE2B cd1638833f5dd298e3271b42851d305ba3bf7b758c2b116030e2858587eefeb2753fe330c43c985a6717bde51779526b8295c736f9554470165a0da48fad0abc SHA512 2b5e497ed679bfea6e0896eb277a98a0d9fe7f9fb5a350d1338bef4ee3c9ed3110dc579787c3e55a9908449d3e72e74e77bb015e4292d5fb374304dfc2686f4e
+EBUILD vbcc-bin-0.9h_pre1.ebuild 847 BLAKE2B 32350b257bbf6b98d2095493481cc584ec00ca0e895d9d55f90e58510f2a6ae25cb5a907eb1dd007c4ee7db69bb30703fb1c702c50d3747b48f5dc4a1ce287d6 SHA512 49a42f172a228d9299d6db9c10c728800f277030b9b0069a3d11a359bf3a3bdd562ce572b1fe6af668cd8fd86ef36b9c8c118f5fb59d52efe72bd7203b14d140
diff --git a/dev-lang/vbcc-bin/vbcc-bin-0.9h_pre1.ebuild b/dev-lang/vbcc-bin/vbcc-bin-0.9h_pre1.ebuild
new file mode 100644
index 0000000..24b8ebd
--- /dev/null
+++ b/dev-lang/vbcc-bin/vbcc-bin-0.9h_pre1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PN="vbcc"
+
+SRC_URI="http://www.ibaug.de/${MY_PN}/${MY_PN}_linux_x64.tar.gz -> ${MY_PN}-${PV}.tar"
+
+DESCRIPTION="Volker Barthels C Compiler"
+HOMEPAGE="http://www.compilers.de/vbcc.html"
+
+KEYWORDS="-* amd64"
+SLOT="0"
+LICENSE=""
+IUSE="+doc"
+
+RESTRICT="mirror strip"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${MY_PN}"
+
+QA_EXECSTACK="usr/libexec/${MY_PN}/targets/*/lib/*"
+
+src_install() {
+ local PKG_DEST=/usr/libexec/${MY_PN}
+
+ einfo "Installing"
+ exeinto ${PKG_DEST}/bin
+ doexe bin/*
+
+ insinto ${PKG_DEST}
+ doins -r config
+
+ insinto ${PKG_DEST}
+ doins -r targets/
+
+ ( echo "VBCC=\"${PKG_DEST}\"" && echo "PATH=${PKG_DEST}/bin" ) \
+ | newenvd - 90vbcc
+
+ if use doc ; then
+ dodoc README v{asm,bcc,link}.pdf
+ fi
+}
diff --git a/dev-python/pytest-benchmark/Manifest b/dev-python/pytest-benchmark/Manifest
new file mode 100644
index 0000000..461754c
--- /dev/null
+++ b/dev-python/pytest-benchmark/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-benchmark-3.4.1.tar.gz 340349 BLAKE2B 474743ef6c2d098ca6451e6da1a40686a529af901bf40ba8daf900844166895c676e3a95e8c252557d97d6668e077f625f96c90c00cdb4a1de021a5e5abae479 SHA512 630b27462796aea97c2d878bb936009d59e1c33be3f4219113eae5e389d2cd7912a7f7bc10a1a9a7abbfc4f69213be10a3cc68bbdceef0783f4b0a8a13600119
+EBUILD pytest-benchmark-3.4.1.ebuild 684 BLAKE2B 6c518e72c904aa3e0c88b270257728e08a63ffe0b685c2803d0939d8251621960433b50c341f6b943aa7c611a3809a85ddfae89081d30f1d8e737ec360f0381e SHA512 40c613af23ff727550ff387924975d032f538eb4df0f2926be53bbb9f73b368399edaa96e50bf94da10e93c6a44df103ffa31eff69e729fcde25b2233a1c3a84
+MISC metadata.xml 412 BLAKE2B 0d79131c6fd8adf72493a7c333959e065cf4f2231f6c770800b6d05ff9afcc246cd202406bea6e28f6b0fd23ee6197aa8dac2dd59d0a89d9b07741f57e8fa5e8 SHA512 d1aab9ea8042bf810398a4195fd3595a8abbeb060ab38fd7b7e40085c8d5f22ecb78bab02e2331d4588199d88e0d3848413d75a18fe4373ecd9940a3c990c604
diff --git a/dev-python/pytest-benchmark/metadata.xml b/dev-python/pytest-benchmark/metadata.xml
new file mode 100644
index 0000000..c08667f
--- /dev/null
+++ b/dev-python/pytest-benchmark/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+ python@gentoo.org
+ Python
+
+
+
+ pytest-cov
+ pytest-dev/pytest-cov
+
+
diff --git a/dev-python/pytest-benchmark/pytest-benchmark-3.4.1.ebuild b/dev-python/pytest-benchmark/pytest-benchmark-3.4.1.ebuild
new file mode 100644
index 0000000..24fef7c
--- /dev/null
+++ b/dev-python/pytest-benchmark/pytest-benchmark-3.4.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_9 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="py.test fixture for benchmarking code."
+HOMEPAGE="https://pypi.org/project/pytest-benchmark/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-python/pytest-3.8[${PYTHON_USEDEP}]
+ dev-python/py-cpuinfo[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ ${RDEPEND}
+ dev-python/jinja2[${PYTHON_USEDEP}]
+ dev-python/tox[${PYTHON_USEDEP}]
+ )
+"
diff --git a/dev-python/pytest-pep8/Manifest b/dev-python/pytest-pep8/Manifest
new file mode 100644
index 0000000..d883e93
--- /dev/null
+++ b/dev-python/pytest-pep8/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-pep8-1.0.6.tar.gz 7271 BLAKE2B edfe2ac899586be9f7fd88f8bad5e5a18200da128d291735a30e374316b5ad449a08956b839605bf3f83b91931fb6890557445fd94f3a5136c7a44ee5e7f91f3 SHA512 162d9e25c264ecd82a51c6798ae75493c724a847ad8cdd953225f73e587f9a14298a6281e541695f6e7471a6121e9b0e4f694270f45ead851e392efcd7aeb758
+EBUILD pytest-pep8-1.0.6.ebuild 500 BLAKE2B d453315fbd12fe4d0cc40c1d0c370215af37530816563d7432acc00d138551db86b849e0abefb41dd4878c0fa3ff17ce8a69404541ad95d94918886ff35801cc SHA512 470416a5cabaf00b83743a1778b2953de34a399e788480d18ec54e4cee5f2502d4804eec7f7451291532048c4ad46e333a2efbaf382abf6193e6b399e4436f65
+MISC metadata.xml 412 BLAKE2B 0d79131c6fd8adf72493a7c333959e065cf4f2231f6c770800b6d05ff9afcc246cd202406bea6e28f6b0fd23ee6197aa8dac2dd59d0a89d9b07741f57e8fa5e8 SHA512 d1aab9ea8042bf810398a4195fd3595a8abbeb060ab38fd7b7e40085c8d5f22ecb78bab02e2331d4588199d88e0d3848413d75a18fe4373ecd9940a3c990c604
diff --git a/dev-python/pytest-pep8/metadata.xml b/dev-python/pytest-pep8/metadata.xml
new file mode 100644
index 0000000..c08667f
--- /dev/null
+++ b/dev-python/pytest-pep8/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+ python@gentoo.org
+ Python
+
+
+
+ pytest-cov
+ pytest-dev/pytest-cov
+
+
diff --git a/dev-python/pytest-pep8/pytest-pep8-1.0.6.ebuild b/dev-python/pytest-pep8/pytest-pep8-1.0.6.ebuild
new file mode 100644
index 0000000..f951eae
--- /dev/null
+++ b/dev-python/pytest-pep8/pytest-pep8-1.0.6.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_9 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin to check PEP8 requirements"
+HOMEPAGE="https://pypi.org/project/pytest-pep8/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-python/pytest-3.8[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pytest-runner/Manifest b/dev-python/pytest-runner/Manifest
new file mode 100644
index 0000000..b4152b5
--- /dev/null
+++ b/dev-python/pytest-runner/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-runner-5.3.1.tar.gz 16262 BLAKE2B 2531bec32afb29a63253289f30880a7f6e74f0dc8626518c17326b74615697a8f7ef3075077a5da61c235e71ffed7aca9bdd64e3722d9381ecbdc66bc4fcbeed SHA512 7104ea8d714cc48fd69cbaedab5e71553889d1bc58b61bbb0d80a1de1cd9002eca2e05d6bc726c984ed4e4c4a276a757153164058295d445e458d763a888bcb6
+EBUILD pytest-runner-5.3.1.ebuild 520 BLAKE2B 1ca8efa706340c3272e3f4107739f44ece76707fa9451ee31db37627ea5cc2a6966a77522514526798eb6d3c95b057a0f2f0f7ae3ce453c701a94509f97e4b82 SHA512 53ec1afe4491df322a41976ce20a82d228f1d8faf902401dec03cd17bdfa097c258785279feffcd62cb7f58d44f12e0933fca7eb3631ce706f59b5bcc66e3c08
+MISC metadata.xml 412 BLAKE2B 0d79131c6fd8adf72493a7c333959e065cf4f2231f6c770800b6d05ff9afcc246cd202406bea6e28f6b0fd23ee6197aa8dac2dd59d0a89d9b07741f57e8fa5e8 SHA512 d1aab9ea8042bf810398a4195fd3595a8abbeb060ab38fd7b7e40085c8d5f22ecb78bab02e2331d4588199d88e0d3848413d75a18fe4373ecd9940a3c990c604
diff --git a/dev-python/pytest-runner/metadata.xml b/dev-python/pytest-runner/metadata.xml
new file mode 100644
index 0000000..c08667f
--- /dev/null
+++ b/dev-python/pytest-runner/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+ python@gentoo.org
+ Python
+
+
+
+ pytest-cov
+ pytest-dev/pytest-cov
+
+
diff --git a/dev-python/pytest-runner/pytest-runner-5.3.1.ebuild b/dev-python/pytest-runner/pytest-runner-5.3.1.ebuild
new file mode 100644
index 0000000..298161c
--- /dev/null
+++ b/dev-python/pytest-runner/pytest-runner-5.3.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_9 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Invoke py.test as distutils command with dependency resolution"
+HOMEPAGE="https://pypi.org/project/pytest-runner"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE=""
+
+RDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index cc5fc1c..a610375 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -1,3 +1,3 @@
-AUX openscad-9999-0001-fix-to-find-lib3mf-2.patch 766 BLAKE2B b28f21821b0bb55ea3743a0510a908eda2a9c0dbba3d4272deb843b86c91f2114a2a3e1e2ac87c4bcfd0631a9c856d41067f166674d42611b8652cd01b4a65d6 SHA512 3abfb61161699a4251fd606de0e1a04ff6160af95c9060861ac73e360343812f3350ad7aa59e17b8ed05ab6b960a6855eb6235bb44bdb3c6a30c0f45ac902a13
+AUX openscad-9999-0001-fix-to-find-lib3mf-2.patch 766 BLAKE2B 00f9dd15b1245631e38510c225bccdafa33dc76825b0f329b4c6697daf6e4d6c0934f19ecc4c003a0174d16bf7102a8b0f45c768d502353a2ca6521a3f247d3e SHA512 362732d790ba887e3ccd9f46993e592d5bb46f236ac27b437d789c32958ffce7b96086d4aa0c5c7187e2f2e672c0906f03a57ffc248a7460d21a1bec17ffaa9d
EBUILD openscad-9999.ebuild 2637 BLAKE2B cb11bb884071eda0a6ab6106562bc5b5f8f5fe497cf6aa8f0bae6b78ebdee4c0f1ead216f8bdb0b6808f937cac7a4eedc0af3db427e44d9200d06570494416aa SHA512 4e03ffe8b4bc5e6a7ca57e3f373494852fceb62397bbb5bbdf3ad7aea8feda08345ec2f2b3735e730952da5e15d660035b006b82d5dda22f50aad8d88f14f31e
MISC metadata.xml 1348 BLAKE2B b15a74a20ef94a6a47de57826c5279a4e8c388a52bf9d1058a1ba0b347fcd77e0c8b79a42515f5411d0991fb8fb71c604f792dd2a2addaaca78bc85dbfc7a611 SHA512 fea109a00324f0bdcaae855e18fba456a449bb8192e633cfd5806fa1040fe3bba24f75493e0012d54afe8828073fc4d02ae01533b45648e05c575777b23572d1
diff --git a/media-gfx/openscad/files/openscad-9999-0001-fix-to-find-lib3mf-2.patch b/media-gfx/openscad/files/openscad-9999-0001-fix-to-find-lib3mf-2.patch
index 46d4237..c108620 100644
--- a/media-gfx/openscad/files/openscad-9999-0001-fix-to-find-lib3mf-2.patch
+++ b/media-gfx/openscad/files/openscad-9999-0001-fix-to-find-lib3mf-2.patch
@@ -1,6 +1,6 @@
diff -urN openscad-9999.orig/cmake/Modules/FindLib3MF.cmake openscad-9999/cmake/Modules/FindLib3MF.cmake
---- openscad-9999.orig/cmake/Modules/FindLib3MF.cmake 2021-09-29 09:08:23.870290708 +0200
-+++ openscad-9999/cmake/Modules/FindLib3MF.cmake 2021-09-29 09:20:36.077846758 +0200
+--- openscad-9999.orig/cmake/Modules/FindLib3MF.cmake 2021-10-11 10:49:12.257231123 +0200
++++ openscad-9999/cmake/Modules/FindLib3MF.cmake 2021-10-11 10:50:22.037900144 +0200
@@ -14,11 +14,11 @@
# Travis CI Ubuntu Trusty environment has some issue with pkg-config
# not finding the version.