major version bump; add pypy support, virtual re-write, rm old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

5 files changed, 58 insertions, 108 deletions

diff --git a/dev-python/django-auth-ldap/ChangeLog b/dev-python/django-auth-ldap/ChangeLog
index d57921bc3f33..146371af85d4 100644
--- a/dev-python/django-auth-ldap/ChangeLog
+++ b/dev-python/django-auth-ldap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/django-auth-ldap
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-auth-ldap/ChangeLog,v 1.9 2013/05/31 02:43:35 floppym Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-auth-ldap/ChangeLog,v 1.10 2014/06/26 15:46:49 idella4 Exp $
+
+*django-auth-ldap-1.2.0 (26 Jun 2014)
+
+  26 Jun 2014; Ian Delaney <idella4@gentoo.org> +django-auth-ldap-1.2.0.ebuild,
+  -django-auth-ldap-1.0.19.ebuild, -django-auth-ldap-1.1.ebuild:
+  major version bump; add pypy support, virtual re-write, rm old
 
   31 May 2013; Mike Gilbert <floppym@gentoo.org> -django-auth-ldap-1.1.4.ebuild,
   django-auth-ldap-1.1.4-r1.ebuild:
diff --git a/dev-python/django-auth-ldap/Manifest b/dev-python/django-auth-ldap/Manifest
index 9f7c518df4bc..6216c905bc06 100644
--- a/dev-python/django-auth-ldap/Manifest
+++ b/dev-python/django-auth-ldap/Manifest
@@ -2,18 +2,16 @@
 Hash: SHA256
 
 AUX docs.patch 697 SHA256 fbf3dffdd07c6844b496599647d21ee08978548fd45d309cfa00367cfa6a4587 SHA512 e9f0607d6f770d451c53e851d6141cd0cdd63ee59e654eab0c3454b9f724f36086115760614470dd42e8f8afc63b018bd695cd596d2ac71530e4a5eaab379779 WHIRLPOOL 797a4983fadae766f33332fcb7236f78135fd5090b153900477897be67f86d218a1e56b5c7c9778095bd2e3679ab0b063d97a385ffb92c726ee13285d574d4bc
-DIST django-auth-ldap-1.0.19.tar.gz 31549 SHA256 db9ba2d367f7a39e8e6474440cf4ef0290ea51c87116ba8d59191051a46fe462 SHA512 5440e47513b0e80a2a409efc88388866b98c387ec86dd94802679ee1d4310a2a55ca2cc9319b17f489db1479fb90e9e9d7e9740b1bd7b888c802e5408a54b6ce WHIRLPOOL dffcfb8c27657f8dd4da584fbeec35671a0e1b1980882c98263d358c8bb04f7f0aa0125f8c759e5ac303ceba408e9c7a56297bd5a5ce53d08e2eb75e8c399e5f
 DIST django-auth-ldap-1.1.4.tar.gz 41140 SHA256 b87919df2211cf68556aa8dbeea01bb4217a0053e6a4eef7a7bc8f2ef07b28bb SHA512 cc97b424ded2916651e5ef65bb35f1aedcc5d51cf1a201d0e9e739b9171fb319b1226dab4791e9c7da867a0b9d5dccf0af79e263599b356f9075e80f1d4c8ba9 WHIRLPOOL d7244a0716b84aa63f42e0c2f36a7faa782340a241e3dd8369e58da49e81ac8c30f57f6b64a118778bcf943d0c93555affa9ccba1e2679a44922520d8f6c6bbe
