gentoo resync : 05.02.2020

5 files changed, 9 insertions, 84 deletions

diff --git a/dev-python/django-auth-ldap/Manifest b/dev-python/django-auth-ldap/Manifest
index 06ae0ce53e49..cfa0beb8cf03 100644
--- a/dev-python/django-auth-ldap/Manifest
+++ b/dev-python/django-auth-ldap/Manifest
@@ -1,8 +1,5 @@
-AUX docs.patch 697 BLAKE2B 049d893d773ca447315ca5aebec808e6933dc39cc6ebb40b06291e5f80d1c7292fc7565e4ed66264eab29d36dc0b610cd6f2864d040c641d82bc921dbc8640c3 SHA512 e9f0607d6f770d451c53e851d6141cd0cdd63ee59e654eab0c3454b9f724f36086115760614470dd42e8f8afc63b018bd695cd596d2ac71530e4a5eaab379779
-DIST django-auth-ldap-1.2.2.tar.gz 131086 BLAKE2B 78f93eb24620907f5b5671972e2b80ec6e59cdc42a455c298bef4c3215616228735a0647b0646b683357bc16ea6d03488aa86626e2ad51211a382ee2d0482909 SHA512 676d1114faeb9a2956ed51c586afea7618c1bf62867d3525596599391f8327b8f22a075c4203311df88279c317ca37b9097b59e55a64330afee6eb1c5a9c9ac3
-DIST django-auth-ldap-1.2.7.tar.gz 131431 BLAKE2B 03fac590118d25ad0d9d8a3ac5dd8bb24f138f193bf27ae85d4e2776be79bb31ca7efb278fd05ca1d45976116ca7ec79ec3b510ca380dd8912ce47f1522ad348 SHA512 2ca29bdceb4b2540f7c90c9dfdfd7a02f91e72cd44ae062cebff84199dab737ee69ada56269189ec0dd70ee7916c3373acba50866280ad080c4c68dd69dffb09
 DIST django-auth-ldap-1.7.0.tar.gz 48897 BLAKE2B b4b196e4cd0882a48d2437326cda57394963fa44a64a3cf5a0ff668bb86243da3979e2746e096a458a5bf1d3c8be687f3d3fe456f5a6b0ada11ebd1f4787e323 SHA512 6478b2ef43e6f49acff3dd2e3a2a462ae02a3f1475d5615ba2f14bfd5efe2b232a3d2008902177d90822fea6b096a05814a5f028f4eec5ee09c5e5a62793e73d
