From 855758894ff8827c6b8d5e3f9465d1a01138d0a2 Mon Sep 17 00:00:00 2001
From: Brian Dolbec <dolsen@gentoo.org>
Date: Mon, 27 Jul 2020 08:12:13 -0700
Subject: dev-python/tubes: Revision bump, remove unnecessary dep

setup.py was still listing characteristic as a dep but was not needed.
Closes: https://bugs.gentoo.org/733936
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
---
 .../tubes/files/remove-unnecessary-dep.patch       | 24 ++++++++++++++++
 dev-python/tubes/metadata.xml                      | 17 +++++------
 dev-python/tubes/tubes-0.2.0-r1.ebuild             | 27 ++++++++++++++++++
 dev-python/tubes/tubes-0.2.0.ebuild                | 33 ----------------------
 4 files changed, 58 insertions(+), 43 deletions(-)
 create mode 100644 dev-python/tubes/files/remove-unnecessary-dep.patch
 create mode 100644 dev-python/tubes/tubes-0.2.0-r1.ebuild
 delete mode 100644 dev-python/tubes/tubes-0.2.0.ebuild

diff --git a/dev-python/tubes/files/remove-unnecessary-dep.patch b/dev-python/tubes/files/remove-unnecessary-dep.patch
new file mode 100644
index 000000000000..678f3c27abd8
--- /dev/null
+++ b/dev-python/tubes/files/remove-unnecessary-dep.patch
@@ -0,0 +1,24 @@
+From 2c05dd8f27c97ebbfea18706ff54d2406448b09a Mon Sep 17 00:00:00 2001
+From: Glyph <glyph@twistedmatrix.com>
+Date: Tue, 3 Mar 2020 01:24:13 -0800
+Subject: [PATCH] remove unnecessary dependency
+
+---
+ setup.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index c647927..e9e3134 100644
+--- a/setup.py
++++ b/setup.py
+@@ -16,7 +16,6 @@ setup(
+     packages=find_packages(exclude=[]),
+     package_dir={'tubes': 'tubes'},
+     install_requires=[
+-        "characteristic",
+         "six",
+         "Twisted",
+     ],
+--
+libgit2 1.0.1
+
diff --git a/dev-python/tubes/metadata.xml b/dev-python/tubes/metadata.xml
index 77d7b556b447..a67569e9a9d4 100644
--- a/dev-python/tubes/metadata.xml
+++ b/dev-python/tubes/metadata.xml
@@ -7,17 +7,14 @@
 	</maintainer>
 	<upstream>
 		<maintainer>
-			<email>bolson@bolson.org</email>
-			<name>Brian Olson</name>
+			<email>glyph@twistedmatrix.com</email>
+			<name>glyph</name>
 		</maintainer>
-		<remote-id type="pypi">cbor</remote-id>
-		<remote-id type="bitbucket">bodhisnarkva/cbor</remote-id>
+		<remote-id type="pypi">Tubes</remote-id>
+		<remote-id type="github">twisted/tubes</remote-id>
 	</upstream>
-	<longdescription>This library provides encoding and decoding for the
-Concise Binary Object Representation (CBOR) (RFC 7049) serialization format.
-It is implemented in pure python with an optional C backend and is compatible
-with versions 2.7 through to 3.8.  On cPython>=3.3 cbor2 can use a built in C
-module for performance similar to how pickle wraps the _pickle C module in the
-Python Standard Library.
+	<longdescription>Presently based primarily on Twisted, its core data
+	structures are fairly framework-agnostic and could be repurposed to work
+	with any event-driven container.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-python/tubes/tubes-0.2.0-r1.ebuild b/dev-python/tubes/tubes-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..e9e16492a5cb
--- /dev/null
+++ b/dev-python/tubes/tubes-0.2.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+inherit distutils-r1
+
+DESCRIPTION="Flow control and backpressure for event-driven applications"
+HOMEPAGE="https://github.com/twisted/tubes https://pypi.org/project/Tubes/"
+SRC_URI="https://github.com/twisted/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 "
+
+DEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/twisted[${PYTHON_USEDEP}]
+"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=( "$FILESDIR/remove-unnecessary-dep.patch")
+
+distutils_enable_tests pytest
diff --git a/dev-python/tubes/tubes-0.2.0.ebuild b/dev-python/tubes/tubes-0.2.0.ebuild
deleted file mode 100644
index 6e7b2f17ad58..000000000000
--- a/dev-python/tubes/tubes-0.2.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-inherit distutils-r1
-
-DESCRIPTION="Flow control and backpressure for event-driven applications"
-HOMEPAGE="https://github.com/twisted/tubes https://pypi.org/project/Tubes/"
-SRC_URI="https://github.com/twisted/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 "
-
-DEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/twisted[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-RDEPEND="${DEPEND}"
-
-distutils_enable_tests pytest
-- 
cgit v1.2.3-65-gdbad