From 5bb2146fef459a32fbb1ea2d68038bb12d575672 Mon Sep 17 00:00:00 2001
From: "Andreas Billmeier (@Home/mbp)" <b@edevau.net>
Date: Sun, 19 Dec 2021 21:02:33 +0100
Subject: [PATCH] rework/cleanup onkyo-eiscp-1.2.7

---
 dev-python/onkyo-eiscp/Manifest               |  5 ++-
 .../onkyo-eiscp-1.2.4-exclude-tests.patch     | 11 -------
 dev-python/onkyo-eiscp/metadata.xml           | 20 +++++++-----
 .../onkyo-eiscp/onkyo-eiscp-1.2.7.ebuild      | 31 ++++++++++++++-----
 4 files changed, 39 insertions(+), 28 deletions(-)
 delete mode 100644 dev-python/onkyo-eiscp/files/onkyo-eiscp-1.2.4-exclude-tests.patch

diff --git a/dev-python/onkyo-eiscp/Manifest b/dev-python/onkyo-eiscp/Manifest
index 44df027fb..4369f1e8a 100644
--- a/dev-python/onkyo-eiscp/Manifest
+++ b/dev-python/onkyo-eiscp/Manifest
@@ -1,4 +1,3 @@
-AUX onkyo-eiscp-1.2.4-exclude-tests.patch 453 BLAKE2B 966418a94703f5af908a19d7ad7aeca907f5d4aa91eb5955e632b8abd23f16b58e57a7a223545ff418c58e3a2a3c71ac0db579da4cb8321f0623586767deac28 SHA512 ee529c6d8a096014a4b2acb2a5fe9f3f7b9086f11dd3f43f280b0f95a2b56edd2fdade60118f6d043303cba76ddd62f775f8969854b02eb9fd3a0a7f4f4f4877
 DIST onkyo-eiscp-1.2.7.tar.gz 48290 BLAKE2B c583b2af2619b6dc070c431a91d77ce507d3bf91f87a5ee181b82333ef597fd45d122c85f3fa4dfe5454b5059c89888744beb0a44a916f8e8cba64fd94b6cda1 SHA512 0fe8f23762d49b3b2c45ef24b94345d9a342cf04b2fa55538abf4ea21a6039011c0ade945f7432555ec948811ab521bb6a611909e19163e0e0c806bf87604635
-EBUILD onkyo-eiscp-1.2.7.ebuild 650 BLAKE2B 5585c132f113943dde30c43148bf343c9e6fdaf449dc0017837f918721bbd23f66681ac442955aeb14c707dd9c35a854b1257fa0438197296a528ee4335c3544 SHA512 b20f47fe0aded497a935e5aec0408eb40723884fb5606eb19dfb88a7ce3721a79acac4879306c9f7dae0861105c663f41bc5758b610f3b8dca59982bc4cb2e74
-MISC metadata.xml 303 BLAKE2B 2750b3d63e2fe64a03fd5a93b4a1d970713f9c765c5ad552e143d9f957741c5a69d8297ba329e6d0b74dd1c1e268cb9bd6a47b03e2c06490b2b792c66914a6e8 SHA512 35e2d23f669a7c5da1d9837209de0568b2b7f79384f7184cf3f8ded1094c4d9921a21977dea327158bf6c01223a862cfdb1eca09dd02e678ced7f1d510157447
+EBUILD onkyo-eiscp-1.2.7.ebuild 965 BLAKE2B ce8c2ae0dcfbc985f5fc1df6d1f6516aa693302bd2a1d203fd0fb3fb0fbe5f4dced9268849cac14b4f1e1d503c5af00d16d6ac8f209e232aab5cf5d0a0157b17 SHA512 58c305ff7e077bc3dc7c7ba52ce9b300201f86379b4767af853c8607649559a00be3c7957a9c590ebae33c64391fea6abac9b061195037c5ae44c1e12c8e1af9
+MISC metadata.xml 464 BLAKE2B d589d0f2ad337ef01911f231abc0c059a91b59f06108b379a7eea75ce12fa6dd8b19391a271139ec3f5b80849d8100d0be410a0eab39a19596a00f2571c3f014 SHA512 79aafd5e15caa33d15dbb6cf547a9997c01ac9ed88767c5637dcf702b1ce32254c985e72e38f331243bc9440b4bc5bb2949c1633f0ef56b79d318090fb523b07
diff --git a/dev-python/onkyo-eiscp/files/onkyo-eiscp-1.2.4-exclude-tests.patch b/dev-python/onkyo-eiscp/files/onkyo-eiscp-1.2.4-exclude-tests.patch
deleted file mode 100644
index 03baf2d47..000000000
--- a/dev-python/onkyo-eiscp/files/onkyo-eiscp-1.2.4-exclude-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- onkyo-eiscp-1.2.4/setup.py
-+++ onkyo-eiscp-1.2.4/setup.py
-@@ -19,7 +19,7 @@
-     author_email='michael@elsdoerfer.com',
-     description='Control Onkyo receivers over ethernet.',
-     long_description=long_description,
--    packages = find_packages(),
-+    packages = find_packages(exclude=["tests"]),
-     entry_points="""[console_scripts]\nonkyo = eiscp.script:run\n""",
-     install_requires=['docopt>=0.4.1', 'netifaces'],
-     platforms='any',
diff --git a/dev-python/onkyo-eiscp/metadata.xml b/dev-python/onkyo-eiscp/metadata.xml
index 27d87ddb5..295521afb 100644
--- a/dev-python/onkyo-eiscp/metadata.xml
+++ b/dev-python/onkyo-eiscp/metadata.xml
@@ -1,9 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<?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">miracle2k/onkyo-eiscp</remote-id>
-		<remote-id type="pypi">onkyo-eiscp</remote-id>
-	</upstream>
+  <maintainer type="project">
+    <email>b@edevau.net</email>
+    <name>Andreas Billmeier</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">onkyo-eiscp</remote-id>
+    <maintainer status="unknown">
+      <email>michael@elsdoerfer.com</email>
+      <name>Michael Elsdörfer</name>
+    </maintainer>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/onkyo-eiscp/onkyo-eiscp-1.2.7.ebuild b/dev-python/onkyo-eiscp/onkyo-eiscp-1.2.7.ebuild
index e745bee6a..62e35fb9e 100644
--- a/dev-python/onkyo-eiscp/onkyo-eiscp-1.2.7.ebuild
+++ b/dev-python/onkyo-eiscp/onkyo-eiscp-1.2.7.ebuild
@@ -1,22 +1,39 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
+
 PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
-DESCRIPTION="Control Onkyo A/V receivers over the network"
+DESCRIPTION="Control Onkyo receivers over ethernet."
 HOMEPAGE="https://github.com/miracle2k/onkyo-eiscp https://pypi.org/project/onkyo-eiscp/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
+IUSE="test"
+
+DOCS="README.rst"
 
 RDEPEND=">=dev-python/docopt-0.4.1[${PYTHON_USEDEP}]
-	dev-python/netifaces[${PYTHON_USEDEP}]"
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	>=dev-python/xmltodict-0.12.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.2.4-exclude-tests.patch )
+src_prepare() {
+	sed -i "s/packages = find_packages()/packages = find_packages(exclude=['tests'])/g" -i setup.py || die
+	eapply_user
+}
+
+python_test() {
+	nosetests --verbose || die
+	py.test -v -v || die
+}