Few small fixes to close #247204

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

3 files changed, 117 insertions, 2 deletions

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index 7b5638d236eb..0c03dc04829a 100644
--- a/dev-python/django/ChangeLog
+++ b/dev-python/django/ChangeLog
@@ -1,6 +1,11 @@
 # 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.29 2009/02/03 09:21:28 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.30 2009/02/15 17:25:42 patrick Exp $
+
+*django-1.0.2-r1 (15 Feb 2009)
+
+  15 Feb 2009; Patrick Lauer <patrick@gentoo.org> +django-1.0.2-r1.ebuild:
+  Few small fixes to close #247204
 
 *django-1.0.2 (03 Feb 2009)
 
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 301bf3c541cc..3365dae00920 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -4,8 +4,9 @@ DIST Django-0.96.2.tar.gz 1637044 RMD160 29488b09cc6d8013716c8a7d190fe6bc9625e56
 DIST Django-1.0.2-final.tar.gz 4649433 RMD160 0cfea620df0831310da4ef51ef6ee4ef1b65974e SHA1 f2d9088f17aff47ea17e5767740cab67b2a73b6b SHA256 50a5d228743a69a682899b20141194bf8fd3fd75eaf33ba5f2932f43ea93ea0d
 DIST Django-1.0.tar.gz 4789634 RMD160 ace144c8d33fda35e29b6a07cd5645d2666c98d9 SHA1 e3875f5ebf6f956d93f8b9bac47e23c48631b798 SHA256 4c780b9e2906944ce02a9325b15f480d2bd4c0b12137f752aa4800c0f8563acf
 EBUILD django-0.96.2.ebuild 2248 RMD160 501513a32dc199187fe4462209612bb9a24782e4 SHA1 5e147c96e1a5f9c5edc5106fd4c8512b87481fb2 SHA256 38f1f1bd6335e8b47951383e000592ada427fc07ef5409e27a5c501462bf2516
+EBUILD django-1.0.2-r1.ebuild 2764 RMD160 1dc4f937fc661ba55c95bbd488c7e1eb722d1063 SHA1 01ad6b3e75bef583264ad5335b6967afb1ccbb7d SHA256 a402bcb93be76e7d91b92081d04e3efb43ef6c5dc6c1ec0c35714deba70d110c
 EBUILD django-1.0.2.ebuild 2737 RMD160 92fb2b296b1f4d1f1c2384caa4b6b29b87e3f2ee SHA1 e3bb0b3e5e56464f6ddbec7a4584898ec4f5361d SHA256 5f72ad26282952b12d17a5332987b19913ebba3b48a43f8af34f0d9108db462d
 EBUILD django-1.0.ebuild 1856 RMD160 510909b478cba449d32a772d41c194c74f6674bb SHA1 2ec91ab1a839683e3af1121cca609376d73b8470 SHA256 aff2ba752f57f78694cd94734e5557fa93c226df3c9430c018f7efb3a3b657e6
 EBUILD django-9999.ebuild 2058 RMD160 8d165e5a603c0f60cdce2f4a0e58673b9bd93403 SHA1 0e95cd5eda84aa7a72b8d5d6d6dbdca6b52680cb SHA256 629bc65a363bd4522b6c1675dddafb4dd833186a5f78efdcd9ab3ea4e4fb296e
-MISC ChangeLog 4834 RMD160 6cff14442b8f6836ef4f81b128a18c23f09cd576 SHA1 a7130833a09aaade99b61a52cac9978e79bdbbba SHA256 3e390d3db5eee2a9907810b13cbee6cce1ed6c181db78914f14aba19e5eb1e17
+MISC ChangeLog 4977 RMD160 70177c4c7fd1ef4a3d7fd73153acb7d7010d4e12 SHA1 9b590f29c8c94a0c86e0f611e4c8b182e91f1a65 SHA256 37a7387a744b877e53a7eb5625f1635292e4bae9e740731007d54b4f38701ff9
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
diff --git a/dev-python/django/django-1.0.2-r1.ebuild b/dev-python/django/django-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..50da96eb1e96
--- /dev/null
+++ b/dev-python/django/django-1.0.2-r1.ebuild
@@ -0,0 +1,109 @@
+# 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.2-r1.ebuild,v 1.1 2009/02/15 17:25:42 patrick Exp $
+EAPI=2
+
+inherit bash-completion subversion distutils multilib versionator webapp
+
+MY_P="${P/#d/D}-final"
+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 ~sparc ~x86"
+IUSE="doc examples mysql postgres sqlite3 test"
+
+RDEPEND="dev-python/imaging
+	sqlite3? ( || (
+		( dev-python/pysqlite:2 <dev-lang/python-2.5 )
+		>=dev-lang/python-2.5[sqlite] ) )
+	test? ( || (
+		( dev-python/pysqlite:2 <dev-lang/python-2.5 )
+		>=dev-lang/python-2.5[sqlite] ) )
+	postgres? ( dev-python/psycopg )
+	mysql? ( >=dev-python/mysql-python-1.2.1_p2 )
+	doc? ( >=dev-python/sphinx-0.3 )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="docs/* AUTHORS"
+
+src_unpack() {
+	distutils_src_unpack
+	if use test; then
+		local repo_uri
+		repo_uri="http://code.djangoproject.com/svn/${PN}/tags/releases/${PV}/tests/"
+		subversion_fetch ${repo_uri} tests
+	fi
+}
+
+src_compile() {
+	distutils_src_compile
+	if use doc ; then
+		pushd docs
+		emake html || die "docs failed"
+		popd
+	fi
+}
+
+src_test() {
+	einfo "Running tests."
+	cat >> tests/settings.py << __EOF__
+DATABASE_ENGINE='sqlite3'
+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-1.0.2 without USE=\"vhosts\""
+	ewarn "webapp-config will automatically install the"
+	ewarn "admin media into the localhost webroot."
+}