From 0020fea0d6389fd8b02613bfe8c8d9fcbf67d18f Mon Sep 17 00:00:00 2001
From: "Andreas Billmeier (@Home/mbp)" <b@edevau.net>
Date: Fri, 3 Nov 2023 00:11:56 +0100
Subject: [PATCH] dev-python/python-eq3bt: drop 0.1.11, fix strays, update
 SRC_URI

Signed-off-by: Andreas Billmeier <b@edevau.net>
---
 dev-python/python-eq3bt/Manifest              |  4 +--
 .../python-eq3bt/python-eq3bt-0.1.11.ebuild   | 28 -------------------
 .../python-eq3bt/python-eq3bt-0.2.ebuild      | 17 ++++++-----
 3 files changed, 11 insertions(+), 38 deletions(-)
 delete mode 100644 dev-python/python-eq3bt/python-eq3bt-0.1.11.ebuild

diff --git a/dev-python/python-eq3bt/Manifest b/dev-python/python-eq3bt/Manifest
index 123d7d98b..de88e2824 100644
--- a/dev-python/python-eq3bt/Manifest
+++ b/dev-python/python-eq3bt/Manifest
@@ -1,5 +1,3 @@
-DIST python-eq3bt-0.1.11.tar.gz 9498 BLAKE2B ac2f5fc52a4a2232905db4e00f6f078c253fb41870af0d4912a2b543d5da9286f77f1a41cd2b276e34045f97d29aeedacd7d2ddf2d5605b69cc091aaaa66f66d SHA512 0b10e12141c938026297c9b7bd039933ff06921b0ecd897d1de1aa6090ee7e985dc8aab9eeaddce24311d0fc07da5eed4ab615eb3c6eed7c32611fa59d9f2714
 DIST python-eq3bt-0.2.tar.gz 18757 BLAKE2B c08f6862296a8e891c2fe5dba3f04951d06382c85c8888c7c25b1de11e0a0a0e548103d1dae4889de756eb26bf41cb92cd9ee3ab4e95fde5db39c325dd23e8d3 SHA512 3fa67e1847e7c720580c9d2c1db1ea1f64f9227f88578dd1a0e002d8f067050ae1b96b2e0fb6d4dd4240196ebc6858f530f771f2cfbf80d82a574fea57136f20
-EBUILD python-eq3bt-0.1.11.ebuild 610 BLAKE2B 5c68d4d43a1e5b4d790699bdb275a7d08845c47683572cfa47c062335dff4a49156a3a17809a07f6bb85c3706d8acaa55221d4fdb3e4bc4d9f7eee57e25ba638 SHA512 cc67286b26ce94d05cf99d712a80992d7c9c2bfc9b2db3e08b28452d6d558ec387f51ffa6748472feb84dc18f64a737f8440717671f2c82a8c8f13215aad7cc1
-EBUILD python-eq3bt-0.2.ebuild 762 BLAKE2B cb3663fd0b7c572383afd443cc42f28725388e4042c849293b4197f48c39e9574822994ad175d91495849d480bcca072e70b0316abf708593cffbad8513ffed4 SHA512 bed15554b2bca58978c08accc0bdf38fccce4076e1752a589a889b4d95618352248a54cb0bc0714a07ff67bae20d6d894ca3cea83e9f02f49b0889acd2115ddf
+EBUILD python-eq3bt-0.2.ebuild 832 BLAKE2B 53f186ad12b8e9084c8d23367131d92bf60be9bf7d41d6415d7c11d2df2550b63d6d68edf8905f499af6db1905291fc16d2ed21cdf1a9a6b1e9941f1452c70b3 SHA512 ba93625306cdcdc28aa471584a1d9a867e86b1d1b2a10062b0a0faa12a0017ba1dd262cf19e900de3cdad591f9fed4c6614f818a86835bda4aec823236c3a436
 MISC metadata.xml 507 BLAKE2B 1f1fa2135b47fbd2d49692767f0aedee1e2f8a84bc8bf905f9f300b514b49f8a59d4960ffe4b5bca7b0976d84f2a15033f0a204b1013a46385132ba7e3b43e7a SHA512 92027954bcffd9fc51baca25704c9498119d2597f851a3ec363dc1f0755e42b2af42db45035e00a2ae610a1508f81c05c33e814aa6554e623f208c2b5166d44b
diff --git a/dev-python/python-eq3bt/python-eq3bt-0.1.11.ebuild b/dev-python/python-eq3bt/python-eq3bt-0.1.11.ebuild
deleted file mode 100644
index e218c03cf..000000000
--- a/dev-python/python-eq3bt/python-eq3bt-0.1.11.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="EQ3 bluetooth thermostat support library"
-HOMEPAGE="https://github.com/rytilahti/python-eq3bt.git https://pypi.org/project/python-eq3bt/"
-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 )"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	py.test -v -v || die
-}
diff --git a/dev-python/python-eq3bt/python-eq3bt-0.2.ebuild b/dev-python/python-eq3bt/python-eq3bt-0.2.ebuild
index 0e6b9ae5b..7a9a8166d 100644
--- a/dev-python/python-eq3bt/python-eq3bt-0.2.ebuild
+++ b/dev-python/python-eq3bt/python-eq3bt-0.2.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=poetry
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi
 
 DESCRIPTION="EQ3 bluetooth thermostat support library"
 HOMEPAGE="https://github.com/rytilahti/python-eq3bt.git https://pypi.org/project/python-eq3bt/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -21,11 +20,15 @@ RDEPEND="dev-python/click[${PYTHON_USEDEP}]
 	dev-python/construct[${PYTHON_USEDEP}]
 	dev-python/bleak[${PYTHON_USEDEP}]"
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
 	)"
 
+src_prepare() {
+	sed -i -e '/include = \["CHANGELOG"\]/c\' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
 python_test() {
 	py.test -v -v || die
 }