[gentoo-commits] repo/proj/guru:master commit in: dev-python/almost/, dev-python/almost/files/

["Andrew Ammerlaan" <andrewammerlaan@gentoo.org>]

commit:     849c2e0b32b97fcc4be60725f2ac081d6d03ac10
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Fri Jul  2 22:35:44 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Jul  2 22:36:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=849c2e0b

dev-python/almost: ebuild maintenance

Closes: https://bugs.gentoo.org/800082
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 dev-python/almost/almost-0.1.5.ebuild              | 23 ++++++++--------------
 .../almost/files/almost-0.1.5-setuptools.patch     | 11 +++++++++++
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/dev-python/almost/almost-0.1.5.ebuild b/dev-python/almost/almost-0.1.5.ebuild
index fc2bfd527..09e1e2cc7 100644
--- a/dev-python/almost/almost-0.1.5.ebuild
+++ b/dev-python/almost/almost-0.1.5.ebuild
@@ -1,37 +1,30 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
-PYTHON_COMPAT=( python3_{7,8} pypy3 )
+COMMIT="cc3eeb0abde7ff95a222d571443989c74a112ff7"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
-COMMIT="cc3eeb0abde7ff95a222d571443989c74a112ff7"
-
 DESCRIPTION="A helper for approximate comparison"
 HOMEPAGE="
 	https://github.com/sublee/almost
 	https://pypi.org/project/almost
 "
 SRC_URI="https://github.com/sublee/almost/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
 
 SLOT="0"
 LICENSE="BSD"
 KEYWORDS="~amd64"
-
 IUSE="test"
-RESTRICT="!test? ( test )"
 
-RDEPEND=""
 DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
-S="${WORKDIR}/${PN}-${COMMIT}"
+RESTRICT="!test? ( test )"
+PATCHES=( "${FILESDIR}/${P}-setuptools.patch" )
 
-#no tests in pypi tarball
 distutils_enable_tests setup.py
-
-src_prepare() {
-	sed -i "s|distribute|setuptools|" setup.py || die
-	default
-}

diff --git a/dev-python/almost/files/almost-0.1.5-setuptools.patch b/dev-python/almost/files/almost-0.1.5-setuptools.patch
new file mode 100644
index 000000000..fc87ec01f
--- /dev/null
+++ b/dev-python/almost/files/almost-0.1.5-setuptools.patch
@@ -0,0 +1,11 @@
+--- a/setup.py
++++ b/setup.py
+@@ -82,7 +82,7 @@
+                  'Programming Language :: Python :: Implementation :: Jython',
+                  'Programming Language :: Python :: Implementation :: PyPy',
+                  'Topic :: Software Development :: Testing'],
+-    install_requires=['distribute'],
++    install_requires=['setuptools'],
+     test_suite='almosttests',
+     tests_require=['pytest'],
+ )