[gentoo-commits] repo/gentoo:master commit in: dev-python/argon2-cffi/

[Michał Górny]

commit:     71f3be6fe1cb74c4d40cf4980e74a23a91ed0757
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 19 22:40:26 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec 19 22:41:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71f3be6f

dev-python/argon2-cffi: Support pp2sp-22

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

 dev-python/argon2-cffi/argon2-cffi-21.2.0.ebuild                    | 1 +
 .../{argon2-cffi-21.3.0.ebuild => argon2-cffi-21.3.0-r1.ebuild}     | 6 +-----
 dev-python/argon2-cffi/argon2-cffi-21.3.0.ebuild                    | 1 +
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/dev-python/argon2-cffi/argon2-cffi-21.2.0.ebuild 
b/dev-python/argon2-cffi/argon2-cffi-21.2.0.ebuild
index 959e84069e39..4b92a9605e4c 100644
--- a/dev-python/argon2-cffi/argon2-cffi-21.2.0.ebuild
+++ b/dev-python/argon2-cffi/argon2-cffi-21.2.0.ebuild
@@ -17,6 +17,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 
 RDEPEND=">=dev-python/argon2-cffi-bindings-21.2.0[${PYTHON_USEDEP}]"
 BDEPEND="
+       <dev-python/pyproject2setuppy-22[${PYTHON_USEDEP}]
        test? (
                dev-python/hypothesis[${PYTHON_USEDEP}]
        )

diff --git a/dev-python/argon2-cffi/argon2-cffi-21.3.0.ebuild 
b/dev-python/argon2-cffi/argon2-cffi-21.3.0-r1.ebuild
similarity index 79%
copy from dev-python/argon2-cffi/argon2-cffi-21.3.0.ebuild
copy to dev-python/argon2-cffi/argon2-cffi-21.3.0-r1.ebuild
index 3a28d9718394..8317e93d5c4a 100644
--- a/dev-python/argon2-cffi/argon2-cffi-21.3.0.ebuild
+++ b/dev-python/argon2-cffi/argon2-cffi-21.3.0-r1.ebuild
@@ -17,6 +17,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 
 RDEPEND=">=dev-python/argon2-cffi-bindings-21.2.0[${PYTHON_USEDEP}]"
 BDEPEND="
+       >=dev-python/pyproject2setuppy-22[${PYTHON_USEDEP}]
        test? (
                dev-python/hypothesis[${PYTHON_USEDEP}]
        )
@@ -25,11 +26,6 @@ BDEPEND="
 DOCS=( AUTHORS.rst FAQ.rst README.rst )
 
 src_prepare() {
-       # Patch the tool.flit.module.name entry in pyproject.toml to include
-       # the "src" subfolder. This allows pyproject2setuppy to retrieve the
-       # dynamic version and description correctly.
-       sed -i -e 's:^name = "argon2":name = "src/argon2":' \
-               "pyproject.toml" || die "Unable to patch package name"
        # Sphinx's conf.py uses importlib.metadata to determine the package
        # version. However, argon2-cffi is not installed when we try to build
        # the docs. Therefore, we patch the release version in conf.py.

diff --git a/dev-python/argon2-cffi/argon2-cffi-21.3.0.ebuild 
b/dev-python/argon2-cffi/argon2-cffi-21.3.0.ebuild
index 3a28d9718394..00502332253a 100644
--- a/dev-python/argon2-cffi/argon2-cffi-21.3.0.ebuild
+++ b/dev-python/argon2-cffi/argon2-cffi-21.3.0.ebuild
@@ -17,6 +17,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 
 RDEPEND=">=dev-python/argon2-cffi-bindings-21.2.0[${PYTHON_USEDEP}]"
 BDEPEND="
+       <dev-python/pyproject2setuppy-22[${PYTHON_USEDEP}]
        test? (
                dev-python/hypothesis[${PYTHON_USEDEP}]
        )