Don't call dodoc on directory; bug 367547. Migrate to bash-completion-r1.

Package-Manager: portage-2.2.0_alpha80/cvs/Linux x86_64

4 files changed, 115 insertions, 12 deletions

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index a8ab5c0f7482..8dece15c7bac 100644
--- a/dev-python/django/ChangeLog
+++ b/dev-python/django/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/django
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.72 2011/09/16 12:03:23 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.73 2011/12/14 10:23:36 floppym Exp $
+
+*django-1.3.1-r1 (14 Dec 2011)
+
+  14 Dec 2011; Mike Gilbert <floppym@gentoo.org> +django-1.3.1-r1.ebuild,
+  django-9999.ebuild:
+  Don't call dodoc on directory; bug 367547. Migrate to bash-completion-r1.
 
   16 Sep 2011; Tony Vroon <chainsaw@gentoo.org> django-1.3.1.ebuild:
   Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo & Ian
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index c8dc45d9649b..f1a55cd52830 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 DIST Django-1.1.4.tar.gz 5750441 RMD160 2aac00043088fa705de428ca44240253fbd79af6 SHA1 a636ea12c5d8b5d5befec60bb356016f092b1943 SHA256 1f9d48a741f98951e65818e167c84c407d1c322efcfd4cb419384773ea793dee
 DIST Django-1.2.5.tar.gz 6379313 RMD160 e57f48331377047763875876e51c754f91f58f80 SHA1 9593e6745650d06c0af82a79d6e304d958419f94 SHA256 649387248296386b589c4a8bf91d34590b43f93b6ebfe6cefbea0ddf4641ccd6
@@ -7,15 +7,16 @@ DIST Django-1.3.1.tar.gz 6514564 RMD160 baf14da8d25eb9852a7989e1a1be7d9fd0e21d3a
 DIST Django-1.3.tar.gz 6504003 RMD160 57a3bdb3eb326634647d2eea9df1b5484316c7bc SHA1 f8814d5e1412bb932318db5130260da5bf053ff7 SHA256 7aeee5c80002ab81d4ebf5416292949ff46e1448d183a183fe05ff6344771c83
 EBUILD django-1.1.4.ebuild 2549 RMD160 87107de3e32e0c74debe57f23260d08ddcc26f88 SHA1 570c02ff1b9681a665280ee1911f346d9e585be4 SHA256 32fd6fbcbcd34297527293081c135242bb4cd31e5fd5ff805268e2f9de3c0979
 EBUILD django-1.2.5.ebuild 2688 RMD160 8a3ff9c99ccfea617c383c432c089af58882b0b5 SHA1 5fe24b90d1314bf9faade5ab673a2847095ecb4d SHA256 9fd7bdd75cb620909d8407f163b0ac7cd8e8acd845ee0111253fea843017461a
+EBUILD django-1.3.1-r1.ebuild 2708 RMD160 34ceea3687b039bb64f1d11a51a34a3f3542374a SHA1 b7c92944c4780d507c1fd3970b57db18e384dfb6 SHA256 59201beb6b32216a175ebeaf34dc2661bd7894952f808636829b4cfa537b777f
 EBUILD django-1.3.1.ebuild 2688 RMD160 ab22ecdf776251fa0215a18ca96fdddb58fe2cbe SHA1 96a3776eec028f8c1190e2f1ca18683cce6ec038 SHA256 dfaf095d232ae8d252ddb32a6ecda426445cf5ffa3bc6f2acde7a0c0be687c31
 EBUILD django-1.3.ebuild 2688 RMD160 5aa33bea4cd9c4b2f5897f597a0c190c18084426 SHA1 0012312329a017bf0c46d26f7c99d6d5c4f544a3 SHA256 7c844b0b71656520df4d30bb75eeffa93e9b4a9a7d9c81ef1623ec07827e98e4
