django: upgraded package to upstream
Upgraded dev-python/django to version 1.4.1 on amd64
This CL was autogenerated by cros_portage_upgrade.
BUG=chromium:236471
TEST=None
Change-Id: Iac8089c3e16514a9a5e9e01e0d809e42ad2fc471
Reviewed-on: https://gerrit.chromium.org/gerrit/50213
Tested-by: Aviv Keshet <akeshet@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Aviv Keshet <akeshet@chromium.org>
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
new file mode 100644
index 0000000..21d05af
--- /dev/null
+++ b/dev-python/django/Manifest
@@ -0,0 +1 @@
+DIST Django-1.4.1.tar.gz 7656756 RMD160 db16156f992630bbe497ab3a4bb2c12997bac991 SHA1 992e0e9c6c3b9167b29946bfe3956406fc747ef4 SHA256 4d8d20eba350d3d29613cc5a6302d5c23730c7f9e150985bc58b3175b755409b
diff --git a/dev-python/django/django-1.4.1.ebuild b/dev-python/django/django-1.4.1.ebuild
new file mode 100644
index 0000000..4cd5942
--- /dev/null
+++ b/dev-python/django/django-1.4.1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.4.1.ebuild,v 1.3 2012/12/04 15:39:48 ago 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="https://www.djangoproject.com/m/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:2 )
+ 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}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+pkg_setup() {
+ python_pkg_setup
+ webapp_pkg_setup
+}
+
+src_prepare() {
+ distutils_src_prepare
+
+ # Disable tests requiring network connection.
+ sed \
+ -e "s/test_correct_url_value_passes/_&/" \
+ -e "s/test_correct_url_with_redirect/_&/" \
+ -i tests/modeltests/validation/tests.py
+ sed \
+ -e "s/test_urlfield_3/_&/" \
+ -e "s/test_urlfield_4/_&/" \
+ -e "s/test_urlfield_10/_&/" \
+ -i tests/regressiontests/forms/tests/fields.py
+}
+
+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/static/admin/* || die "doins failed"
+
+ webapp_src_install
+}
+
+pkg_preinst() {
+ :
+}
+
+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/files/django-1.3.1-djangodocs_extension.patch b/dev-python/django/files/django-1.3.1-djangodocs_extension.patch
new file mode 100644
index 0000000..fa75c73
--- /dev/null
+++ b/dev-python/django/files/django-1.3.1-djangodocs_extension.patch
@@ -0,0 +1,55 @@
+https://code.djangoproject.com/changeset/16223
+https://code.djangoproject.com/changeset/16231
+https://code.djangoproject.com/changeset/16952
+
+--- docs/_ext/djangodocs.py
++++ docs/_ext/djangodocs.py
+@@ -16,7 +16,7 @@
+ except ImportError:
+ json = None
+
+-from sphinx import addnodes, roles
++from sphinx import addnodes, roles, __version__ as sphinx_ver
+ from sphinx.builders.html import StandaloneHTMLBuilder
+ from sphinx.writers.html import SmartyPantsHTMLTranslator
+ from sphinx.util.console import bold
+@@ -127,26 +127,29 @@
+
+ # Don't use border=1, which docutils does by default.
+ def visit_table(self, node):
++ self._table_row_index = 0 # Needed by Sphinx
+ self.body.append(self.starttag(node, 'table', CLASS='docutils'))
+
+ # <big>? Really?
+ def visit_desc_parameterlist(self, node):
+ self.body.append('(')
+ self.first_param = 1
++ self.param_separator = node.child_text_separator
+
+ def depart_desc_parameterlist(self, node):
+ self.body.append(')')
+
+- #
+- # Don't apply smartypants to literal blocks
+- #
+- def visit_literal_block(self, node):
+- self.no_smarty += 1
+- SmartyPantsHTMLTranslator.visit_literal_block(self, node)
+-
+- def depart_literal_block(self, node):
+- SmartyPantsHTMLTranslator.depart_literal_block(self, node)
+- self.no_smarty -= 1
++ if sphinx_ver < '1.0.8':
++ #
++ # Don't apply smartypants to literal blocks
++ #
++ def visit_literal_block(self, node):
++ self.no_smarty += 1
++ SmartyPantsHTMLTranslator.visit_literal_block(self, node)
++
++ def depart_literal_block(self, node):
++ SmartyPantsHTMLTranslator.depart_literal_block(self, node)
++ self.no_smarty -= 1
+
+ #
+ # Turn the "new in version" stuff (versionadded/versionchanged) into a
diff --git a/metadata/md5-cache/dev-python/django-1.4.1 b/metadata/md5-cache/dev-python/django-1.4.1
new file mode 100644
index 0000000..3564368
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-1.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare prerm setup test
+DEPEND=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:2 ) mysql? ( >=dev-python/mysql-python-1.2.1_p2 ) 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 ) ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* >=app-admin/webapp-config-1.50.15
+DESCRIPTION=High-level Python web framework
+EAPI=3
+HOMEPAGE=http://www.djangoproject.com/ http://pypi.python.org/pypi/Django
+IUSE=doc mysql postgres sqlite test vhosts
+KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=BSD
+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:2 ) mysql? ( >=dev-python/mysql-python-1.2.1_p2 ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* >=app-admin/webapp-config-1.50.15
+SLOT=0
+SRC_URI=https://www.djangoproject.com/m/releases/1.4/Django-1.4.1.tar.gz
+_eclasses_=bash-completion-r1 3480f8385cb9e31797e7b659e366e2d2 distutils b4c334e216d998c4ce4b750cb091e42e eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed webapp b5c5b98a2289a6050810cf6022ac00be
+_md5_=40c51a2549cb73e7c41c23f05d749e2a
