diff --git a/README.md b/README.md
index c0a1f44fe..aa878c8a1 100644
--- a/README.md
+++ b/README.md
@@ -538,12 +538,12 @@ A daily compile test is run at Github with Python 3.9 to catch general faults. E
## Licenses
This repository itself is released under GPL-3 (like most Gentoo repositories), all work on the depending components under the licenses they came from. Perhaps you came here because I filed an issue at your component about a bad or missing license. It is easy to [assign a license](https://docs.github.com/en/communities/setting-up-your-project-for-healthy-contributions/adding-a-license-to-a-repository). During cleanups and license investigations I have been asked often which license to choose. I am not a lawyer, but I can offer the following table, counted over this repository, perhaps this helps your decision. If a package has more than one license listed, all of them are counted.
-There are 1930 Ebuilds in total, 1923 of them have in total 1935 (35 different) licenses assigned.
+There are 1928 Ebuilds in total, 1921 of them have in total 1933 (35 different) licenses assigned.
|License| Ebuilds using it|
|-------|-----|
|MIT|1165|
-|Apache-2.0|364|
+|Apache-2.0|362|
|GPL-3|122|
|BSD|106|
|LGPL-3|30|
diff --git a/dev-python/aiohwenergy/Manifest b/dev-python/aiohwenergy/Manifest
deleted file mode 100644
index f1e29fb49..000000000
--- a/dev-python/aiohwenergy/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST aiohwenergy-0.7.0.tar.gz 12008 BLAKE2B 5f00fdeb5babb4ad984205681805cb9f565131e72624e9b4cfeaa0b7b0068301405eb86a3384d1d53eb39a683e1dc8324126bbbe57569240b2084bb6788b626a SHA512 c2a1f814fa9d532b9c70895c68dccbcfb6cd8942bf4c988a7bf637bbcf0d1760a9b999967f74c355297a179737fd897a75734bb5502f8f9334367f43f2e6b4dd
-DIST aiohwenergy-0.8.0.tar.gz 11671 BLAKE2B a94f6505e3f38f540670a86ddd3bb1c35d6a33f2f5eb898d9b11665f98888bc656db751a200878a67d83225dc95be43fa7faa86d3de07e32a531df976a1c47d5 SHA512 3f5a308c785e3c58820287f7c28c605754b5c89cb041c434ce94f66a5c89e87986bc8d7ab5821379973e2b4331a9ad41f7f31d0651087ca4689f9d67e55638ac
-EBUILD aiohwenergy-0.7.0.ebuild 1085 BLAKE2B df2c623e312fcc3fa914c619977879b7d2c30d5235a31d6891a67284192d3093fbfd0e20785871af67c9fb4f7953c5b064231eaf9b58f0445459eb0f00b60882 SHA512 a2f235829499b1f5e11fe4ae2abe95c5beec5b045486a1eb0dfd373b2a90162070ea12960eddadd6a702e7f5a870d062613daf0d583107afec2a3662de95656d
-EBUILD aiohwenergy-0.8.0.ebuild 775 BLAKE2B 710f953a66cdcb9ad55176ed5bc6e580a359f8aea569c67f3751f0a53a2b26037e1d0343773adfe203721ccaa20da68e7ece5609282c3fed9914662d0492115f SHA512 5517db407fc501386f3a24b82c8e829f80b2e3b903f2f4f21ecfadc44c4e6e93cc61845baa028887bb6e6117324685bb27c5d3105a03bb39987d5d9aa5d2d9a0
-MISC metadata.xml 448 BLAKE2B 345626cd89d1ad5bac8bd999e417c264d28793f2cae920e61fa17fb31892681ee502eb6b44c76bd979c364fa45a933869bfd5e0a36c755c28385a05e871a3208 SHA512 f6355adff24cfa28753c478311d10bfbd3898a90288a100c9255023a929c2686acf6cf7286fbe29ba65c69c598b58de6a3bc5bbf457717b2f673afafcd76417d
diff --git a/dev-python/aiohwenergy/aiohwenergy-0.7.0.ebuild b/dev-python/aiohwenergy/aiohwenergy-0.7.0.ebuild
deleted file mode 100644
index 546c4fd71..000000000
--- a/dev-python/aiohwenergy/aiohwenergy-0.7.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module to talk to HomeWizard Energy Devices."
-HOMEPAGE="https://github.com/DCSBL/aiohwenergy https://pypi.org/project/aiohwenergy/"
-
-# Files are missing on Pypi
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/DCSBL/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DOCS="README.md"
-
-RDEPEND="dev-python/aiohttp[${PYTHON_USEDEP}]"
-BDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- )"
-
-python_test() {
- nosetests --verbose || die
- py.test -v -v || die
-}
-
-src_prepare() {
- sed -i 's/packages=find_packages(exclude=\["contrib", "docs", "tests"\]),/packages=find_packages(exclude=\["contrib", "docs", "test"\]),/g' -i setup.py || die
- eapply_user
- }
diff --git a/dev-python/aiohwenergy/aiohwenergy-0.8.0.ebuild b/dev-python/aiohwenergy/aiohwenergy-0.8.0.ebuild
deleted file mode 100644
index 44371cfbe..000000000
--- a/dev-python/aiohwenergy/aiohwenergy-0.8.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module to talk to HomeWizard Energy Devices."
-HOMEPAGE="https://github.com/DCSBL/aiohwenergy https://pypi.org/project/aiohwenergy/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DOCS="README.md"
-
-RDEPEND="dev-python/aiohttp[${PYTHON_USEDEP}]"
-BDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- )"
-
-python_test() {
- nosetests --verbose || die
- py.test -v -v || die
-}
diff --git a/dev-python/aiohwenergy/metadata.xml b/dev-python/aiohwenergy/metadata.xml
deleted file mode 100644
index 8fdf1d92a..000000000
--- a/dev-python/aiohwenergy/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
- b@edevau.net
- Andreas Billmeier
-
-
- aiohwenergy
-
- github@ducosebel.nl
- DCSBL
-
-
-
diff --git a/dev-python/urwid/Manifest b/dev-python/urwid/Manifest
deleted file mode 100644
index a39e875e5..000000000
--- a/dev-python/urwid/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST urwid-1.3.1.tar.gz 588549 BLAKE2B b2e135fa1ba60ef75f6d748c7a51e5eecef2c7fd51e19782c4901ab2715c6afc01ac709cd79c74e3da9b8671dfd021c968aaf7c3fa393e607e0ed9ac54bcbbb4 SHA512 8b505d38f3a0c04bbf527b324dc36212f2580213dd55eca61c66705d3beaac4f074c39aaa0f4f71add1fe5f3fce4c4c6dc88dd1e981b04bac6d52195d7a3f0ed
-EBUILD urwid-1.3.1.ebuild 986 BLAKE2B 1555790871ffb63d42b820ddadfbe4b2ca37bd74507cbdb48d3ef689883b853ee203d078ccc8f961fa9b82545d50d75bc40556eed3d9b2447f3812175b59b1db SHA512 dae2f3a909b3e75ee6ba62912c1d42eaee54a2adb0d25a83dfd672f741e4276a5747b7f6c15f8f8718cc5490261f647eb88c8293133b2c6818844325ffa8f50c
-MISC metadata.xml 440 BLAKE2B 181d795a7708c89abb2b6a9cabacf3a52cdb9201c768a85242193a377d161472da12baa5d735ef01d1b44d8019273115a7b78bfbc8d84306631d86bcf0a37946 SHA512 285d1b7c3edb045e8c06710f3795d863c5860c6bc0c54ef87092dbcc2f2ed04f3ab0a75c58c569e56fd554321795e9b89483f73a66a0139c2ced1fa2463dfe58
diff --git a/dev-python/urwid/metadata.xml b/dev-python/urwid/metadata.xml
deleted file mode 100644
index 0366cf580..000000000
--- a/dev-python/urwid/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
- b@edevau.net
- Andreas Billmeier
-
-
- urwid
-
- ian@excess.org
- Ian Ward
-
-
-
diff --git a/dev-python/urwid/urwid-1.3.1.ebuild b/dev-python/urwid/urwid-1.3.1.ebuild
deleted file mode 100644
index f749cee79..000000000
--- a/dev-python/urwid/urwid-1.3.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1
-
-DESCRIPTION="Curses-based user interface library for Python"
-HOMEPAGE="https://urwid.org/ https://pypi.org/project/urwid/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-distutils_enable_sphinx docs
-distutils_enable_tests setup.py
-
-src_prepare() {
- # optional tests broken by modern tornado versions
- sed -e 's:import tornado:&_broken:' \
- -i urwid/tests/test_event_loops.py || die
- distutils-r1_src_prepare
-}
-
-python_compile() {
- if ! python_is_python3; then
- local CFLAGS="${CFLAGS} -fno-strict-aliasing"
- export CFLAGS
- fi
-
- distutils-r1_python_compile
-}
-
-python_install_all() {
- use examples && dodoc -r examples
- distutils-r1_python_install_all
-}