gentoo resync : 28.04.2019

5 files changed, 10 insertions, 59 deletions

diff --git a/dev-python/ldappool/Manifest b/dev-python/ldappool/Manifest
index f8097febb50b..778ddb849f61 100644
--- a/dev-python/ldappool/Manifest
+++ b/dev-python/ldappool/Manifest
@@ -1,9 +1,5 @@
-DIST ldappool-1.0.tar.gz 6795 BLAKE2B 139175ddfa9dadb32b047a13e29ce4ac593abbc9268358f440906c9f196fa793c38bb87da7b1dd4d3b08db1cad378fdc61ebde94da6b7497313b8f1a3e7eb332 SHA512 081dc08833d95bb0d3ce396cbbe697252e2b483cc3703e87f00f8af0513f9fdca4ff9c97295fb439ff1fcd404027d5922c2a6337665cfad526be3c6b83acfa53
-DIST ldappool-2.0.0.tar.gz 15089 BLAKE2B 0fc5f930657d500bbc317f180d96dd66c04bbf1c24b3de7acf5542d61380a3419dd5375b3ffac6d602ac4b62005a8d6e73ed088ae716801e562187e6c11672e5 SHA512 824243cca712d6aef8929c74cb15f0cefbc8795cdb599d3b0cc48e8eee4a58d3db94a6642379f87ba011784c289f936a62f2aed637bb005985bbee2118d3b6ea
-DIST ldappool-2.1.0.tar.gz 16395 BLAKE2B 1cfd13f35e5224dad53d5346b2cf064ae8afdde8a04cf71a3af079b05f2b4e5f66e51523fde16ab128cbbef55f29629252237b78cb0a8fb8270c563ca5a52f52 SHA512 a261a4a68e159a54eae51dc19ed543398a1be61d305ba3958d4dab9ed2de9787203a418e5d754cf12c503e5a4c2e8d180d609968e6407201548d4c4886526c0c
 DIST ldappool-2.3.1.tar.gz 16125 BLAKE2B 2fd2da35fa8f4b7d7f1e85107528595fe83ee771193ddb1099357607a98a90a43d8f7d64a364e323d5b127d989b6ca68d1325593806f66d50c35cdb4f85580f4 SHA512 7cf5eddc39ba5fd51151a5af6f728dd1ba15521abaeb2ddac7a19fa59e987b92eb6dd4d4ce505e715edcc650702248248bdc1a0f7ef4366220b7799e42a7dfbe