-DIST django-auth-ldap-1.1.tar.gz 33022 SHA256 95f89b01c0d85a882ae3446af13e8f9804e0a2a816e9d2152ca44eaf8f2bf7a3 SHA512 422a40da476a6af185f787c7111578f3a7af81970fddf1b50faf6dad7dd51225c6063364b63e500c74fb433ee9c5cda9819ef52df86d0bb2a24f51f00878f89c WHIRLPOOL aca900ab3865e89a5db3bcc1fd5c5454f61e50ac449a1e6f455a2796bda5001cf40f5ba0384bc91331e1990a609e80c3acd0f984c5d6b3b66c43188993e51e17
-EBUILD django-auth-ldap-1.0.19.ebuild 1158 SHA256 a1f37dacad5122d5812b00ed51c5daaa5d367e1781a4bb971ff332b7a2593f87 SHA512 d4fccb24245f3f5eab7652a86db3dc2d8e37dfb7b02a6b24592e5690029fbf50bac164826f1bd6a5ff48d9e513171389db42261fd79ecbd754a80ca857cffda5 WHIRLPOOL 14bb6fb53d4e276a8149f916b272496c26ee9c6449fa196d2243311435697433a7b6a037452a83c21ef0066b1039a2d04209f5c5575ee3123d8e78b8a240aff4
+DIST django-auth-ldap-1.2.0.zip 158395 SHA256 61b0aab57726eb0f0b9ef540e871c99247070178c254c16b8612c8235129adc5 SHA512 60e1370590561613b6c99eee8cc8cf80ca63de4882a7753b136d1aee7fbd8f9dcf445d146bee258dbe5f53c15e80c3ac8afc77414462919852100984ed92e4e2 WHIRLPOOL b9788ed88e1837318ac0be592d6784a3560fa5d3d0d365d67ce028a13de09f9ebfa90913bb7424d1e3ac1de62bf91da3a8748dd8d4c27b425e3ed55b47b1ac6b
 EBUILD django-auth-ldap-1.1.4-r1.ebuild 1223 SHA256 f48eaf08b9146cecc1bf51944f01223396381c6c19e1b30d496177d6fafa5ff4 SHA512 54c4128435c6a3b0f42bf0d803a66b06753fc8084f0a5fa5821655accd4d47108af62f736f193331adca89aa7de8eebe6fbec678139f4e10df20a51ce60a5e2a WHIRLPOOL e6f347a17a50518993703310b1d437a4320a4b50ad924b2ca75ad0876783ce26fe8bcf5b314cb9d1dd42591b0ba3b9bd18a3792d76e285eed77b23638e3dddd1
-EBUILD django-auth-ldap-1.1.ebuild 1112 SHA256 b82503b39518dcd65040fa1bcb79737df0b8c1ac03f319d948cd265d2b08436d SHA512 498f764d30b999e6e999d78349e545f365cd444602e2daefdfb73c38e49003ca2263685e86e1c67b49ea21e4046315a438b411c37d2c7bde30eb02ea38529eda WHIRLPOOL ae7c276e6228e5638d03826b6df29edfa3ed1e96ce9ed9643d069bb841476369e94f30c0f1331e6001149e17331663b882163c06fdbc658d6dac888c8b9a828a
-MISC ChangeLog 1633 SHA256 ff041c8f503fb10dcbded4dca112bd0fade815a8b3836c707828047bb62a0846 SHA512 589b13f790e0021d279924820dcc33cb90b10a143401ce3278f873f8b8deb0832aa3e247c1a63348571fd37071617e7c40a86e22a6d224c0ac1856c2f088f7c7 WHIRLPOOL d2be6a2f59fa3f4ebbcb3b85100697fa704cc5884cb7386659751f6dbf3ddb4b194f0d3ba5a9c16a4b4d80e6b2a23a79e1edfcffe43ea5bab13369272f3a6e3d
+EBUILD django-auth-ldap-1.2.0.ebuild 1220 SHA256 c491d05eb103d4e140cf0744b4fa75ac21efc1374be6d80a3bed23abf0363cc6 SHA512 62acfe7f36fba92bfe4befef126020fb98026fe14dbbea011a1e2fc6ded66eead5f6505a59b1b84eedb7390187ad19981c111a369984e6241f828aaaf429b134 WHIRLPOOL beab201d7cf762ac39dd4e948afbc138c9e9c619fe92ce1a53ebf240b0206f4886852f75c0784d992ef3bfb309be7718b233e468ebf14dac1fe9bd9b92aa82f2
+MISC ChangeLog 1884 SHA256 bf9aedf6860d34f73c5278551222aa6cb8b5c197ad2ce2defeab3e1675ce8a6d SHA512 7c1b02eb2b324a9a6e1275317ad1f75638e39f3afb6e78528c80c52554b48f93cb385a068791ffa20e69c4081ef0e69928da3059895ab4a5ab8cc6da41229a6b WHIRLPOOL defc3f7f056276cf01ff43c1b097def2832c6b1f19d75bf3050fd84c536a890d49a8a32518615910dcecce0c1196e552d1b038c07188248f02a340c0436e16b8
 MISC metadata.xml 260 SHA256 aa42fd34367f8532e3ec288da5a0ccaec0973c77a3ff9e1b5f7f529a7ca0140b SHA512 358bb417582243eea5b359fba2198daea33f24b411a3334552560210bc7f112d00b5243c83fd4c6621f4470d4d80c47f99ff29b745e6c5a2cbc797bf4669b62a WHIRLPOOL 714636fb56e549ccef61f50adfd5f858aca9a4a1183fe17e0ab0a7fe9e6070a65e33bd55581a430eb18c17780bbe2b704389e89206d167f1ff1e5b8f8f6b2bf4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlGoDlgACgkQC77qH+pIQ6TpKAEAlGN6Lbkcni4w9mikAu7lakdU
