bumps

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 188 insertions, 5 deletions

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index 5c5289b25728..a98c10c514a3 100644
--- a/dev-python/django/ChangeLog
+++ b/dev-python/django/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/django
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.137 2014/08/26 08:33:36 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.138 2014/09/01 05:05:46 idella4 Exp $
+
+*django-1.5.9 (01 Sep 2014)
+*django-1.4.14 (01 Sep 2014)
+
+  01 Sep 2014; Ian Delaney <idella4@gentoo.org> +django-1.4.14.ebuild,
+  +django-1.5.9.ebuild:
+  bumps
 
 *django-1.6.6 (26 Aug 2014)
 
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 59481bf601bb..561db56b63d3 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -6,20 +6,24 @@ AUX django-1.5-py3tests.patch 959 SHA256 62fbb00c8d919306b48c8fcc82c7fa5e8aa3858
 AUX django-1.5.4-objects.patch 1467 SHA256 237d0ee4e9f2af1d98b0b230977a41d061cbdbefc153193bc1539c4ad82622ee SHA512 09bdaab452f692679a15d0fbadf3c044417aeda0ce65b30bd2994d86b33ae93c13eb159fdad373a031ab2e0563861e29d1f9935b52c33af34a6afd25461e904d WHIRLPOOL d8a18947bd826c28836ce5180a6f9de758722fcc45ba11ca6a887c65711e7fa23827dcab734b6bfe51c330dd05a2d67a5d82e6e2d85130cdb05fcb4ca0622f26
 AUX django-1.6-objects.patch 729 SHA256 ea217c069a28b19063fcf216433cab48bd693fa51db0585881905532575a0875 SHA512 e7dc3cc8e50b4b0d546983dd79f1fa2bf7680d04d1e401267334ce72ee065e0fac2b00f9287ccafc3fabca29bca4c1d6475021b5da19d145a2d90fd491bb7ae7 WHIRLPOOL 00b4f579809206c78ce1648059c56a3af146c883c1b36f4febede15b4d3075a3686b30a6feac8d03c1df5e45994da5a2fdece6bdb71afb8d16bb72e139d67931
 DIST Django-1.4.13.tar.gz 7753532 SHA256 a8fede657378b6862744b19012e7071279b952ecd208fd83227723866068f2c0 SHA512 de9b095e28334d095e03067d931ef1f2bb24332d739b5f10cfc524ca20d15d94fa756fb80394c306ea2351549f6a7669acf491e44f29cfc0b220f620f9a4b080 WHIRLPOOL 72aba9cd46327f0bdece26823e7258a9bd39bb556bb0d52ef467105e2f44cfb0b6ba451b545dba663479abfe870ceabf561b1510e8e871a61672855b9c1bd3b4
+DIST Django-1.4.14.tar.gz 7754876 SHA256 81edad81211fd515677a35ab2d40833557649dd650f150baf8416f416b8a6c9c SHA512 b7e2e57d15bc5eee62aa0425932c99928cceb3f4bfdc28de42a96ee9ba2bdc0c28e7e102846e7ea3735eaaa00944b7aaeb0bd8625216dee2fc406f0be2601892 WHIRLPOOL 02689da58ab0d70a8f8e0f388a6f8ca9e25091fef0fce0ade0cada9072906bb7a4dc0d81728c9f0509a0c45b55e93e66bae8a85c6356ef66ddb911b3895e9546
 DIST Django-1.5.8.tar.gz 8071329 SHA256 01db30f38a081241a9cbc7bef12cb599506b80727613350e427547bed12aaaa3 SHA512 446e4e9ff59290816247ac750d6b311e520d0491304ff601946c41689bf1589f380c874624bc67a5850baeeca8c0bab494a66e42ad3562785780d424cfdaa2fe WHIRLPOOL b49486b6ea9baf2a3ccb8cf3774b1d010c429298edef79e91b5a39cadcb1bfed3ac4b8b3b59e7ded05737eb7694eca5177c8f2d459782107495441209b230041
