gentoo resync : 28.04.2021

7 files changed, 29 insertions, 31 deletions

diff --git a/dev-python/pypam/Manifest b/dev-python/pypam/Manifest
index 30df1aa43004..0db8c34fe787 100644
--- a/dev-python/pypam/Manifest
+++ b/dev-python/pypam/Manifest
@@ -1,9 +1,9 @@
-AUX PyPAM-0.5.0-dealloc.patch 607 BLAKE2B c2b7869630298792849900fd17a9d199d5b3e8d2da7cfd2a7432a7f3e4a006f6dc869f2a178863de19b7ea080bd972871a6257df5ce54f8dcf6eafae8c8017f8 SHA512 105573489be31763ed01bab02ccaf7147c73b196d85d8318eceda145e86fb5c3fa3a59b7baee9d85f6d5ae40df0335689267650461f5440a9c2991954c367e8e
-AUX PyPAM-0.5.0-memory-errors.patch 3708 BLAKE2B 36bda941cd5c326ca6f6eacbef667d7baf2d78054191a012710bcd52867b8deda61349da03b5e0fb95508936e1902237267f66a7f53ffc1ea4531d78b7e8b71d SHA512 358e57ba6450b533cbdb39f559813767799e387937a610b15e5e8e78d59b6501785c40c3ffdc5b1914ff6c9220716cdf9b537847373379eb94094f6ffe23c7f5
+AUX PyPAM-0.5.0-dealloc.patch 479 BLAKE2B 6ac545e93f2ed7b5cac789c8b736e92a809f34e7dcd976f0d712a7ec98993b8768e2bf7a5daa2bbcee75b68aa5c40a4f70617da51b2c598446ed00326f33fa51 SHA512 82cdcffade33fd558694d3bfa1d1ea81b314f446a002b8b6ce0392f48747ec06304c87eaa550d59304cebe3b6af64bd775c162be1079871307731da10daa8910
+AUX PyPAM-0.5.0-memory-errors.patch 3582 BLAKE2B e6660ff163dd17a77f2c701752b4a822b6e984b04d3c9b745a7dbf62794250453617b494dcd48f55f45a0495219150c3a85257dd353fbffbaa736f66b08d468c SHA512 b3d403b5b9c4d27846fb8de9f47cad1827af769df85729fd92fb530a9adfb63b915d7cfa8eaf0fecf745f800e9748a3dd85e2b1d9fcb04f25086252b76981577
 AUX PyPAM-0.5.0-nofree.patch 1913 BLAKE2B f22624c695efca7f73f4f8aeb821bdc5cfe1440cea9202feaac2005d49b04de79fc9882199f508bb2f2bff747aeccb7299358d5a6601f8e9a57934745da1d29e SHA512 7292483d60f75d577055f4bf7380b110620669a19b3e2e3a4700e2c816758af865213cf19b329260338e82f9a0cba03a14dea06ba636251f1436ec0c3373f751
-AUX PyPAM-0.5.0-return-value.patch 1854 BLAKE2B b65a57aad50003ce62ac4b45d0b2a25eba1036a14b6ff71bcfa6fa7dff6c56456feadf969b45b8d5cc300cbf551ae89b124b48da3f4eb1f4f7461eeffe114455 SHA512 73d81d9a7398933011eba0739e3bce7651c3da1bf38f77b510172e26f569d329c3b28e5192a25ee0616875ddad52e67697dabe021d31cc5e51e9e78941333c8d
-AUX PyPAM-python3-support.patch 5987 BLAKE2B 3c3723c0c3c121d6341aae48b1b8a47c2ed88db4eb6ed09b3c6e53a8e4380336b4b971fa83bda70e891b437ba0bd807af6b2ba9ca3b321791ae3dfa441f1cbe0 SHA512 8437e5648f4bfe7a4895324c4277e91b5588271ed31a7fa374a4d7f03af18b8f6038c90afe79f16c96219debb10d9dfb6f33883dc097edb2c67714d893acf13a
-AUX pypam-0.5.0-stricter.patch 335 BLAKE2B ac348ae8ae8db84a5e5b92c3dc842bc843e28af23c34e929b63fbe029f70233689efd6974a65e3dce48f0ce28ec4195698566268972f895106d96d796647116c SHA512 6cb56d4610fab8f14af83d64215de24b38c820c61099054c0c02bcc831b0f50dee5746def85e2ae669b8657dce2fe31fcc93f07a93e3b49f0c7a78f48acd74c7
+AUX PyPAM-0.5.0-return-value.patch 1728 BLAKE2B f8f08fb3e254c2f706fb0dc17874bae0dbb21ea4185e22ca859f53b78058dc27817219eafcb30fc1482047983b8a2fac509b5feb9975457f0bf34bebfac8200b SHA512 a00e84a8f865f63b88e6889ba020e7c9050e0f218243d62d3890af50033aed7a187500612c392fade64e03391d0702e46d51c3a3aba9340dc498c2d1dbee5627
+AUX PyPAM-python3-support.patch 5759 BLAKE2B 4aabd07b022f1c9db01b462438a2908cc248a1751e86230cbeacb8ecf11af5f7696a41387acfed6d6fd7231b053cd736a02fb597b401bdcd8515f11e1e5628ff SHA512 f2fa907fa2f4459894a14f801b65d7459c82ee202a39e6f18f77aa98192543326372a55217615da8b82c34891892d61f8290c3d6e8989ac577083429dd071abd
+AUX pypam-0.5.0-stricter.patch 287 BLAKE2B d3c70bc1db78da2f8434cc076b2a2044dc0d23683cafbd520d98aef089da4d1fe7c0344e72f838a894423d9b8f53e566b10c3cb6b6e267fcc67de14d69601ab6 SHA512 2ea057cce5e8b7810c879554cb9793b3869342a95c5ffa5239012157a3d09c8ab8cbca1f18424b147e83d6ffd770c417cdd39b7521780e611f8c69991c91d9eb
 DIST PyPAM-0.5.0.tar.gz 105206 BLAKE2B 7778275cae11606ca8e522d2f99fb0558c55545cdaedb3ff7c55b4bb693ed3429e22566912f53c7795f73316bc45f1bfbdf5a53daec234dba87e1c141e2410f2 SHA512 9e0e919e34930d2283307cd6665c5287c664a76a5de56367bd975867ac26b376ae03d30cb3bc4a16390c977ca2690cfd2e90ac73dcc7886b8c999444da4a07e0
-EBUILD pypam-0.5.0-r6.ebuild 1025 BLAKE2B 7c56c8ca47392d40c44f63c2ae192657278f06709a8ee5ec625c9011d8fd77ebeabef08f8a198654aa10c60db9ab7a57737a28dcd61d6a675f6205a4af819108 SHA512 cb02598fa2dbc0352e041e78c61edacc185f32cb0eb5069116ceb561065eb20dbfe613fdac3718f225e118dcb26b9e93aae346cc10d44af39bf84c1b9dbc92c8
+EBUILD pypam-0.5.0-r6.ebuild 1034 BLAKE2B 3b0bd955c209a66c439dbecd494141757a4293b6c73275ae857ed969402488afdc39456a29a9c2416afed75b3d022cc9a4487d79732e13972c53efc89eabf062 SHA512 57a309c9456a771fe2c8d6cd0e04872406873c90fe6bb944aebf1998a7b3bba974c03910d99f6392ac29dd5fdafdc8fa16b6c82f78b0e046a467c44368446148
 MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
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=(