bump; 1.4.2, tested fine

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

3 files changed, 128 insertions, 2 deletions

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index c2550418e074..1d481876b020 100644
--- a/dev-python/django/ChangeLog
+++ b/dev-python/django/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/django
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.86 2012/11/01 07:56:06 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.87 2012/11/16 15:16:30 idella4 Exp $
+
+*django-1.4.2 (17 Nov 2012)
+
+  17 Nov 2012; Ian Delaney <idella4@gentoo.org> +django-1.4.2.ebuild:
+  bump; 1.4.2, tested fine
 
   01 Nov 2012; Patrick Lauer <patrick@gentoo.org> django-9999.ebuild:
   Fixing live ebuild for #439192
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 1ef74de9043a..c1c3ba876c12 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX django-1.3.1-djangodocs_extension.patch 1879 SHA256 fbf7b2383f18f03755f30fe9a25e05d994aa22d7a6832b92073f5a3dcf7a0a87 SHA512 54f14cd523ffb87cff1e768e656823a41d7ee7a29ccf2f2759622de1f4285b74b9e74810803af328cf3fdddbb97d35ec632ba8673a19713c6d8e06d174978d25 WHIRLPOOL 9a723ae60a3917ac16083e7ab4d19b8009a3662ef89bb91f8847b7f413907cb329419f4f9e97e517a07f99c235b5a2d0c2d26840e65dad26f6343aa572511487
 DIST Django-1.3.2.tar.gz 6507042 SHA256 72c4080fe30863c4581521ef6f7bfcc12d01e7c55b9ad1935acaa43e466dd764 SHA512 8a9d78269f9a0b84d2716f0a29d83866c670c2cec50ac48e6f4455073c4bb44d8f7828c1c3e735683daf7c7f528fd00f65f457c6e34fc538d0f6a4bbb95f88e3 WHIRLPOOL f750574297620d43e74f8ec0ddaa9dc381b2bee0fcd6afe369985652acf21d7cb07a22a242aca440b17546a8a89822bc7ef5299aeb507cd2bd94f2d1669fd374
 DIST Django-1.4.1.tar.gz 7656756 SHA256 4d8d20eba350d3d29613cc5a6302d5c23730c7f9e150985bc58b3175b755409b SHA512 1956e84c2c5131b17c76699a733801105c554d447341547c306ecf02ab1ef61371efe8fec0a8f10ddeafc9f13b61680543772678f9f1d594ad320c673669d0b2 WHIRLPOOL 38f639fa02681ab5a139bf9ce8807c0320796b7eb4e1acb498aae688a785c4ec5acaae15e9e50d8ec561be39145776d26860fbe50efab1f2dac12fa1b5504c38
+DIST Django-1.4.2.tar.gz 7722026 SHA256 edfd8733f45bbaa524cee25bcac3080ce28c21242c27227464eae3fa6b3d80e7 SHA512 5021eec3c7a48537fa15097e471232cf13d2019cfa166ff4ad50388e09ea11d85161e2e4d92927e15b1c11831286d236bd7f9817c0a2557a4bccf7b08f10751e WHIRLPOOL cf7965d7c09ae6ff54c5d3a8acf3d3348d6b008d5bdb331c37af836ec03d39cee2e7f24fb9173da155f41e290034fbb962a68d728efbfd30c05291f61cdf6682
 EBUILD django-1.3.2.ebuild 3118 SHA256 a14606386851e38b3f9742962684b81940cb7cc7319359165732c4bf97a291b4 SHA512 c2027870bd7551594d6f3abc7054d1363ac5e87af2b4aa582d3fcce22f4489dc43573f48623fb61066d37ceb965098eb208758f8fac6a555065f3fd365ee25a9 WHIRLPOOL 33575c226068d708f377ec39f4ad82197ee8481ecf3201755392e772c960b016175fcbf746275d66ce61b55ac6b1382716d6e3c797340d443b7fdd8017d97b79
 EBUILD django-1.4.1.ebuild 3041 SHA256 08ba7b9625a0afe752c8219e16b6b21147529b2e445d7435ada3d5c0a14681af SHA512 21ad4ae311abba5d7dafb874f85ac2c33f6ff7d4e7d5e444dd909fd06518b64ec937bfe498d1df068326ec45713852c6efe37b4a6799a38887d9bd8695f8af7e WHIRLPOOL 6d7b31e84d8c250a2dfbd982d920b53b4b8b1247257d02a2657b0f36937ac5a2e61e4bb1f564463b5d7fcbfb1ebda2f60146d650bbfbb050dd1005bb5edf236b