+DIST Django-1.5.9.tar.gz 8074400 SHA256 47ce505c5046c38817828bee253b7256872f86c4340db1af698cb8548dbaa0d2 SHA512 0b42f09a6bd28b18eaaf6b1788fcc620ee410442c4f179130babed3fa6763155cc5469e1b38d68a87742a21f34e0ac343167dd7a9de0595c81e81a25296a1087 WHIRLPOOL 817e88b2a82b48d6c7f2f78091f66b786227b5513be01f99c90a5ab36920e5d15167dc209e9954641d61536e62e396719224fbd4b5812e349ccf59e48ff1d72b
 DIST Django-1.6.5.tar.gz 6633768 SHA256 36940268c087fede32d3f5887cce9af9e5d27962a0c405aacafc2a3cc1f755c5 SHA512 60d36b1b23cdda42f33d4c15e41053fe0fc1c6584617bd6ed683dfb0a6d6dfaa849b387ea514129acb2cc40e89fe33818db1e0897df110d1b8f5ed1a3b256905 WHIRLPOOL 0e284ed126b7c7b065a2a6929a7cd179aee63bca490f8e639facd0413c5313f2131ec18a8450429cbfb2ac034bd67c4d7ab94b2fb64df4a64c5f6dac876eb489
 DIST Django-1.6.6.tar.gz 6645456 SHA256 536cbd54e533ba3563d205f0c91988b24e7d74b8b253d7825e42214b50ba7e90 SHA512 4d52ed7e31df7d1b449697e5ecd48a94cbb365a1f0abe6b9308ba815b1ef80d2c38d8ba07a57f928617a592afaa44d48374ecf3901b66e68d389fc4ac4f6891d WHIRLPOOL db69860de31c2283faab0931818d215dab12cb36ed1f8b3160d0e1b5ed49c72b66b751b086cd454acde76c5c1b003ca89fabbdf88603de7b4cacf5df4385d3e0
 EBUILD django-1.4.13.ebuild 2557 SHA256 6324a5fbedc0d5bb5a256670dbada2adf7ea89eb6f37f484a10be9ae38bba5fe SHA512 5ba85fa019466d49006e0529c75f52c961744cea4406061dd67a4ee42d702811772f0ef20269df809b66590f7d97f9cfd6fc2d903d0b1258d0ef1b9179dd3cc3 WHIRLPOOL 1abeb48e97e637bc459a20e050273379d7017950e02c76de43031b540fe1190b509e42cb4e35cc166b2a0874a39d9303283bb17342fa3af65630d8fbfbb5a6c7
+EBUILD django-1.4.14.ebuild 2563 SHA256 431d9742754eb6c7a371b784348758e5355f2ea15bd23a02ba961f71ab99856a SHA512 f60afe1fd7986b5bf474ed6beb356992d2f46b5922a60bb626c014931b64e46d201f8e37e734901c6117f14bf89af63855cfcf05a6eb3d8a0b5f23d5c6effd52 WHIRLPOOL 270d0d458d74eb63905e57b2f6fd437bf5078528c3f930c07feecfc3039f259a3618bb7035c13fa0711cddf44d847bdb5d2496656cf299193537c2e135829b1d
 EBUILD django-1.5.8.ebuild 2569 SHA256 d3a762b98ae394170ec901853b2b44dbdbeab0182391b8b2cf189ec368b780e7 SHA512 774d461a68bbb245c245d1e39687b4bbda7c040a5a8369bb5d5c7800493f74a018c8870d1f68f0ef483e5de9256ed7faa0b7cc07ec31c449232102e97e3bc180 WHIRLPOOL f83d42ca4e7c9ff5be3dc02fad4587a45e1bb3d25f8116f8539a34ba578a1e2f93a58bfd60d1ef01afb012e46d072cde4c8cb0944cef3cd110f099a520d01c1f
