gentoo resync : 16.09.2020

3 files changed, 5 insertions, 34 deletions

diff --git a/net-p2p/torrentinfo/Manifest b/net-p2p/torrentinfo/Manifest
index 8f7d0de23e1d..447e662c895d 100644
--- a/net-p2p/torrentinfo/Manifest
+++ b/net-p2p/torrentinfo/Manifest
@@ -1,5 +1,4 @@
 AUX torrentinfo-1.8.6-fix-tests.patch 934 BLAKE2B 6204fd3d04f7c8ddd4f4e9b9c64683003a4eb19f06fe5d7b7f76d3cdcb356b279ca4ac2d226080422f7bf98711d591b6b054d25539f3aa4096ad25ba970d6ef8 SHA512 d878048fe01bea0260f6b3045e77f88a6fb94ed11e15996fa3389119d8315657f77d2434d2c67b3ab58c83d4741f11c22723f0e9abbd06f4ab0df82cffc1b064
 DIST torrentinfo-1.8.6.tar.gz 22232 BLAKE2B 04159e4e54fbe979a1a73e1dee39c9b7f9def389c44e3886fd28707646a2bc4c6a4dfadd5494ef9283427959da1c36260828693a0008e09993786d8639813bcf SHA512 7f36f6c80876cbd70ea9e1331195c8a30a6546406f345402d4bec5c58afb9b03a3b60189b8d177a63a7047c3ede7fc18d8fc47ecb1bcbb726dd01b7cb2a6efb2
-EBUILD torrentinfo-1.8.6-r1.ebuild 658 BLAKE2B edc1003a5e95c63db7adbbd18c3348792057ad3425d65959e7edccc7ae097d84eb9ba7a67f510d101b1b3408fc83cfd3e5e7dffa7f44fbf1fe5276872e06ca58 SHA512 df54436f230e85e99370be87b9087f1ee8083825ef445bf3ebf1033eab12f70425a18de740955d24b191f1b1a2116f28e9b95e4b7a6312091748a35fd1720636
-EBUILD torrentinfo-1.8.6-r2.ebuild 681 BLAKE2B d75174a576086dc4a2613deacb2a061c3a39ac4653ac99b9a2b93989263feb4c58bc5d8585340c80d7b9e9290b94ffe241af874d5ae43187fc94abcbc26a7baa SHA512 0805247c3281b8f4d9ac6316575eec421436a331b087162c5001636a19ef5aa8567cf8e827f7e48ddcd4aa1e4eaea6cff54bc9246e85b220802408c199dbcc81
+EBUILD torrentinfo-1.8.6-r2.ebuild 786 BLAKE2B d01117f7efa22f0e417344cde827348cd07a17bd3196c0f6c895cb1752d3fcb8805b716d63d7c36e0e272ad3c6fb893b25d951ca0f8d63810d32f7594e2e1f1b SHA512 25d6c0f5943404daaf6218215ad7c3b2466a6b60d8af77b3198b1c017d74ddce481ab34e53e0adbc59bb82af3db53a720b60084180bdc67b658ea5e8d18a2e55
 MISC metadata.xml 514 BLAKE2B 5369e1bd1e98a7f74671ee33fb82473ec8154c75352d6d3c605d847ba605e22da4946e72ecd4799012f098ba6d82d46eadd599122c6820c1fa854bd6b58ae24a SHA512 8f37c7e38771055becfa77f5f2bde1dbf2bbd16c9b469f0b4174f9db97c8ace9836bed9708f8e375538140e4d3e194caeb5829dd8219c176a3745dbb55f38dd5
diff --git a/net-p2p/torrentinfo/torrentinfo-1.8.6-r1.ebuild b/net-p2p/torrentinfo/torrentinfo-1.8.6-r1.ebuild
deleted file mode 100644
index 21dd13248428..000000000000
--- a/net-p2p/torrentinfo/torrentinfo-1.8.6-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A torrent file parser"
-HOMEPAGE="https://github.com/Fuuzetsu/torrentinfo"
-SRC_URI="https://github.com/Fuuzetsu/torrentinfo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-tests.patch" )
-
-python_test() {
-	nosetests test/tests.py || die "tests failed with ${EPYTHON}"
-}
diff --git a/net-p2p/torrentinfo/torrentinfo-1.8.6-r2.ebuild b/net-p2p/torrentinfo/torrentinfo-1.8.6-r2.ebuild
index 56e97bef6ea9..7c4fc84190c9 100644
--- a/net-p2p/torrentinfo/torrentinfo-1.8.6-r2.ebuild
+++ b/net-p2p/torrentinfo/torrentinfo-1.8.6-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
 # The package uses distutils
 DISTUTILS_USE_SETUPTOOLS=no
 
@@ -18,12 +18,12 @@ KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-BDEPEND="
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
+BDEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
 PATCHES=( "${FILESDIR}/${P}-fix-tests.patch" )
 
+# distutils_enable_tests nose doesn't work here,
+# probably because the test file has a non-standard name
 python_test() {
 	nosetests test/tests.py || die "tests failed with ${EPYTHON}"
 }