gentoo Easter resync : 12.04.2020

5 files changed, 5 insertions, 42 deletions

diff --git a/dev-python/passlib/Manifest b/dev-python/passlib/Manifest
index a23b4a03aa5a..5878182f3f9e 100644
--- a/dev-python/passlib/Manifest
+++ b/dev-python/passlib/Manifest
@@ -2,7 +2,6 @@ AUX passlib-1.7.1-tests.patch 1552 BLAKE2B 86cfedd409d6aff983c31ec33362577e5e353
 AUX passlib-1.7.2-pypy3.patch 3117 BLAKE2B c68b96cddf48038198e7d5d35da33c581c2abcf1aef75e6ca556c39a87e242e9990ed17235596ffb68a4154eec9acb6fcb0d651a04856a93f79a993865d702f7 SHA512 808fc0f3067f30f23118b5222d90f86910b3e681c585d1bdb237a2b954ff99936105042f2a0fce8f4ae2b0301cd201be68905be316fed5ebfd81ccc1cf29fd1a
 DIST passlib-1.7.1.tar.gz 645724 BLAKE2B f34e3bbc5a61ff71cc989fa26edb9f992909bfdcc6ca1b094ebc02fc9942eb1db1ea18fc3dd5bb7d9fcecf6b4bd82e93aba07c7ce63ec85452b5d7117a6e1968 SHA512 3d5f069cd4e44e5e87cdabc46845acbdd6c1eeedb7ce1f611aebee87b0f7af19009b6a47a10ec555fd84260b9f5c933c6429e325d30326de3869f05031674168
 DIST passlib-1.7.2.tar.gz 649654 BLAKE2B 40279113d9ff633cea47222f2d72af0abee78dc52a9b46adf66aaae213594eaae7f245cc80004f85b5055b882741b4bedfd81ee39132db23760d37a34e87ac6a SHA512 1ea0654b177b5ab2e1a7e5c3949642c34805ace6e4e4a0f82fafdb3f374edd99c667906ce598c335b668da049860648d5cbebb3e62d775898d5b0cb8cfc7bf53