+EBUILD django-1.5.9.ebuild 2575 SHA256 b903b0a635eb8afb9d73f01d72e1e97a17fdc90964e44218ba105244672c29f7 SHA512 a156a2bd7cd0e730536f08acac3783657698739eb1c26a9c3db9fab330963b81c0247d5c87177e4ccc764d2e5c64d17c917338e02c9fea6605486f3907f3197d WHIRLPOOL e01628d39ccb12d1535fa975ef22830a988d0c5dc1599792a647f687680456771db79ab31a7c0e9f315c097858a08e017090e75205c8c7b3c9d11b75ffe650c0
 EBUILD django-1.6.5.ebuild 2822 SHA256 b22170e5940b4efb7a306b8da94aa7443442de3fc80bc325e66d0d9850df11f5 SHA512 1db6a4e97a48b1326953c1fec762da71137e7295c459518ee7e5c6565c791f1a16e0af87b29c25ad18f4907c2525163384558a2f0e1d46cb07eb9c9ee8298479 WHIRLPOOL 8d496a8078c198a518a570e7c48f10293bdb27c1d503cc8693193074a18ea8a9a025410d477e98f76be2384861c33c8c5a89a2eeeac8a3305ffc0292bffeb882
 EBUILD django-1.6.6.ebuild 2690 SHA256 7e08441118cedd641374bfe629e9e0d3a2e22f99e0336856a2ef8806d832bdd9 SHA512 234523efb2772117d0d73d25ef00f3663dae65177a895ab0ec0ab62309dbc64546b9d2f4fafc005751a9fbc04c54799db64c1db63ccac3b9b3d4bb8a00c45907 WHIRLPOOL cfbd3ba49285086600881b4092fced3f657d8fa78027a06734994c4e1df10b8c4abd4e16310397fe39cdb0a67d8d393f9b37c3439509764f49b850e717248bc2
 EBUILD django-9999.ebuild 2378 SHA256 7bab217e56b3cbafc16f45b32462afc0ad791658c123df2100e2336622332fcc SHA512 bc2a6a3217627133b74115c02f93eaf71b250f410f39f433baf86da74dd45bc7c8b191b10fa40ef299f1f9a98f0a12f223953c6050321f246052a2ce90cf588f WHIRLPOOL fecb6f73ff804f70c468ffa79d64f12aa5960c171f61be323bbf0a5cfde35c042752bf8e61c3af1b1a50ab64002c675120381f4412a3fb37d0861efa1d14dd43
-MISC ChangeLog 21282 SHA256 4c6b6718665db647d57a6244ae57aea357d8a43d496276ca0369f8452ff6e893 SHA512 030f69891022e99e561e0792916ba1508e37e6cdbb0c704d774af126a9646657d24e7afa2592d7e06119f3f193d3dc6db28e4ceae441bf43fbc79d9b433d02a4 WHIRLPOOL d22564b9710c5496d631da5bd28a99c6071c0060f0a9b4819b51cbb5bcf36eec4f16008248ca4b8c6a6c84e689a378e72c88aafba969c3be5f12961331851274
+MISC ChangeLog 21444 SHA256 db8df63da9d87ba37f72941ede9d0ca9934d079a72324248ba34dbd7f7825f00 SHA512 7f910b9334bcb219aa928224c2b5a0829cf1ece34e9b4656c196ffc36cca7d6b6703dd372e764fa2c081e1b3519a9f274e6a779e215be6d481928e5328b1fbf8 WHIRLPOOL e9bdef60eb070a41dcfcadb61b18d9b829c7cb51d38cb08f7c821aea13166c18e585b34b6f67daf3c09cf4c792f21f62c755c5ad2c870c9cadafbd3a64ce80e6
 MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlP8REIACgkQso7CE7gHKw3HZwCfeD8hX2l9o52ta2TELY5xP1Kh
-j04AoLp4RGeQE3ClWFP7X7y+c55z7Z1n
-=8jHS
+iEYEAREIAAYFAlQD/IcACgkQso7CE7gHKw1NkgCg0H+77RieGSgdvHkEp1Nnqa2r
+MnwAnAscsfxqr7QOZBafiGJKFfTMIztY
+=ihu4
 -----END PGP SIGNATURE-----
