Version bump.

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

3 files changed, 106 insertions, 2 deletions

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index c30f27bed0ca..9b65c16600cb 100644
--- a/dev-python/django/ChangeLog
+++ b/dev-python/django/ChangeLog
@@ -1,6 +1,12 @@
 # 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.62 2011/02/09 04:01:00 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.63 2011/02/09 04:37:42 arfrever Exp $
+
+*django-1.2.5 (09 Feb 2011)
+
+  09 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +django-1.2.5.ebuild:
+  Version bump.
 
 *django-1.1.4 (09 Feb 2011)
 
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 4140fe0743bc..e747f2fcc49e 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -2,8 +2,10 @@ AUX django-1.2.4-python-2.7.patch 1466 RMD160 5661eb7856dd4690c9a89182a248ea4236
 AUX django-1.2.4-ticket-14576.patch 2379 RMD160 55894fdf1d2c6c0e255b7c773b34aa7d0f52789d SHA1 c24debf30e27a709b44f8a350bbd3c14c7c4e3f1 SHA256 4d663ab67309be059394cda8406d344e1f34ccd1c815cd71a8bc56a37bf58808
 DIST Django-1.1.4.tar.gz 5750441 RMD160 2aac00043088fa705de428ca44240253fbd79af6 SHA1 a636ea12c5d8b5d5befec60bb356016f092b1943 SHA256 1f9d48a741f98951e65818e167c84c407d1c322efcfd4cb419384773ea793dee
 DIST Django-1.2.4.tar.gz 6357270 RMD160 e28338a82d662df999a68a4473ed76bd00c974fc SHA1 d8347a9062404de49e2f474e6e99395361f34db8 SHA256 0f06cccd4ca92173b958dd80edff35035888f15554be425e5d6d55c7f94a8381
+DIST Django-1.2.5.tar.gz 6379313 RMD160 e57f48331377047763875876e51c754f91f58f80 SHA1 9593e6745650d06c0af82a79d6e304d958419f94 SHA256 649387248296386b589c4a8bf91d34590b43f93b6ebfe6cefbea0ddf4641ccd6
 EBUILD django-1.1.4.ebuild 2549 RMD160 87107de3e32e0c74debe57f23260d08ddcc26f88 SHA1 570c02ff1b9681a665280ee1911f346d9e585be4 SHA256 32fd6fbcbcd34297527293081c135242bb4cd31e5fd5ff805268e2f9de3c0979
 EBUILD django-1.2.4-r1.ebuild 2827 RMD160 c26e8c635817da8b6b527d19c1556a68f7f641e8 SHA1 b83341dc52b0725f17630d77fd76170e74ea1503 SHA256 fcf07054f5e6c2623c19633c8ed07bdc86c4922ec111ade9e2ef9b607d904693
+EBUILD django-1.2.5.ebuild 2690 RMD160 3fe6185c7966d05839dbaecfb0b9e067abd44c20 SHA1 2eb170a2eaebde1fe626aab8a9c1d1850f61d188 SHA256 84efc2daebe4edebce78db73c055a6eaa1b06a98285a5e566ff07e93e2403b36
 EBUILD django-9999.ebuild 2608 RMD160 8e6086c8322b9e53d109afc0da9f23b101a5446e SHA1 a32603f8985d40a48ce6459239aa2ed313f4b34d SHA256 1ae9d563db7b5bcb47e4f959f35092deecca01fb8c1b627ad41c02f27379d1f4
-MISC ChangeLog 9745 RMD160 3b9e594e45bdc358fad44d555503474e9926b543 SHA1 c2e8dcc58b646cb0b2a1f4c7ba56eae6d1445155 SHA256 88b10e853d72a04b981ba5a8db03a6593bae7f3af28b98905bd6522ae0e6737e
+MISC ChangeLog 9888 RMD160 ea14d00c324d81c166d2925346143ced620ca14d SHA1 7af961f482c46e3f889b5d07f9d8eebf17891d57 SHA256 05d0fdcddabb2c151a859a4125fcd0351ef36932a2644a92a34b0ed3374a9a6b
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
diff --git a/dev-python/django/django-1.2.5.ebuild b/dev-python/django/django-1.2.5.ebuild
new file mode 100644
index 000000000000..d1980fce561b
--- /dev/null
+++ b/dev-python/django/django-1.2.5.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.2.5.ebuild,v 1.1 2011/02/09 04:37:42 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+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 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/* AUTHORS"
+WEBAPP_MANUAL_SLOT="yes"
+
+pkg_setup() {
+	python_pkg_setup
+	webapp_pkg_setup
+}
+
+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
+
+	dobashcompletion extras/django_bash_completion
+
+	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/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."
+}