Version bump.

Package-Manager: portage-HEAD/cvs/Linux x86_64

3 files changed, 126 insertions, 5 deletions

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index 0a49dac4c8d1..8bc88e025a82 100644
--- a/dev-python/django/ChangeLog
+++ b/dev-python/django/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/django
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.45 2010/05/14 19:29:43 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.46 2010/05/26 17:59:26 arfrever Exp $
+
+*django-1.2.1 (26 May 2010)
+
+  26 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +django-1.2.1.ebuild:
+  Version bump.
 
 *django-1.1.2 (14 May 2010)
 
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 75024b76189c..4ad1a044b9b2 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -2,9 +2,11 @@ AUX django-1.1.1-fix_tests.patch 840 RMD160 4a5a121c37fe883209505312be39dc2a9143
 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.2.tar.gz 5748420 RMD160 234ed051b4b0424f8bbd06b7021aaf94c4d185ff SHA1 1d3df9f1f7bbd5ba6334cb3503791a2b290af96e SHA256 5ccea372454536148e603b1a7c010711c25a991ffaf3b2d6ab2034ad05e1ec25
-EBUILD django-1.0.4.ebuild 2667 RMD160 b48eb97109356a87e2a2b534edcdad7019966f3c SHA1 78bed277b708aa3e87e4073dfeb91ba930e3ee28 SHA256 f6b9c557713a803835114950f9bad9acf3a9d69c003fc8351b46d2fd2c8e7a5a
+DIST Django-1.2.1.tar.gz 6248006 RMD160 25904c6f450e88404256f951ee39cb6b39de5f76 SHA1 1b5655f300d7333be06289451723dc5260a9944c SHA256 eaa29f2344568cc871c4517a348de0d5c39fbd055b4c998cd4a80601bb51e7b9
+EBUILD django-1.0.4.ebuild 2798 RMD160 d651fb7b3cd6e4c910fe715c5b8231f55e073b00 SHA1 ed3ffa0d87f92a53632fabe7264fb5a1996cbb17 SHA256 80a8f064e2e2db5bc871dc450ce178a1c157cba844754c268e8ceb27f7497a10
 EBUILD django-1.1.1.ebuild 2905 RMD160 54bb51c2b1f3ae15df025fae35bc40949277efc1 SHA1 72e55bd601bde3854b85b200a528253fedd19d67 SHA256 367ad96a992390dd0e5f2a41bf03e232273d2dab7b4881b30068c8fc753f121e
-EBUILD django-1.1.2.ebuild 2814 RMD160 a27abef014d337539f708bda4c28654e09844eb1 SHA1 32f20d734dfacb028464a1cebc88d935f50d539b SHA256 9e5678d2c1aa0ac57c0f1884c5522fdf2848e98e2e72238e4cbe2df5e0bfe68c
-EBUILD django-9999.ebuild 2147 RMD160 3358d2759e7ebcdbe1c101577b744adbb2a954d6 SHA1 a2184989e17d608c2568b709d1007997280a737b SHA256 b5983acebeab1c000cd662d05650330ba60d56805971ea9a0e592ad3fd45ac59
-MISC ChangeLog 7007 RMD160 09bf12c9ad7522455c755b045bc2a0365d29f605 SHA1 cd84295b6a0caa5d262ff449781750db11ff8162 SHA256 a43e52db60557eff1126eceb0e37714c818cd22deb81d4c84d868ea757ee9998
+EBUILD django-1.1.2.ebuild 2839 RMD160 4d9ff0e0936a6690c30a621eac636922da274719 SHA1 fde5519ceded43bfe6fdae1852193c465e85b9c9 SHA256 085d4d3d2f89a675e3ef28dbe29a4ab21c5f6aa299d702cce756bfb5c4c25cd5
+EBUILD django-1.2.1.ebuild 2839 RMD160 6c172e790deff15bde714159775e5777dd58e350 SHA1 a25488768b6d6a0bb807aa2247eafd4ae2ea626e SHA256 cd0dd92d7a875fe104ffb940c56f168333b1a68bc25471d6b6304b25c17ac408
+EBUILD django-9999.ebuild 2692 RMD160 f0e0c8340549542bf510810e51cb7abff67503d8 SHA1 8eda5ac7de9d6226a1020fd8eaf180d4bbe8eb51 SHA256 7db4373064caad0d60bf782c2096d684325f7839485f3a26be946e298600bbc6
+MISC ChangeLog 7150 RMD160 9a3ac8adab7106e028be0e1a821e9177804d04f0 SHA1 e3fdf373a6205f7f696733e136c815805ba9403b SHA256 fbf2e770b073da0fe30c850ce37215a18d6603c97db85acd7f3669e691e2f861
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
diff --git a/dev-python/django/django-1.2.1.ebuild b/dev-python/django/django-1.2.1.ebuild
new file mode 100644
index 000000000000..a5ff5e69df1e
--- /dev/null
+++ b/dev-python/django/django-1.2.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.2.1.ebuild,v 1.1 2010/05/26 17:59:26 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit bash-completion 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 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}"
+
+DOCS="docs/* AUTHORS"
+WEBAPP_MANUAL_SLOT="yes"
+
+pkg_setup() {
+	python_pkg_setup
+	webapp_pkg_setup
+}
+
+src_compile() {
+	distutils_src_compile
+
+	if use doc; then
+		pushd docs > /dev/null
+		einfo "Generation of documentation"
+		emake html || die "Generation of 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__
+		# Tests have non-standard assumptions about PYTHONPATH and
+		# don't work with usual "build-${PYTHON_ABI}/lib".
+		PYTHONPATH="." "$(PYTHON)" tests/runtests.py --settings=settings -v1
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	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
+		rm -fr docs/_build/html/_sources
+		dohtml -A txt -r docs/_build/html/*
+	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."
+}