+EBUILD django-1.4.2.ebuild 3023 SHA256 991f232fba410418ac7c5952cada10986fdc75568e565e5085d27682c76533ee SHA512 5b44fb0d61e9a756b1afde8281fda80772537f5570d119a885fe03d0e974a6537780cc053801d7283ab7802639b45fb676c2b553a4668032899c227f72dea7e0 WHIRLPOOL 8ebfac3bbe188904b843c18486f4df00da0fc68d35de12eeac6ed026d88b469631cea3053ded73c8924d8024d4d67317c47f90c185fe5a58751f0bbc04b7dfed
 EBUILD django-9999.ebuild 2888 SHA256 fbdc827f1d63e04a250515c3ac4b640911b0aa7d89b5c5d7a005197fcfec5d38 SHA512 ff02473709c87dd7a588a7ee2641111292d4472aae399d90aad63a3ee82f7c3882630f507ac95d559bdf1fa88e63205cd6381872e8fa7b4e517e8b8018f4480a WHIRLPOOL 8c08e218fe0e4dd8a5c7ada9844bce83e25d46c9f8042bc015118f31bb53d66459b55ef5c7e34f7b8d07a5a9b15dc42f9a0eb4ac4ce73d6bbf63b217f328c1e3
-MISC ChangeLog 13423 SHA256 714cbffd0993bbebb4e6f253a6d49f0b415e487303a2d5cf83c031ada2e8d092 SHA512 6d7a45a12e253e166d184151a91193c75a8f1bfe81f3b01faf2ade9d86d5252d23ae91405b584b14080ba8cc20b47ecad2db192f9d8fe2f180c965854d89d31e WHIRLPOOL 0867b3695aacd6b00ab347cdd639aff4332aa23f24d2ffa19360b93ce231be64685efc63cbb44af27de06ecddc7f61c9c2aadee97aecaf16b5b771f5759bdf9c
+MISC ChangeLog 13550 SHA256 e191f3ec5f4ea9f50dcb7f788bf5d01efcce73895b71a96af30e74669b47cd3b SHA512 0143f02e9e877f96fa1a1d71a5a938099659de7e81e4f9cda3670b101f5e0e42dc022088ac0cbf926ca48cd7a1292196c2dd8273463be1df9455b99b759c5c17 WHIRLPOOL 4bf22ecc831e6bb7b4ea955cfac2195fd0e5deaf390a4c0e93afc3601ee4aab54feca56ca88d9de067c1985283559f8a931bcff8ceab6a7bca480aa087a15d34
 MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlCnOcQACgkQso7CE7gHKw2s1wCg0tlSS1MWWyz0x4t3P/bbOkYh
+SyYAoLO7HIlVscxACG3VrtaklccfgVCy
+=yupL
+-----END PGP SIGNATURE-----
diff --git a/dev-python/django/django-1.4.2.ebuild b/dev-python/django/django-1.4.2.ebuild
new file mode 100644
index 000000000000..cabdc7911a59
--- /dev/null
+++ b/dev-python/django/django-1.4.2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.4.2.ebuild,v 1.1 2012/11/16 15:16:30 idella4 Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+PYTHON_TESTS_RESTRICTED_ABIS="2.6"     		# fails with 1 single Error
+
+inherit bash-completion-r1 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="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="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:2 )
+	mysql? ( >=dev-python/mysql-python-1.2.3 )"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-1.0.7 )
+	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}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+pkg_setup() {
+	python_pkg_setup
+	webapp_pkg_setup
+}
+
+src_prepare() {
+	distutils_src_prepare
+
+	# 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
+}
+
+src_compile() {
+	distutils_src_compile
+	if use doc; then
+		einfo "Generation of documentation"
+		pushd docs > /dev/null
+		emake html
+		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
+
+	newbashcomp extras/django_bash_completion ${PN}
+
+	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/static/admin/*
+
+	webapp_src_install
+}
+
+pkg_preinst() {
+	:
+}
+
+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."
+}