From 3abacf8f8c5d34bf0ed14751ea6f672d09db36bf Mon Sep 17 00:00:00 2001
From: Anton Schubert <ischluff@mailbox.org>
Date: Mon, 20 Jul 2020 22:11:37 +0200
Subject: [PATCH] dev-python/pykeepass: fix pykeepass dependencies

Package-Manager: Portage-3.0.0, Repoman-2.3.20
---
 dev-python/pykeepass/Manifest                 |  4 +--
 dev-python/pykeepass/pykeepass-2.8.2.ebuild   | 29 -------------------
 ...3.0.2.ebuild => pykeepass-3.0.2-r1.ebuild} | 11 +++----
 3 files changed, 5 insertions(+), 39 deletions(-)
 delete mode 100644 dev-python/pykeepass/pykeepass-2.8.2.ebuild
 rename dev-python/pykeepass/{pykeepass-3.0.2.ebuild => pykeepass-3.0.2-r1.ebuild} (73%)

diff --git a/dev-python/pykeepass/Manifest b/dev-python/pykeepass/Manifest
index 9dcf18c..04b2363 100644
--- a/dev-python/pykeepass/Manifest
+++ b/dev-python/pykeepass/Manifest
@@ -1,5 +1,3 @@
-DIST 2.8.2.tar.gz 30297 BLAKE2B f3a67ebda389d9dd91989bf833a8b33fb21be57d26da6bb116a58c25fa6a99d70223e9ab71d00df5cbcfa79e6f765789fc19aee8c6c6039bd57f2f01f69d5463 SHA512 0f9c18d459abaf4b485a14806808aee5bc19521527ee0a296502bad61ba0ade4b82430eeecfeeeadd40ce743d7ad0c88c6b085f7a1e7009380196269c62362f1
 DIST 3.0.2.tar.gz 54024 BLAKE2B 312e7baf814b721ec68f66702a8c43fdcd15f64ae2960e73cd487b0e59934c8328362ed2304452488b8ee27b9dc075df43e8f421f6d0c190db11d4e0e1207a69 SHA512 9a29a68790ff0c724d04a4bfd66103f0a10607fdcec4b74b0943ad843775804f607a60bd35cdd910541f6610745a0a77e62e69a55303d3785ef5ec64c6bf9780
-EBUILD pykeepass-2.8.2.ebuild 675 BLAKE2B 1dfe1283fe1068f71a4e8acf0d40a0ed585ff86876b695affb72ea70ac724823138f92312514ddd9377c8681ce5154ec47843b92b28cc017db2c56858ebf9ba1 SHA512 f14e531da1b009b16263ddb2fb01ff27cc63c33306a60b18bd796a711cb29a733b10493c52e55b25961c3ff58e11f9be9598acf599468f43c384d89c7aec4470
-EBUILD pykeepass-3.0.2.ebuild 806 BLAKE2B 50f543eee34970028f89061e3456f5afa4a13f0e927c750791d329943f968bcbbb5795b88ef585c2186e2e9ed7595cd89ff20928fd8242fa2c48798417f596d1 SHA512 f84eed718589b2266b9384ed61aeb8a008d59ea8144f34283533cca3a3ab7e96218ba21de1aab943576fdf67d7479d7df1e92bb72a8f9db9bf1f95a18ab3e325
+EBUILD pykeepass-3.0.2-r1.ebuild 748 BLAKE2B 1364f96e1546cf9a9bd100421dae8138c3bac47a22a86dc01e06b775b4b3a99b289034ea9de5302ce383f613216a43448bc3be90f33fdf6c67ce141320fe3458 SHA512 e18e121f4284766d61880e32913aeed2064f6b40423a0a1f74781ddce2a47fde738795d7ee853a1962b46cb1425c4c3ef43ec212ec224a47197454f2d918a1cf
 MISC metadata.xml 216 BLAKE2B 98b55d77f4255ca20a41fef0a66299cf6baec1df788810e210ecad6a6352c642ca652c2d404e24ff181f3c34cee7ef750d7985d7826e9c6ee7765dd657dc765c SHA512 6eacf7815e19e9e770cad73069181bdd082df3996c1cba2c1eead43fff8d001390152049f0f50d8bab7b3554873918f2ffeb972bbd2698243e5a0ffd33a6af1b
diff --git a/dev-python/pykeepass/pykeepass-2.8.2.ebuild b/dev-python/pykeepass/pykeepass-2.8.2.ebuild
deleted file mode 100644
index 931aa16..0000000
--- a/dev-python/pykeepass/pykeepass-2.8.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Low-level library to interact with keepass databases (supports the v.4 format) "
-HOMEPAGE="https://github.com/pschmitt/pykeepass"
-SRC_URI="https://github.com/pschmitt/pykeepass/archive/${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
->=dev-python/libkeepass-0.3.0
->=dev-python/lxml-3.8.0
->=dev-python/nose-1.3.7
->=dev-python/pycrypto-2.6.1
-"
-RDEPEND="${DEPEND}"
-
-python_prepare_all() {
-	rm -r tests
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pykeepass/pykeepass-3.0.2.ebuild b/dev-python/pykeepass/pykeepass-3.0.2-r1.ebuild
similarity index 73%
rename from dev-python/pykeepass/pykeepass-3.0.2.ebuild
rename to dev-python/pykeepass/pykeepass-3.0.2-r1.ebuild
index ced332d..bedaaac 100644
--- a/dev-python/pykeepass/pykeepass-3.0.2.ebuild
+++ b/dev-python/pykeepass/pykeepass-3.0.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Low-level library to interact with keepass databases (supports the v.4 format) "
@@ -17,13 +17,10 @@ IUSE=""
 
 DEPEND="
 	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/argon2_cffi[${PYTHON_USEDEP}]
+	dev-python/argon2-cffi[${PYTHON_USEDEP}]
 	dev-python/construct[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	|| (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-	)
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
 "
 RDEPEND="${DEPEND}"