Bump for #409527

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

3 files changed, 123 insertions, 13 deletions

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index cabbe0a28760..0923c6fd60e5 100644
--- a/dev-python/django/ChangeLog
+++ b/dev-python/django/ChangeLog
@@ -1,6 +1,11 @@
 # 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.77 2011/12/21 07:06:46 floppym Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.78 2012/04/01 05:29:36 patrick Exp $
+
+*django-1.4 (01 Apr 2012)
+
+  01 Apr 2012; Patrick Lauer <patrick@gentoo.org> +django-1.4.ebuild:
+  Bump for #409527
 
   21 Dec 2011; Mike Gilbert <floppym@gentoo.org>
   +files/django-1.3.1-djangodocs_extension.patch, django-1.3.1-r1.ebuild,
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index d6b32a248099..be70c91d7b86 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,23 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX django-1.3.1-djangodocs_extension.patch 1879 RMD160 90c422607da766af1d0a8bb0f3bf95fe931a9b1e SHA1 ab0fc5d204f578722fde96bfa24dfa4ed54653fc SHA256 fbf7b2383f18f03755f30fe9a25e05d994aa22d7a6832b92073f5a3dcf7a0a87
 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
 DIST Django-1.3.1.tar.gz 6514564 RMD160 baf14da8d25eb9852a7989e1a1be7d9fd0e21d3a SHA1 fd968134c8ded38d2d9ccd2cafe865a0585aefc4 SHA256 af9118c4e8a063deb0b8cda901fcff2b805e7cf496c93fd43507163f3cde156b
 DIST Django-1.3.tar.gz 6504003 RMD160 57a3bdb3eb326634647d2eea9df1b5484316c7bc SHA1 f8814d5e1412bb932318db5130260da5bf053ff7 SHA256 7aeee5c80002ab81d4ebf5416292949ff46e1448d183a183fe05ff6344771c83
+DIST Django-1.4.tar.gz 7632772 RMD160 6c015864335264ad3d9497bda8e828a436fbc800 SHA1 acc0b854bfbda29c74c1f818323139cf18b38eeb SHA256 c096bafbea10e7d359bc15eb00a9bf11dbf5201a16d62acfa2de61d5a35488e9
 EBUILD django-1.1.4.ebuild 2553 RMD160 5d5e9593a0b847c2ab62c98d2f32b26e8fb17d28 SHA1 98b185b4850bcc8b91375ddc2d701d96cbfe088b SHA256 2deb22d66256a1870d6e5e136b89a63e7b2e43c65cc892e391696aea32ea7adf
 EBUILD django-1.2.5.ebuild 2692 RMD160 2f1ac2e3409aabadb3fa1eb12dc589fcc9d5882c SHA1 76049400cc3511901a56bed4c7fffa8a63a44c1b SHA256 3872f7dbe4cbd100665b916d13cc339d39006a60518e44401f9b856e6ae7a460
 EBUILD django-1.3.1-r1.ebuild 3119 RMD160 e9c2db6ef31d441007b5557f116f7a34c989a576 SHA1 c5dba6e4693e22652391cfe1860cc5087b20cda3 SHA256 86c402c8a3fc2f33946fa04a018e3bcd83e4004a07538effd93cfd2c77e7a155
 EBUILD django-1.3.1.ebuild 2692 RMD160 32d33c03154dbda27cd693dc96c9bab872cf32bf SHA1 868214ae0cb9816436c1d031651002a9dab6a2e4 SHA256 8890c99f1cda800a12aff474c49b7598cb3ed9cf0382f6515b7f1f37da33e57b
 EBUILD django-1.3.ebuild 2688 RMD160 5aa33bea4cd9c4b2f5897f597a0c190c18084426 SHA1 0012312329a017bf0c46d26f7c99d6d5c4f544a3 SHA256 7c844b0b71656520df4d30bb75eeffa93e9b4a9a7d9c81ef1623ec07827e98e4
+EBUILD django-1.4.ebuild 3204 RMD160 6c384555c66124156638afb9d7595e519bde6c82 SHA1 1af4e8e414a6ab04ab58f4f491d646a817775733 SHA256 9d0702ba6f886203f15557457c6076783d23d28357c9d2e76b007601f0353089
 EBUILD django-9999.ebuild 2909 RMD160 0773e04c23bb859a7a105da9466c31693b66e880 SHA1 ec25a2a20d2cfa9cec156d2b4459355618873c86 SHA256 7f095467fba20fee47d6d4b66bdc53c446ad3205672dc73bec3df4a646d21f0d
-MISC ChangeLog 11890 RMD160 c18ec06ff931d8814a3a2858837d0d7242039ec6 SHA1 a06a7e331242bc3fc5e4e786521e3ed382b46f22 SHA256 46a4d0cdc45890eb5df58bc24584501740c7f19d8569da18ec73513c6eac0991
+MISC ChangeLog 12007 RMD160 322069d3f6612537b4fd91f69f68deff1c4098ea SHA1 dfbd323b619a19fd84795266788d20018c39793b SHA256 8a13f3733ba645fa05ae8674771d9e7ef664e7c7420919c49ea6910391a0fd7d
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk7xhY8ACgkQC77qH+pIQ6TgyQEAn4lblmH0AITlS+eNpj0fYVn0
-UIJPkmHqpHj/IC7iTLABAMRyyUaV7O7Dv1HAsHlFlCL1jFB0+ldzyHHm9HzLuk6+
-=F/qR
------END PGP SIGNATURE-----
diff --git a/dev-python/django/django-1.4.ebuild b/dev-python/django/django-1.4.ebuild
new file mode 100644
index 000000000000..ea2523752e76
--- /dev/null
+++ b/dev-python/django/django-1.4.ebuild
@@ -0,0 +1,113 @@
+# 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.ebuild,v 1.1 2012/04/01 05:29:36 patrick Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit bash-completion-r1 distutils eutils 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"
+SRC_URI="http://www.djangoproject.com/download/1.4/tarball/ -> ${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_prepare() {
+	distutils_src_prepare
+	#epatch "${FILESDIR}/${P}-djangodocs_extension.patch"
+
+	# 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}}"
+	# gone
+	#doins -r django/contrib/admin/media/* || 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."
+}