dev-python/pypam: EAPI-7 bump

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

6 files changed, 23 insertions, 25 deletions

diff --git a/dev-python/pypam/files/PyPAM-0.5.0-dealloc.patch b/dev-python/pypam/files/PyPAM-0.5.0-dealloc.patch
index b73dd0b08c59..596491c46bcd 100644
--- a/dev-python/pypam/files/PyPAM-0.5.0-dealloc.patch
+++ b/dev-python/pypam/files/PyPAM-0.5.0-dealloc.patch
@@ -1,6 +1,6 @@
-diff -up PyPAM-0.5.0/PAMmodule.c.dealloc PyPAM-0.5.0/PAMmodule.c
---- PyPAM-0.5.0/PAMmodule.c.dealloc	2011-01-17 22:48:22.000000000 +0100
-+++ PyPAM-0.5.0/PAMmodule.c	2011-01-18 21:24:59.000000000 +0100
+diff -up a/PAMmodule.c b/PAMmodule.c
+--- a/PAMmodule.c
++++ b/PAMmodule.c
 @@ -538,10 +538,11 @@ static void PyPAM_dealloc(PyPAMObject *s
      free(self->service);
      free(self->user);
diff --git a/dev-python/pypam/files/PyPAM-0.5.0-memory-errors.patch b/dev-python/pypam/files/PyPAM-0.5.0-memory-errors.patch
index 6e0b4c0dce4b..6da3dd6eb7d6 100644
--- a/dev-python/pypam/files/PyPAM-0.5.0-memory-errors.patch
+++ b/dev-python/pypam/files/PyPAM-0.5.0-memory-errors.patch
@@ -1,6 +1,6 @@
-diff -up PyPAM-0.5.0/PAMmodule.c.memory PyPAM-0.5.0/PAMmodule.c
---- PyPAM-0.5.0/PAMmodule.c.memory	2012-05-07 17:22:54.503914026 +0200
-+++ PyPAM-0.5.0/PAMmodule.c	2012-05-07 17:23:15.644381942 +0200
+diff -up a/PAMmodule.c b/PAMmodule.c
+--- a/PAMmodule.c
++++ b/PAMmodule.c
 @@ -37,33 +37,48 @@ static void PyPAM_Err(PyPAMObject *self,
  
      err_msg = pam_strerror(self->pamh, result);
diff --git a/dev-python/pypam/files/PyPAM-0.5.0-return-value.patch b/dev-python/pypam/files/PyPAM-0.5.0-return-value.patch
index 6e771e9949a3..3773d6fafd20 100644
--- a/dev-python/pypam/files/PyPAM-0.5.0-return-value.patch
+++ b/dev-python/pypam/files/PyPAM-0.5.0-return-value.patch
@@ -1,6 +1,6 @@
-diff -up PyPAM-0.5.0/PAMmodule.c.retval PyPAM-0.5.0/PAMmodule.c
---- PyPAM-0.5.0/PAMmodule.c.retval	2012-05-04 21:47:51.000000000 +0200
-+++ PyPAM-0.5.0/PAMmodule.c	2012-05-07 09:42:27.690963206 +0200
+diff -up a/PAMmodule.c b/PAMmodule.c
+--- a/PAMmodule.c
++++ b/PAMmodule.c
 @@ -248,7 +248,7 @@ static PyObject * PyPAM_setcred(PyObject
      result = pam_setcred(_self->pamh, flags);
      
diff --git a/dev-python/pypam/files/PyPAM-python3-support.patch b/dev-python/pypam/files/PyPAM-python3-support.patch
index 2aec60eabdf4..a4100953631f 100644
--- a/dev-python/pypam/files/PyPAM-python3-support.patch
+++ b/dev-python/pypam/files/PyPAM-python3-support.patch
@@ -1,5 +1,5 @@
---- PAMmodule.c.python3	2014-06-24 11:29:10.958299393 +0200
-+++ PAMmodule.c	2014-06-24 15:20:02.728118493 +0200
+--- a/PAMmodule.c
++++ b(PAMmodule.c
 @@ -15,6 +15,14 @@
  #include <stdio.h>
  #include <dlfcn.h>
@@ -167,8 +167,8 @@
 +    return m;
 +#endif
  }
---- setup.py.python3	2014-06-24 15:58:07.792172439 +0200
-+++ setup.py	2014-06-24 15:58:13.714909021 +0200
+--- a/setup.py
++++ b/setup.py
 @@ -12,7 +12,7 @@
      license='LGPL',
      ext_modules=[
@@ -178,8 +178,8 @@
              ['PAMmodule.c'],
              libraries=['pam', 'pam_misc'],
              extra_compile_args = ['-std=c99'],
---- tests/PamTest.py.python3	2014-06-24 16:54:28.902998249 +0200
-+++ tests/PamTest.py	2014-06-24 17:07:11.392094775 +0200
+--- a/tests/PamTest.py
++++ b/tests/PamTest.py
 @@ -41,13 +41,13 @@
      def test_userdata_default(self):
          """The default value for userdata is None."""
diff --git a/dev-python/pypam/files/pypam-0.5.0-stricter.patch b/dev-python/pypam/files/pypam-0.5.0-stricter.patch
index 453910349134..2ebe2d0af953 100644
--- a/dev-python/pypam/files/pypam-0.5.0-stricter.patch
+++ b/dev-python/pypam/files/pypam-0.5.0-stricter.patch
@@ -1,6 +1,6 @@
 === modified file 'PAMmodule.c'
---- PAMmodule.c	2007-05-28 17:50:59 +0000
-+++ PAMmodule.c	2007-05-28 18:13:33 +0000
+--- a/PAMmodule.c
++++ b/PAMmodule.c
 @@ -9,8 +9,9 @@
  
 +#include <Python.h>
diff --git a/dev-python/pypam/pypam-0.5.0-r6.ebuild b/dev-python/pypam/pypam-0.5.0-r6.ebuild
index 9f1d35ef9ee3..af7d95bbd828 100644
--- a/dev-python/pypam/pypam-0.5.0-r6.ebuild
+++ b/dev-python/pypam/pypam-0.5.0-r6.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python3_{7..9} )
+EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=no
+MY_P="PyPAM-${PV}"
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1 flag-o-matic
 
-MY_PN="PyPAM"
-MY_P="${MY_PN}-${PV}"
-
 DESCRIPTION="Python Bindings for PAM (Pluggable Authentication Modules)"
 HOMEPAGE="http://www.pangalactic.org/PyPAM"
 SRC_URI="http://www.pangalactic.org/PyPAM/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -21,8 +21,6 @@ IUSE=""
 DEPEND=">=sys-libs/pam-0.64"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
 DOCS=( AUTHORS examples/pamtest.py )
 
 PATCHES=(