From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 F1C6A1392E8 for ; Sat, 3 Jul 2021 09:59:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A36CE0845; Sat, 3 Jul 2021 09:59:16 +0000 (UTC) Received: from smtp.gentoo.org (unknown [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 8490BE0845 for ; Sat, 3 Jul 2021 09:59:16 +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 D3CDA342AD7 for ; Sat, 3 Jul 2021 09:59:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2BC097D1 for ; Sat, 3 Jul 2021 09:59:10 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1625265372.849c2e0b32b97fcc4be60725f2ac081d6d03ac10.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: dev-python/almost/, dev-python/almost/files/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-python/almost/almost-0.1.5.ebuild dev-python/almost/files/almost-0.1.5-setuptools.patch X-VCS-Directories: dev-python/almost/files/ dev-python/almost/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 849c2e0b32b97fcc4be60725f2ac081d6d03ac10 X-VCS-Branch: master Date: Sat, 3 Jul 2021 09:59:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 86a0f58c-a718-42a2-abb9-d16fecd5fa4f X-Archives-Hash: 9c53c7659407c4511bfac39340d48bf6 commit: 849c2e0b32b97fcc4be60725f2ac081d6d03ac10 Author: Alessandro Barbieri gmail com> AuthorDate: Fri Jul 2 22:35:44 2021 +0000 Commit: Andrew Ammerlaan gentoo 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 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'], + )