diff --git a/dev-python/kikit/Manifest b/dev-python/kikit/Manifest
index 0f5ffb1..c4d698a 100644
--- a/dev-python/kikit/Manifest
+++ b/dev-python/kikit/Manifest
@@ -2,4 +2,4 @@ AUX kikit 207 BLAKE2B 9fac1154a538c2f2b219b4994ee7d4f9e922018d7bf6d8052809e84637
 AUX kikit-info 209 BLAKE2B 6aedee39f304bf0da16ca9072efbb5ac1a6b560f460aa310b7f87e74c4874e50f6c587f5e91a1ed73d7f7678527eee8b0de067c8c3715b10b7a2f114c8acf0a3 SHA512 f8e97bcc27214a6b3f0890a8604ce8b52a9fc35540f6dcd37621eaf59bf575eb9e4091686aae0f4b3bff111b5e5f37ffefa23f42748cc6a0b78589fb7b5f3af2
 AUX kikit-plugin 211 BLAKE2B 126681a24c8369e8429e30a1a01579697626254f54b876867fdfab21969928f768621d7437648470dbdbd6fcb57e3b05d13888161ec1ac38cb747849f58e91aa SHA512 99d8e905b1b5e9002e2b328febf2cbe5cfc3ca58e7bebaf34d912538028d8313f33e3866f6cfdc89c1059e2252a11e8037631962b8e04dc8f99946eb7034ed09
 AUX kikit_plugin.py 106 BLAKE2B dfc9e818c59d5b59a6a31d8394b8cb00a3839450f1563ea2124d84935276b26125e9dd078f8e6cdc0f057d9865358cc11694188f3c0fea58e2829dd39c5d881d SHA512 ff8907d3f044384261ad1340c5c234edf5a3cd8cce1bb97753aee3fb6c85c19d0ac0ad187fda5bfc88a850d5812a07fc41f0f8e62cdb8f68aad59974d00a94e0
-EBUILD kikit-9999.ebuild 1546 BLAKE2B f7e6555fa9bd349659eb278f0631265d71d475d5bee0c0fdbd789d2f4870d7a943b8b9eb28e924ef773d9217bafb79f392d6dcc2554e1fe4226cb14d6767a83b SHA512 dc61ec64917aa841e23861409383a924460205e6a8d835acb69c5e549f210d773b9c72c46e2edda43c086fa13ce940aa260ebe2fb9ee6a93a66f29b65064145a
+EBUILD kikit-9999.ebuild 1554 BLAKE2B 74db7b6c7cb96a8fa53221fbbd861aae69cd22fe9de1515e204fe8a0dc127e0aab01258f6c5260ceeb0ca2e96eecc8e62a25bb4c62ce2f89d5f8d17d1e9795bb SHA512 d61dc94f2daf38054325cd632b8bf3d1e0718324959a9066cdc08939be5463d5c00f5e0dc363f7a750cd31f333b83868be02a1ddb822943056c84431aa711f18
diff --git a/dev-python/kikit/kikit-9999.ebuild b/dev-python/kikit/kikit-9999.ebuild
index bad9b0d..d093f65 100644
--- a/dev-python/kikit/kikit-9999.ebuild
+++ b/dev-python/kikit/kikit-9999.ebuild
@@ -35,9 +35,9 @@ RDEPEND="$(python_gen_cond_dep '
 		dev-python/pcbdraw[${PYTHON_SINGLE_USEDEP}]
 		dev-python/pcbnewtransition[${PYTHON_SINGLE_USEDEP}]
 		dev-python/pybars3[${PYTHON_USEDEP}]
+		>=dev-python/shapely-1.7[${PYTHON_USEDEP}]
 		>=dev-python/solidpython-1.1.2[${PYTHON_USEDEP}]
 		sci-electronics/kicad[${PYTHON_SINGLE_USEDEP}]
-		sci-libs/shapely[${PYTHON_USEDEP}]
 	')
 "
 
diff --git a/dev-python/pcbdraw/Manifest b/dev-python/pcbdraw/Manifest
index 2210563..38210eb 100644
--- a/dev-python/pcbdraw/Manifest
+++ b/dev-python/pcbdraw/Manifest
@@ -1,2 +1,2 @@
-AUX pcbdraw 209 BLAKE2B 85ce50272fbd2d2aa7547ca7b24ab1e4aa719896e23701b9a515e546aee4495c45d3e55d08a46c4e3f595c54f1c10b3d562d489ca4a3396039866abaab34793b SHA512 6d6922430c39aadcd160fed4f665f897a5bfdaf013d1094f37f4fad3b4f30a118b62da39c563b7e239559cfdd034d8f98dfdcdfbdc0cff84da9ea4dab9afb92d
-EBUILD pcbdraw-9999.ebuild 1512 BLAKE2B a1828b003584ca89ba85237d7ce027c4e461d214fd0b22e4fb3b6fa28a76187fb67193ccec83d28aaec9af4c65b37bafffadcd82270ffa3b1bf81912d9bf1aa6 SHA512 ca7db499db69522ccf94de5972a151ba40e6a073d11297ba1485d2f23a7801b1c1e4b2f903e848b9545086f56d82b5652ddce8f4cbd3522e63e7f328e3e9ff6a
+AUX pcbdraw 207 BLAKE2B b30a413cf0e03bc3a96b32606942b623e705554b286ab9a7f89e1de2ce2af92a73d4e76faa30793f0869d2bed203e5a316bcd60e0096d129165b4f26c6a39a70 SHA512 312c7c7d5ab16ddf892d369bf3cb8f76929500e040af4d2e0d3cdab45004303bede29c3230a9c468f8ee50a50a463d02385468a6552e8a02b4e49aff119f0fe6
+EBUILD pcbdraw-9999.ebuild 1519 BLAKE2B 0e78f6cbef129e45749f4d3ceded9a4c37d14b193733fd9127bca299a1435b4f865bc5edb079b43ef3a97d26a228267967885d53fb137d99ee8f2e943f6ee509 SHA512 7f5b12947f2dba64a00830f5969d64a94c625f63cf710eeede36470fe4afbb4d1e23fcc92624d8e1f013b80b80cb7476e76ed7591aae5cfd7a9d1a598bc850c6
diff --git a/dev-python/pcbdraw/files/pcbdraw b/dev-python/pcbdraw/files/pcbdraw
index f778ab0..81d318c 100644
--- a/dev-python/pcbdraw/files/pcbdraw
+++ b/dev-python/pcbdraw/files/pcbdraw
@@ -1,4 +1,4 @@
-#!/usr/bin/python3.9
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 import re
 import sys