-EBUILD django-auth-ldap-1.2.2.ebuild 1114 BLAKE2B 5a72f990c54db6b1cf3249c633f5a7aff2c10d07ffa025268a3eb98e2553acb3705bcb24b4a8daafe72d94974735e81bf48fb4ed8f51f28781e9e62376858667 SHA512 0eb83d088c1f1d4f8b1f2a6464d6210f066cce86a90751d545c484004f4737ddc48614a5f351d8f514879d336a4a6377d9f10f6d6b767a4eb40a38d8e26b68a8
-EBUILD django-auth-ldap-1.2.7.ebuild 1072 BLAKE2B 02b45c58db352358a09e3485709942a8b84440bfb06f7916a29f5157c1542c7165e1fcd3184f14a612789b6145ecf19b04dab160056664dd9d9afdbb6cfb40c2 SHA512 8420ffc74950507c5d6a17a68eead4a994f9789969e85c106ff730cc99ae7ffeec463f51eab5c4953e5497596a912a725fdcab1ae3fe8330ac35b2d624bb9114
-EBUILD django-auth-ldap-1.7.0.ebuild 815 BLAKE2B 7a714432e75e8d53a833064039be4334eb77d7c15a9075cf66ae35258ac69d32228296d021a783b4e8dabbe910b0f045745ae9ae32907c7319908649077916e5 SHA512 9597294aca51a9f1c2187c6f0e88735de38122e02724959559ddc15d53524481d88cbf24ef0cc2a1bb3c55017c2ad65d25d81ea7d77e3bf0e8014cb3c556af4a
+DIST django-auth-ldap-2.1.0.tar.gz 51027 BLAKE2B 1229d184746cf05f9c7ddb9e6674b2c529a0fc6d051f78ba01de6a80b0e5e408a8da10e35087efad60f1fef90be708e8a0c05b04c4408500329d9dfb567c0f8b SHA512 4c204eee856e33fae80a22a80bd0f3a21d1f2ee33b1ad56087832f89e91d7e1441579cf77541c1c35e8e0532d4da937b736fe3b4708d7c2d7bbccacbb0b24061
+EBUILD django-auth-ldap-1.7.0.ebuild 805 BLAKE2B 31db6a058fe57553674e8280000f73f98a6e7cb097a780d7ced7d51a718be5c9579c9200a36e1aafbf89c851c49669f36e2f6eae09ed3c37db495810bf4c117a SHA512 fa134060ed1eb3ac903fcfd819461a14d5061eb74c58a406daf5d3b4d22c58b231ef561f88664f4fbef811be5de3d1be3d42e49181927b87c6c7432a898525c4
+EBUILD django-auth-ldap-2.1.0.ebuild 815 BLAKE2B 910123666df462c14ff541c68a6acc5cdd7a14d591c49dfcdd0e1f49f10af2e17731c5740c74789893efb6ac884e5991514a5d61adfc40c829861a1231f0643c SHA512 8c84ad3dce69989e4241b1201409c99dca497ade0df83f98aefdadcf342e41c446b8682f40296cb0b9b500260df6ac6986cee7c8f44f09d9222f0e02bccbb528
 MISC metadata.xml 398 BLAKE2B 89e1948a1d118a27477e02fc01d630aaf7c9199cd913a08efc5510fec05996e1aef84fbac359d09ef73a5de083b1920747928c3626afe7aa9c1c9dfa720f16c1 SHA512 e3350f6ab3d2c07965eb2c6ba1d82a929bea8e9974d8a2cdc12acde88aab50f2c20105e90e847a23e5dea5f97a7ab6a7a0c9eb75e193eb90ea5453c53eb36d41
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-1.2.2.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-1.2.2.ebuild
deleted file mode 100644
index e75848f809c8..000000000000
--- a/dev-python/django-auth-ldap/django-auth-ldap-1.2.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-# Although setup.py claims to support py3, python-ldap does not
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Django LDAP authentication backend"
-HOMEPAGE="https://pypi.org/project/django-auth-ldap/ https://bitbucket.org/psagers/django-auth-ldap/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="dev-python/django[${PYTHON_USEDEP}]
-		>=dev-python/python-ldap-2.0[${PYTHON_USEDEP}]"
-DEPEND="app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/mockldap-0.2[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-#S="${WORKDIR}"/psagers-${PN}-80379ce59e6b
-
-PATCHES=( "${FILESDIR}"/docs.patch )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH=. "${PYTHON}" test/manage.py test || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-1.7.0.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-1.7.0.ebuild
index c87198ee39f6..9fa4f75ce881 100644
--- a/dev-python/django-auth-ldap/django-auth-ldap-1.7.0.ebuild
+++ b/dev-python/django-auth-ldap/django-auth-ldap-1.7.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-1.2.7.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-2.1.0.ebuild
index db72fc552b7f..2dcefcb72c1b 100644
--- a/dev-python/django-auth-ldap/django-auth-ldap-1.2.7.ebuild
+++ b/dev-python/django-auth-ldap/django-auth-ldap-2.1.0.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-# Although setup.py claims to support py3, python-ldap does not
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1
 
@@ -12,30 +11,21 @@ HOMEPAGE="https://pypi.org/project/django-auth-ldap/ https://bitbucket.org/psage
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
+IUSE="doc"
 
 LICENSE="BSD"
 SLOT="0"
 
-RDEPEND="dev-python/django[${PYTHON_USEDEP}]
-		>=dev-python/python-ldap-2.0[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/django-1.11[${PYTHON_USEDEP}]
+		>=dev-python/python-ldap-3.1[${PYTHON_USEDEP}]"
 DEPEND="app-arch/unzip
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/mockldap-0.2[${PYTHON_USEDEP}] )
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 
-PATCHES=( "${FILESDIR}"/docs.patch )
-
 python_compile_all() {
 	use doc && emake -C docs html
 }
 
-python_test() {
-	PYTHONPATH=. "${PYTHON}" test/manage.py test || die
-}
-
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/build/html/. )
 	distutils-r1_python_install_all
diff --git a/dev-python/django-auth-ldap/files/docs.patch b/dev-python/django-auth-ldap/files/docs.patch
deleted file mode 100644
index c4e918fac538..000000000000
--- a/dev-python/django-auth-ldap/files/docs.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Avoid unwanted d'loading for un-needed ojects.inv files
-diff -ur django-auth-ldap-1.1.4.orig/docs/source/conf.py django-auth-ldap-1.1.4/docs/source/conf.py
---- docs/source/conf.py	2013-03-10 06:01:09.000000000 +0800
-+++ docs/source/conf.py	2013-05-18 23:14:35.761187583 +0800
-@@ -29,13 +29,6 @@
-     'daldocs',
- ]
- 
--intersphinx_mapping = {
--    'python': ('http://docs.python.org/', None),
--    'django': ('https://docs.djangoproject.com/en/dev/',
--               'https://docs.djangoproject.com/en/dev/_objects/'),
--    'pythonldap': ('http://python-ldap.org/doc/html/', None),
--}
--
- # Add any paths that contain templates here, relative to this directory.
- templates_path = ['../_templates']
-