gentoo resync : 10.02.2020

3 files changed, 110 insertions, 22 deletions

diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index 3e86092e7139..ed0b433d1f46 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,8 +1,10 @@
 DIST python-ldap-2.4.19.tar.gz 138503 BLAKE2B 54e088743ccd3fff00f66d8208122b9ebcc154b788d3511f170a3deaf9cfdc5ba813ef05e4a40f42079d2bc60cf871ffae8618cc2e41b3632e79243bbd43cc74 SHA512 bfa8b87449f03d70d78bf890d1190ef5a153e1b84db97ca4b40465bfba9faedace2a69f4ae1279ef6323c01255f52993cf0e4374bc32d9660a5286dfc7c17b85
 DIST python-ldap-2.4.32.tar.gz 126025 BLAKE2B 2e16942680cc037c1251f500855c10de8d63194d400059f20449d541854c2ddc8863cfff5f84716818d0b37f331336a53e4b158e9ba55edc4becb6612d999ed3 SHA512 35a526330852ee87acd240cd285881afe498612fcedbffe93c6e41fb082300cd8b351d9100dc2b3049c658ed062d69cea90f28f9db51a80d94816ce249bbd028
 DIST python-ldap-3.1.0.tar.gz 366019 BLAKE2B 19e95ee096f40cc195257f82ccb5f882cc521561b14e77469be91e013d6b566102c6b426463e68353a3140fc96ebc622deed94929a3aa81cc14cb072440efe44 SHA512 71948cbae1c9a47f9e68fb8c6d65d91a2992261dd9aa535a0453f5733be1c2a25be1dda3c84abc6bdebab92150c89cc8caa757454331a0303de4fa46788b414a
+DIST python-ldap-3.2.0.tar.gz 367645 BLAKE2B 5109f4a13644d53fff7506ad2417da6dbfd5d1c5d31cc63932338ee0bc7327b00878804764366523fc0610191126c1a1367e15fddbad481880f73d29d96d3322 SHA512 ef2833739fd57ad26d97ae5dba3bca8a47e770ff3f113d06a5bed0841f8fcbbe6cd102e75c753dfff48f5f6041f46a91c6166f3bb9ca44ef9bd643c0666c6b23
 EBUILD python-ldap-2.4.19-r1.ebuild 2432 BLAKE2B 3744a25dcfee201440c4022b099e0c0b8dacd1b013eeba0cf01ce7d2eac6315d85c6d1d47c7f8edf2cd0ca21f080b7ebc4f71d8167e7803a2aaaca55fe469676 SHA512 0f8c032c5348516c29b53c0a1d7a1a717eafc498f19247c871c358632e16c6c8ae1cb809f902ee85f9ea4fbf8138df33cfa7a9cbe1929618ecd85295d33874af
 EBUILD python-ldap-2.4.32.ebuild 2219 BLAKE2B 61e0715dcd6f88f78a6b06830e815ec57184e94ec9a19f5417c56f417b1ca8dd07e8e6fcab6640ca69e038aa7ad7e24164275c1869f0d026c6e03564bf0639f0 SHA512 245ac35b5d94121d5c5a8559f8a013882497dc4352b02182c4b1e5578c42a8d24a93f41e790bdcb3988f61458e034ff696197a8a799fc61fcb187654bd89ed14
 EBUILD python-ldap-3.1.0-r1.ebuild 2279 BLAKE2B 042c7b6894037233ad82551e6977412bd37f68cef2cd73633bfe1b2d28ee8c5ae797be00ab032bc7ab7390738d9ae8a17ef1152ec034b8c02b6e65655dde17cb SHA512 d0228010b5cbcf12b7b63b95f9b1f943b8de1253ff19a96219914f09ccac1c107268edeeb1c5496c5978e085b3b7d4513a2b912145c068ffa49aa8a17dce6845
-EBUILD python-ldap-9999.ebuild 2283 BLAKE2B 3e4ee2edfc36a79c051624b8c1582cb03be6d9d4732b52fca0ae99fb4f412c172c6c8ae969deb5bad2580bc8a43e97513cf7c262fd8ed9631ce292be0e75225f SHA512 d4a0b50d09e825189a14d8a08672f034433dbca72ae703847371ffa36f1332fca1f906a439d23dff21bf6102ded65b31bd496ac78369e09fc23a008cc150ab3a
+EBUILD python-ldap-3.2.0.ebuild 2192 BLAKE2B 88662b67f7b2a3031297e9ffa3f5594c039df242fcc48fa0fb3e4e98d42077b93d1fac3d0fd7a7537fad9bbd4e300e4fb2f32a685233abe342cb36d4fb8d4e85 SHA512 08f173a9d465f206f052137d9f47e60e6e7e0022728ff8666489ccead27f232bc7d306c7765156fa161ac94ad8a1ad7d12cefe0b714099bf257a991f728ce2d7
+EBUILD python-ldap-9999.ebuild 2192 BLAKE2B 88662b67f7b2a3031297e9ffa3f5594c039df242fcc48fa0fb3e4e98d42077b93d1fac3d0fd7a7537fad9bbd4e300e4fb2f32a685233abe342cb36d4fb8d4e85 SHA512 08f173a9d465f206f052137d9f47e60e6e7e0022728ff8666489ccead27f232bc7d306c7765156fa161ac94ad8a1ad7d12cefe0b714099bf257a991f728ce2d7
 MISC metadata.xml 448 BLAKE2B 4d845f5269cc16dc38e4516d15b3bd66e8eb793fa8d43cca45ef4e04784231757cab47386d43f9361de45889abe21557696d28936b1fd76cead93775393a60e6 SHA512 806ea3543e12f0b571212695f4d9e9e008493550b29b480fc022b55ce2ee1fe561e9eb3a81e887457b7c1cb98fb2c6d46f38890513cee9f4808351821b4f01c6
