diff --git a/README.md b/README.md
index 5c0aeffe9..243ebc00f 100644
--- a/README.md
+++ b/README.md
@@ -538,11 +538,11 @@ 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 1799 Ebuilds in total, 1792 of them have in total 1804 (35 different) licenses assigned.
+There are 1798 Ebuilds in total, 1791 of them have in total 1803 (35 different) licenses assigned.
 
 |License| Ebuilds using it|
 |-------|-----|
-|MIT|1074|
+|MIT|1073|
 |Apache-2.0|344|
 |GPL-3|113|
 |BSD|101|
diff --git a/dev-python/plugwise/Manifest b/dev-python/plugwise/Manifest
index c287fcf90..ade616a6a 100644
--- a/dev-python/plugwise/Manifest
+++ b/dev-python/plugwise/Manifest
@@ -1,7 +1,5 @@
-DIST plugwise-0.18.5.tar.gz 61991 BLAKE2B fc9867bdf97e9b4cf90652c54aead43fad679320ac2f47043c5deb90414f5e1902096cf33de095dae65b6d2c4b93763ad4b4ba56d4919e261a37787dd62a988b SHA512 0a6764a029c230073365dd3fcdd335740a941af4af400d53a92a7ca0c30121656f9065e2dac1d471b272e4a295689a73998fd0d68beb769fbf71141e0b6fbc82
 DIST plugwise-0.18.7.tar.gz 62063 BLAKE2B 4de1925e435c7b7389dfc07b2e71b105862c547bf8f5efc132a8ba2e77222cb55e32303eda681b7082463dc48acfb5e0918dc210c12b4bdf8c8acd8d284f6425 SHA512 746e4e8874b4a0286a45a4d5aeba3947d4a87200927b942ef2504ae7a7dea6e5bcde827cdc255853e4b6be54f8efc9acf895195699212cedb755dacedf8db97c
 DIST plugwise-0.21.3.tar.gz 64077 BLAKE2B a658b0cb9b257d68950b2dffdaa9b89fa915e68d05f08d51674432b5965c20d88d55aac8f56093c0a4a35f7defc92621a62087b9c4f15994b2c7c9bfc44f4977 SHA512 e438e01a0c1290699172daa33139d8093e3f71ea88a1c9441e91ab3903c434f64ed185e6facbedcc85a36fc845c78c455422a1f9e4a2a0b17df389ce61b8e218
-EBUILD plugwise-0.18.5.ebuild 1130 BLAKE2B 7c9fabcd53aefe6cbd139cef3ca34bc30dd7971ad417a0a42b26e08e95dc25dcf73ab4d103c287de02c68b8b84d369c6207655ac42989d29a7aee17a75d13afe SHA512 aa5fb05dba5761a988053cf5aed08319f4a6478c8b87978e080732690596b7a9e61a50a7d0175774fcdf3f3b7295ef1abba125ece5e97adfaa80f81ad3f209a7
 EBUILD plugwise-0.18.7.ebuild 1095 BLAKE2B 8cde9d1566354cffd8ea1d3f051f4afe96679e28fb78df138c55985fd62b10cca4a665d829dccfe2323a1398149acf8d44e29bce6cddfdb11ef2f73bf7006858 SHA512 389472597dc5a540accdfb1c509a4b612148be5cf3ec8908ae7c22273418912e9fb828627051af5b74a85bd0274361262753b052098a526483c36ee90f925914
 EBUILD plugwise-0.21.3.ebuild 1095 BLAKE2B 8cde9d1566354cffd8ea1d3f051f4afe96679e28fb78df138c55985fd62b10cca4a665d829dccfe2323a1398149acf8d44e29bce6cddfdb11ef2f73bf7006858 SHA512 389472597dc5a540accdfb1c509a4b612148be5cf3ec8908ae7c22273418912e9fb828627051af5b74a85bd0274361262753b052098a526483c36ee90f925914
 MISC metadata.xml 447 BLAKE2B 9b78f25d4ceeb259d3eabe60e222b47cae15bfc845a74c8640bf53440061f8a385067b2374754fc525cd78dabef7daa3439374b9cb5aee5ed5bba498f1112083 SHA512 6935774d4bc3e598c2c6df1fcc42ba2e4e9727e48804f66b88ac8cb2139bcc8a3d4994ad21059f725b07759e872cb025d4aa8a82c8d7e2b38b730d32db68af9b
diff --git a/dev-python/plugwise/plugwise-0.18.5.ebuild b/dev-python/plugwise/plugwise-0.18.5.ebuild
deleted file mode 100644
index d451ad334..000000000
--- a/dev-python/plugwise/plugwise-0.18.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Plugwise (Adam/Anna/P1/Stick/Stretch) API to use in conjunction with Home Assistant Core."
-HOMEPAGE="https://github.com/plugwise/python-plugwise https://pypi.org/project/plugwise/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DOCS="README.md"
-
-RDEPEND="dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/async-timeout[${PYTHON_USEDEP}]
-	dev-python/crcmod[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/munch[${PYTHON_USEDEP}]
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/semver[${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
-}
-
-distutils_enable_tests setup.py