diff --git a/.github/workflows/duplicates.yml b/.github/workflows/duplicates.yml
new file mode 100644
index 0000000000..d143d718e0
--- /dev/null
+++ b/.github/workflows/duplicates.yml
@@ -0,0 +1,23 @@
+name: duplicates
+
+on:
+  push:
+    branches: [ dev ]
+  pull_request:
+    branches: [ dev ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup master gentoo repository
+      run: |
+        sudo mkdir -p /var/db/repos/gentoo /etc/portage /var/cache/distfiles
+        wget -qO - "https://github.com/gentoo-mirror/gentoo/archive/master.tar.gz" | sudo tar xz -C /var/db/repos/gentoo --strip-components=1
+        sudo wget "https://www.gentoo.org/dtd/metadata.dtd" -O /var/cache/distfiles/metadata.dtd
+        sudo wget "https://gitweb.gentoo.org/proj/portage.git/plain/cnf/repos.conf" -O /etc/portage/repos.conf
+        sudo ln -s /var/db/repos/gentoo/profiles/default/linux/amd64/17.1 /etc/portage/make.profile
+    - name: Check for duplicates
+      run: |
+        ./scripts/check-duplicates.sh
diff --git a/.github/workflows/pkgcheck.yml b/.github/workflows/pkgcheck.yml
index bf3af980ae..048f17c5f4 100644
--- a/.github/workflows/pkgcheck.yml
+++ b/.github/workflows/pkgcheck.yml
@@ -10,22 +10,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.9
-      uses: actions/setup-python@v2
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Run pkgcheck
+      uses: pkgcore/pkgcheck-action@v1
       with:
-        python-version: 3.9
-    - name: Install pkgcheck
-      run: |
-        python -m pip install --upgrade pip
-        pip install pkgcheck
-    - name: Setup master gentoo repository
-      run: |
-        sudo mkdir -p /var/db/repos/gentoo /etc/portage /var/cache/distfiles
-        wget -qO - "https://github.com/gentoo-mirror/gentoo/archive/master.tar.gz" | sudo tar xz -C /var/db/repos/gentoo --strip-components=1
-        sudo wget "https://www.gentoo.org/dtd/metadata.dtd" -O /var/cache/distfiles/metadata.dtd
-        sudo wget "https://gitweb.gentoo.org/proj/portage.git/plain/cnf/repos.conf" -O /etc/portage/repos.conf
-        sudo ln -s /var/db/repos/gentoo/profiles/default/linux/amd64/17.1 /etc/portage/make.profile
-    - name: Test with pkgcheck
-      run: |
-        pkgcheck scan --exit --checks=-RedundantVersionCheck --keywords=-MissingAccountIdentifier,-OldPackageUpdate
+        args: --keywords=-RedundantVersion,-MissingAccountIdentifier,-OldPackageUpdate
diff --git a/dev-libs/tweeny/Manifest b/dev-libs/tweeny/Manifest
index 1db1ee8733..e489168b99 100644
--- a/dev-libs/tweeny/Manifest
+++ b/dev-libs/tweeny/Manifest
@@ -1,2 +1,2 @@
-DIST tweeny-3.1.0.tar.gz 49467 BLAKE2B 7b1a3b7a7dba22d291c89dc3b2ee07458070aa55f2e77adfc1f0de4095187d2a2e0e0960a17a17fd96cccdd114d42d5e1bb4a6a76edc4b97500b2615c0eb574e SHA512 8109c241f866b565d15f1f5f87837f178a4fd3c5169d73e73e18334c54274024b48c9baed1f1935201ab872687bacb9ff3f8ecbae8078de4e1b459242450b9a5
 DIST tweeny-3.1.1.tar.gz 49663 BLAKE2B 1528e4ed6a42101fb96cc5283ee72a5546ae73b04fd8bc888902060410b94716fe6b3513fcf705553cd1f6c587aa23a26915b45aa592cd7f59bb83dcf1d64eac SHA512 3bffa130364512c9bb91b2cba73fc55833eafd9841e35dfccec68d6f865d571dfdb526c0af16124cdf9ce25b9c9f1a6097122075067e84746ede1b733e81d74b
+DIST tweeny-3.2.0.tar.gz 51418 BLAKE2B 8f1b164872f75d0f9847ab44145014e58cb8fe41a41b716215226120ddb901ff217063bbcdfb6649922988bd69dbea00e3de6ec4e71b4065d51c980bb71bbe56 SHA512 809b8250f7df6c3e9d27e9967c586d1ca4be29e3b551b57285da1060a6928c91e0afa6b3ef6b546cae48035383939f19d67889b632dd60a2fbb0a22aafaabe89
diff --git a/dev-libs/tweeny/tweeny-3.1.0.ebuild b/dev-libs/tweeny/tweeny-3.2.0.ebuild
similarity index 74%
rename from dev-libs/tweeny/tweeny-3.1.0.ebuild
rename to dev-libs/tweeny/tweeny-3.2.0.ebuild
index e36d70c222..7842f48567 100644
--- a/dev-libs/tweeny/tweeny-3.1.0.ebuild
+++ b/dev-libs/tweeny/tweeny-3.2.0.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
@@ -14,23 +14,20 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="doc"
 
-RDEPEND=""
-DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 src_prepare() {
 	cmake_src_prepare
 
 	if use doc; then
-		sed -i "s@DESTINATION share/doc/Tweeny@DESTINATION share/doc/${PF}@" \
+		sed -i 's@DESTINATION share/doc/Tweeny@DESTINATION ${CMAKE_INSTALL_DOCDIR}@' \
 			doc/CMakeLists.txt || die "Could not change documentation path."
 	fi
 }
 
 src_configure() {
 	local -a mycmakeargs=(
-		-DTWEENY_BUILD_EXAMPLES=NO
 		-DTWEENY_BUILD_DOCUMENTATION=$(usex doc)
-		-DTWEENY_BUILD_EXTRAS=NO
 	)
 
 	cmake_src_configure
diff --git a/dev-python/anyio/Manifest b/dev-python/anyio/Manifest
index 0d009d2c2d..83033c8400 100644
--- a/dev-python/anyio/Manifest
+++ b/dev-python/anyio/Manifest
@@ -1 +1 @@
-DIST anyio-2.0.2.tar.gz 91805 BLAKE2B 26a7bd16f3f7b9d59cec7b93e13a48a3bd09c459ed1e751d0189836218a8384979ec5778feb29b00dc6871640c2e67e1b4b3162d050253e195536e02902cb89a SHA512 5ce46e6cf167b2ee526e92642e65d1e715f443750b4c8b12d0c449ad460afd0280be920bcde0653f478eb52ab9db035a35ccb6908460bf425e85d7d0aa3f1799
+DIST anyio-2.1.0.tar.gz 95186 BLAKE2B 5dcb110e0e3d543525bb5081c948124e0e0f6bb0a80038104a8ab793ecf961a56d56576ad96a78b0fb69f3c7731dea3d9573b757f859ee8e61e65490432b9b69 SHA512 923467cdfbf6d0f427345704e99aec44cafc21f78a8b3b88d1ca9be93fb52a77d472229a242664977a873faf05c7c47a44a55aa4d0158959f60bf4ac8a46cdeb
diff --git a/dev-python/anyio/anyio-2.0.2.ebuild b/dev-python/anyio/anyio-2.1.0.ebuild
similarity index 92%
rename from dev-python/anyio/anyio-2.0.2.ebuild
rename to dev-python/anyio/anyio-2.1.0.ebuild
index ae1b57a600..3e5f0dd979 100644
--- a/dev-python/anyio/anyio-2.0.2.ebuild
+++ b/dev-python/anyio/anyio-2.1.0.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 # Build with USE="-doc" first because of circular dependency
 # otherwise one gets the error that sphinx-autodoc-typehints
-# does not support py3.8
+# does not support py3.9
 # DOCS_BUILDER="sphinx"
-# DOCS_DIR="${S}/docs"
+# DOCS_DIR="docs"
 # DOCS_DEPEND="
 # 	dev-python/anyio
 # 	>=dev-python/sphinx-autodoc-typehints-1.2.0
diff --git a/dev-python/geopy/geopy-2.0.0.ebuild b/dev-python/geopy/geopy-2.0.0.ebuild
index 2727113c21..37a11b5e22 100644
--- a/dev-python/geopy/geopy-2.0.0.ebuild
+++ b/dev-python/geopy/geopy-2.0.0.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"
@@ -17,11 +17,11 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 
 RDEPEND="
-	<sci-geosciences/geographiclib-2[python,${PYTHON_USEDEP}]
-	>=sci-geosciences/geographiclib-1.49[python,${PYTHON_USEDEP}]
+	<sci-geosciences/GeographicLib-2
+	>=sci-geosciences/GeographicLib-1.49
 "
 BDEPEND="test? (
 	dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
diff --git a/dev-python/graphene/Manifest b/dev-python/graphene/Manifest
index 7a175b7a63..3618cd539f 100644
--- a/dev-python/graphene/Manifest
+++ b/dev-python/graphene/Manifest
@@ -1 +1 @@
-DIST graphene-3.0.0_beta6.tar.gz 113241 BLAKE2B cd205c9309577d3a8038da0630f4e55ef2f6df5286bfd37b1f7f70ad850ca5704e82af515d3f2ce6b51713f8776597f0f211268cc958f902e9b82ec1b8678aaf SHA512 f0d29ea7eddd27c0d11c41493d40fc86da8b3d7108765e66b2fc7de8e56fbf30cc0a0ee01755780c32bf415a59175792d5164c8c95ca947e9da7d408d0859bf3
+DIST graphene-3.0.0_beta7.tar.gz 113258 BLAKE2B 4a3adadfea6dc6fd936b8bad83cf02c1b2b7937648712ee26ce3c5eb7e6d6631790ae2f22fff334de4495ed3197761862e88450e7f837ee06f71e7de4009efe4 SHA512 df4dee75c8c5bc5643dd5231bff61f7f1e2efe7203e61a3e32b10c80c2f44139a408ca99726fea51d6aa6e844e648c860c41e3e20ee4679dd3573f43047e71fa
diff --git a/dev-python/graphene/graphene-3.0.0_beta6.ebuild b/dev-python/graphene/graphene-3.0.0_beta7.ebuild
similarity index 96%
rename from dev-python/graphene/graphene-3.0.0_beta6.ebuild
rename to dev-python/graphene/graphene-3.0.0_beta7.ebuild
index 8988301d44..d0223b9900 100644
--- a/dev-python/graphene/graphene-3.0.0_beta6.ebuild
+++ b/dev-python/graphene/graphene-3.0.0_beta7.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
diff --git a/dev-python/hstspreload/Manifest b/dev-python/hstspreload/Manifest
index fd5ee2f835..9cb182d4a8 100644
--- a/dev-python/hstspreload/Manifest
+++ b/dev-python/hstspreload/Manifest
@@ -1 +1 @@
-DIST hstspreload-2020.12.22.tar.gz 992297 BLAKE2B a9695c15ec624fd8322ac713a05109d5a1921abca6e37846357c9dec96f5f55cd8ecefdd915416f0ef88e42913999b946e18012d0df925e58b496d6822c0dbb8 SHA512 19e92c4f4f0d3d9693f4540ce6c730b748eecbdb75b05ba7b25d64cef7afe0c6c8477c7b0a35bb8b8105269689e7dae6b1ff109e953b4aac375fb9903e4ffaf6
+DIST hstspreload-2021.2.15.tar.gz 1067446 BLAKE2B 53157d1adbddcd0818c296e964ad185b4c8740d306be032b86d265f4057f3173fd66ecefa98f8a66c1bcc4f9d88dca7fee040f534d4335b387ad301dc210e839 SHA512 3d5c10c9102b85b30efeb4fe5fa1cb35f019594e9e9483e3e557c8793c965cfabd8889969003958d8183832f81bcb17095d2cce4c21c46c13784c6289f931514
diff --git a/dev-python/hstspreload/hstspreload-2020.12.22.ebuild b/dev-python/hstspreload/hstspreload-2021.2.15.ebuild
similarity index 81%
rename from dev-python/hstspreload/hstspreload-2020.12.22.ebuild
rename to dev-python/hstspreload/hstspreload-2021.2.15.ebuild
index a43cc3d0c4..2b0c5b3b46 100644
--- a/dev-python/hstspreload/hstspreload-2020.12.22.ebuild
+++ b/dev-python/hstspreload/hstspreload-2021.2.15.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://github.com/sethmlarson/hstspreload
 	https://pypi.org/project/hstspreload
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/sethmlarson/hstspreload/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/httpcore/Manifest b/dev-python/httpcore/Manifest
index 83dced4a82..b4f192135f 100644
--- a/dev-python/httpcore/Manifest
+++ b/dev-python/httpcore/Manifest
@@ -1,2 +1,2 @@
 DIST httpcore-0.10.1.tar.gz 42164 BLAKE2B 939dac21235f56e0d39ee4cbe7dca9f686fb086598c35d5335532baaa4fb36e904f9cb9676ba8c412deb5f560a1b379d599993148fda11e74a18a37743613ee5 SHA512 1eddc62f0b2a0c48166de0d2f1717de7db2dd1e1ae959d07ed74e19e098fb5470c4a94348d33614226671870edf134288808aea332abb71f776bb733ff26053f
-DIST httpcore-0.12.2.tar.gz 56120 BLAKE2B 384f266be9aac2b92b630b008c655afbf27e9442d5ee0dd3059b29b3c36c27d973a74289fef0b391c0dabbc87c9213b18fae271e4781b7a4bb1ea9fd22f6496a SHA512 d4d172f9e5f6079a67626c324994ee4fcef86ff485e482b330ed6969eefb125a965d907a6dff2c463a54e3c8a26e82bda4742de162518810b53880e9d952c67c
+DIST httpcore-0.12.3.tar.gz 57587 BLAKE2B 3c0e7a210b21e54564c4c6077fadf66344b887662c71b05a1ad4a2c0224a4d703eccdf576d4443341176edee03b6776bfd49aaef2ea2f29f02614677e1dfad85 SHA512 b31535231dc2b6a5f1c9c0c538628f75360f04b4747b447ab0a7168ed32d0eabd463335c2f7fa782dcabb4cbc32891a2839ae50e0999d5a791c01b02533d38f0
diff --git a/dev-python/httpcore/httpcore-0.10.1.ebuild b/dev-python/httpcore/httpcore-0.10.1.ebuild
index 615b25eba9..5df6a34ee8 100644
--- a/dev-python/httpcore/httpcore-0.10.1.ebuild
+++ b/dev-python/httpcore/httpcore-0.10.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 DOCS_BUILDER="mkdocs"
 DOCS_DEPEND="dev-python/mkdocs-material"
diff --git a/dev-python/httpcore/httpcore-0.12.2.ebuild b/dev-python/httpcore/httpcore-0.12.3.ebuild
similarity index 94%
rename from dev-python/httpcore/httpcore-0.12.2.ebuild
rename to dev-python/httpcore/httpcore-0.12.3.ebuild
index a59caa84b9..ee00ef4e3c 100644
--- a/dev-python/httpcore/httpcore-0.12.2.ebuild
+++ b/dev-python/httpcore/httpcore-0.12.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 DOCS_BUILDER="mkdocs"
 DOCS_DEPEND="dev-python/mkdocs-material"
diff --git a/dev-python/httpx/httpx-0.16.1.ebuild b/dev-python/httpx/httpx-0.16.1.ebuild
index ae45099356..8e65c5b475 100644
--- a/dev-python/httpx/httpx-0.16.1.ebuild
+++ b/dev-python/httpx/httpx-0.16.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 DOCS_BUILDER="mkdocs"
 DOCS_DEPEND="dev-python/mkdocs-material"
@@ -23,6 +23,8 @@ LICENSE="BSD"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 
+# lots of these
+# request() got an unexpected keyword argument 'ext'
 RESTRICT="test"
 
 RDEPEND="
diff --git a/dev-python/hypercorn/Manifest b/dev-python/hypercorn/Manifest
index 0641d40acc..6274153d0a 100644
--- a/dev-python/hypercorn/Manifest
+++ b/dev-python/hypercorn/Manifest
@@ -1 +1 @@
-DIST hypercorn-0.11.1.tar.gz 148921 BLAKE2B 6fb35ee4a3da6a5a348dc5d923a79f8536b557ae91e9cb2c2c75a4f70bfb970562d80714b600463b5012ebf0b3859e7628b50d2fa992ba256958b13c17b99278 SHA512 6ea9ae3df1f268f2032de06fc392b98c8dc6df16fa7bc49956592de5a45eb991de5af4a8ac7612f932eab29633d4708a5cef34440b0b2be528478e4326e62b1b
+DIST hypercorn-0.11.2.tar.gz 150475 BLAKE2B fa2c2572fe61aa09bfa62691ac18a8d0149a2e31dda82c77c4fc6ff2720739a824e05ff754d9aec9c499e6c02fb77e1f0a2bd4e3efbb3154730fc369f91b949c SHA512 7d90f654445cc3db6cec001ac8523513dec78bd8bce03ddfb56cd46b999c6d5b4f44a7853f2e88673c3e288c104adae3d105c8c8147f306656136cbb9771b289
diff --git a/dev-python/hypercorn/hypercorn-0.11.1.ebuild b/dev-python/hypercorn/hypercorn-0.11.2.ebuild
similarity index 54%
rename from dev-python/hypercorn/hypercorn-0.11.1.ebuild
rename to dev-python/hypercorn/hypercorn-0.11.2.ebuild
index 34846977b8..056ad59a9f 100644
--- a/dev-python/hypercorn/hypercorn-0.11.1.ebuild
+++ b/dev-python/hypercorn/hypercorn-0.11.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 DOCS_BUILDER="sphinx"
@@ -41,7 +41,6 @@ BDEPEND="
 		>=dev-python/mock-4[${PYTHON_USEDEP}]
 		<dev-python/pytest-6[${PYTHON_USEDEP}]
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
 		dev-python/pytest-trio[${PYTHON_USEDEP}]
 		dev-python/trio[${PYTHON_USEDEP}]
 	)
@@ -49,28 +48,20 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
-#python_prepare_all() {
-#	# do not install LICENSE to /usr/
-#	sed -i -e '/data_files/d' setup.py || die
-#
-#	# Remove pytest-cov dep
-#	sed -i -e '21,22d' setup.cfg || die
-#
-#	distutils-r1_python_prepare_all
-#}
+python_prepare_all() {
+	# do not install LICENSE to /usr/
+	sed -i -e '/data_files/d' setup.py || die
 
-#pkg_postinst() {
-#	optfeature "asyncio event loop on top of libuv" dev-python/uvloop
-#	optfeature "websockets support using wsproto" dev-python/wsproto
-#	optfeature "websockets support using websockets" dev-python/websockets
-#	optfeature "httpstools package for http protocol" dev-python/httptools
-#	optfeature "efficient debug reload" dev-python/watchgod
-#}
+	# Remove pytest-cov dep
+	sed -i -e '/addopts/d' setup.cfg || die
 
-#python_test() {
-#	pytest -vv \
-#			--deselect tests/protocols/test_http.py::test_supported_upgrade_request[H11Protocol] \
-#			--deselect tests/protocols/test_http.py::test_supported_upgrade_request[HttpToolsProtocol] \
-#			--deselect tests/protocols/test_websocket.py::test_invalid_upgrade[WSProtocol] \
-#	|| die
-#}
+	distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+	optfeature "asyncio event loop on top of libuv" dev-python/uvloop
+	optfeature "websockets support using wsproto" dev-python/wsproto
+	optfeature "websockets support using websockets" dev-python/websockets
+	optfeature "httpstools package for http protocol" dev-python/httptools
+	optfeature "efficient debug reload" dev-python/watchgod
+}
diff --git a/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild b/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild
index 4891886451..f248974d8f 100644
--- a/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild
+++ b/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 DOCS_BUILDER="sphinx"
 DOCS_DIR="${S}/docs/source"
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.11.1.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.11.1.ebuild
index f45bccc3a6..b1885f21f9 100644
--- a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.11.1.ebuild
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.11.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphobjinv/sphobjinv-2.0.1.ebuild b/dev-python/sphobjinv/sphobjinv-2.0.1.ebuild
index 9550dad351..52f906ca8b 100644
--- a/dev-python/sphobjinv/sphobjinv-2.0.1.ebuild
+++ b/dev-python/sphobjinv/sphobjinv-2.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7,8} )
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
@@ -17,7 +17,7 @@ HOMEPAGE="
 SRC_URI="https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 "
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
 
 RDEPEND="