-EBUILD passlib-1.7.1-r1.ebuild 942 BLAKE2B 9ce2a5d002f6c5f6d592d618ddfaccac39b7ee7dc3ca7566fd73ded9588e55fd0f484314ce98cc7deb798f24e2357e6c166712d2f0201fc962645d12e47896fd SHA512 8e13da6ae54b8c1703bbc02f33bcb5bf59d2b2c0feb52b98024b75dd462351296d3e78cb8524b14e08dbf7018b646764e35b14553f1478c284348b2edeb3cc72
-EBUILD passlib-1.7.1-r2.ebuild 1017 BLAKE2B 3951702642b043ce19ad9b8b277484646f753e5c081d91dc38e5c4740d942ec041d9a07191d29767aae853423d06aada6713ed20fdc8513d9dbfff928371c526 SHA512 e9f5fb5eddb7b92f4184deb6c0764e5b7e5ce7aa58322b92ba4f9aa7641f2d10b1863f8bb6c3d8cbe91b18fabd9357623623e368cd5fc95064b89087cb775572
-EBUILD passlib-1.7.2.ebuild 883 BLAKE2B b3594af509e40f5c76db4a7099906eba74066626a28e3a2b554d46e40a39ed73d210d327d3e3df4c4427bddbb427c5d5f0709b1cfc497f7298f76bbcc96330ac SHA512 7589008340b071ce6cc3bbcbf1a0112545f13caf57e76fb9a94de7ba5433149cffacee844a456b478939b277c7b996e3433e81d9ca353eb80fe1f195d3ccc526
-MISC metadata.xml 913 BLAKE2B e5e596a7d8039ea24c92c7cc33702c8adbfec59171a6dfb6ddf83beb213d5a29ca0c2c12b3f7d59f7dd5e5234984bdcdeae0f9dc859faa2bb23f2c3ac072b322 SHA512 942c129b6e9213511959c07967ca77c8888571b8e8ddda7e57da964f4dbb58f55ff10f90d1322d3a95752f00f1439bfb29604600e7a3b926660513d52a6c8b1c
+EBUILD passlib-1.7.1-r2.ebuild 1015 BLAKE2B e7dd0f347873e24f8c2e57a1c2b8238a297cf9c4ab52eba334b9657792d52698de8f7904a331d0bb8d071d44827da2907fe02649203b2108d97d9e90c21a88c2 SHA512 1edbd6c8d88e503ad86b70f79d0e9954f57cee8187c1175e155e5932bb834edd40fcbf89c12be2b458148fb3cbdf7a08d003bcc3edf6ee0d58b62cbf3544292b
+EBUILD passlib-1.7.2.ebuild 897 BLAKE2B 8538f1d270ecadba09fca849ca9a053fecf8380c533223ab674fafef9ad5a233bf8e843890a2190dbb6d69a779ec54ce7447feeba0ff9deb60d975792305f9ef SHA512 4ff928cf5f0c9a9114a7a00eca33cc256db76ce8ff3b4c6d213d490dd61391d31bb591df886086db59d40fd73fae51a7252429715e32ec1c533d83ba7db105bd
+MISC metadata.xml 794 BLAKE2B 717057e0abe888ef6c692a0777d9c106426238d690934a852fea3084154dfa190546c1779c6da9fbda61f6b204bfb152cf391727c4225baf2f0d6030d4ad6be5 SHA512 baf29cb74e295119b984f3acc3470f63811f9ee49849e97b1808354c15be121e723fabafb053a0a7c94032faa7747d149d000b68acfccd919ea4ec9d28d2f930
diff --git a/dev-python/passlib/metadata.xml b/dev-python/passlib/metadata.xml
index edca8675d1fb..a4bd399c529a 100644
--- a/dev-python/passlib/metadata.xml
+++ b/dev-python/passlib/metadata.xml
@@ -13,9 +13,6 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<longdescription lang="en">
-		comprehensive password hashing framework supporting over 20 schemes
-	</longdescription>
 	<use>
 		<flag name="bcrypt">bcrpyt hash algoryptm support</flag>
 		<flag name="totp">time based one time password support</flag>
diff --git a/dev-python/passlib/passlib-1.7.1-r1.ebuild b/dev-python/passlib/passlib-1.7.1-r1.ebuild
deleted file mode 100644
index b13bb2f8e226..000000000000
--- a/dev-python/passlib/passlib-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Password hashing framework supporting over 20 schemes"
-HOMEPAGE="https://bitbucket.org/ecollins/passlib/wiki/Home/"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-SLOT="0"
-IUSE="+bcrypt doc +scrypt test +totp"
-RESTRICT="!test? ( test )"
-
-RDEPEND="bcrypt? ( dev-python/bcrypt[${PYTHON_USEDEP}] )
-	totp? ( dev-python/cryptography[${PYTHON_USEDEP}] )
-	scrypt? ( dev-python/scrypt[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests -w "${BUILD_DIR}"/lib || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use doc && dodoc docs/{*.rst,requirements.txt,lib/*.rst}
-}
diff --git a/dev-python/passlib/passlib-1.7.1-r2.ebuild b/dev-python/passlib/passlib-1.7.1-r2.ebuild
index 560714066abe..2c3f8d8ff2b7 100644
--- a/dev-python/passlib/passlib-1.7.1-r2.ebuild
+++ b/dev-python/passlib/passlib-1.7.1-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://bitbucket.org/ecollins/passlib/wiki/Home/"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc x86"
 SLOT="0"
 IUSE="+bcrypt doc +scrypt test +totp"
 
diff --git a/dev-python/passlib/passlib-1.7.2.ebuild b/dev-python/passlib/passlib-1.7.2.ebuild
index 1c6a58cc73c7..0838a5c3127b 100644
--- a/dev-python/passlib/passlib-1.7.2.ebuild
+++ b/dev-python/passlib/passlib-1.7.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://bitbucket.org/ecollins/passlib/wiki/Home/"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
 SLOT="0"
 IUSE="+bcrypt doc +scrypt +totp"