-LctSFJvrHedNvVFxl7gA/29cl6Wcu62M9YptEDhKDhYbOh35EZ0W0QaT+JABi2KU
-=xknM
+iEYEAREIAAYFAlOsPn0ACgkQso7CE7gHKw2tBwCgyCgHbgpWfnIyHI4EsssdPesw
+84AAnRQTd1AmmDXyUTD8dUh+aBXyl35V
+=3EnO
 -----END PGP SIGNATURE-----
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-1.0.19.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-1.0.19.ebuild
deleted file mode 100644
index 44e1e126edcf..000000000000
--- a/dev-python/django-auth-ldap/django-auth-ldap-1.0.19.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-auth-ldap/django-auth-ldap-1.0.19.ebuild,v 1.3 2012/05/04 08:07:57 iksaif Exp $
-
-EAPI=4
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS="3.*"
-inherit distutils
-
-DESCRIPTION="Django LDAP authentication backend"
-HOMEPAGE="http://pypi.python.org/pypi/django-auth-ldap http://bitbucket.org/psagers/django-auth-ldap/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-LICENSE="BSD"
-SLOT="0"
-PYTHON_MODNAME="django_auth_ldap"
-
-RDEPEND=""
-DEPEND="${RDEPEND} >=dev-python/django-1.0
-	dev-python/python-ldap
-	doc? ( dev-python/sphinx )"
-
-src_test() {
-	export DJANGO_SETTINGS_MODULE="django.conf"
-	testing() {
-		"$(PYTHON)" build-$(python_get_version)/lib/django_auth_ldap/tests.py
-		echo "tests completed for python"$(python_get_version)
-	}
-	python_execute_function testing
-}
-
-src_compile() {
-	distutils_src_compile
-	if use doc; then
-		emake -C docs html
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r docs/_build/html/*
-	fi
-}
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-1.1.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-1.1.ebuild
deleted file mode 100644
index bea2f12c2477..000000000000
--- a/dev-python/django-auth-ldap/django-auth-ldap-1.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-auth-ldap/django-auth-ldap-1.1.ebuild,v 1.1 2012/05/19 13:47:56 tampakrap Exp $
-
-EAPI=4
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-DESCRIPTION="Django LDAP authentication backend"
-HOMEPAGE="http://pypi.python.org/pypi/django-auth-ldap http://bitbucket.org/psagers/django-auth-ldap/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-LICENSE="BSD"
-SLOT="0"
-PYTHON_MODNAME="django_auth_ldap"
-
-RDEPEND=">=dev-python/django-1.0"
-DEPEND="${RDEPEND}
-	dev-python/python-ldap
-	doc? ( dev-python/sphinx )"
-
-src_compile() {
-	distutils_src_compile
-
-	use doc && emake -C docs html
-}
-
-src_test() {
-	export DJANGO_SETTINGS_MODULE="django.conf"
-
-	# Python.[56] trigger a harmless deprecation warning
-	testing() {
-		"$(PYTHON)" -m django_auth_ldap.tests
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r docs/_build/html/
-	fi
-}
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-1.2.0.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-1.2.0.ebuild
new file mode 100644
index 000000000000..915400002a74
--- /dev/null
+++ b/dev-python/django-auth-ldap/django-auth-ldap-1.2.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-auth-ldap/django-auth-ldap-1.2.0.ebuild,v 1.1 2014/06/26 15:46:49 idella4 Exp $
+
+EAPI=5
+# Although setup.py claims to support py3, python-ldap does not
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Django LDAP authentication backend"
+HOMEPAGE="http://pypi.python.org/pypi/django-auth-ldap http://bitbucket.org/psagers/django-auth-ldap/"
+SRC_URI="https://bitbucket.org/psagers/django-auth-ldap/get/80379ce59e6b.zip -> ${P}.zip"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="dev-python/django[${PYTHON_USEDEP}]
+		>=dev-python/python-ldap-2.0[${PYTHON_USEDEP}]"
+DEPEND="app-arch/unzip
+	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
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}