diff --git a/dev-python/django/django-1.4.14.ebuild b/dev-python/django/django-1.4.14.ebuild
new file mode 100644
index 000000000000..e7cdb270b316
--- /dev/null
+++ b/dev-python/django/django-1.4.14.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.4.14.ebuild,v 1.1 2014/09/01 05:05:46 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='sqlite?'
+
+inherit bash-completion-r1 distutils-r1 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="https://www.djangoproject.com/m/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="mysql postgres sqlite test"
+
+RDEPEND="virtual/python-imaging[${PYTHON_USEDEP}]
+	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	mysql? ( >=dev-python/mysql-python-1.2.3[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? ( ${PYTHON_DEPS//sqlite?/sqlite} )"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+python_prepare_all() {
+	# 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 || die
+	sed \
+		-e "s/test_urlfield_3/_&/" \
+		-e "s/test_urlfield_4/_&/" \
+		-e "s/test_urlfield_10/_&/" \
+		-i tests/regressiontests/forms/tests/fields.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. \
+	"${PYTHON}" tests/runtests.py --settings=test_sqlite -v1 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	# Port conflict in django.test.testcases.LiveServerTestCase.
+	# Several other races with temp files.
+	DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
+}
+
+src_install() {
+	distutils-r1_src_install
+	webapp_src_install
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newbashcomp extras/django_bash_completion ${PN}
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r django/contrib/admin/static/admin/.
+}
+
+pkg_postinst() {
+	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"
+	elog
+	ewarn "If you build Django ${PV} without USE=\"vhosts\""
+
+	# XXX: call webapp_pkg_postinst? the old ebuild didn't do that...
+	ewarn "webapp-config will automatically install the"
+	ewarn "admin media into the localhost webroot."
+}
diff --git a/dev-python/django/django-1.5.9.ebuild b/dev-python/django/django-1.5.9.ebuild
new file mode 100644
index 000000000000..8134dc57fe41
--- /dev/null
+++ b/dev-python/django/django-1.5.9.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.5.9.ebuild,v 1.1 2014/09/01 05:05:46 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_2,3_3} pypy )
+PYTHON_REQ_USE='sqlite?'
+WEBAPP_NO_AUTO_INSTALL="yes"
+
+inherit bash-completion-r1 distutils-r1 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="https://www.djangoproject.com/m/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 ~x64-macos ~x86-macos"
+IUSE="doc mysql postgres sqlite test"
+
+PY2_USEDEP=$(python_gen_usedep python2_7)
+PY23_USEDEP=$(python_gen_usedep python2_7 'python{3_3,3_4}')
+RDEPEND="virtual/python-imaging[${PYTHON_USEDEP}]
+	postgres? ( dev-python/psycopg:2[${PY23_USEDEP}] )
+	mysql? ( >=dev-python/mysql-python-1.2.3[${PY2_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
+	test? ( ${PYTHON_DEPS//sqlite?/sqlite} )"
+
+REQUIRED_USE="mysql? ( $(python_gen_useflags python2_7) )
+		postgres? ( || ( $(python_gen_useflags 'python{2_7,3_2,3_3}') ) )"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.5.4-objects.patch \
+		"${FILESDIR}"/${PN}-1.5-py3tests.patch )
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+	fi
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	# https://code.djangoproject.com/ticket/20514
+	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v1 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	# Port conflict in django.test.testcases.LiveServerTestCase.
+	# Several other races with temp files.
+	DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
+}
+
+src_install() {
+	distutils-r1_src_install
+	webapp_src_install
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}
+
+	if use doc; then
+		rm -fr docs/_build/html/_sources
+		local HTML_DOCS=( docs/_build/html/. )
+	fi
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r django/contrib/admin/static/admin/.
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "A copy of the admin media is available to webapp-config for installation in a"
+	elog "webroot, as well as the traditional location in python's site-packages dir"
+	elog "for easy development."
+	webapp_pkg_postinst
+}