diff --git a/dev-python/python-ldap/python-ldap-3.2.0.ebuild b/dev-python/python-ldap/python-ldap-3.2.0.ebuild
new file mode 100644
index 000000000000..108ef92cab3a
--- /dev/null
+++ b/dev-python/python-ldap/python-ldap-3.2.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Various LDAP-related Python modules"
+HOMEPAGE="https://www.python-ldap.org/en/latest/
+	https://pypi.org/project/python-ldap/
+	https://github.com/python-ldap/python-ldap"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/python-ldap/python-ldap.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
+fi
+
+LICENSE="PSF-2"
+SLOT="0"
+IUSE="examples sasl ssl"
+
+# We do not need OpenSSL, it is never directly used:
+# https://github.com/python-ldap/python-ldap/issues/224
+RDEPEND="
+	!dev-python/pyldap
+	>=dev-python/pyasn1-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.1.5[${PYTHON_USEDEP}]
+	>net-nds/openldap-2.4.11:=[sasl?,ssl?]
+"
+# We do not link against cyrus-sasl but we use some
+# of its headers during the build.
+BDEPEND="
+	>net-nds/openldap-2.4.11:=[sasl?,ssl?]
+	sasl? ( >=dev-libs/cyrus-sasl-2.1 )
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx Doc
+
+python_prepare_all() {
+	# The live ebuild won't compile if setuptools_scm < 1.16.2 is installed
+	# https://github.com/pypa/setuptools_scm/issues/228
+	if [[ ${PV} == *9999* ]]; then
+		rm -r .git || die
+	fi
+
+	if ! use sasl; then
+		sed -i 's/HAVE_SASL//g' setup.cfg || die
+	fi
+	if ! use ssl; then
+		sed -i 's/HAVE_TLS//g' setup.cfg || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Run all tests which don't require slapd
+	local ignored_tests=(
+		t_bind.py
+		t_cext.py
+		t_edit.py
+		t_ldapobject.py
+		t_ldap_options.py
+		t_ldap_sasl.py
+		t_ldap_schema_subentry.py
+		t_ldap_syncrepl.py
+		t_slapdobject.py
+	)
+	pushd Tests >/dev/null || die
+	pytest -vv ${ignored_tests[@]/#/--ignore } \
+		|| die "tests failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+}
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc -r Demo/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-ldap/python-ldap-9999.ebuild b/dev-python/python-ldap/python-ldap-9999.ebuild
index 2e9dd826183f..108ef92cab3a 100644
--- a/dev-python/python-ldap/python-ldap-9999.ebuild
+++ b/dev-python/python-ldap/python-ldap-9999.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-
-PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
 DESCRIPTION="Various LDAP-related Python modules"
 HOMEPAGE="https://www.python-ldap.org/en/latest/
-	https://pypi.org/project/python-ldap/"
+	https://pypi.org/project/python-ldap/
+	https://github.com/python-ldap/python-ldap"
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/python-ldap/python-ldap.git"
 	inherit git-r3
@@ -20,8 +20,7 @@ fi
 
 LICENSE="PSF-2"
 SLOT="0"
-IUSE="doc examples sasl ssl test"
-RESTRICT="!test? ( test )"
+IUSE="examples sasl ssl"
 
 # We do not need OpenSSL, it is never directly used:
 # https://github.com/python-ldap/python-ldap/issues/224
@@ -33,17 +32,14 @@ RDEPEND="
 "
 # We do not link against cyrus-sasl but we use some
 # of its headers during the build.
-DEPEND="
+BDEPEND="
 	>net-nds/openldap-2.4.11:=[sasl?,ssl?]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	sasl? ( >=dev-libs/cyrus-sasl-2.1 )
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
 "
 
+distutils_enable_tests pytest
+distutils_enable_sphinx Doc
+
 python_prepare_all() {
 	# The live ebuild won't compile if setuptools_scm < 1.16.2 is installed
 	# https://github.com/pypa/setuptools_scm/issues/228
@@ -61,13 +57,6 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-python_compile_all() {
-	if use doc; then
-		sphinx-build Doc Doc/_build/html || die
-		HTML_DOCS=( Doc/_build/html/. )
-	fi
-}
-
 python_test() {
 	# Run all tests which don't require slapd
 	local ignored_tests=(
@@ -81,9 +70,15 @@ python_test() {
 		t_ldap_syncrepl.py
 		t_slapdobject.py
 	)
-	cd Tests || die
-	py.test	${ignored_tests[@]/#/--ignore } \
+	pushd Tests >/dev/null || die
+	pytest -vv ${ignored_tests[@]/#/--ignore } \
 		|| die "tests failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
 }
 
 python_install_all() {