Bump, thanks to quantumsummers for reporting.

Package-Manager: portage-2.2_rc44/cvs/Linux x86_64

4 files changed, 234 insertions, 2 deletions

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index bc0c9a7db8ef..5066724b8a3c 100644
--- a/dev-python/django/ChangeLog
+++ b/dev-python/django/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/django
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.36 2009/08/04 03:19:59 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.37 2009/10/09 23:05:00 patrick Exp $
+
+*django-1.1.1 (09 Oct 2009)
+*django-1.0.4 (09 Oct 2009)
+
+  09 Oct 2009; Patrick Lauer <patrick@gentoo.org> +django-1.0.4.ebuild,
+  +django-1.1.1.ebuild:
+  Bump, thanks to quantumsummers for reporting.
 
 *django-1.1 (04 Aug 2009)
 
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index e4c7a7c5dde1..2469cada8f20 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,10 +1,14 @@
 DIST Django-1.0.2-final.tar.gz 4649433 RMD160 0cfea620df0831310da4ef51ef6ee4ef1b65974e SHA1 f2d9088f17aff47ea17e5767740cab67b2a73b6b SHA256 50a5d228743a69a682899b20141194bf8fd3fd75eaf33ba5f2932f43ea93ea0d
 DIST Django-1.0.3.tar.gz 5086964 RMD160 21983d9722f12299a08010507be96b8a9640a565 SHA1 d7efafe20de8cd97ee417f6538a7ff1e86bfcd4a SHA256 93efd71771c836c06218506c974ac60f8f640dcb3244bc9a0c5aeb65676a5935
+DIST Django-1.0.4.tar.gz 5088869 RMD160 9f61455bc4cc0277ddfe4a957863d5995f8c23f3 SHA1 a8b9f33adb007146b8b57f22f0f38467f0d2693a SHA256 a9388a047814bbe356c43d3d2e3afff42b1f93190c86aa4ac72f828a5ef107eb
+DIST Django-1.1.1.tar.gz 5614106 RMD160 bf42e548ff86fc587086eaffc53d9397e2a8c871 SHA1 441c54f0e90730bf4a55432b64519169b1e6ef20 SHA256 d65b18319496fc4923b37fdb736e5ba1a90a3a18e2d7eaac7f3ad30738d1f6e4
 DIST Django-1.1.tar.gz 5609609 RMD160 c3ae06b2cd2af3c8aa6058747acbd7646ea83cfd SHA1 690dda39595d70678840e917d712fc916d137c16 SHA256 578338be3288eff853039ad498297decdc3bb20265a0c4dee09efdf8e267c900
 DIST django-1.0.2-tests.tar.bz2 228757 RMD160 8d30a18aac7d8c7da2cc3b0a23fea2ff233a5661 SHA1 ca309850b35f81825b09994c95dd227c5e589e75 SHA256 dd4f6c551ac3398961609c43aa581741eb98b8cb59722c88ce776bb52a74ade0
 EBUILD django-1.0.2-r1.ebuild 2778 RMD160 10fa8d5ef0525546a0d76e604f35fda5edc703d2 SHA1 01521b75b2e44b60f3ea226dd1288c526676055c SHA256 08a2b65e3e0503a3a8810705ecf9ac338c959f026c364312794036d8eb211f80
 EBUILD django-1.0.3.ebuild 2668 RMD160 5b2bb6a0e1e535e8f46c1ef97d0cecd5ad5ce803 SHA1 405d5e405e791b3dbb8ecf8b17f3e814d0469a05 SHA256 93f179dc7b9a943f6f0ec2991785d2d4c9972ac612b6976b3eb1d0a86a6b57ac
+EBUILD django-1.0.4.ebuild 2667 RMD160 b48eb97109356a87e2a2b534edcdad7019966f3c SHA1 78bed277b708aa3e87e4073dfeb91ba930e3ee28 SHA256 f6b9c557713a803835114950f9bad9acf3a9d69c003fc8351b46d2fd2c8e7a5a
+EBUILD django-1.1.1.ebuild 2747 RMD160 e4f8ccd64799ea51559bb461b557193962c24260 SHA1 bd4bc8d22cc1bfd5871dbca1aa05ef5a2777a58c SHA256 77846ef97c9057c823d85a06c553847a52fd4997ef1e1fee97d9045ba3108ef0
 EBUILD django-1.1.ebuild 2746 RMD160 4049f5bd3cc183ed0a51022421d2f212e866fe27 SHA1 16594945165413b05bbaa7d7ea4e46c4aaaca20c SHA256 c197363cac311f62ef14487f0484e98edf3f9cab605df4220319b3cd7c0ede36
 EBUILD django-9999.ebuild 2147 RMD160 3358d2759e7ebcdbe1c101577b744adbb2a954d6 SHA1 a2184989e17d608c2568b709d1007997280a737b SHA256 b5983acebeab1c000cd662d05650330ba60d56805971ea9a0e592ad3fd45ac59
