From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1299309-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id A174D139345
	for <garchives@archives.gentoo.org>; Mon,  5 Jul 2021 10:56:30 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 9C5ECE0A91;
	Mon,  5 Jul 2021 10:56:29 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 841EAE0A91
	for <gentoo-commits@lists.gentoo.org>; Mon,  5 Jul 2021 10:56:29 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id ADB6E335D8B
	for <gentoo-commits@lists.gentoo.org>; Mon,  5 Jul 2021 10:56:27 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id E5109797
	for <gentoo-commits@lists.gentoo.org>; Mon,  5 Jul 2021 10:56:25 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1625482576.85ad52f6ac152b9f6bba496db322e5aeb70dc332.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/testtools/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-python/testtools/testtools-2.4.0-r2.ebuild
X-VCS-Directories: dev-python/testtools/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 85ad52f6ac152b9f6bba496db322e5aeb70dc332
X-VCS-Branch: master
Date: Mon,  5 Jul 2021 10:56:25 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: bb126086-acf0-4ca5-bc44-9214c3bf2375
X-Archives-Hash: fd41f9872d807506236f0c7d8e34e794

commit:     85ad52f6ac152b9f6bba496db322e5aeb70dc332
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  5 10:53:56 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jul  5 10:56:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85ad52f6

dev-python/testtools: Eliminate traceback2 too

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/testtools/testtools-2.4.0-r2.ebuild | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev-python/testtools/testtools-2.4.0-r2.ebuild b/dev-python/testtools/testtools-2.4.0-r2.ebuild
index d95f4dfff00..2e853225cf7 100644
--- a/dev-python/testtools/testtools-2.4.0-r2.ebuild
+++ b/dev-python/testtools/testtools-2.4.0-r2.ebuild
@@ -22,7 +22,6 @@ RDEPEND="
 	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
 	dev-python/pyrsistent[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	dev-python/traceback2[${PYTHON_USEDEP}]
 "
 DEPEND="
 	test? (
@@ -41,11 +40,13 @@ distutils_enable_sphinx doc
 distutils_enable_tests unittest
 
 src_prepare() {
-	# eliminate unittest2
-	sed -i -e '/unittest2/d' requirements.txt || die
+	# eliminate unittest2 & traceback2
+	sed -i -e '/unittest2/d' -e '/traceback2/d' requirements.txt || die
 	# also conditional imports
 	find -name '*.py' -exec \
 		sed -i -e 's:unittest2:unittest:' {} + || die
+	sed -i -e 's/^traceback =.*/import traceback/' \
+		testtools/content.py || die
 	distutils-r1_src_prepare
 }