gentoo resync : 25.08.2020

4 files changed, 5 insertions, 26 deletions

diff --git a/dev-python/pbkdf2/Manifest b/dev-python/pbkdf2/Manifest
index d044fdea4e2f..0e35b476df41 100644
--- a/dev-python/pbkdf2/Manifest
+++ b/dev-python/pbkdf2/Manifest
@@ -1,4 +1,3 @@
 DIST pbkdf2-1.3.tar.gz 6360 BLAKE2B 0a449b593fb1dddd604db687dab1fcdbeae37819dc17d7a875d8f592b1a45ac16903a77de46b72d87fbc2d41217f044046c4b4cf3a10b579e4f21e151d8512d0 SHA512 1297950d045f9b56f5eb9f771fe65091802c1f12f090a8a80fb5e36bfa10f1c1ac3b9dc8088f4a640b840fb7073aadd3fdf39f3979118046ba5cde477d071244
-EBUILD pbkdf2-1.3-r1.ebuild 516 BLAKE2B f92a81aa2c15d54221bfbf7de7f3160d8303e6c57f46ef1bbdae3b859cdd5753d3ec76a89e0d2b883ebb4ba3d25061da9d988cb192ee29a333052e662cc61ea0 SHA512 7509f0b500a94f72b6a03030db54b1c1a7f486ebb9235b1a8002fb248790046d312a57a290fa999aac53e57bdb06623ff5a3f331497c77046cd09166de80f3cf
-EBUILD pbkdf2-1.3.ebuild 554 BLAKE2B fb57fca27f52f8083b0de8360858a5ab61aee0c02d0f7350e7e4a111f0d6664570e84371cae1b18eb0365927b1ae284ee0ef4a4020808c3b2272aced7d116916 SHA512 01bc93d2e57b5ac6277a504e36b2104c3f0e9b851f5c43480bf5948f3b16a0ee200306aebc3308c72296f33998b3f3265bf41554071d04602bdae506a2a4a64d
-MISC metadata.xml 459 BLAKE2B 965991be60210f9e930734bce65864e787ce89679cd3022cc4bf8b0fae52673d38a27c6e44b4f809df88eecf7408adb248cb232399e3377974e8af91184c206f SHA512 698082fce3b94481fefb400b8328018726c7c0151f088ead749fc0e25224852cdce344947b9f084011e216918237aed988f39f6ceefe60dc86ab6e1859583136
+EBUILD pbkdf2-1.3-r1.ebuild 513 BLAKE2B 4dc7a0726c72030ee1341fe6da907ed023837ed03ee5674e4a5b1f0f2f719b370db5e98e3e3a3987f2ad7e7f319b70e2506e785822b7cb1ef7211d9f0525a633 SHA512 1e7f80f3e2d988d385b0ea37c7bcc610348433164e7184cf9c21b79d0ca97b406c1d990916109e30582d75e2c3e419cf42426a1fd9e7e496282656bf2e121bc9
+MISC metadata.xml 484 BLAKE2B 4ce23d6736927047d0ee59c636e9604083c545fc1680ed90dde2465607a20993d17754025f4bd4349e290ba92a9ef34968014e68198342dba92a4cdece01f5cc SHA512 e54cdc2cc3594935b89509a992660df90735360bab5402e81169060e32ad90878d4b08adfa18694127b74970a25c011330215a0ee01eea57c0563c7fd9c02190
diff --git a/dev-python/pbkdf2/metadata.xml b/dev-python/pbkdf2/metadata.xml
index 81b5d33a3e1f..98439a9b8566 100644
--- a/dev-python/pbkdf2/metadata.xml
+++ b/dev-python/pbkdf2/metadata.xml
@@ -9,6 +9,7 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pbkdf2</remote-id>
   </upstream>
diff --git a/dev-python/pbkdf2/pbkdf2-1.3-r1.ebuild b/dev-python/pbkdf2/pbkdf2-1.3-r1.ebuild
index 619eb7f07504..d36cbd940caa 100644
--- a/dev-python/pbkdf2/pbkdf2-1.3-r1.ebuild
+++ b/dev-python/pbkdf2/pbkdf2-1.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/pbkdf2/pbkdf2-1.3.ebuild b/dev-python/pbkdf2/pbkdf2-1.3.ebuild
deleted file mode 100644
index 340f42749de4..000000000000
--- a/dev-python/pbkdf2/pbkdf2-1.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{3_6,3_7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Implementation of the password-based key derivation function, PBKDF2, specified in RSA PKCS#5 v2.0"
-HOMEPAGE="https://www.dlitz.net/software/python-pbkdf2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE=""
-
-python_test() {
-	"${PYTHON}" test/test_pbkdf2.py || die "Tests failed with ${EPYTHON}"
-}