-MISC ChangeLog 5847 RMD160 f1407b71f131fbfcd34ab30dbcbbe61d63d784f9 SHA1 323777cce712078a4d14eb0c3eda072aa4625f63 SHA256 1341f17fda7c4e3f7dbcb89f4667ae48ab96dca2b1975dfcc949963f8a6917ce
+MISC ChangeLog 6048 RMD160 2e5838b24b4f7723ba27235e74f95085fe9e1438 SHA1 4e5f7d3655540d253595d6f5c8959a66ec5af4a2 SHA256 d66a7e94fe908d2bcd4fc592c239a2c5b2bc2b4579043f9a62a1afa73e4d3e32
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
diff --git a/dev-python/django/django-1.0.4.ebuild b/dev-python/django/django-1.0.4.ebuild
new file mode 100644
index 000000000000..9c0e31a7d677
--- /dev/null
+++ b/dev-python/django/django-1.0.4.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.0.4.ebuild,v 1.1 2009/10/09 23:05:00 patrick Exp $
+
+EAPI="2"
+
+inherit bash-completion distutils multilib versionator webapp
+
+MY_P="${P/#d/D}"
+WEBAPP_MANUAL_SLOT="yes"
+
+DESCRIPTION="High-level python web framework"
+HOMEPAGE="http://www.djangoproject.com/"
+SRC_URI="http://media.djangoproject.com/releases/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc examples mysql postgres sqlite test"
+
+RDEPEND="dev-python/imaging
+	sqlite? ( || (
+		>=dev-lang/python-2.5[sqlite]
+		( dev-python/pysqlite:2 <dev-lang/python-2.5 )
+	) )
+	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.5[sqlite]
+		( dev-python/pysqlite:2 <dev-lang/python-2.5 )
+	) )"
+
+S="${WORKDIR}/${MY_P}"
+
+PYTHON_MODNAME="django"
+
+DOCS="docs/* AUTHORS"
+
+src_compile() {
+	distutils_src_compile
+
+	if use doc ; then
+		pushd docs > /dev/null
+		emake html || die "Generation of HTML documentation failed"
+		popd > /dev/null
+	fi
+}
+
+src_test() {
+	einfo "Running tests."
+	cat >> tests/settings.py << __EOF__
+DATABASE_ENGINE='sqlite3'
+DATABASE_NAME='test.db'
+ROOT_URLCONF='tests/urls.py'
+SITE_ID=1
+__EOF__
+	PYTHONPATH="." ${python} tests/runtests.py --settings=settings -v1 || die "tests failed"
+}
+
+src_install() {
+	distutils_python_version
+	site_pkgs="$(python_get_sitedir)"
+	export PYTHONPATH="${PYTHONPATH}:${D}/${site_pkgs}"
+	dodir ${site_pkgs}
+
+	distutils_src_install
+
+	dobashcompletion extras/django_bash_completion
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+
+	if use doc ; then
+		mv docs/_build/html/{_,.}sources
+		dohtml txt -r docs/_build/html/*
+	fi
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r "${D}/${site_pkgs}"/django/contrib/admin/media/*
+
+	#webapp_postinst_txt en "${WORKDIR}"/postinstall-en.txt
+	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
+	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-1.1.1.ebuild b/dev-python/django/django-1.1.1.ebuild
new file mode 100644
index 000000000000..2eba0c5e517b
--- /dev/null
+++ b/dev-python/django/django-1.1.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.1.1.ebuild,v 1.1 2009/10/09 23:05:00 patrick Exp $
+
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit bash-completion distutils multilib versionator webapp
+
+MY_P="${P/#d/D}"
+WEBAPP_MANUAL_SLOT="yes"
+
+DESCRIPTION="High-level python web framework"
+HOMEPAGE="http://www.djangoproject.com/"
+SRC_URI="http://media.djangoproject.com/releases/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc examples mysql postgres sqlite test"
+
+RDEPEND="dev-python/imaging
+	sqlite? ( || (
+		>=dev-lang/python-2.5[sqlite]
+		( dev-python/pysqlite:2 <dev-lang/python-2.5 )
+	) )
+	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.5[sqlite]
+		( dev-python/pysqlite:2 <dev-lang/python-2.5 )
+	) )"
+
+RESTRICT_PYTHON_ABIS="3*"
+
+S="${WORKDIR}/${MY_P}"
+
+PYTHON_MODNAME="django"
+
+DOCS="docs/* AUTHORS"
+
+src_compile() {
+	distutils_src_compile
+
+	if use doc ; then
+		pushd docs > /dev/null
+		emake html || die "Generation of HTML documentation failed"
+		popd > /dev/null
+	fi
+}
+
+src_test() {
+	testing() {
+		cat >> tests/settings.py << __EOF__
+DATABASE_ENGINE='sqlite3'
+DATABASE_NAME='test.db'
+ROOT_URLCONF='tests/urls.py'
+SITE_ID=1
+__EOF__
+		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" tests/runtests.py --settings=settings -v1
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_python_version
+	site_pkgs="$(python_get_sitedir)"
+	export PYTHONPATH="${PYTHONPATH}:${D}/${site_pkgs}"
+	dodir ${site_pkgs}
+
+	distutils_src_install
+
+	dobashcompletion extras/django_bash_completion
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+
+	if use doc ; then
+		mv docs/_build/html/{_,.}sources
+		dohtml txt -r docs/_build/html/*
+	fi
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r "${D}/${site_pkgs}"/django/contrib/admin/media/*
+
+	#webapp_postinst_txt en "${WORKDIR}"/postinstall-en.txt
+	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
+	echo
+	ewarn "If you build Django ${PV} without USE=\"vhosts\""
+	ewarn "webapp-config will automatically install the"
+	ewarn "admin media into the localhost webroot."
+}