Use bitbucket tarball and fix python_test.

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 20 insertions, 68 deletions

diff --git a/dev-python/django-auth-ldap/ChangeLog b/dev-python/django-auth-ldap/ChangeLog
index e8f61ef8d834..d57921bc3f33 100644
--- a/dev-python/django-auth-ldap/ChangeLog
+++ b/dev-python/django-auth-ldap/ChangeLog
@@ -1,6 +1,10 @@
 # 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.8 2013/05/18 15:24:01 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-auth-ldap/ChangeLog,v 1.9 2013/05/31 02:43:35 floppym Exp $
+
+  31 May 2013; Mike Gilbert <floppym@gentoo.org> -django-auth-ldap-1.1.4.ebuild,
+  django-auth-ldap-1.1.4-r1.ebuild:
+  Use bitbucket tarball and fix python_test.
 
 *django-auth-ldap-1.1.4-r1 (18 May 2013)
 
diff --git a/dev-python/django-auth-ldap/Manifest b/dev-python/django-auth-ldap/Manifest
index a659c3de53b8..9f7c518df4bc 100644
--- a/dev-python/django-auth-ldap/Manifest
+++ b/dev-python/django-auth-ldap/Manifest
@@ -3,18 +3,17 @@ 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 39252 SHA256 54fab9a4d8a493edc124496fbfdb6b6723b45ddf7be53144b378c8e54fdf0185 SHA512 993b2e41a8fdb012228a721bf5915b1e3a29deaefb14f9954a7a75dfb99b4ca6e42125d07444347ec72f3ccd72e29d2e90f2509e43fd397d2bbbb20e2c633f8f WHIRLPOOL 0ad3b001af61a3ac759e6999c40612c211f9bae67217cd986dadd73480c972faadd5dacf5b7ce18565f716a5c582c11d7724003e4b7c832173f10d6a7349607e
+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
-EBUILD django-auth-ldap-1.1.4-r1.ebuild 1257 SHA256 0feb0744c5bd98e638457ecf06926dea6ee92d4fe09dff4cef7329ce1baa1b73 SHA512 4c06c2d297efdca3dbe94dde5d35b062b8137ed01aa097e5702bf64a14b025e8347dab2f5f44735741cccbb41fcee08eed5c7cac18892cc144565f5272568990 WHIRLPOOL e221c253081a48300e76795ceacfc5f59a52da626c35abf670042dec7e488e44754660a5d9ae0b226bbef00036b690f1d2ad31c968fedd40882151159c9c2dd3
-EBUILD django-auth-ldap-1.1.4.ebuild 1114 SHA256 a62d3423c96940e7d77f0c8218399b1d1cce2cb4cf30530b28d7c6663e0c3dcc SHA512 775476707de8d8ef06a97cde67272483041211247601d1d98d0548acc1db046cbf16b9c0eca98b55ae74619251510f36465a35f2291b57de2f089734b0ad25d6 WHIRLPOOL 818269cf2b41a5c933f519358daa673e6e1ef35d8dd968d26c63dddc21a0c06b9131cd8c8e6f1850b20a4fa5b6448ffff680a08797b4751fb26d4ccfe4717977
+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 1470 SHA256 734971bd4cbb17c903da2b45f47eda5cda8df3a4379bf0bbd51537ae5b470273 SHA512 0a964b2016e2db6b39128cbb4682af9e0663e474dd3f80681e73b162422e51f6633df8aada502fa7671b260bd66016be531a5c77447f93f0645afe051e9ac6e0 WHIRLPOOL 2a7fb591f611d5358c35d2265e52a64088d860a6c9c274eef434c4f60e588ee6ba38d497040e00f0f009e973bd3415edef39f40e4cca787d737bedef0df460e0
+MISC ChangeLog 1633 SHA256 ff041c8f503fb10dcbded4dca112bd0fade815a8b3836c707828047bb62a0846 SHA512 589b13f790e0021d279924820dcc33cb90b10a143401ce3278f873f8b8deb0832aa3e247c1a63348571fd37071617e7c40a86e22a6d224c0ac1856c2f088f7c7 WHIRLPOOL d2be6a2f59fa3f4ebbcb3b85100697fa704cc5884cb7386659751f6dbf3ddb4b194f0d3ba5a9c16a4b4d80e6b2a23a79e1edfcffe43ea5bab13369272f3a6e3d
 MISC metadata.xml 260 SHA256 aa42fd34367f8532e3ec288da5a0ccaec0973c77a3ff9e1b5f7f529a7ca0140b SHA512 358bb417582243eea5b359fba2198daea33f24b411a3334552560210bc7f112d00b5243c83fd4c6621f4470d4d80c47f99ff29b745e6c5a2cbc797bf4669b62a WHIRLPOOL 714636fb56e549ccef61f50adfd5f858aca9a4a1183fe17e0ab0a7fe9e6070a65e33bd55581a430eb18c17780bbe2b704389e89206d167f1ff1e5b8f8f6b2bf4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlGXnSEACgkQso7CE7gHKw145QCeJsxgl4/42guTq888CZGqELkK
-YP0AnAkPqDjuIry5XpHoji8RtM6lIC7g
-=75xU
+iF4EAREIAAYFAlGoDlgACgkQC77qH+pIQ6TpKAEAlGN6Lbkcni4w9mikAu7lakdU
+LctSFJvrHedNvVFxl7gA/29cl6Wcu62M9YptEDhKDhYbOh35EZ0W0QaT+JABi2KU
+=xknM
 -----END PGP SIGNATURE-----
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-1.1.4-r1.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-1.1.4-r1.ebuild
index d1ad34121c95..856f875b04ee 100644
--- a/dev-python/django-auth-ldap/django-auth-ldap-1.1.4-r1.ebuild
+++ b/dev-python/django-auth-ldap/django-auth-ldap-1.1.4-r1.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2013 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.4-r1.ebuild,v 1.1 2013/05/18 15:24:01 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-auth-ldap/django-auth-ldap-1.1.4-r1.ebuild,v 1.2 2013/05/31 02:43:35 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit distutils-r1
+inherit distutils-r1 vcs-snapshot
 
 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"
+SRC_URI="https://bitbucket.org/psagers/django-auth-ldap/get/${PV}.tar.gz -> ${P}.tar.gz"
+
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
@@ -29,14 +30,11 @@ python_compile_all() {
 }
 
 python_test() {
-	export DJANGO_SETTINGS_MODULE="django.conf"
-	if ! "${PYTHON}" -c \
-		"from django.conf import global_settings;global_settings.SECRET_KEY='green'" -m django_auth_ldap.tests
-	then
-		die "tests failed under ${EPYTHON}"
-	else
-		einfo "tests passed under ${EPYTHON}"
-	fi
+	pushd test > /dev/null || die
+	set -- django-admin.py test django_auth_ldap --settings=test.settings
+	echo "$@"
+	"$@" || die "Tests failed with ${EPYTHON}"
+	popd > /dev/null || die
 }
 
 python_install_all() {
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-1.1.4.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-1.1.4.ebuild
deleted file mode 100644
index e835f1fe13e0..000000000000
--- a/dev-python/django-auth-ldap/django-auth-ldap-1.1.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2013 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.4.ebuild,v 1.1 2013/05/05 15:09:34 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
-}