-EBUILD django-9999.ebuild 2543 RMD160 540a51b64d471f433e9071ca0f4219b7353441e5 SHA1 fb671ec6fdbbe3527cba97b7f40d1998b2bc07c3 SHA256 ca1fe7ef74821fda031b12f289ce81daa2af930cf3abd16dba39fe21766f57b1
-MISC ChangeLog 11088 RMD160 252691a23812b3426dbb1025838a4e35af5ecea8 SHA1 8d409d9d25cfe7d58e310083ff773f09a22c93bd SHA256 80a14ebbe0196f87538ea025f3cb8884759003deba7ed346502be1e3f7d0ab3f
+EBUILD django-9999.ebuild 2551 RMD160 ff538bed36bae311a21d55338f061fb4e40321a9 SHA1 a0b78247295ddc576045fe41fdd80451dfe3f7fd SHA256 8cc716340b54af192c36b9b1ce1add9040a6bbee756f9aeb4aad5dadbd7e8d6f
+MISC ChangeLog 11292 RMD160 ebc66c7d058a2f56a20aff2950f557182d7cf202 SHA1 fdbf3c632096f5fea7b960b51b365b58f64363fb SHA256 0f10d1e8e9bab647c2c193c6ab30c1826e2ebd7c2eadb8071e195631d1aa06aa
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5zOxYACgkQp5vW4rUFj5rZ5QCdHxGkd92lWageO985X0WjV4Ri
-UVAAn3ODaZlLVddkgIAhEBCVIyVr02Zr
-=YF8h
+iF4EAREIAAYFAk7oeTAACgkQC77qH+pIQ6SMNAD/eByGp3YZ0HVzq5Q0mLYcXeRZ
+vup6bqxmhY6KYSyRC3YA/js1cPwSoBSOG+hKd8nU9k/d4NDN/RJdszcsAHtvZhAe
+=1DeA
 -----END PGP SIGNATURE-----
diff --git a/dev-python/django/django-1.3.1-r1.ebuild b/dev-python/django/django-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..dd9ac201fe81
--- /dev/null
+++ b/dev-python/django/django-1.3.1-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.3.1-r1.ebuild,v 1.1 2011/12/14 10:23:36 floppym Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit bash-completion-r1 distutils versionator webapp
+
+MY_P="Django-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django"
+SRC_URI="http://media.djangoproject.com/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc mysql postgres sqlite test"
+
+RDEPEND="dev-python/imaging
+	sqlite? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) )
+	postgres? ( dev-python/psycopg )
+	mysql? ( >=dev-python/mysql-python-1.2.1_p2 )"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-0.3 )
+	test? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="docs/README AUTHORS"
+WEBAPP_MANUAL_SLOT="yes"
+
+pkg_setup() {
+	python_pkg_setup
+	webapp_pkg_setup
+}
+
+src_compile() {
+	distutils_src_compile
+
+	if use doc; then
+		einfo "Generation of documentation"
+		pushd docs > /dev/null
+		emake html || die "Generation of documentation failed"
+		popd > /dev/null
+	fi
+}
+
+src_test() {
+	testing() {
+		# Tests have non-standard assumptions about PYTHONPATH and
+		# don't work with usual "build-${PYTHON_ABI}/lib".
+		PYTHONPATH="." "$(PYTHON)" tests/runtests.py --settings=test_sqlite -v1
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+
+	newbashcomp extras/django_bash_completion ${PN} || die
+
+	if use doc; then
+		rm -fr docs/_build/html/_sources
+		dohtml -A txt -r docs/_build/html/* || die "dohtml failed"
+	fi
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r django/contrib/admin/media/* || die "doins failed"
+
+	webapp_src_install
+}
+
+pkg_preinst() {
+	:
+}
+
+pkg_postinst() {
+	bash-completion_pkg_postinst
+	distutils_pkg_postinst
+
+	einfo "Now, Django has the best of both worlds with Gentoo,"
+	einfo "ease of deployment for production and development."
+	echo
+	elog "A copy of the admin media is available to"
+	elog "webapp-config for installation in a webroot,"
+	elog "as well as the traditional location in python's"
+	elog "site-packages dir for easy development"
+	echo
+	ewarn "If you build Django ${PV} without USE=\"vhosts\""
+	ewarn "webapp-config will automatically install the"
+	ewarn "admin media into the localhost webroot."
+}
diff --git a/dev-python/django/django-9999.ebuild b/dev-python/django/django-9999.ebuild
index 640c2513bce3..7420daaa1b54 100644
--- a/dev-python/django/django-9999.ebuild
+++ b/dev-python/django/django-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v 1.9 2011/02/09 18:16:28 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v 1.10 2011/12/14 10:23:36 floppym Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.*"
 
-inherit bash-completion distutils subversion webapp
+inherit bash-completion-r1 distutils subversion webapp
 
 DESCRIPTION="High-level Python web framework"
 HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django"
@@ -30,7 +30,7 @@ S="${WORKDIR}"
 
 ESVN_REPO_URI="http://code.djangoproject.com/svn/django/trunk/"
 
-DOCS="docs/* AUTHORS"
+DOCS="docs/README AUTHORS"
 WEBAPP_MANUAL_SLOT="yes"
 
 pkg_setup() {
@@ -61,7 +61,7 @@ src_test() {
 src_install() {
 	distutils_src_install
 
-	dobashcompletion extras/django_bash_completion
+	dobashcomp extras/django_bash_completion ${PN}
 
 	if use doc; then
 		rm -fr docs/_build/html/_sources