-EBUILD ldappool-1.0.ebuild 471 BLAKE2B 88329c9a131d9c8c4607227041b70a733c765e701a1583ef6984705b5339e84f4f5e268829114c878f66f9b7c8b5fd0793630b325a411d5cfc550d99442352fa SHA512 710a13787440aa22507537cfaa02d6ceace6590a4e9a8fab0fbea9f3f47d1e6bbff3f4fb0d2ee9ff470121923051c44b90260a759dc57e81797b83d9fd24ec93
-EBUILD ldappool-2.0.0.ebuild 539 BLAKE2B 410282259e0eb80636acd6a5083c436d824bb4ec37c1bb2f3b674d3cc5b458a0118c9da3def9f05ab6795ad7987558441f1af2eee9ce685a5e23be6aa598497f SHA512 47517b04ae8bd0969a668910d0f9c6b198ec2ec4e7c19bc3ab561056d813362ef96aa7627aa1eddfc3942ca03d388f14c6bce92a7ae1ad78e3c4b6970c0cae4d
-EBUILD ldappool-2.1.0.ebuild 582 BLAKE2B c31041b2c347e5f4dba69920ff4c822a781b534fe0d8eb7dc6c03836362bb4ee00ab50b1a8ddd525bebe14fe0db84e805327ca4d9d3458eab1244956e6ad05c7 SHA512 e9948a4048915ea51f61533fd52f5b63235ee0774a3170cb316ee623fdf559bf258738a7a5b5e7c1df0098ab65b70a1d53feb8e79a503b5da67c61cdd3e76a79
-EBUILD ldappool-2.3.1.ebuild 585 BLAKE2B 3f5730764317b0b339271edbd32225b10e691f3fca6036fb5dfb95821ba5ecd7330c1067d81feea7179a9ded8696fba31c28f37193808d6912edb2375fddcf27 SHA512 6c6bc77f4bc7415581dc728a3785284c60279f5a7d561bed8312d5caff80eaf30e0ed0d10f13a5957e568f4f53be06bc00236ad814930461c367b6f36aa88635
+DIST ldappool-2.4.1.tar.gz 18611 BLAKE2B 44de0b3b3c4ef94e232189216e55c0adf85b51e4d6e2e7c47a6c9dca455e9e09919bc04e264e027e4ba96af8dc7315a78e5094f5ed2ccd4c8f6c3952da38370f SHA512 ea22290d9acc7f90093cb27aacbf339e1edbad33780051db263cc5254d0b42494e6dd67da9f5e506f09c5867a69afbea89d14e0c3aac47233cba0ffe361b1a75
+EBUILD ldappool-2.3.1.ebuild 583 BLAKE2B 7faeb4b436721396328d1638d969a14504a34f9b5bcc3745d3aa590201591fd56ae06309892785821cf3501bc129beb5e8394d0ddb17620240bf696bcda8a234 SHA512 5613d5ba936f63b919d9cba0afedc1a132c2b86e215db45072ac39029542cd802b97fc31308f3189d9df55e876771890808e26627a822460a734c8aa8689668f
+EBUILD ldappool-2.4.1.ebuild 680 BLAKE2B 8a678c8c1003df78a543a96b8dcf870c1e22a7a2d141e04c65fda9060ec7183ce59d9251eaca4839866019227818117aa94ee408bd8e2982f18feda92074fa3e SHA512 4f98a5948ca1b3dc5d179655fd92fb7354c7333b58ee900171cb53692fb13c3bb46d982cfb8b382ca1b347fd54710c9ef9a0f4f2638229d2d95c44e3433821a1
 MISC metadata.xml 570 BLAKE2B 4fd4570935a9c99cb7bb552c6b02dcb2e5de5acc8f8d88b3939225839b469609f9d8b1895c738d9a131898ac620ffcda387170b6f4b4b256747ff0257ffd7227 SHA512 c8ca27a9ee07cc0af330a7c6fc0906346c8de23644a5df9b6846cd6246370c9ac05a6c49eb748cd4c4f21698a317beb19184f1753325592408c2f4b6b73d8f59
diff --git a/dev-python/ldappool/ldappool-1.0.ebuild b/dev-python/ldappool/ldappool-1.0.ebuild
deleted file mode 100644
index 92bcc53a435f..000000000000
--- a/dev-python/ldappool/ldappool-1.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A connection pool for python-ldap"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	dev-python/python-ldap[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/ldappool/ldappool-2.0.0.ebuild b/dev-python/ldappool/ldappool-2.0.0.ebuild
deleted file mode 100644
index a89eef334720..000000000000
--- a/dev-python/ldappool/ldappool-2.0.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A connection pool for python-ldap"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/pyldap-2.4[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/ldappool/ldappool-2.3.1.ebuild b/dev-python/ldappool/ldappool-2.3.1.ebuild
index 9a2f70feaab0..f6e2ab0e81a8 100644
--- a/dev-python/ldappool/ldappool-2.3.1.ebuild
+++ b/dev-python/ldappool/ldappool-2.3.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ldappool/ldappool-2.1.0.ebuild b/dev-python/ldappool/ldappool-2.4.1.ebuild
index 2e56ca352a46..4eaf891a9b4b 100644
--- a/dev-python/ldappool/ldappool-2.1.0.ebuild
+++ b/dev-python/ldappool/ldappool-2.4.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1
 
@@ -21,5 +21,7 @@ DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
 RDEPEND="
-	>=dev-python/pyldap-2.4.20[${PYTHON_USEDEP}]
+	>=dev-python/python-ldap-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
 "