@@ -47,6 +47,9 @@ python_prepare_all() {
 	# not sure why this fails
 	rm tests/test_flake8_ext.py || die
 
+	# --strict option is deprecated in pytest>6
+	sed -i -e '/addopts/d' tox.ini || die
+
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild b/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild
index 5cf5ce8345..7218e21bc8 100644
--- a/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild
+++ b/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
@@ -23,3 +23,8 @@ distutils_enable_tests pytest
 #distutils_enable_sphinx doc \
 #				dev-python/sphinxcontrib-programoutput \
 #				dev-python/sphinx_rtd_theme
+
+python_test() {
+	# skip the doctests
+	pytest -vv tests || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/tekore/tekore-3.5.1.ebuild b/dev-python/tekore/tekore-3.5.1.ebuild
index 6014145fbe..629dfd89e5 100644
--- a/dev-python/tekore/tekore-3.5.1.ebuild
+++ b/dev-python/tekore/tekore-3.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/trio/Manifest b/dev-python/trio/Manifest
index 9a5d6f8856..a148b09351 100644
--- a/dev-python/trio/Manifest
+++ b/dev-python/trio/Manifest
@@ -1 +1,2 @@
 DIST trio-0.18.0.tar.gz 484421 BLAKE2B 239cf63076f8ae2c3ea0b4c5d1b88b88e27f8d43ff85c65a6c25785d797e48746df0acffbae741ce8f5e71301b12b7fb7ce4900248db3bec375f651b8379b22b SHA512 ebed3ebee93d2dde03a5c1063b0053a885b7aef29269c0459d470c14dd5c917800a91c38304dfc505c92a32c197eb802310fee7b224beb130b920d0201f4a33e
+DIST trio-0.18.0_p20210212.tar.gz 485725 BLAKE2B b9ba391cb98062073db3605ce16d4a6dea515678e9e3d7994addc06220c730ef86648346178fd28205ad820eee0ea596c0d799d3d4bcd530ff35ef65722457dd SHA512 ca87e6dd7ab2b1757e67520e0a3921cb609703f05ebce974af2faf789dfd9416c4ff9d56b09cd6a4c9325a0d4051491f18ba24b4b3aa65285cf9de1f0f256010
diff --git a/dev-python/trio/trio-0.18.0_p20210212.ebuild b/dev-python/trio/trio-0.18.0_p20210212.ebuild
new file mode 100644
index 0000000000..7d0d590f13
--- /dev/null
+++ b/dev-python/trio/trio-0.18.0_p20210212.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+COMMIT="ff86c6023758590a54fca9f48f5c16d2263ba31d"
+
+inherit distutils-r1 linux-info
+
+DESCRIPTION="Python library for async concurrency and I/O"
+HOMEPAGE="
+	https://github.com/python-trio/trio
+	https://pypi.org/project/trio
+"
+SRC_URI="https://github.com/python-trio/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/async_generator[${PYTHON_USEDEP}]
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	dev-python/idna[${PYTHON_USEDEP}]
+	dev-python/outcome[${PYTHON_USEDEP}]
+	dev-python/sniffio[${PYTHON_USEDEP}]
+	dev-python/sortedcontainers[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/astor-0.8.0[${PYTHON_USEDEP}]
+		>=dev-python/immutables-0.6[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		>=dev-python/jedi-0.17.0[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		dev-python/yapf[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source \
+					">=dev-python/immutables-0.6" \
+					dev-python/sphinxcontrib-trio \
+					dev-python/sphinx_rtd_theme \
+					dev-python/towncrier
+
+python_prepare_all() {
+	# Disable tests require IPv6
+	if ! linux_config_exists || ! linux_chkconfig_present IPV6; then
+		sed -i  -e "/for family in/s/, AF_INET6//" \
+			-e "/test_getaddrinfo/i@pytest.mark.skip(reason='no IPv6')" \
+			trio/tests/test_socket.py || die "sed failed for test_socket.py"
+	fi
+
+	# these tests require internet access
+	rm trio/tests/test_ssl.py || die
+	rm trio/tests/test_highlevel_ssl_helpers.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# tests fail if package is already installed without this
+	PYTHONPATH="${S}"
+	cd "${S}" || die
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/uvicorn/uvicorn-0.13.3.ebuild b/dev-python/uvicorn/uvicorn-0.13.3.ebuild
index ffb4f1c304..927e2d41b4 100644
--- a/dev-python/uvicorn/uvicorn-0.13.3.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.13.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 DOCS_BUILDER="mkdocs"
@@ -20,6 +20,10 @@ LICENSE="BSD"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 
+# lots of these
+# 'AsyncConnectionPool' object has no attribute 'arequest'
+RESTRICT="test"
+
 RDEPEND="
 	>=dev-python/click-7[${PYTHON_USEDEP}]
 	<dev-python/click-8[${PYTHON_USEDEP}]
diff --git a/games-action/minecraft-launcher/Manifest b/games-action/minecraft-launcher/Manifest
index 77c330f20d..c2a4e32f24 100644
--- a/games-action/minecraft-launcher/Manifest
+++ b/games-action/minecraft-launcher/Manifest
@@ -1,5 +1,5 @@
 DIST minecraft-launcher-1.6.93.jar 4481683 BLAKE2B 29597977cc70f831bff7f77cb2493d8c8f8138518c79f5e92f91ed6440ae2224b4140546c37645370173c668d9db894ca6b548b6cfd41da40c4e1ff51f0d820b SHA512 85739c0c0828af5b901b9933173f08229175aef1e8dec40c83981fb6fc330285b4c3a206cdf4405408106eff56ce1e516368d18bf44f631446ebac45e9aba125
 DIST minecraft-launcher-2.2.1441.tar.gz 77295040 BLAKE2B 9c56dc06394e9087d345860ea92daf0e01cb10a45196e249cd5bdcce1d326ccbbf788da2610cbb7715740fc73857be1da7fdbc975b7b12a93fd39699d68d9b5e SHA512 b384bbb621a2c379eb6c7ab865252e31a54ad0bd4b2b29ff25d4be635571d967e1be9dfb792f20d0edc3529fd8762a0a73b9bd67456339450ad8ccc6b16de64d
-DIST minecraft-launcher-2.2.1767_beta.tar.gz 76760051 BLAKE2B bfe01bc0398918ff5a646db9d93a4be0532a94ef04a5fff5fbd09b96b7681d7a999a57f6a30dff51d06098df6fa0dc337a3528ed33518c2785f79ee72ad935bc SHA512 eb1667eeed14db68e45c60509e6bd345a9ce29282c0f40dbcdc6c454fd87be42782450c1908961e3fef96dc0944d6e14316aff8a80bdcc9810d3f7200079534c
+DIST minecraft-launcher-2.2.1867_beta.tar.gz 76767905 BLAKE2B 62af6c11a8ea483cb87b59022ffbfd1d6972aabb4323509452a486afc9de81008872f74d53ea039b1b8ce5adbc9f13bba1937236598f529556ced2d29442f063 SHA512 1a252aab832c5e3fae13a462c22c44fdb0a5727465f643616201ee60ce3810fa9ea3ab59aabfa5a8d0b10976672e8187df9275f3f23d1c42021b8cd5336ec00e
 DIST minecraft-launcher-legacy.svg 61803 BLAKE2B 6527c869aec955f5e457e57f6c60b6391c29f2bc6f83d72b9a432cc9b77df6fb842549158f38e32a0bec6973d6fac4af3a1a5562cb84b5a4fd1d95de645da842 SHA512 aa08e8fa2a5c1c3e2d714644cb9648adb779c09fff5a9e5b79cea42c53be3f53631d199f72c1eec56e4b4f8e46be8f4ae88fbe456865621b589a7c4f9438549a
 DIST minecraft-launcher.svg 61803 BLAKE2B 6527c869aec955f5e457e57f6c60b6391c29f2bc6f83d72b9a432cc9b77df6fb842549158f38e32a0bec6973d6fac4af3a1a5562cb84b5a4fd1d95de645da842 SHA512 aa08e8fa2a5c1c3e2d714644cb9648adb779c09fff5a9e5b79cea42c53be3f53631d199f72c1eec56e4b4f8e46be8f4ae88fbe456865621b589a7c4f9438549a
diff --git a/games-action/minecraft-launcher/minecraft-launcher-2.2.1767_beta.ebuild b/games-action/minecraft-launcher/minecraft-launcher-2.2.1867_beta.ebuild
similarity index 100%
rename from games-action/minecraft-launcher/minecraft-launcher-2.2.1767_beta.ebuild
rename to games-action/minecraft-launcher/minecraft-launcher-2.2.1867_beta.ebuild
diff --git a/gui-wm/dwl/Manifest b/gui-wm/dwl/Manifest
new file mode 100644
index 0000000000..a446975c90
--- /dev/null
+++ b/gui-wm/dwl/Manifest
@@ -0,0 +1 @@
+DIST dwl-0.2.tar.gz 49105 BLAKE2B c9fc48b1018c46f5a7923dda615ac2bfc3d4ba7ccc588253f02343aa411be61e791093a4ee4938257dd13a4d0e69425ca10ba524dc6e081cb977ee89d0b4165f SHA512 f7903c58ff95f947ac7d5706cf140ff72abcc33c9b8c5b16baa4e548e72aee4f6f0b2cbd95204cc25d000f6a5533c5d8009ad443b1fd95e18c06cda8050ff743
diff --git a/gui-wm/dwl/dwl-0.2.ebuild b/gui-wm/dwl/dwl-0.2.ebuild
new file mode 100644
index 0000000000..fbd1f9833e
--- /dev/null
+++ b/gui-wm/dwl/dwl-0.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="dwm for Wayland"
+HOMEPAGE="https://github.com/djpohly/dwl"
+SRC_URI="https://github.com/djpohly/dwl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="gui-libs/wlroots
+dev-libs/wayland-protocols"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	emake PREFIX="${D}"/usr install
+}
diff --git a/gui-wm/dwl/metadata.xml b/gui-wm/dwl/metadata.xml
new file mode 100644
index 0000000000..ad8cead24f
--- /dev/null
+++ b/gui-wm/dwl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>svdm-gentoo@protonmail.com</email>
+        <name>Simon van der Maas</name>
+    </maintainer>
+</pkgmetadata>
diff --git a/media-gfx/qfontviewer/metadata.xml b/media-gfx/qfontviewer/metadata.xml
new file mode 100644
index 0000000000..231c0fe3a4
--- /dev/null
+++ b/media-gfx/qfontviewer/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">alopatindev/qfontviewer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-gfx/qfontviewer/qfontviewer-9999.ebuild b/media-gfx/qfontviewer/qfontviewer-9999.ebuild
new file mode 100644
index 0000000000..e7127f05d4
--- /dev/null
+++ b/media-gfx/qfontviewer/qfontviewer-9999.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit git-r3
+
+DESCRIPTION="Font viewer with character table"
+HOMEPAGE="http://qfontviewer.sourceforge.net/"
+EGIT_REPO_URI="https://github.com/alopatindev/qfontviewer"
+LICENSE="GPL-3+"
+SLOT="0"
+
+DEPEND="dev-qt/qtwidgets:5"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	einstalldocs
+	newbin "${P}" "${PN}"
+}
diff --git a/media-video/vidify-audiosync/vidify-audiosync-0.3.0.ebuild b/media-video/vidify-audiosync/vidify-audiosync-0.3.0.ebuild
index f214984bd7..2a32a5a29b 100644
--- a/media-video/vidify-audiosync/vidify-audiosync-0.3.0.ebuild
+++ b/media-video/vidify-audiosync/vidify-audiosync-0.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
diff --git a/media-video/vidify/vidify-2.2.6.ebuild b/media-video/vidify/vidify-2.2.6.ebuild
index 974600dcc5..f36a4f702b 100644
--- a/media-video/vidify/vidify-2.2.6.ebuild
+++ b/media-video/vidify/vidify-2.2.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
diff --git a/net-im/discord-canary-bin/Manifest b/net-im/discord-canary-bin/Manifest
index c722d912f6..52f5b1938f 100644
--- a/net-im/discord-canary-bin/Manifest
+++ b/net-im/discord-canary-bin/Manifest
@@ -1 +1 @@
-DIST discord-canary-0.0.116.tar.gz 70916212 BLAKE2B 8e3fb7d0d88866ad01427c07d72c0b08aa87e7a92cb38d20d7b12cfbf35394c30c8771c7945560da7e2d854ae2d87e4b4d78d07324dcbf4656a022e0b940fbeb SHA512 189848f97b43bf6d972908f5692fdf148a43e65d233cca4cd51e47eccfe1510d0ce9ac15f093c87451b178ec9b57e91e0163da32a1a62a49ab61af76debe734f
+DIST discord-canary-0.0.119.tar.gz 71822214 BLAKE2B 9c98f263f540bdb720597daa9ab7a77de4cdbeea45dfc47bb8bf14f8e7b4a69d2c366140efffeb6cfc951e9ee02f10e63007dfbc93eb58c3e8e45ff23ca261b7 SHA512 6f6d7175ecd6f2992caa8b29c28d1533fb15aa9b201fec9c5822500104f161c55cbbe3e698af8ab98a4bd152c96759f5d18583c5db472c777666a9c4eb72de83
diff --git a/net-im/discord-canary-bin/discord-canary-bin-0.0.116.ebuild b/net-im/discord-canary-bin/discord-canary-bin-0.0.119.ebuild
similarity index 97%
rename from net-im/discord-canary-bin/discord-canary-bin-0.0.116.ebuild
rename to net-im/discord-canary-bin/discord-canary-bin-0.0.119.ebuild
index bcf012445e..618be3f523 100644
--- a/net-im/discord-canary-bin/discord-canary-bin-0.0.116.ebuild
+++ b/net-im/discord-canary-bin/discord-canary-bin-0.0.119.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
diff --git a/net-misc/lyricwikia/lyricwikia-0.1.11.ebuild b/net-misc/lyricwikia/lyricwikia-0.1.11.ebuild
index 7e29e7d58d..05e31bb8ee 100644
--- a/net-misc/lyricwikia/lyricwikia-0.1.11.ebuild
+++ b/net-misc/lyricwikia/lyricwikia-0.1.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
diff --git a/net-misc/rtv/Manifest b/net-misc/rtv/Manifest
new file mode 100644
index 0000000000..eec1ff6eb7
--- /dev/null
+++ b/net-misc/rtv/Manifest
@@ -0,0 +1 @@
+DIST rtv-1.27.0.tar.gz 17277593 BLAKE2B 25d504a7715cbab926d5dc612baee223d9fa192828763edffb3a8fa09861b2c6bf6835adda638b1300ecebbc2e1822709971dd9e63ea7e05b6a7eebc0d5dbda7 SHA512 38a136af0b9a4e693e9db119ebdee332a20002622029107c1860dc32f15fe2d4a0b68d1a45e6817e9c00a3aaece3dfcd604f04de71a6dec4bbf1c23df2bf6605
diff --git a/net-misc/rtv/metadata.xml b/net-misc/rtv/metadata.xml
new file mode 100644
index 0000000000..ad8cead24f
--- /dev/null
+++ b/net-misc/rtv/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>svdm-gentoo@protonmail.com</email>
+        <name>Simon van der Maas</name>
+    </maintainer>
+</pkgmetadata>
diff --git a/net-misc/rtv/rtv-1.27.0.ebuild b/net-misc/rtv/rtv-1.27.0.ebuild
new file mode 100644
index 0000000000..50827b513c
--- /dev/null
+++ b/net-misc/rtv/rtv-1.27.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_REQ_USE="ncurses"
+inherit distutils-r1
+
+DESCRIPTION="Browse Reddit from your terminal"
+HOMEPAGE="https://github.com/michael-lazar/rtv"
+SRC_URI="https://github.com/michael-lazar/rtv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-python/beautifulsoup[${PYTHON_USEDEP}]
+dev-python/decorator[${PYTHON_USEDEP}]
+dev-python/requests[${PYTHON_USEDEP}]
+dev-python/six[${PYTHON_USEDEP}]
+dev-python/kitchen[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/profiles/make.defaults b/profiles/make.defaults
deleted file mode 100644
index 9b93bcdec8..0000000000
--- a/profiles/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
-
-# Env vars to expand into USE vars.
-USE_EXPAND="GEOIDS_DATASETS GRAVITY_MODELS MAGNETIC_MODELS PRECISION"
-
diff --git a/profiles/updates/1Q-2021 b/profiles/updates/1Q-2021
index 998970ae65..e77d3241c5 100644
--- a/profiles/updates/1Q-2021
+++ b/profiles/updates/1Q-2021
@@ -1 +1,4 @@
 move dev-python/faker dev-python/Faker
+move sci-geosciences/geographiclib sci-geosciences/GeographicLib
+move x11-libs/kimageannotator media-libs/kimageannotator
+move x11-libs/kcolorpicker media-libs/kcolorpicker
diff --git a/sci-geosciences/geographiclib/Manifest b/sci-geosciences/geographiclib/Manifest
deleted file mode 100644
index 2ee55de4d2..0000000000
--- a/sci-geosciences/geographiclib/Manifest
+++ /dev/null
@@ -1,20 +0,0 @@
-DIST geographiclib-1.51.tar.gz 2470362 BLAKE2B 5e0a0f44d3b0c62ed7e28285b240cab07a7592e5bf4b181c25b62d8462bb7e2c21f6fcb09577c5f766578803c4b303fdb69af006d3ae62a8b5cb80e92b76236f SHA512 34487a09fa94a34d24179cfe9fd2e5fdda28675966703ca137cbfe6cc88760c2fbde55f76c464de060b58bfe0a516e22c0f59318cf85ae7cc01c5c6a73dd6ead
-DIST geoids-egm2008-1.tar.bz2 162388303 BLAKE2B ec79dbe2b25e8f9474fb4e8b704f9cb3c99d80004d0049bcfd956f7bcaa0822e6c0fcdc076f14075c688aeaac47bf68e192a114fca4c21edd81be880114b85f4 SHA512 0928a6e19aea2f372e946ce69c3a3826c2685c0a4029eb4bec7ab16873c03fbcc224ce47d99e6b6798e274a7d469fd3d303954938fb1f58c5dd5ba74907913d9
-DIST geoids-egm2008-2_5.tar.bz2 34927299 BLAKE2B bd4e3a04221669fe58e41eb4b93965415f3e238cd9af475fe78fe00592ebc80470309ac63366d9416bb2e0fd835dcb28a1302d89670d85271546a712c0918cc6 SHA512 dd65c8dc916f98a8592cc64518e2a6ac657d7d02d8316ff74cf3fcc62e413a8780ec52421b90e2ab4d846bd7fa2231e6d0a39467a7ea5b8774c71b9fece3cb34
-DIST geoids-egm2008-5.tar.bz2 10414793 BLAKE2B ee4fa8e8ab9e87b21197a0a6149a52a49e16a1cde3b5490b4590bede8f67ce6854c9fd2b55491a20963a150aeed53efef95aadde27ca9e9c3a88526940ba402d SHA512 cb3598219df6c7c4a3aea0df0005561aae90dd85c33b79ef39da00cf7512509ae3a3962178e83bed6a1ea85614618bfaf523653a56e6492d3fef243d8483eb0d
-DIST geoids-egm84-15.tar.bz2 1475184 BLAKE2B 3249dd2e724c33468542548070f5f0e8443480b627f046ced8316d6741a1566b3c43c88f20b18e56b599b71ecb5076295ac5cc099880ed5da82d74e5ccd07777 SHA512 06919c11044df7bd1b669e66972ccb19c0b439709becb5623ebb5a2f80ce5ed5fca3b3b47b519db80eb796f402919b093f6dcb68ee3a171096d84bcb051fa267
-DIST geoids-egm84-30.tar.bz2 416481 BLAKE2B f86c29543dc6ac3df0a7e95085872d84dc7a172a6d2636b0cd1e20bc7587fe8632911dff9821961c981edbadb7b68bb56e97a233ab7165d13810e920cce8bb34 SHA512 446d272afe925f7d73b4f0b251b3477d1f92e10a7335b5a05bf4d1f247e04413fb856f7a3f73958c87cbdf59fc516296d15bf7ed438cc1bed8f0ee4cd1630b67
-DIST geoids-egm96-15.tar.bz2 1490277 BLAKE2B c2fff9874dd2c155a5c63899841937fda0f66a1bd8cec6acc2d6c8242f1dd097c7f0a315288c0aee1c23b325634cddd56981f7a50833feb1ea57ded96bd9a30a SHA512 82f362483e605502ba2d996d3c05095d2967357b61322d18f1313fdb77c39a0307087eefadba10b9c260abf73b3c0013e84339ae173420e77f75d2da6f0a95bb
-DIST geoids-egm96-5.tar.bz2 10225152 BLAKE2B 81fbfb0095fc9a496a9434f8462b2aaeb2ce7fdaff2332aa38e9d57ab79e5801fa93705683a513a7990738494c57fc729520597353faa9a79775563f93018d69 SHA512 cbb4f2ca4df26f98af2848c0ec9d485567475ae510da1b8559c67e32a2b6abe1e4f1c24153952feca73a92b045454e44a2506b63f4f9ed634a296af085b99511
-DIST gravity-egm2008.tar.bz2 74456990 BLAKE2B 6f64b60d5506d7c27d22ea979d666103d529aaa9b12ec1a2cb9248c0cd6ac97c6ec1e4c64bb8f690999143d9e2e76e528b8ed66fc5c48ecbc20ffd94b9b767bb SHA512 c921c3bd66fb00d05ee983c3e9ad49b38f4a8d881e9073ccf250f3737486701beeac66d0d8726626282a91bdc44ddce073f2e6729bfa914b78887009aed0ad0f
-DIST gravity-egm84.tar.bz2 258023 BLAKE2B 58820879bf22a50a4c39824971fe8921eab9610af9a913d0aaf6b0457274c48373ba4f1aad63f35c0c24e302fef4ae0923b900cd3dfffd6f3b38f77977332b4e SHA512 350a182912580dfc8072f6c9e92d1f3559094bb19d167008228e3888ed0b6af69dc22bd0ac63ee6074cb91266a9c7ce29452076c96b72c5b39feae84f0dd7a54
-DIST gravity-egm96.tar.bz2 2055724 BLAKE2B f2a844f565aa5383f6443bcdc22daf515b9f75b2e68091b07a59a9f70d8f0dea238198104fed746c16bd308429d8ee5487273b073eb1edcb86128fa72ac5ea79 SHA512 8c1db592355dad1a2ed5db9782cc8589abd83857eae0e476495695ab66e8b67a6c8df9afa277fdefb23f24a900f41d49e40a4f18f0deae98f23659848b3e2e3d
-DIST gravity-wgs84.tar.bz2 807 BLAKE2B 3092194633b838d7f589341b5696c5206516ded394f2c1a36f4d1c40c408e3755543ce03d8d34fdff6fa8f6739bff6d285bfadf99c4d43e0c9104b98ed0192ff SHA512 a786941bf978dd3cb10cd554110c1bc27d9647a3377468022785e85d9900c20732c3a9bce2dd84f1df69221d00f90c06e0b08685c1cfa006019885e0758c363e
-DIST magnetic-emm2010.tar.bz2 3627692 BLAKE2B 61e28905710781735bdb214cd7758aa371dd3409269a7793054afd43bf257274badf068647925c4da94d4bb5b06c0a24a0f8cb97ee2ac935818ed4eaaa3c4465 SHA512 09a2059158d9bfc40047a5680d96c026c399d319669ffda32bfc2eb6bcc7449201c0fb4244d074b4d4c0445719e3c4415cc18af51c93f66edcbcc3b92cf0a8b7
-DIST magnetic-emm2015.tar.bz2 659405 BLAKE2B 927d5b884b7a4c89301b0f53863674dbd8e8d4d597d21c39412620b475010bfa0878bd79933f3724ba6c9fa3722f475519d913157204f1ff7b3c1735c59ad26a SHA512 44a0f8d9c4b9cdc86bac397858af6b15d4d6d6e7638641cc09e4e95b2757cdcf1a690280b4b593504cdab48e5dc09a98b08575117329a7c0473efa9649769098
-DIST magnetic-emm2017.tar.bz2 1733711 BLAKE2B 4ad26905d3db94d41c3d6336b88e9eb72c14b14de2101f384166613ca5a5c8690b71dfa1510d010dfb3c5080194cbc66974f747d8df31733c3c5b642fcebed18 SHA512 e6b3d54bd9b10eefd6cd331e0ab011b04f0c71bb023d3356436afe0109e64ba54b35abd059c39d7d920eb826106fb562b424d4239fbffe0ae517823e8f9a36f8
-DIST magnetic-igrf11.tar.bz2 6011 BLAKE2B 342f2ac19f3de151e726c42b3d2e63967c5d8986c580c43ccdf003902997ea2a4e57495c5f5098168cce8410ca267dd84d2e5508e9e6e5a9d7074b48d600c76e SHA512 fd406c642aa551db0d1bc04c895ef84899367807709020bf774e8e944410252e9072ec3ef4273c46fce18d115e0a04e9ea4f83ac890638a21a414fb742a67c0d
-DIST magnetic-igrf12.tar.bz2 6640 BLAKE2B 0cd310d64e9eae1d43302a7ec2b2b90e4a963dc041ff03437a44b299e16feb38ba2719411da7dfeaa7378c7469546c03c6aae11260e439574e7df2f68518a5b9 SHA512 f15744e19e1bf45bfafa62ed03b9966dd068c7baec761601d102f29e3bd801ec92355f169ac18b8f7b9fae001af13903aaab38b05334d9784dff30ce1c01e5d8
-DIST magnetic-wmm2010.tar.bz2 1442 BLAKE2B 1a22029dc69e015a092527640315e5fda3017178a4604bf58da5b4b3362570d5e6f49f3425ade94adfb15fb93b1e9e4f0bc08cfaf1466944f0cb013ca0e7846c SHA512 fba2dd2017e6b832d46e98dcc0e09ae0d8b2a904f172fef0f1085c924df22c2edad443167f176623ba7d4f047bf5c3a91d870e5854f03fc90ae2e536694e8dea
-DIST magnetic-wmm2015v2.tar.bz2 1448 BLAKE2B 7570e05cfd7cf217d72ee917d17c66411461251db97792dbd71c292374482127cf6febb92e27d5722e215878ac5d741ec942b654490947155d2ca3f1d984c064 SHA512 d4f1cf83c5d893b60f78764139f486c55d808ebf0bf647bb163d4582bd6e515ab68d3ba00c74c5aa570017208dfad0a042ce848199c335a961755cab25d1fb86
-DIST magnetic-wmm2020.tar.bz2 1434 BLAKE2B 1eee2dcd5731a8d192fe00399b3d500a8b5353b2c457ca3330845aef90a0fc5fcd66025cae0a2577438d6561174565b8b2516aa2ad27086326073ffa6ea9726c SHA512 7e64a9c15b2a29f6cc96151eef0d97225cdd6bf02afcd65b19eef13464f80c1dab753e21900c481074ebdd3410d8ab81b83c288bf0d3e24d91a3810f8e63cf6f
diff --git a/sci-geosciences/geographiclib/geographiclib-1.51.ebuild b/sci-geosciences/geographiclib/geographiclib-1.51.ebuild
deleted file mode 100644
index da7a08e077..0000000000
--- a/sci-geosciences/geographiclib/geographiclib-1.51.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake distutils-r1
-
-MY_PN="GeographicLib"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="C++ library for converting geographic coordinate systems"
-HOMEPAGE="https://sourceforge.net/projects/geographiclib/"
-
-# To-Do:find out why this doesn't work
-# 105/167 Test #105: GeodSolve82 ......................***Failed
-# Required regular expression not found. Regex=[20\.0010* 0\.0* 180\.0* 20\.0010* 0\.0* 180\.0* 0\.0* 0\.0* 0\.0* 1\.0* 1\.0* -?0
-RESTRICT="test"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE_GEOIDS_DATASETS="
-	geoids_datasets_egm84-30
-	geoids_datasets_egm84-15
-	geoids_datasets_egm96-15
-	geoids_datasets_egm96-5
-	geoids_datasets_egm2008-5
-	geoids_datasets_egm2008-2-5
-	geoids_datasets_egm2008-1
-"
-IUSE_GRAVITY_MODELS="
-	gravity_models_egm84
-	gravity_models_egm96
-	gravity_models_egm2008
-	gravity_models_wgs84
-"
-IUSE_MAGNETIC_MODELS="
-	magnetic_models_wmm2010
-	magnetic_models_wmm2015v2
-	magnetic_models_wmm2020
-	magnetic_models_igrf11
-	magnetic_models_igrf12
-	magnetic_models_emm2010
-	magnetic_models_emm2015
-	magnetic_models_emm2017
-"
-IUSE_PRECISION="
-	precision_arbitrary
-	+precision_double
-	precision_long-double
-	precision_quad
-	precision_single
-"
-IUSE="${IUSE_GEOIDS_DATASETS} ${IUSE_GRAVITY_MODELS} ${IUSE_MAGNETIC_MODELS} ${IUSE_PRECISION} boost doc examples geoids gravity magnetic python"
-IUSE_EXPAND="GEOIDS_DATASETS GRAVITY_MODELS MAGNETIC_MODELS PRECISION"
-
-REQUIRED_USE="
-	^^ ( ${IUSE_PRECISION/+/} )
-	geoids? ( || ( ${IUSE_GEOIDS_DATASETS/+/} ) )
-	gravity? ( || ( ${IUSE_GRAVITY_MODELS/+/} ) )
-	magnetic? ( || ( ${IUSE_MAGNETIC_MODELS/+/} ) )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-COMMON_URI="https://sourceforge.net/projects/${PN}/files"
-SRC_URI="
-${COMMON_URI}/distrib/${MY_P}.tar.gz/download -> ${P}.tar.gz
-
-geoids_datasets_egm84-30?         ( ${COMMON_URI}/geoids-distrib/egm84-30.tar.bz2	-> geoids-egm84-30.tar.bz2	)
-geoids_datasets_egm84-15?         ( ${COMMON_URI}/geoids-distrib/egm84-15.tar.bz2	-> geoids-egm84-15.tar.bz2	)
-geoids_datasets_egm96-15?         ( ${COMMON_URI}/geoids-distrib/egm96-15.tar.bz2	-> geoids-egm96-15.tar.bz2	)
-geoids_datasets_egm96-5?          ( ${COMMON_URI}/geoids-distrib/egm96-5.tar.bz2	-> geoids-egm96-5.tar.bz2	)
-geoids_datasets_egm2008-5?        ( ${COMMON_URI}/geoids-distrib/egm2008-5.tar.bz2	-> geoids-egm2008-5.tar.bz2	)
-geoids_datasets_egm2008-2-5?      ( ${COMMON_URI}/geoids-distrib/egm2008-2_5.tar.bz2	-> geoids-egm2008-2_5.tar.bz2	)
-geoids_datasets_egm2008-1?        ( ${COMMON_URI}/geoids-distrib/egm2008-1.tar.bz2	-> geoids-egm2008-1.tar.bz2	)
-
-gravity_models_egm84?            ( ${COMMON_URI}/gravity-distrib/egm84.tar.bz2		-> gravity-egm84.tar.bz2	)
-gravity_models_egm96?            ( ${COMMON_URI}/gravity-distrib/egm96.tar.bz2		-> gravity-egm96.tar.bz2	)
-gravity_models_egm2008?          ( ${COMMON_URI}/gravity-distrib/egm2008.tar.bz2	-> gravity-egm2008.tar.bz2	)
-gravity_models_wgs84?            ( ${COMMON_URI}/gravity-distrib/wgs84.tar.bz2		-> gravity-wgs84.tar.bz2	)
-
-magnetic_models_wmm2010?         ( ${COMMON_URI}/magnetic-distrib/wmm2010.tar.bz2	-> magnetic-wmm2010.tar.bz2	)
-magnetic_models_wmm2015v2?       ( ${COMMON_URI}/magnetic-distrib/wmm2015v2.tar.bz2	-> magnetic-wmm2015v2.tar.bz2	)
-magnetic_models_wmm2020?         ( ${COMMON_URI}/magnetic-distrib/wmm2020.tar.bz2	-> magnetic-wmm2020.tar.bz2	)
-magnetic_models_igrf11?          ( ${COMMON_URI}/magnetic-distrib/igrf11.tar.bz2	-> magnetic-igrf11.tar.bz2	)
-magnetic_models_igrf12?          ( ${COMMON_URI}/magnetic-distrib/igrf12.tar.bz2	-> magnetic-igrf12.tar.bz2	)
-magnetic_models_emm2010?         ( ${COMMON_URI}/magnetic-distrib/emm2010.tar.bz2	-> magnetic-emm2010.tar.bz2	)
-magnetic_models_emm2015?         ( ${COMMON_URI}/magnetic-distrib/emm2015.tar.bz2	-> magnetic-emm2015.tar.bz2	)
-magnetic_models_emm2017?         ( ${COMMON_URI}/magnetic-distrib/emm2017.tar.bz2	-> magnetic-emm2017.tar.bz2	)
-"
-#TODO: find out the licenses of the geoid and gravity datasets
-LICENSE="
-	MIT
-	geoids? ( public-domain )
-	gravity? ( public-domain )
-	magnetic? ( public-domain )
-"
-
-RDEPEND="
-	>=dev-libs/boost-1.65.0
-"
-DEPEND="
-	${RDEPEND}
-	doc? (
-		>=app-doc/doxygen-1.8.7
-		>=dev-lang/perl-5.26.1-r1
-		>=dev-python/sphinx-1.6.3-r2
-		>=sys-apps/util-linux-2.31
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-distutils_enable_tests setup.py
-# there are additional docs in the python dir
-distutils_enable_sphinx python/doc
-
-src_prepare() {
-	#TODO: strip cflags
-#	sed -i "s|CXXFLAGS = -g -Wall -Wextra -O3 -std=c++0x||" tools/Makefile.mk || die
-#	sed -i "s|CXXFLAGS = -g -Wall -Wextra -O3 -std=c++0x||" src/Makefile.mk || die
-
-	cmake_src_prepare
-
-	if use python; then
-		cd "python" || die
-		distutils-r1_python_prepare_all
-		cd ".." || die
-	fi
-}
-
-src_configure() {
-	local precision
-	use precision_arbitrary		&& precision="5"
-	use precision_double		&& precision="2"
-	use precision_long-double	&& precision="3"
-	use precision_quad		&& precision="4"
-	use precision_single		&& precision="1"
-
-	export GEODATAPATH="/usr/share/${PN}"
-
-	local mycmakeargs=(
-		-DGEOGRAPHICLIB_DOCUMENTATION=$(usex doc ON OFF)
-		-DGEOGRAPHICLIB_LIB_TYPE="SHARED"
-		-DUSE_BOOST_FOR_EXAMPLES=$(usex boost ON OFF)
-		-DGEOGRAPHICLIB_PRECISION="${precision}"
-		-DGEOGRAPHICLIB_DATA="${GEODATAPATH}"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use python; then
-		cd "python" || die
-		python_foreach_impl distutils-r1_python_compile
-		cd ".." || die
-		use doc && build_sphinx python/doc
-	fi
-}
-
-src_test() {
-	# Only 1 failing test in the C code, python passes for me
-	cmake_src_test
-
-	if use python; then
-		cd "python" || die
-		python_foreach_impl python_test
-		cd ".." || die
-	fi
-}
-
-src_install() {
-	insinto "${GEODATAPATH}/geoids"
-	use geoids && doins -r "${WORKDIR}"/geoids/.
-	insinto "${GEODATAPATH}/gravity"
-	use gravity && doins -r "${WORKDIR}"/gravity/.
-	insinto "${GEODATAPATH}/magnetic"
-	use magnetic && doins -r "${WORKDIR}"/magnetic/.
-
-	cmake_src_install
-
-	# remove python things added by the cmake_src_install function
-	# these are installed in the wrong python dir
-	rm -rf "${D}/usr/$(get_libdir)/python" || die
-	# if use python we re-add these python files correctly
-	if use python; then
-		cd "python" || die
-		python_foreach_impl distutils-r1_python_install
-		cd ".."
-	fi
-
-	#TODO: find out if java stuff need something
-
-	# Installs to wrong doc dir for some reason
-	# Also happens with USE="-doc"
-	mv "${D}/usr/share/doc/${MY_PN}" "${D}/usr/share/doc/${P}" || die
-}
diff --git a/sci-geosciences/geographiclib/metadata.xml b/sci-geosciences/geographiclib/metadata.xml
deleted file mode 100644
index c04b45db25..0000000000
--- a/sci-geosciences/geographiclib/metadata.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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>
-	<upstream>
-		<maintainer status="active">
-			<email>charles@karney.com</email>
-			<name>Charles Karney</name>
-		</maintainer>
-		<doc lang="en">https://geographiclib.sourceforge.io/html</doc>
-		<bugs-to>https://sourceforge.net/p/geographiclib/bugs/</bugs-to>
-		<remote-id type="sourceforge">geographiclib</remote-id>
-	</upstream>
-	<use>
-		<flag name="boost">Boost library is searched for in order to build the NearestNeighbor example</flag>
-		<flag name="gravity">Install the gravity models</flag>
-		<flag name="geoids">Install the geoid datasets</flag>
-		<flag name="magnetic">Install the magnetic field models</flag>
-		<flag name="geoids_datasets_egm84-30">http://earth-info.nga.mil/GandG/wgs84/gravitymod/wgs84_180/wgs84_180.html 30' grid</flag>
-		<flag name="geoids_datasets_egm84-15">http://earth-info.nga.mil/GandG/wgs84/gravitymod/wgs84_180/wgs84_180.html 15' grid</flag>
-		<flag name="geoids_datasets_egm96-15">http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm96/egm96.html 15' grid</flag>
-		<flag name="geoids_datasets_egm96-5">http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm96/egm96.html 5' grid</flag>
-		<flag name="geoids_datasets_egm2008-5">http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm2008 5' grid</flag>
-		<flag name="geoids_datasets_egm2008-2-5">http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm2008 2.5' grid</flag>
-		<flag name="geoids_datasets_egm2008-1">http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm2008 1' grid</flag>
-		<flag name="gravity_models_egm84">the Earth Gravity Model 1984, which includes terms up to degree 180</flag>
-		<flag name="gravity_models_egm96">the Earth Gravity Model 1996, which includes terms up to degree 360</flag>
-		<flag name="gravity_models_egm2008"> the Earth Gravity Model 2008, which includes terms up to degree 2190</flag>
-		<flag name="gravity_models_wgs84">the WGS84 Reference Ellipsoid. This is just reproduces the normal gravitational field for the reference ellipsoid. This includes the zonal coefficients up to order 20.</flag>
-		<flag name="magnetic_models_wmm2010">the World Magnetic Model 2010, which approximates the main magnetic field for the period 2010–2015.</flag>
-		<flag name="magnetic_models_wmm2020"> the World Magnetic Model 2020, which approximates the main magnetic field for the period 2020–2025.</flag>
-		<flag name="magnetic_models_wmm2015v2">the World Magnetic Model 2015, which approximates the main magnetic field for the period 2015–2020.</flag>
-		<flag name="magnetic_models_igrf11">the International Geomagnetic Reference Field (11th generation), which approximates the main magnetic field for the period 1900–2015.</flag>
-		<flag name="magnetic_models_igrf12">the International Geomagnetic Reference Field (12th generation), which approximates the main magnetic field for the period 1900–2020.</flag>
-		<flag name="magnetic_models_emm2010">the Enhanced Magnetic Model 2010, which approximates the main and crustal magnetic fields for the period 2010–2015.</flag>
-		<flag name="magnetic_models_emm2015">the Enhanced Magnetic Model 2015, which approximates the main and crustal magnetic fields for the period 2000–2020.</flag>
-		<flag name="magnetic_models_emm2017">the Enhanced Magnetic Model 2017, which approximates the main and crustal magnetic fields for the period 2000–2022.</flag>
-		<flag name="precision_arbitrary">floating point arbitrary precision</flag>
-		<flag name="precision_double">floating point 53-bit precision</flag>
-		<flag name="precision_quad">floating point 113-bit precision</flag>
-		<flag name="precision_long-double">floating point 64-bit precision</flag>
-		<flag name="precision_single">floating point 24-bit precision</flag>
-	</use>
-	<longdescription lang="en">
-GeographicLib is a small set of C++ classes for converting between geographic, UTM, UPS, MGRS, and geocentric coordinates, for gravity (e.g., EGM2008), geoid, and geomagnetic field (e.g., WMM2010) calculations, and for solving geodesic problems.
-	</longdescription>
-</pkgmetadata>
diff --git a/scripts/check-duplicates.sh b/scripts/check-duplicates.sh
new file mode 100755
index 0000000000..85af7839c4
--- /dev/null
+++ b/scripts/check-duplicates.sh
@@ -0,0 +1,77 @@
+#! /usr/bin/env bash
+# Maintainer: Andrew Ammerlaan <andrewammerlaan@riseup.net>
+# Maintainer: Theo Anderson <telans@posteo.de>
+#
+# This checks for potential and exact package matches within an overlay & ::gentoo
+# Note that this is not going to be 100% accurate
+#
+
+GENTOO_DIR="/var/db/repos/gentoo"
+GENTOO_PACKAGES=(
+	$(find ${GENTOO_DIR} -mindepth 2 -maxdepth 2 -printf "%P\n" \
+		| sort | grep -Ev "^(.git|.github|metadata|profiles|scripts)/"
+	)
+)
+REPO_PACKAGES=(
+	$(find . -mindepth 2 -maxdepth 2 -printf "%P\n" \
+		| sort | grep -Ev "^(.git|.github|metadata|profiles|scripts)/"
+	)
+)
+
+REPO_NAME="$(cat profiles/repo_name)"
+
+printf "\nChecking for duplicates...\n"
+
+for GENTOO_PKG in ${GENTOO_PACKAGES[@]}; do
+	GENTOO_CATEGORIES+=( ${GENTOO_PKG%%/*} )	# Separate category
+	GENTOO_PKG_NAME=${GENTOO_PKG##*/}			# Separate name
+	GENTOO_PKG_NAME=${GENTOO_PKG_NAME,,}		# Force lower case, e.g. to match foobar and FooBar
+	GENTOO_PKG_NAME=${GENTOO_PKG_NAME/[-_]}		# Remove underscores and dashes, e.g. to match foo-bar and foo_bar
+	GENTOO_PKG_NAMES+=( ${GENTOO_PKG_NAME} )
+done
+
+printf "Testing ${#REPO_PACKAGES[@]} ${REPO_NAME^} packages against ${#GENTOO_PKG_NAMES[@]} Gentoo packages\n"
+
+for REPO_PKG in ${REPO_PACKAGES[@]}; do
+	REPO_PKG_CATEGORY=${REPO_PKG%%/*}
+	REPO_PKG_NAME=${REPO_PKG##*/}
+	REPO_PKG_NAME=${REPO_PKG_NAME,,}
+	REPO_PKG_NAME=${REPO_PKG_NAME/[-_]}
+
+	if [[ ${GENTOO_PKG_NAMES[@]} =~ " ${REPO_PKG_NAME} " ]]; then	# Check for a matcing name in the Gentoo tree,
+		for (( i=0; i<${#GENTOO_PKG_NAMES[@]}; i++ )); do			# otherwise there is no need to continue
+			[[ ${GENTOO_PKG_NAMES[$i]} == ${REPO_PKG_NAME} ]] && index+=( $i ) # Find the category/index for multiple matching names
+		done
+
+		for i in ${index[@]}; do	# For each possible match
+			if [[ ${GENTOO_PACKAGES[$i]} == ${REPO_PKG} ]]; then
+				PKG_EXACT_MATCH+="\t${REPO_PKG}::${REPO_NAME} exact match of ${GENTOO_PACKAGES[$i]}::gentoo\n"
+				break	# An exact match is fatal, no need to continue
+			elif [[ ${GENTOO_CATEGORIES[$i]} == ${REPO_PKG_CATEGORY} ]]; then # Possible match within the same category
+				PKG_CATEGORY_MATCH+="\t${REPO_PKG}::${REPO_NAME} possible duplicate of ${GENTOO_PACKAGES[$i]}::gentoo\n"
+			else # Possible match in a different category
+				PKG_SPECULATIVE_MATCH+="\t${REPO_PKG}::${REPO_NAME} possible duplicate of ${GENTOO_PACKAGES[$i]}::gentoo\n"
+			fi
+		done
+		unset index
+	fi
+done
+
+if [[ -n ${PKG_SPECULATIVE_MATCH} ]]; then
+	printf "\nWARNING: The following packages closely match packages in the main Gentoo repository:\n"
+	printf "${PKG_SPECULATIVE_MATCH}"
+	printf "Please check these manually.\n"
+fi
+
+if [[ -n ${PKG_CATEGORY_MATCH} ]]; then
+	printf "\nWARNING: The following packages closely match packages in the main Gentoo repository, in the same category:\n"
+	printf "${PKG_CATEGORY_MATCH}"
+	printf "Please check these manually.\n"
+fi
+
+if [[ -n ${PKG_EXACT_MATCH} ]]; then
+	printf "\nERROR: The following packages override packages in the main Gentoo repository:\n"
+	printf "${PKG_EXACT_MATCH}"
+	printf "Please remove these packages.\n"
+	exit 1
+fi
diff --git a/x11-libs/kcolorpicker/Manifest b/x11-libs/kcolorpicker/Manifest
deleted file mode 100644
index bd34c038f8..0000000000
--- a/x11-libs/kcolorpicker/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST kColorPicker-0.1.2.tar.gz 11534 BLAKE2B 53acd4e9b7dbd4796a2a3dd1c20f36ac12c40570b083c4197d583ee422f9ec484ff62aae38353c6b03e699f29a93bfec4e7065a85da9c7a82a72e81cb139603d SHA512 d2c135c84000a0b3aae66fa90807c5d62f93588eda4e7ea503a94a236ee197e1b852d1b9c0bd9cdf611afa1b42ffbfcfa1d4c4f13ff88b9c8765f6a3631cfbc8
-DIST kColorPicker-0.1.4.tar.gz 11438 BLAKE2B 407211d5938d78aa8bfe193c037a3224ab51cacec7213e4526689ba38a800db2f5df4b0804cd3cc428765a22f426b50d870a355ce07d3f40ff231b8d4f44bf93 SHA512 135b8e0e189feb724f6a4f6a09b8e18922d294fbb3c80cd8522acec272ad0503eff5bf375ae7d58b1dd2f891dc0df187b2a3442726f8ff980583c475090b8673
diff --git a/x11-libs/kcolorpicker/kcolorpicker-0.1.2.ebuild b/x11-libs/kcolorpicker/kcolorpicker-0.1.2.ebuild
deleted file mode 100644
index 71a076931f..0000000000
--- a/x11-libs/kcolorpicker/kcolorpicker-0.1.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Qt based Color Picker with popup menu"
-HOMEPAGE="https://github.com/ksnip/kColorPicker"
-MY_PN=kColorPicker
-MY_P="${MY_PN}-${PV}"
-SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtwidgets:5[png]"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
diff --git a/x11-libs/kcolorpicker/kcolorpicker-0.1.4.ebuild b/x11-libs/kcolorpicker/kcolorpicker-0.1.4.ebuild
deleted file mode 100644
index 71a076931f..0000000000
--- a/x11-libs/kcolorpicker/kcolorpicker-0.1.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Qt based Color Picker with popup menu"
-HOMEPAGE="https://github.com/ksnip/kColorPicker"
-MY_PN=kColorPicker
-MY_P="${MY_PN}-${PV}"
-SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtwidgets:5[png]"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
diff --git a/x11-libs/kcolorpicker/metadata.xml b/x11-libs/kcolorpicker/metadata.xml
deleted file mode 100644
index 47d516c434..0000000000
--- a/x11-libs/kcolorpicker/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-        <maintainer type="person">
-                <email>dflogeras2@gmail.com</email>
-                <name>David Flogeras</name>
-        </maintainer>
-        <longdescription lang="en">QToolButton with color popup menu with lets you select a color. The popup features a color dialog button which can be used to add custom colors to the popup menu.
-        </longdescription>
-</pkgmetadata>
diff --git a/x11-libs/kimageannotator/Manifest b/x11-libs/kimageannotator/Manifest
deleted file mode 100644
index dab2ebea4b..0000000000
--- a/x11-libs/kimageannotator/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST kImageAnnotator-0.2.1.tar.gz 107027 BLAKE2B 247ea31f3dfd90fd175b879c3fe06a50ee2ce8f3f2ce395efa1882fe8abc4be4e5a739782054682336cf327fe288d24b17971c89dfaf7f5202ba3f607165b0f2 SHA512 6f9d03b6d0d020c90fa050ac6be30b680db8dd3a2035db80856bb69c9e6ef0228b2d152c5f234caf6d3fe2d8433b17fbdfee728246f2a8c339936b6ba051a52b
-DIST kImageAnnotator-0.3.1.tar.gz 130708 BLAKE2B 5491ca5b3d11bfeeb92366d737251bfeb5a19631e37269d8edc4b9799d86f93ac276aa1edd34ed0aa27fff2b2fbfe07044150ef90b3dfe59d40f7669c547cce8 SHA512 5953b4083328a632c889b8a7bef0e61ef7dd9c6dfdeb9cf99fa248409116f2757ca63ff98e1695b46dfb24d818bf296c89abb7609af1b06034f814557e1c5af0
-DIST kImageAnnotator-0.3.2.tar.gz 131905 BLAKE2B 053878a5825b6786d1feac15ef6e1c642a1777e57f70fff106ef23441b14a8e83063240354ce338d7c474882bf580af35698365ac145ee0faae6070c7d29b989 SHA512 d3efad99b49bc398737d4ca47ae3460f5c13a571bfd2db7527a44d65100b5d456ed7308e67432886acfd0029dfad1ecea53e96c975e857e283218483cde23f39
-DIST kimageannotator-0.4.0.tar.gz 164030 BLAKE2B 09ec5eb18d212739c21b30809808cdd453321bf785fd79d21ae3ad5259edfb1dcddbac4de3fc68131627f0252c67f45f22d8572d91bb8c182d68e0d3140bcad5 SHA512 4fb76ff889ad4619080246f91e92fe9683056766b96faa071e0f73efd7c3647f90716fcf94b283461cd0152bdaa647002d26ffc7bf2cd1756ecdf3111005085a
diff --git a/x11-libs/kimageannotator/kimageannotator-0.2.1.ebuild b/x11-libs/kimageannotator/kimageannotator-0.2.1.ebuild
deleted file mode 100644
index 30148e8256..0000000000
--- a/x11-libs/kimageannotator/kimageannotator-0.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Tool for annotating images"
-HOMEPAGE="https://github.com/ksnip/kImageAnnotator"
-MY_PN=kImageAnnotator
-MY_P="${MY_PN}-${PV}"
-SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Hard depend on QtTest until next upstream release makes it optional
-DEPEND="
-		dev-qt/qtsvg:5
-		dev-qt/qttest:5
-		x11-libs/kcolorpicker"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
diff --git a/x11-libs/kimageannotator/kimageannotator-0.3.1.ebuild b/x11-libs/kimageannotator/kimageannotator-0.3.1.ebuild
deleted file mode 100644
index 9139507326..0000000000
--- a/x11-libs/kimageannotator/kimageannotator-0.3.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Tool for annotating images"
-HOMEPAGE="https://github.com/ksnip/kImageAnnotator"
-MY_PN=kImageAnnotator
-MY_P="${MY_PN}-${PV}"
-SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtsvg:5
-		>=x11-libs/kcolorpicker-0.1.4"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
diff --git a/x11-libs/kimageannotator/kimageannotator-0.3.2.ebuild b/x11-libs/kimageannotator/kimageannotator-0.3.2.ebuild
deleted file mode 100644
index 9139507326..0000000000
--- a/x11-libs/kimageannotator/kimageannotator-0.3.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Tool for annotating images"
-HOMEPAGE="https://github.com/ksnip/kImageAnnotator"
-MY_PN=kImageAnnotator
-MY_P="${MY_PN}-${PV}"
-SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtsvg:5
-		>=x11-libs/kcolorpicker-0.1.4"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
diff --git a/x11-libs/kimageannotator/kimageannotator-0.4.0.ebuild b/x11-libs/kimageannotator/kimageannotator-0.4.0.ebuild
deleted file mode 100644
index e36ee23a60..0000000000
--- a/x11-libs/kimageannotator/kimageannotator-0.4.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Tool for annotating images"
-HOMEPAGE="https://github.com/ksnip/kImageAnnotator"
-SRC_URI="https://github.com/ksnip/kImageAnnotator/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-qt/qtsvg:5
-	>=x11-libs/kcolorpicker-0.1.4
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/kImageAnnotator-${PV}"
diff --git a/x11-libs/kimageannotator/metadata.xml b/x11-libs/kimageannotator/metadata.xml
deleted file mode 100644
index 0e8d24b296..0000000000
--- a/x11-libs/kimageannotator/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-        <maintainer type="person">
-                <email>dflogeras2@gmail.com</email>
-                <name>David Flogeras</name>
-        </maintainer>
-        <longdescription lang="en">Tool for annotating images.
-        </longdescription>
-</pkgmetadata>
diff --git a/x11-misc/ksnip/ksnip-1.6.2-r1.ebuild b/x11-misc/ksnip/ksnip-1.6.2-r1.ebuild
index 3739c85876..6d0ce55027 100644
--- a/x11-misc/ksnip/ksnip-1.6.2-r1.ebuild
+++ b/x11-misc/ksnip/ksnip-1.6.2-r1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 		dev-qt/qtprintsupport:5
 		dev-qt/qtx11extras:5
 		dev-qt/qtxml:5
-		x11-libs/kimageannotator
+		media-libs/kimageannotator
 		x11-libs/libxcb"
 BDEPEND=""
 
diff --git a/x11-misc/ksnip/ksnip-1.7.1.ebuild b/x11-misc/ksnip/ksnip-1.7.1.ebuild
index 208a24d9ec..31d0784578 100644
--- a/x11-misc/ksnip/ksnip-1.7.1.ebuild
+++ b/x11-misc/ksnip/ksnip-1.7.1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 		dev-qt/qtprintsupport:5
 		dev-qt/qtx11extras:5
 		dev-qt/qtxml:5
-		>=x11-libs/kimageannotator-0.3.1
+		>=media-libs/kimageannotator-0.3.1
 		x11-libs/libxcb"
 BDEPEND=""
 
diff --git a/x11-misc/ksnip/ksnip-1.7.3.ebuild b/x11-misc/ksnip/ksnip-1.7.3.ebuild
index bbeafef30b..1f66bdefdb 100644
--- a/x11-misc/ksnip/ksnip-1.7.3.ebuild
+++ b/x11-misc/ksnip/ksnip-1.7.3.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 		dev-qt/qtprintsupport:5
 		dev-qt/qtx11extras:5
 		dev-qt/qtxml:5
-		>=x11-libs/kimageannotator-0.3.2
+		>=media-libs/kimageannotator-0.3.2
 		x11-libs/libxcb"
 BDEPEND=""
 
diff --git a/x11-misc/ksnip/ksnip-1.8.0.ebuild b/x11-misc/ksnip/ksnip-1.8.0.ebuild
index 79f7a7b9ff..e09e584a7a 100644
--- a/x11-misc/ksnip/ksnip-1.8.0.ebuild
+++ b/x11-misc/ksnip/ksnip-1.8.0.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
@@ -19,7 +19,7 @@ RDEPEND="
 		dev-qt/qtprintsupport:5
 		dev-qt/qtx11extras:5
 		dev-qt/qtxml:5
-		>=x11-libs/kimageannotator-0.4.0
+		>=media-libs/kimageannotator-0.4.0
 		x11-libs/libxcb
 "
 DEPEND="${RDEPEND}"