diff --git a/dev-python/pcbdraw/pcbdraw-9999.ebuild b/dev-python/pcbdraw/pcbdraw-9999.ebuild
index 803bb94..054842f 100644
--- a/dev-python/pcbdraw/pcbdraw-9999.ebuild
+++ b/dev-python/pcbdraw/pcbdraw-9999.ebuild
@@ -53,6 +53,7 @@ src_compile() {
 }
 
 src_install() {
+	sed -
         python_domodule ${PN}
 	python_doscript ${FILESDIR}/pcbdraw
 	dodoc -r doc
diff --git a/dev-python/pymeta3/Manifest b/dev-python/pymeta3/Manifest
index 48bf872..e5133cd 100644
--- a/dev-python/pymeta3/Manifest
+++ b/dev-python/pymeta3/Manifest
@@ -1,2 +1,3 @@
 DIST pymeta3-0.5.1.tar.gz 29566 BLAKE2B ca508055c7ae23d488bfa8f79874aad104de6f92f9e02c096fd252e1aaae551f30964d2b134918ce7c313c0d5985365cd1c1b4d1886ef8f6fc64fd8266a77ff1 SHA512 3a44661ae550cbb56fb0397af835e3a12ac81243d4a2f1ac3d9d713a3955cb276441e112e7cd75beb7ebd0c4bfa03014ec8b625750dffeec891b5b7802b72575
+EBUILD pymeta3-0.5.1-r1.ebuild 540 BLAKE2B aeb4959d8fbee72fbf243a0479e5e5fc6a23e8e1dfa93b81d496a4dcd69c088179b6431023b848e3439fc05dfdbe30ad663e3a1fbdc75339f1c515964ff1a6ba SHA512 171faff402c00a3bdfe0756f563b80bea7a9506a5ee4f6e8965d1662b5e4c6de74fd06c9e0ac030be8f258f0237358247608ccf2494d9926fb1476cfe8f9e244
 EBUILD pymeta3-0.5.1.ebuild 539 BLAKE2B 8aa9c167b46b25f3ddc2c76a770d549a60a382415cb200b62fed6f4e35891ab351362c2bc17fdb4b3624aac5c6041fb72cfa014ab7fbe9032be9b46d85f4b870 SHA512 e6a8d4c4491c6d614e9a68675b31148cc37bde71b2b736fa821cc5d4ef97311d0e4d817bb1c01fe5156a91afef2b9491553e4d29f22d5fe4b795bcf1a4575a02
diff --git a/dev-python/pymeta3/pymeta3-0.5.1-r1.ebuild b/dev-python/pymeta3/pymeta3-0.5.1-r1.ebuild
new file mode 100644
index 0000000..ef54a68
--- /dev/null
+++ b/dev-python/pymeta3/pymeta3-0.5.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+MY_PN="PyMeta3"
+MY_P="${MY_PN}-${PV}"
+
+inherit distutils-r1
+
+DESCRIPTION="Pattern-matching language based on OMeta for Python"
+HOMEPAGE="https://github.com/wbond/pymeta3"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/pytest-runner/Manifest b/dev-python/pytest-runner/Manifest
index b4152b5..f06b7c1 100644
--- a/dev-python/pytest-runner/Manifest
+++ b/dev-python/pytest-runner/Manifest
@@ -1,3 +1,4 @@
 DIST pytest-runner-5.3.1.tar.gz 16262 BLAKE2B 2531bec32afb29a63253289f30880a7f6e74f0dc8626518c17326b74615697a8f7ef3075077a5da61c235e71ffed7aca9bdd64e3722d9381ecbdc66bc4fcbeed SHA512 7104ea8d714cc48fd69cbaedab5e71553889d1bc58b61bbb0d80a1de1cd9002eca2e05d6bc726c984ed4e4c4a276a757153164058295d445e458d763a888bcb6
+EBUILD pytest-runner-5.3.1-r1.ebuild 525 BLAKE2B cd928d48542a19d47b3f6fb83ef04dfb8ff3b85b4164fe7ad7b97447e00276b3d68e27b0b319e2e25ee5dd42cf4e1b623123fdcc980b0b087de7e6448c5fb103 SHA512 6bcff63e6fe623398c06eab969741c1326502cb8e4ef5ac55d7a39f02cf2889d336f815220c17aaaffee842ca40d7ae92bb87ce4e7641885687935bc6827fcb6
 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/pytest-runner-5.3.1-r1.ebuild b/dev-python/pytest-runner/pytest-runner-5.3.1-r1.ebuild
new file mode 100644
index 0000000..105a99f
--- /dev/null
+++ b/dev-python/pytest-runner/pytest-runner-5.3.1-r1.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,10} 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}]
+"